diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md
index 30a8e40ee2a..7073e2a413a 100644
--- a/.github/pull_request_template.md
+++ b/.github/pull_request_template.md
@@ -1,41 +1,11 @@
-PLEASE FOLLOW THE CHECKLIST BELOW WHEN CREATING A NEW PULL REQUEST. THE
-CHECKLIST IS FOR YOUR INFORMATION AND MUST BE REMOVED BEFORE SUBMITTING THE PULL
-REQUEST.
+PLEASE DESCRIBE YOUR CHANGES.
+THIS MESSAGE ENDS UP AS THE COMMIT MESSAGE.
+DO NOT USE @-MENTIONS HERE!
 
-## Checklist
+--- END COMMIT MESSAGE ---
 
-- [ ] Does the PR title follow the `<prefix>: title` scheme?
+Any further description goes here, @-mentions are ok here!
 
-    The prefix must be one of:
-
-    - `fix`: for a bugfix
-    - `feat`: for a new feature
-    - `refactor`: for an improvement of an existing feature
-    - `perf`, `test`: for performance- or test-related changes
-    - `docs`: for documentation-related changes
-    - `build`, `ci`, `chore`: as appropriated for infrastructure changes
-
-- [ ] Does this modify the public API as defined in `docs/versioning.rst`?
-
-    - [ ] Does the PR title contain a `!` to indicate a breaking change?
-    - [ ] Is there section starting with `BREAKING CHANGE:` in the PR body
-          that explains the breaking change?
-
-- [ ] Is the PR ready to be merged?
-
-    - [ ] If not: is it marked as a draft PR?
-
-- [ ] Does this PR close an existing issue?
-
-    - [ ] Is the issue correctly linked so it will be automatically closed
-        upon successful merge (See closing keywords link in the sidebar)?
-
-- The CI will initially report a missing milestone. One of the maintainers will
-  handle assigning a milestone for book-keeping.
-
-- An automated workflow will assign labels based on changed files, and whether
-  or not reference files were changed. These do not have to be set manually.
-
-- If you push updates, and you know they will be superceded later on, consider adding
-  `[skip ci]` in the commit message. This will instruct the CI system not to run any
-  jobs on this commit.
+- Use a *conventional commits* prefix: [quick summary](https://www.conventionalcommits.org/en/v1.0.0/#summary)
+  - We mostly use `feat`, `fix`, `refactor`, `docs`, `chore` and `build` types.
+- A milestone will be assigned by one of the maintainers
diff --git a/.github/workflows/analysis.yml b/.github/workflows/analysis.yml
index 2ce3bfdc278..f33bb927f40 100644
--- a/.github/workflows/analysis.yml
+++ b/.github/workflows/analysis.yml
@@ -20,8 +20,9 @@ env:
   CTEST_OUTPUT_ON_FAILURE: 1
   CCACHE_DIR: ${{ github.workspace }}/ccache
   CCACHE_MAXSIZE: 1.25G
-  CCACHE_KEY_SUFFIX: r1
+  CCACHE_KEY_SUFFIX: r2
   ACTS_LOG_FAILURE_THRESHOLD: WARNING
+  DEPENDENCY_URL: https://acts.web.cern.ch/ACTS/ci/ubuntu-24.04/deps.v5.tar.zst
 
 # NOTE this only builds core unittests to reduce the output size. if we
 #      found a way to have Github actions not fail regularly with this job
@@ -29,18 +30,21 @@ env:
 jobs:
   build_debug:
     runs-on: ubuntu-latest
-    container: ghcr.io/acts-project/ubuntu2404:58
+    container: ghcr.io/acts-project/ubuntu2404:63
     steps:
 
       - uses: actions/checkout@v4
 
+      - name: Install dependencies
+        run: CI/dependencies.sh
+
       - name: Cache build
         uses: actions/cache@v4
         with:
-          path: ${{ github.workspace }}/ccache
-          key: ${{ runner.os  }}-ccache-linux_ubuntu_debug_${{ env.CCACHE_KEY_SUFFIX }}_${{ github.sha }}
+          path: ${{ env.CCACHE_DIR }}
+          key: ccache-${{ runner.os  }}-${{ github.job }}-${{ env.CCACHE_KEY_SUFFIX }}-${{ github.sha }}
           restore-keys: |
-            ${{ runner.os  }}-ccache-linux_ubuntu_debug_${{ env.CCACHE_KEY_SUFFIX }}_
+            ccache-${{ runner.os  }}-${{ github.job }}-${{ env.CCACHE_KEY_SUFFIX }}-
 
       - name: Configure
         run: >
@@ -49,6 +53,7 @@ jobs:
           --preset=github-ci
           -DCMAKE_BUILD_TYPE=Debug
           -DCMAKE_CXX_FLAGS="-Werror --coverage -g -gz -g1"
+          -DPython_EXECUTABLE=$(which python3)
           -DACTS_BUILD_ODD=OFF
       - name: Build
         run: cmake --build build
@@ -86,10 +91,14 @@ jobs:
 
   build_performance:
     runs-on: ubuntu-latest
-    container: ghcr.io/acts-project/ubuntu2404:58
+    container: ghcr.io/acts-project/ubuntu2404:63
     if: github.ref == 'refs/heads/main'
     steps:
       - uses: actions/checkout@v4
+
+      - name: Install dependencies
+        run: CI/dependencies.sh
+
       - name: Install dependencies
         run: pip3 install git+https://github.com/paulgessinger/cmakeperf.git@2a409b5
       - name: Configure
@@ -98,6 +107,7 @@ jobs:
           --preset=github-ci
           -DCMAKE_BUILD_TYPE=RelWithDebInfo
           -DCMAKE_CXX_FLAGS="-Werror"
+          -DPython_EXECUTABLE=$(which python3)
           -DACTS_BUILD_ODD=OFF
       - name: Measure
         run: cmakeperf collect build/compile_commands.json -o perf.csv
diff --git a/.github/workflows/builds.yml b/.github/workflows/builds.yml
index f31c4c2e06d..87c57c27b7e 100644
--- a/.github/workflows/builds.yml
+++ b/.github/workflows/builds.yml
@@ -19,32 +19,37 @@ env:
   HOMEBREW_NO_INSTALL_CLEANUP: 1
   CCACHE_DIR: ${{ github.workspace }}/ccache
   CCACHE_MAXSIZE: 500M
-  CCACHE_KEY_SUFFIX: r1
+  CCACHE_KEY_SUFFIX: r2
+  DEPENDENCY_TAG: v5
 
 jobs:
   linux_ubuntu:
     runs-on: ubuntu-latest
-    container: ghcr.io/acts-project/ubuntu2404:58
+    container: ghcr.io/acts-project/ubuntu2404:63
     env:
       INSTALL_DIR: ${{ github.workspace }}/install
       ACTS_LOG_FAILURE_THRESHOLD: WARNING
-    steps:
-      - name: Install git lfs
-        run: apt-get update && apt-get install -y git-lfs
 
+    steps:
       - uses: actions/checkout@v4
         with:
           submodules: true
           lfs: true
 
+      - name: Set dependencies URL
+        run: echo "DEPENDENCY_URL=https://acts.web.cern.ch/ACTS/ci/ubuntu-24.04/deps.${DEPENDENCY_TAG}.tar.zst" >> $GITHUB_ENV
+
+      - name: Install dependencies
+        run: CI/dependencies.sh
+
       - name: Restore ccache
         uses: actions/cache/restore@v4
         id: ccache-restore
         with:
-          path: ${{ github.workspace }}/ccache
-          key: ${{ runner.os  }}-ccache-linux_ubuntu_${{ env.CCACHE_KEY_SUFFIX }}_${{ github.sha }}
+          path: ${{ env.CCACHE_DIR }}
+          key: ccache-${{ runner.os  }}-${{ github.job }}-${{ env.CCACHE_KEY_SUFFIX }}-${{ github.sha }}
           restore-keys: |
-            ${{ runner.os  }}-ccache-linux_ubuntu_${{ env.CCACHE_KEY_SUFFIX }}_
+            ccache-${{ runner.os  }}-${{ github.job }}-${{ env.CCACHE_KEY_SUFFIX }}-
 
       - name: Configure
         # setting CMAKE_CXX_STANDARD=20 is a workaround for a bug in the
@@ -58,6 +63,7 @@ jobs:
           cmake -B build -S .
           --preset=github-ci
           -DCMAKE_INSTALL_PREFIX="${INSTALL_DIR}"
+          -DPython_EXECUTABLE=$(which python3)
           -DACTS_BUILD_PLUGIN_ONNX=ON
 
       - name: Build
@@ -107,20 +113,23 @@ jobs:
 
   linux_examples_test:
     runs-on: ubuntu-latest
-    container: ghcr.io/acts-project/ubuntu2404:58
+    container: ghcr.io/acts-project/ubuntu2404:63
     needs: [linux_ubuntu]
     env:
       ACTS_SEQUENCER_DISABLE_FPEMON: true
 
     steps:
-      - name: Install git lfs
-        run: apt-get update && apt-get install -y git-lfs
-
       - uses: actions/checkout@v4
         with:
           submodules: true
           lfs: true
 
+      - name: Set dependencies URL
+        run: echo "DEPENDENCY_URL=https://acts.web.cern.ch/ACTS/ci/ubuntu-24.04/deps.${DEPENDENCY_TAG}.tar.zst" >> $GITHUB_ENV
+
+      - name: Install dependencies
+        run: CI/dependencies.sh
+
       - uses: actions/download-artifact@v4
         with:
           name: acts-linux-ubuntu
@@ -135,29 +144,34 @@ jobs:
           PYTEST_MD_REPORT_VERBOSE: 0
           PYTEST_MD_REPORT_OUTPUT: pytest.md
         run: >
-          /usr/local/bin/geant4-config --install-datasets
+          geant4-config --install-datasets
           && source build/this_acts_withdeps.sh
-          && pip3 install -r Examples/Python/tests/requirements.txt
-          && pip3 install pytest-md-report
+          && python3 -m pip install -r Examples/Python/tests/requirements.txt
+          && python3 -m pip install pytest-md-report
           && pytest -rFsv -k "not exatrkx" -v
           && cat ${PYTEST_MD_REPORT_OUTPUT} >> $GITHUB_STEP_SUMMARY
 
   linux_physmon:
     runs-on: ubuntu-latest
-    container: ghcr.io/acts-project/ubuntu2404:58
+    container: ghcr.io/acts-project/ubuntu2404:63
     needs: [linux_ubuntu]
     env:
       ACTS_SEQUENCER_DISABLE_FPEMON: true
 
     steps:
-      - name: Install git lfs
-        run: apt-get update && apt-get install -y git-lfs time
-
       - uses: actions/checkout@v4
         with:
           submodules: true
           lfs: true
 
+      - run: apt-get update && apt-get install -y time
+
+      - name: Set dependencies URL
+        run: echo "DEPENDENCY_URL=https://acts.web.cern.ch/ACTS/ci/ubuntu-24.04/deps.${DEPENDENCY_TAG}.tar.zst" >> $GITHUB_ENV
+
+      - name: Install dependencies
+        run: CI/dependencies.sh
+
       - uses: actions/download-artifact@v4
         with:
           name: acts-linux-ubuntu
@@ -177,10 +191,15 @@ jobs:
         run: >
           echo "::group::Dependencies"
           && git config --global safe.directory "$GITHUB_WORKSPACE"
-          && pip3 install histcmp==0.6.7 matplotlib
-          && pip3 install -r Examples/Scripts/requirements.txt
-          && /usr/local/bin/geant4-config --install-datasets
+          && python3 -m pip install histcmp==0.6.8 matplotlib
+          && python3 -m pip install -r Examples/Scripts/requirements.txt
+          && geant4-config --install-datasets
+          && venv_python=$(which python3)
+          && echo $venv_python
           && source build/this_acts_withdeps.sh
+          && export PATH=$(dirname $venv_python):$PATH
+          && echo $PATH
+          && which python3
           && echo "::endgroup::"
           && CI/physmon/phys_perf_mon.sh all physmon
 
@@ -231,27 +250,31 @@ jobs:
             std: 20
           - image: ubuntu2204_clang
             std: 20
-    container: ghcr.io/acts-project/${{ matrix.image }}:58
+    container: ghcr.io/acts-project/${{ matrix.image }}:63
     env:
       INSTALL_DIR: ${{ github.workspace }}/install
       ACTS_LOG_FAILURE_THRESHOLD: WARNING
-    steps:
-      - name: Install git lfs
-        run: apt-get update && apt-get install -y git-lfs
 
+    steps:
       - uses: actions/checkout@v4
         with:
           submodules: true
           lfs: true
 
+      - name: Set dependencies URL
+        run: echo "DEPENDENCY_URL=https://acts.web.cern.ch/ACTS/ci/ubuntu-22.04/deps.${DEPENDENCY_TAG}.tar.zst" >> $GITHUB_ENV
+
+      - name: Install dependencies
+        run: CI/dependencies.sh
+
       - name: Restore ccache
         uses: actions/cache/restore@v4
         id: ccache-restore
         with:
-          path: ${{ github.workspace }}/ccache
-          key: ${{ runner.os  }}-ccache-linux_${{ matrix.image }}_${{ env.CCACHE_KEY_SUFFIX }}_${{ github.sha }}
+          path: ${{ env.CCACHE_DIR }}
+          key: ccache-${{ runner.os  }}-${{ github.job }}-${{ env.CCACHE_KEY_SUFFIX }}-${{ github.sha }}
           restore-keys: |
-            ${{ runner.os  }}-ccache-linux_${{ matrix.image }}_${{ env.CCACHE_KEY_SUFFIX }}_
+            ccache-${{ runner.os  }}-${{ github.job }}-${{ env.CCACHE_KEY_SUFFIX }}-
 
 
       - name: Configure
@@ -264,6 +287,7 @@ jobs:
           --preset=github-ci
           -DCMAKE_CXX_STANDARD=${{ matrix.std }}
           -DCMAKE_INSTALL_PREFIX="${INSTALL_DIR}"
+          -DPython_EXECUTABLE=$(which python3)
 
       - name: Build
         run: cmake --build build
@@ -306,11 +330,8 @@ jobs:
     runs-on: macos-14
     env:
       INSTALL_DIR: ${{ github.workspace }}/install_acts
-      DEPENDENCY_DIR: ${{ github.workspace }}/install
       ACTS_LOG_FAILURE_THRESHOLD: WARNING
-      DEPENDENCY_URL: https://acts.web.cern.ch/ACTS/ci/macos-14/deps.v2.tar.zst
-      # Works around an issue where root's RPATH is wrong for tbb, thus won't find it
-      DYLD_LIBRARY_PATH: "${{ github.workspace }}/install/tbb/2021.11.0/lib"
+
     steps:
       - uses: actions/checkout@v4
         with:
@@ -320,64 +341,71 @@ jobs:
       - name: Print architecture
         run: uname -p
 
+      - name: Set dependencies URL
+        run: echo "DEPENDENCY_URL=https://acts.web.cern.ch/ACTS/ci/macos-14/deps.${DEPENDENCY_TAG}.tar.zst" >> $GITHUB_ENV
+
       - name: Install dependencies
         run: >
           brew install cmake ninja ccache xerces-c
-          && wget --verbose --progress=dot:giga --continue --retry-connrefused --tries=5 --timeout=2 -O deps.tar.zst ${{ env.DEPENDENCY_URL }}
-          && mkdir ${{ env.DEPENDENCY_DIR }}
-          && tar -xf deps.tar.zst -C ${{ env.DEPENDENCY_DIR }}
-          && PATH="${{ env.DEPENDENCY_DIR }}/bin:$PATH"
-          && python3 -m pip install pyyaml jinja2
+          && CI/dependencies.sh
 
       - name: Restore ccache
         uses: actions/cache/restore@v4
         id: ccache-restore
         with:
-          path: ${{ github.workspace }}/ccache
-          key: ${{ runner.os  }}-ccache_${{ env.CCACHE_KEY_SUFFIX }}_${{ github.sha }}
+          path: ${{ env.CCACHE_DIR }}
+          key: ccache-${{ runner.os  }}-${{ github.job }}-${{ env.CCACHE_KEY_SUFFIX }}-${{ github.sha }}
           restore-keys: |
-            ${{ runner.os  }}-ccache_${{ env.CCACHE_KEY_SUFFIX }}_
+            ccache-${{ runner.os  }}-${{ github.job }}-${{ env.CCACHE_KEY_SUFFIX }}-
 
       - name: Configure
         run: >
           ccache -z
-          && PATH="${{ env.DEPENDENCY_DIR }}/bin:$PATH"
           && cmake -B build -S .
           --preset=github-ci
           -DCMAKE_PREFIX_PATH="${{ env.DEPENDENCY_DIR }}"
-          -DPython_EXECUTABLE=${{ env.DEPENDENCY_DIR }}/bin/python3
           -DCMAKE_INSTALL_PREFIX="${{ env.INSTALL_DIR }}"
+          -DPython_EXECUTABLE=$(which python3)
+
       - name: Build
         run: cmake --build build
+
       - name: ccache stats
         run: ccache -s
+
       - name: Save ccache
         uses: actions/cache/save@v4
         if: always()
         with:
           path: ${{ github.workspace }}/ccache
           key: ${{ steps.ccache-restore.outputs.cache-primary-key }}
+
       - name: Unit tests
         run: cmake --build build --target test
+
       - name: Integration tests
         run: cmake --build build --target integrationtests
+
       - name: Install
         run: cmake --build build --target install
+
       - uses: actions/upload-artifact@v4
         with:
           name: acts-macos
           path: ${{ env.INSTALL_DIR }}
+
       - name: Downstream configure
         run: >
-          PATH="${{ env.DEPENDENCY_DIR }}/bin:$PATH"
-          && cmake -B build-downstream -S Tests/DownstreamProject
+          cmake -B build-downstream -S Tests/DownstreamProject
           -GNinja
           -DCMAKE_BUILD_TYPE=Release
           -DCMAKE_CXX_FLAGS=-Werror
           -DCMAKE_CXX_STANDARD=20
           -DCMAKE_PREFIX_PATH="${INSTALL_DIR}"
+
       - name: Downstream build
         run: cmake --build build-downstream
+
       - name: Downstream run
         run: >
           PATH="${{ env.DEPENDENCY_DIR }}/bin:$PATH"
diff --git a/.github/workflows/checks.yml b/.github/workflows/checks.yml
index 5686d842b66..edd31d051a4 100644
--- a/.github/workflows/checks.yml
+++ b/.github/workflows/checks.yml
@@ -116,6 +116,16 @@ jobs:
       - name: Check
         run: >
           CI/check_spelling
+  math_macros:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - uses: actions/setup-python@v5
+        with:
+          python-version: '3.12'
+      - name: Check
+        run: >
+          CI/check_math_macros.py . --exclude "thirdparty/*"
   missing_includes:
     runs-on: ubuntu-latest
     steps:
diff --git a/.github/workflows/sonarcloud.yml b/.github/workflows/sonarcloud.yml
index f7dfa2bdb97..1c0fc64ff27 100644
--- a/.github/workflows/sonarcloud.yml
+++ b/.github/workflows/sonarcloud.yml
@@ -23,6 +23,8 @@ jobs:
 
       - name: "Checkout repository"
         uses: actions/checkout@v4
+        with:
+          fetch-depth: 0 # To prevent shallow clone
 
       - name: 'Download artifact'
         uses: actions/github-script@v7
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 843980dd82a..b0a213e607d 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,12 +1,14 @@
 variables:
   CCACHE_DIR: ${CI_PROJECT_DIR}/ccache
   CCACHE_MAXSIZE: 2G
-  CCACHE_KEY_SUFFIX: r1
+  CCACHE_KEY_SUFFIX: r2
   CTEST_OUTPUT_ON_FAILURE: 1
 
+  DEPENDENCY_TAG: v5
+
 clang_tidy:
   stage: build
-  image: ghcr.io/acts-project/ubuntu2404:58
+  image: ghcr.io/acts-project/ubuntu2404:63
   tags:
     - large
   artifacts:
@@ -14,6 +16,8 @@ clang_tidy:
       - src/clang-tidy/
     when: always
     expire_in: 1 week
+  variables:
+    DEPENDENCY_URL: https://acts.web.cern.ch/ACTS/ci/ubuntu-24.04/deps.$DEPENDENCY_TAG.tar.zst
   script:
     - git clone $CLONE_URL src
     - cd src
@@ -24,19 +28,21 @@ clang_tidy:
         && ln -sf /usr/bin/clang++-18 /usr/bin/clang++
         && ln -sf /usr/bin/clang-18 /usr/bin/clang
         && ln -sf /usr/bin/clang-tidy-18 /usr/bin/clang-tidy
+
+    - source CI/dependencies.sh
+
     - >
         cmake -B build -S .
         --preset=gitlab-ci-clangtidy
         -DCMAKE_CXX_COMPILER=clang++
         -DCMAKE_C_COMPILER=clang
-        -DACTS_RUN_CLANG_TIDY=ON
-        -DACTS_BUILD_ODD=OFF
+        -DPython_EXECUTABLE=$(which python3)
 
     # Main clang-tidy run during cmake compilation
     - CI/clang_tidy/run_clang_tidy.sh clang-tidy build
 
     # Install dependencies for processing scripts
-    - pip install -r CI/clang_tidy/requirements.txt
+    - python3 -m pip install -r CI/clang_tidy/requirements.txt
 
     # Parse the main clang-tidy run
     - >
@@ -55,14 +61,19 @@ clang_tidy:
 
 build_exatrkx_cpu:
   stage: build
-  image: ghcr.io/acts-project/ubuntu2204_exatrkx:58
+  image: ghcr.io/acts-project/ubuntu2204_exatrkx:63
+  variables:
+    DEPENDENCY_URL: https://acts.web.cern.ch/ACTS/ci/ubuntu-22.04/deps.$DEPENDENCY_TAG.tar.zst
   tags:
     - large
 
   cache:
-    key: ccache-exatrkx-cpu-$CI_COMMIT_REF_SLUG
+    key: ccache-${CI_JOB_NAME}-${CI_COMMIT_REF_SLUG}-${CCACHE_KEY_SUFFIX}
+    fallback_keys:
+      - ccache-${CI_JOB_NAME}-${CI_DEFAULT_BRANCH}-${CCACHE_KEY_SUFFIX}
+    when: always
     paths:
-      - ${CI_PROJECT_DIR}/ccache
+      - ${CCACHE_DIR}
 
   script:
     - export PATH=/usr/local/sbin:/usr/sbin:/sbin:$PATH
@@ -72,28 +83,35 @@ build_exatrkx_cpu:
     - git clone $CLONE_URL src
     - cd src
     - git checkout $HEAD_SHA
+    - source CI/dependencies.sh
     - cd ..
     - mkdir build
-    # Here we only do a minimal build without examples to save ressources
+    # Here we only do a minimal build without examples to save resources
     - >
       cmake -B build -S src
       --preset=gitlab-ci-exatrkx
+      -DPython_EXECUTABLE=$(which python3)
       -DACTS_EXATRKX_ENABLE_CUDA=OFF
 
     - ccache -z
-    - cmake --build build -- -j2
+    - cmake --build build -- -j6
     - ccache -s
 
 build_exatrkx:
   stage: build
-  image: ghcr.io/acts-project/ubuntu2204_exatrkx:58
+  image: ghcr.io/acts-project/ubuntu2204_exatrkx:63
+  variables:
+    DEPENDENCY_URL: https://acts.web.cern.ch/ACTS/ci/ubuntu-22.04/deps.$DEPENDENCY_TAG.tar.zst
   tags:
     - large
 
   cache:
-    key: ccache-exatrkx-$CI_COMMIT_REF_SLUG
+    key: ccache-${CI_JOB_NAME}-${CI_COMMIT_REF_SLUG}-${CCACHE_KEY_SUFFIX}
+    fallback_keys:
+      - ccache-${CI_JOB_NAME}-${CI_DEFAULT_BRANCH}-${CCACHE_KEY_SUFFIX}
+    when: always
     paths:
-      - ${CI_PROJECT_DIR}/ccache
+      - ${CCACHE_DIR}
 
   artifacts:
     paths:
@@ -111,22 +129,24 @@ build_exatrkx:
     - git clone $CLONE_URL src
     - cd src
     - git checkout $HEAD_SHA
+    - source CI/dependencies.sh
     - cd ..
     - mkdir build
     - >
       cmake -B build -S src
       --preset=gitlab-ci-exatrkx
+      -DPython_EXECUTABLE=$(which python3)
       -DCMAKE_CUDA_ARCHITECTURES="75;86"
 
     - ccache -z
-    - cmake --build build -- -j2
+    - cmake --build build -- -j6
     - ccache -s
 
 # test_exatrkx_unittests:
 #   stage: test
 #   needs:
 #     - build_exatrkx
-#   image: ghcr.io/acts-project/ubuntu2204_exatrkx:58
+#   image: ghcr.io/acts-project/ubuntu2204_exatrkx:63
 #   tags:
 #     - docker-gpu-nvidia
 #   script:
@@ -136,7 +156,7 @@ build_exatrkx:
 #   stage: test
 #   needs:
 #     - build_exatrkx
-#   image: ghcr.io/acts-project/ubuntu2204_exatrkx:58
+#   image: ghcr.io/acts-project/ubuntu2204_exatrkx:63
 #   tags:
 #     - docker-gpu-nvidia
 #   script:
@@ -146,19 +166,23 @@ build_exatrkx:
 #     - git clone $CLONE_URL src
 #     - cd src
 #     - git checkout $HEAD_SHA
-#     - pip3 install -r Examples/Python/tests/requirements_ubuntu2004.txt
+#     - pip3 install -r Examples/Python/tests/requirements.txt
 #     - nvidia-smi
 #     - pytest -rFsv -k test_exatrkx
 
 build_linux_ubuntu:
   stage: build
-  image: ghcr.io/acts-project/ubuntu2404:58
+  image: ghcr.io/acts-project/ubuntu2404:63
+  variables:
+    DEPENDENCY_URL: https://acts.web.cern.ch/ACTS/ci/ubuntu-24.04/deps.$DEPENDENCY_TAG.tar.zst
 
   cache:
-    key: ccache-${CI_JOB_NAME_SLUG}-${HEAD_REF}-${CCACHE_KEY_SUFFIX}
-    when: 'always'
+    key: ccache-${CI_JOB_NAME}-${CI_COMMIT_REF_SLUG}-${CCACHE_KEY_SUFFIX}
+    fallback_keys:
+      - ccache-${CI_JOB_NAME}-${CI_DEFAULT_BRANCH}-${CCACHE_KEY_SUFFIX}
+    when: always
     paths:
-      - ${CI_PROJECT_DIR}/ccache
+      - ${CCACHE_DIR}
 
   artifacts:
     paths:
@@ -177,21 +201,25 @@ build_linux_ubuntu:
     - git checkout $HEAD_SHA
     - git submodule init
     - git submodule update
+    - source CI/dependencies.sh
 
     - cd ..
     - mkdir build
     - >
       cmake -B build -S src
       --preset=gitlab-ci
+      -DPython_EXECUTABLE=$(which python3)
       -DACTS_BUILD_PLUGIN_ONNX=ON
 
     - ccache -z
-    - cmake --build build -- -j2
+    - cmake --build build -- -j6
     - ccache -s
 
 linux_test_examples:
   stage: test
-  image: ghcr.io/acts-project/ubuntu2404:58
+  image: ghcr.io/acts-project/ubuntu2404:63
+  variables:
+    DEPENDENCY_URL: https://acts.web.cern.ch/ACTS/ci/ubuntu-24.04/deps.$DEPENDENCY_TAG.tar.zst
   needs: [build_linux_ubuntu]
 
   script:
@@ -202,17 +230,20 @@ linux_test_examples:
     - git checkout $HEAD_SHA
     - git submodule init
     - git submodule update
+    - source CI/dependencies.sh
     - cd ..
 
-    - /usr/local/bin/geant4-config --install-datasets
+    - geant4-config --install-datasets
     - source build/this_acts_withdeps.sh
     - cd src
-    - pip3 install -r Examples/Python/tests/requirements.txt
+    - python3 -m pip install -r Examples/Python/tests/requirements.txt
     - pytest -rFsv -k "not exatrkx" -v -s
 
 linux_physmon:
   stage: test
-  image: ghcr.io/acts-project/ubuntu2404:58
+  image: ghcr.io/acts-project/ubuntu2404:63
+  variables:
+    DEPENDENCY_URL: https://acts.web.cern.ch/ACTS/ci/ubuntu-24.04/deps.$DEPENDENCY_TAG.tar.zst
   needs: [build_linux_ubuntu]
 
   artifacts:
@@ -229,13 +260,19 @@ linux_physmon:
     - git checkout $HEAD_SHA
     - git submodule init
     - git submodule update
+    - source CI/dependencies.sh
     - cd ..
 
     - git config --global safe.directory "$GITHUB_WORKSPACE"
-    - pip3 install histcmp==0.6.7 matplotlib
-    - pip3 install -r src/Examples/Scripts/requirements.txt
-    - /usr/local/bin/geant4-config --install-datasets
+    - python3 -m pip install histcmp==0.6.8 matplotlib
+    - python3 -m pip install -r src/Examples/Scripts/requirements.txt
+    - geant4-config --install-datasets
+    - venv_python=$(which python3)
+    - echo $venv_python
     - source build/this_acts_withdeps.sh
+    - export PATH=$(dirname $venv_python):$PATH
+    - echo $PATH
+    - which python3
     - cd src
     - CI/physmon/phys_perf_mon.sh all physmon
 
@@ -243,17 +280,19 @@ linux_physmon:
 ### UBUNTU EXTRA JOB MATRIX ###
 ###############################
 
-.linux_ubuntu_extra: &linux_ubuntu_extra
+.linux_ubuntu_extra:
   variables:
     INSTALL_DIR: ${CI_PROJECT_DIR}/install
 
   stage: build
 
   cache:
-    key: ccache-${CI_JOB_NAME_SLUG}-${HEAD_REF}-${CCACHE_KEY_SUFFIX}
-    when: 'always'
+    key: ccache-${CI_JOB_NAME}-${CI_COMMIT_REF_SLUG}-${CCACHE_KEY_SUFFIX}
+    fallback_keys:
+      - ccache-${CI_JOB_NAME}-${CI_DEFAULT_BRANCH}-${CCACHE_KEY_SUFFIX}
+    when: always
     paths:
-      - ${CI_PROJECT_DIR}/ccache
+      - ${CCACHE_DIR}
 
   script:
     - git clone $CLONE_URL src
@@ -262,16 +301,18 @@ linux_physmon:
     - git checkout $HEAD_SHA
     - git submodule init
     - git submodule update
+    - source CI/dependencies.sh
 
     - cd ..
     - mkdir build
     - >
       cmake -B build -S src
       --preset=gitlab-ci
+      -DPython_EXECUTABLE=$(which python3)
       -DCMAKE_CXX_STANDARD=${CXXSTD}
 
     - ccache -z
-    - cmake --build build -- -j2
+    - cmake --build build -- -j6
     - ccache -s
 
     - ctest --test-dir build -j$(nproc)
@@ -295,25 +336,27 @@ linux_physmon:
     # Downstream run
     - ./build-downstream/bin/ShowActsVersion
 
-linux_ubuntu_2404:
-  <<: *linux_ubuntu_extra
+linux_ubuntu_2204:
+  extends: .linux_ubuntu_extra
   variables:
     CXXSTD: 20
-  image: ghcr.io/acts-project/ubuntu2404:58
+    DEPENDENCY_URL: https://acts.web.cern.ch/ACTS/ci/ubuntu-22.04/deps.$DEPENDENCY_TAG.tar.zst
+  image: ghcr.io/acts-project/ubuntu2204:63
 
 linux_ubuntu_2204_clang:
-  <<: *linux_ubuntu_extra
+  extends: .linux_ubuntu_extra
   variables:
     CXXSTD: 20
-  image: ghcr.io/acts-project/ubuntu2204_clang:58
+    DEPENDENCY_URL: https://acts.web.cern.ch/ACTS/ci/ubuntu-22.04/deps.$DEPENDENCY_TAG.tar.zst
+  image: ghcr.io/acts-project/ubuntu2204_clang:63
 
 
 ######################
 ### LCG JOB MATRIX ###
 ######################
 
-.lcg: &lcg_base_job
-  image: ghcr.io/acts-project/${OS}-base:58
+.lcg_base_job:
+  image: ghcr.io/acts-project/${OS}-base:63
   stage: build
   tags:
     - cvmfs
@@ -325,10 +368,12 @@ linux_ubuntu_2204_clang:
     SETUP:
 
   cache:
-    key: ccache-${CI_JOB_NAME_SLUG}-${HEAD_REF}-${CCACHE_KEY_SUFFIX}
-    when: 'always'
+    key: ccache-${CI_JOB_NAME}-${CI_COMMIT_REF_SLUG}-${CCACHE_KEY_SUFFIX}
+    fallback_keys:
+      - ccache-${CI_JOB_NAME}-${CI_DEFAULT_BRANCH}-${CCACHE_KEY_SUFFIX}
+    when: always
     paths:
-      - ${CI_PROJECT_DIR}/ccache
+      - ${CCACHE_DIR}
 
   before_script:
     - 'echo "LCG_VERSION: ${LCG_VERSION}"'
@@ -364,17 +409,18 @@ linux_ubuntu_2204_clang:
       cmake -B build -S src
       --preset=gitlab-ci
       -DCMAKE_INSTALL_PREFIX="${INSTALL_DIR}"
+      -DPython_EXECUTABLE=$(which python3)
       -DACTS_BUILD_PLUGIN_GEOMODEL=OFF # GeoModel is not in LCG at this point
 
     - ccache -z
-    - cmake --build build -- -j2
+    - cmake --build build -- -j6
     - ccache -s
 
     - ctest --test-dir build -j$(nproc)
 
 
 lcg_105:
-  <<: *lcg_base_job
+  extends: .lcg_base_job
 
   variables:
     LCG_VERSION: "105"
diff --git a/.kodiak.toml b/.kodiak.toml
index b5be47df1ee..651905f7ce0 100644
--- a/.kodiak.toml
+++ b/.kodiak.toml
@@ -2,7 +2,7 @@ version = 1
 
 merge.message.title = "pull_request_title"
 merge.message.body = "pull_request_body"
-merge.message.cut_body_before = "--- BEGIN COMMIT MESSAGE ---"
+merge.message.cut_body_after = "--- END COMMIT MESSAGE ---"
 merge.message.cut_body_and_text = true
 merge.method = "squash"
 merge.message.include_coauthors = true
diff --git a/.merge-sentinel.yml b/.merge-sentinel.yml
index f62cdb682ce..1394407a063 100644
--- a/.merge-sentinel.yml
+++ b/.merge-sentinel.yml
@@ -14,6 +14,7 @@ rules:
     required_checks:
      - Docs / docs
      - Analysis / build_debug
+     - SonarCloud Code Analysis
 
     required_pattern:
      - "Builds / *"
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index 9000c17f6e9..68c78341c5d 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -28,3 +28,76 @@ repos:
     hooks:
     - id: gersemi
       args: ["-i", "--no-warn-about-unknown-commands"]
+
+  - repo: https://github.com/codespell-project/codespell
+    rev: v2.2.4
+    hooks:
+    - id: codespell
+      args: [
+        "-S", "*.ipynb,*.onnx,_build,*.svg",
+        "-I", "./CI/codespell_ignore.txt"
+      ]
+      exclude: ^CI/.*$
+
+  - repo: local
+    hooks:
+    - id: license
+      name: license
+      language: system
+      entry: CI/check_license.py --fix
+      files: \.(cpp|hpp|ipp|cu|cuh)$
+
+  - repo: local
+    hooks:
+    - id: include_guards
+      name: include_guards
+      language: system
+      entry: CI/check_include_guards.py --fail-global
+      files: \.hpp$
+
+  - repo: local
+    hooks:
+    - id: pragma_once
+      name: pragma_once
+      language: system
+      entry: CI/check_pragma_once.sh
+      files: \.hpp$
+
+  - repo: local
+    hooks:
+    - id: type_t
+      name: type_t
+      language: system
+      entry: CI/check_type_t.py
+      files: \.(cpp|hpp|ipp|cu|cuh)$
+
+  - repo: local
+    hooks:
+    - id: boost_test
+      name: boost_test
+      language: system
+      entry: CI/check_boost_test_macro.sh
+      files: ^Tests\/.*\.(cpp|hpp|ipp|cu|cuh)$
+
+  - repo: local
+    hooks:
+    - id: cmake_options
+      name: cmake_options
+      language: system
+      entry: docs/parse_cmake_options.py --write docs/getting_started.md
+      files: ^CMakeLists.txt$
+
+  - repo: local
+    hooks:
+    - id: leftover_conflict_markers
+      name: Leftover conflict markers
+      language: system
+      entry: git diff --staged --check
+
+  - repo: local
+    hooks:
+    - id: math_macros
+      name: math_macros
+      language: system
+      entry: CI/check_math_macros.py
+      files: \.(cpp|hpp|ipp|cu|cuh)$
diff --git a/Alignment/include/ActsAlignment/Kernel/Alignment.hpp b/Alignment/include/ActsAlignment/Kernel/Alignment.hpp
index 0d0a524f7bb..2a14da18476 100644
--- a/Alignment/include/ActsAlignment/Kernel/Alignment.hpp
+++ b/Alignment/include/ActsAlignment/Kernel/Alignment.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2020-2021 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
@@ -149,7 +149,7 @@ struct Alignment {
   /// @tparam fit_options_t The fit options type
   ///
   /// @param gctx The current geometry context object
-  /// @param sourcelinks The fittable uncalibrated measurements
+  /// @param sourceLinks The fittable uncalibrated measurements
   /// @param sParameters The initial track parameters
   /// @param fitOptions The fit Options steering the fit
   /// @param idxedAlignSurfaces The idxed surfaces to be aligned
@@ -161,7 +161,7 @@ struct Alignment {
             typename fit_options_t>
   Acts::Result<detail::TrackAlignmentState> evaluateTrackAlignmentState(
       const Acts::GeometryContext& gctx,
-      const std::vector<source_link_t>& sourcelinks,
+      const std::vector<source_link_t>& sourceLinks,
       const start_parameters_t& sParameters, const fit_options_t& fitOptions,
       const std::unordered_map<const Acts::Surface*, std::size_t>&
           idxedAlignSurfaces,
diff --git a/Alignment/include/ActsAlignment/Kernel/Alignment.ipp b/Alignment/include/ActsAlignment/Kernel/Alignment.ipp
index 9e11bdbb09d..09170ee9ca9 100644
--- a/Alignment/include/ActsAlignment/Kernel/Alignment.ipp
+++ b/Alignment/include/ActsAlignment/Kernel/Alignment.ipp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2020-2021 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include "Acts/EventData/VectorMultiTrajectory.hpp"
 #include "Acts/EventData/VectorTrackContainer.hpp"
@@ -15,7 +15,7 @@ template <typename source_link_t, typename start_parameters_t,
 Acts::Result<ActsAlignment::detail::TrackAlignmentState>
 ActsAlignment::Alignment<fitter_t>::evaluateTrackAlignmentState(
     const Acts::GeometryContext& gctx,
-    const std::vector<source_link_t>& sourcelinks,
+    const std::vector<source_link_t>& sourceLinks,
     const start_parameters_t& sParameters, const fit_options_t& fitOptions,
     const std::unordered_map<const Acts::Surface*, std::size_t>&
         idxedAlignSurfaces,
@@ -24,8 +24,8 @@ ActsAlignment::Alignment<fitter_t>::evaluateTrackAlignmentState(
                               Acts::VectorMultiTrajectory{}};
 
   // Convert to Acts::SourceLink during iteration
-  Acts::SourceLinkAdapterIterator begin{sourcelinks.begin()};
-  Acts::SourceLinkAdapterIterator end{sourcelinks.end()};
+  Acts::SourceLinkAdapterIterator begin{sourceLinks.begin()};
+  Acts::SourceLinkAdapterIterator end{sourceLinks.end()};
 
   // Perform the fit
   auto fitRes = m_fitter.fit(begin, end, sParameters, fitOptions, tracks);
@@ -82,13 +82,13 @@ void ActsAlignment::Alignment<fitter_t>::calculateAlignmentParameters(
   alignResult.numTracks = trajectoryCollection.size();
   double sumChi2ONdf = 0;
   for (unsigned int iTraj = 0; iTraj < trajectoryCollection.size(); iTraj++) {
-    const auto& sourcelinks = trajectoryCollection.at(iTraj);
+    const auto& sourceLinks = trajectoryCollection.at(iTraj);
     const auto& sParameters = startParametersCollection.at(iTraj);
     // Set the target surface
     fitOptionsWithRefSurface.referenceSurface = &sParameters.referenceSurface();
     // The result for one single track
     auto evaluateRes = evaluateTrackAlignmentState(
-        fitOptions.geoContext, sourcelinks, sParameters,
+        fitOptions.geoContext, sourceLinks, sParameters,
         fitOptionsWithRefSurface, alignResult.idxedAlignSurfaces, alignMask);
     if (!evaluateRes.ok()) {
       ACTS_DEBUG("Evaluation of alignment state for track " << iTraj
diff --git a/Alignment/include/ActsAlignment/Kernel/AlignmentError.hpp b/Alignment/include/ActsAlignment/Kernel/AlignmentError.hpp
index 88cae792a8f..9f77022929e 100644
--- a/Alignment/include/ActsAlignment/Kernel/AlignmentError.hpp
+++ b/Alignment/include/ActsAlignment/Kernel/AlignmentError.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2020 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
diff --git a/Alignment/include/ActsAlignment/Kernel/AlignmentMask.hpp b/Alignment/include/ActsAlignment/Kernel/AlignmentMask.hpp
index 735f7de86fb..f3849589152 100644
--- a/Alignment/include/ActsAlignment/Kernel/AlignmentMask.hpp
+++ b/Alignment/include/ActsAlignment/Kernel/AlignmentMask.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2019 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
diff --git a/Alignment/include/ActsAlignment/Kernel/detail/AlignmentEngine.hpp b/Alignment/include/ActsAlignment/Kernel/detail/AlignmentEngine.hpp
index 64e7f9c0eb7..1bb21fdc8bd 100644
--- a/Alignment/include/ActsAlignment/Kernel/detail/AlignmentEngine.hpp
+++ b/Alignment/include/ActsAlignment/Kernel/detail/AlignmentEngine.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2020-2021 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
diff --git a/Alignment/src/Kernel/detail/AlignmentEngine.cpp b/Alignment/src/Kernel/detail/AlignmentEngine.cpp
index c5c012d08d7..23ff0b14433 100644
--- a/Alignment/src/Kernel/detail/AlignmentEngine.cpp
+++ b/Alignment/src/Kernel/detail/AlignmentEngine.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2020-2021 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include "ActsAlignment/Kernel/detail/AlignmentEngine.hpp"
 
diff --git a/CI/check_boost_test_macro.sh b/CI/check_boost_test_macro.sh
index d8f4e25c651..2af7b85f1ec 100755
--- a/CI/check_boost_test_macro.sh
+++ b/CI/check_boost_test_macro.sh
@@ -1,14 +1,21 @@
 #!/bin/bash
 
+files="$@"
+
+if [ -z "$files" ]; then
+    files=$(find Tests -name "*.hpp" -or -name "*.cpp" -or -name "*.ipp")
+fi
+
 test_string="BOOST_TEST("
-grep $test_string -n -r Tests --include "*.cpp" --include "*.hpp" --include "*.ipp"
 
-status=$?
+ec=0
+for file in $files; do
+  grep -n "$test_string" "$file"
+  status=$?
+  if [ $status -ne 1 ]; then
+    echo "Found occurrences of '$test_string' in '$file'"
+    ec=1
+  fi
+done
 
-if [[ $status -eq 0 ]]; then
-  echo "Found occurrences of '$test_string'"
-  exit 1
-else
-  echo "Did not find occurrences of '$test_string'"
-  exit 0
-fi
+exit $ec
diff --git a/CI/check_include_guards.py b/CI/check_include_guards.py
index 146322b3bda..0489c065b44 100755
--- a/CI/check_include_guards.py
+++ b/CI/check_include_guards.py
@@ -75,7 +75,7 @@ def main():
     input_help = """
 Input files: either file path, dir path (will glob for headers) or custom glob pattern
     """
-    p.add_argument("input", help=input_help.strip())
+    p.add_argument("input", nargs="+", help=input_help.strip())
     p.add_argument(
         "--fail-local", "-l", action="store_true", help="Fail on local include guards"
     )
@@ -90,15 +90,20 @@ def main():
 
     headers = []
 
-    if os.path.isfile(args.input):
-        headers = [args.input]
-    elif os.path.isdir(args.input):
-        patterns = ["**/*.hpp", "**/*.h"]
-        headers = sum(
-            [glob(os.path.join(args.input, p), recursive=True) for p in patterns], []
-        )
-    else:
-        headers = glob(args.input, recursive=True)
+    if len(args.input) == 1:
+        if os.path.isdir(args.input[0]):
+            patterns = ["**/*.hpp", "**/*.h"]
+            headers = sum(
+                [
+                    glob(os.path.join(args.input[0], p), recursive=True)
+                    for p in patterns
+                ],
+                [],
+            )
+        else:
+            headers = glob(args.input[0], recursive=True)
+    elif all([os.path.isfile(i) for i in args.input]):
+        headers = args.input
 
     valid = True
     nlocal = 0
diff --git a/CI/check_license.py b/CI/check_license.py
index 2a7453e56b5..68296ae6f0e 100755
--- a/CI/check_license.py
+++ b/CI/check_license.py
@@ -32,90 +32,29 @@ def err(string):
         return string
 
 
-class CommitInfo:
-    date = None
-    year = None
-    author = None
-    subject = None
-    body = None
-
-
-def check_git_dates(src):
-    output = (
-        check_output(["git", "log", "--format={{{%an|%ad|%s|%b}}}", "--", src])
-        .decode("utf-8")
-        .strip()
-    )
-
-    # find single outputs
-    commits = re.findall(r"{{{((?:.|\n)*?)}}}", output)
-    commits = [c for c in commits if "[ignore-license]" not in c]
-    commits = [c.split("|") for c in commits]
-
-    # print(output)
-    mod = commits[0]
-    add = commits[-1]
-
-    madd = re.match(r".*\d{2}:\d{2}:\d{2} (\d{4})", add[1])
-    assert madd != None, "Regex did not match git log output"
-    mmod = re.match(r".*\d{2}:\d{2}:\d{2} (\d{4})", mod[1])
-    assert mmod != None, "Regex did not match git log output"
-
-    addcommit = CommitInfo()
-    addcommit.date = add[1]
-    addcommit.year = int(madd.group(1))
-    addcommit.author = add[0]
-    addcommit.subject = add[2]
-    addcommit.body = add[3]
-
-    modcommit = CommitInfo()
-    modcommit.date = mod[1]
-    modcommit.year = int(mmod.group(1))
-    modcommit.author = mod[0]
-    modcommit.subject = mod[2]
-    modcommit.body = mod[3]
-
-    return addcommit, modcommit
-
-
 def main():
     p = argparse.ArgumentParser()
-    p.add_argument("input")
+    p.add_argument("input", nargs="+")
     p.add_argument(
         "--fix", action="store_true", help="Attempt to fix any license issues found."
     )
-    p.add_argument(
-        "--check-years",
-        action="store_true",
-        help="Check the license year info using git info for each file.",
-    )
-    p.add_argument(
-        "--fail-year-mismatch",
-        action="store_true",
-        help="Fail if year in license statement is not valid.",
-    )
     p.add_argument("--exclude", "-e", action="append", default=EXCLUDE)
 
     args = p.parse_args()
     print(args.exclude)
 
-    if os.path.isdir(args.input):
+    extensions = ["cpp", "hpp", "ipp", "cuh", "cu", "C", "h"]
+
+    if len(args.input) == 1 and os.path.isdir(args.input[0]):
+        find_command = ["find", args.input[0]]
+        for ext in extensions:
+            find_command.extend(["-iname", f"*.{ext}", "-or"])
+        # Remove the last "-or" for a valid command
+        find_command = find_command[:-1]
+
         srcs = (
             str(
-                check_output(
-                    [
-                        "find",
-                        args.input,
-                        "-iname",
-                        "*.cpp",
-                        "-or",
-                        "-iname",
-                        "*.hpp",
-                        "-or",
-                        "-iname",
-                        "*.ipp",
-                    ]
-                ),
+                check_output(find_command),
                 "utf-8",
             )
             .strip()
@@ -123,32 +62,32 @@ def main():
         )
         srcs = filter(lambda p: not p.startswith("./build"), srcs)
     else:
-        srcs = [args.input]
+        srcs = args.input
 
-    year = int(datetime.now().strftime("%Y"))
+    founding_year = 2016
+    year_str = f"{founding_year}"
+    year = year_str
 
-    raw = """// This file is part of the Acts project.
+    raw = """// This file is part of the ACTS project.
 //
-// Copyright (C) {year} CERN for the benefit of the Acts project
+// Copyright (C) {year} CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/."""
+// file, You can obtain one at https://mozilla.org/MPL/2.0/."""
 
     reg = (
-        r"\A// This file is part of the Acts project.\n"
+        r"\A// This file is part of the ACTS project.\n"
         + r"//\n"
-        + r"// Copyright \(C\) (?P<year>.*) CERN for the benefit of the Acts project\n"
+        + r"// Copyright \(C\) (?P<year>.*) CERN for the benefit of the ACTS project\n"
         + r"//\n"
         + r"// This Source Code Form is subject to the terms of the Mozilla Public\n"
         + r"// License, v\. 2\.0\. If a copy of the MPL was not distributed with this\n"
-        + r"// file, You can obtain one at http://mozilla.org/MPL/2.0/.\Z"
+        + r"// file, You can obtain one at https://mozilla.org/MPL/2.0/.\Z"
     )
 
     ref = re.compile(reg, re.M)
     clean_re = re.compile(r"(\(C\)) (.*) (CERN)", re.M)
-    year_re = re.compile(r"^(?P<year1>20\d{2}|(?P<year2>20\d{2})-(?P<year3>20\d{2}))$")
-    extract_re = re.compile(r"(20\d{2})-?(20\d{2})?")
 
     def clean(s):
         return clean_re.sub(r"\1 XXXX \3", s)
@@ -156,54 +95,33 @@ def clean(s):
     def get_clean_lines(s):
         return [clean(l) + "\n" for l in s.split("\n")]
 
-    def validate_years(year1, year2):
-        if year1 and year2:
-            year1 = int(year1)
-            year2 = int(year2)
-            if year1 >= year2:
-                return False
-            if year1 > year or year2 > year:
-                return False
-        else:
-            theyear = int(year1 if year1 else year2)
-            if theyear > year:
-                return False
-        return True
-
     error_summary = ""
-    info_summary = ""
 
-    def eprint(*args):
+    def eprint(string):
         nonlocal error_summary
-        error_summary += " ".join(map(str, args)) + "\n"
-
-    def year_print(*pargs):
-        nonlocal error_summary
-        nonlocal info_summary
-        string = " ".join(map(str, pargs)) + "\n"
-        if args.fail_year_mismatch:
-            error_summary += string
-        else:
-            info_summary += string
+        error_summary += string + "\n"
 
     exit = 0
     srcs = list(srcs)
     nsrcs = len(srcs)
-    step = int(nsrcs / 20)
+    step = max(int(nsrcs / 20), 1)
+    # Iterate over all files
     for i, src in enumerate(srcs):
         if any([fnmatch(src, e) for e in args.exclude]):
             continue
 
+        # Print progress
         if nsrcs > 1 and i % step == 0:
-            string = "{}/{} -> {:.2f}%".format(i, nsrcs, i / float(nsrcs) * 100.0)
+            string = f"{i}/{nsrcs} -> {i / float(nsrcs) * 100.0:.2f}%"
             if sys.stdout.isatty():
                 sys.stdout.write(string + "\r")
             else:
                 print(string)
 
+        # Read the header
         with open(src, "r+") as f:
             license = ""
-            for x in range(len(raw)):
+            for _ in range(len(raw)):
                 line = f.readline()
                 if not line.startswith("//"):
                     break
@@ -211,192 +129,56 @@ def year_print(*pargs):
             license = ("".join(license)).strip()
             m = ref.search(license)
 
-            if m == None:
+            # License could not be found in header
+            if m is None:
                 eprint("Invalid / missing license in " + src + "")
 
-                exp = [l + "\n" for l in raw.format(year="XXXX").split("\n")]
+                exp = [l + "\n" for l in raw.format(year=year_str).split("\n")]
                 act = get_clean_lines(license)
 
                 diff = difflib.unified_diff(exp, act)
                 eprint("".join(diff))
-                eprint()
+                eprint("")
 
                 if args.fix:
                     eprint("-> fixing file (prepend)")
                     f.seek(0)
                     file_content = f.read()
                     f.seek(0)
-                    stmnt = raw.format(year=year)
+                    stmnt = raw.format(year=year_str)
                     f.write(stmnt + "\n\n")
                     f.write(file_content)
 
                 exit = 1
-            else:
-                # we have a match, need to verify year string is right
-
-                if args.check_years:
-                    git_add_commit, git_mod_commit = check_git_dates(src)
-                    git_add_year = git_add_commit.year
-                    git_mod_year = git_mod_commit.year
-                year_act = m.group("year")
-                ym = year_re.match(year_act)
-                valid = True
-                if not ym:
-                    eprint("Year string does not match format in {}".format(src))
-                    eprint("Expected: YYYY or YYYY-YYYY (year or year range)")
-                    eprint("Actual:   {}\n".format(year_act))
-
-                    if args.fix:
-                        extract = extract_re.search(year_act)
-                        year1 = extract.group(1)
-                        year2 = extract.group(2)
-
-                    exit = 1
-                    valid = False
-
-                else:
-                    extract = extract_re.search(year_act)
-                    year1 = extract.group(1)
-                    year2 = extract.group(2)
-
-                    if not validate_years(year1, year2):
-                        eprint("Year string is not valid in {}".format(src))
-                        eprint("Year string is: " + year_act + "\n")
-                        exit = 1
-                        valid = False
-
-                    if args.check_years:
-                        if git_add_year != git_mod_year:
-                            # need year range in licence
-                            if not (year1 and year2):
-                                year_print("File: {}".format(src))
-                                # year_print("o File was modified in a different year ({}) than it was added ({})."
-                                # .format(git_mod_year, git_add_year))
-                                year_print(
-                                    "- File was added in {}".format(git_add_year)
-                                )
-                                year_print(
-                                    "- File was modified on {} by {}:\n{}".format(
-                                        git_mod_commit.date,
-                                        git_mod_commit.author,
-                                        git_mod_commit.subject + git_mod_commit.body,
-                                    )
-                                )
-                                year_print(
-                                    "=> License should say {}-{}".format(
-                                        git_add_year, git_mod_year
-                                    )
-                                )
-
-                                act_year = year1 if year1 else year2
-                                year_print(
-                                    err(
-                                        "{} But says: {}".format(CROSS_SYMBOL, act_year)
-                                    )
-                                )
-
-                                if args.fail_year_mismatch:
-                                    exit = 1
-                                    year_print("\n")
-                                else:
-                                    year_print("This is not treated as an error\n")
-                                valid = False
-                            else:
-                                if (
-                                    int(year1) != git_add_year
-                                    or int(year2) != git_mod_year
-                                ):
-                                    year_print("File: {}".format(src))
-                                    year_print(
-                                        "Year range {}-{} does not match range from git {}-{}".format(
-                                            year1, year2, git_add_year, git_mod_year
-                                        )
-                                    )
-                                    year_print(
-                                        "- File was added in {}".format(git_add_year)
-                                    )
-                                    year_print(
-                                        "- File was modified on {} by {}:\n{}".format(
-                                            git_mod_commit.date,
-                                            git_mod_commit.author,
-                                            git_mod_commit.subject
-                                            + git_mod_commit.body,
-                                        )
-                                    )
-                                    year_print(
-                                        "=> License should say {}-{}".format(
-                                            git_add_year, git_mod_year
-                                        )
-                                    )
-                                    year_print(
-                                        err(
-                                            "{} But says: {}-{}".format(
-                                                CROSS_SYMBOL, year1, year2
-                                            )
-                                        )
-                                    )
-                                    if args.fail_year_mismatch:
-                                        exit = 1
-                                        year_print("\n")
-                                    else:
-                                        year_print("This is not treated as an error\n")
-                                    valid = False
-
-                        else:
-                            if int(year1) < git_mod_year:
-                                year_print("File: {}".format(src))
-                                year_print(
-                                    "- Year {} does not match git modification year {}".format(
-                                        year1, git_mod_year
-                                    )
-                                )
-                                year_print(
-                                    "- File was modified on {} by {}:\n{}".format(
-                                        git_mod_commit.date,
-                                        git_mod_commit.author,
-                                        git_mod_commit.subject + git_mod_commit.body,
-                                    )
-                                )
-                                year_print(
-                                    "=> License should say {}".format(git_mod_year)
-                                )
-                                year_print(
-                                    err("{} But says: {}".format(CROSS_SYMBOL, year1))
-                                )
-                                if args.fail_year_mismatch:
-                                    exit = 1
-                                    year_print("\n")
-                                else:
-                                    year_print("This is not treated as an error\n")
-                                valid = False
-
-                if args.fix and not valid:
+                continue
+
+            # We have a match, need to verify year string is right
+            year_act = m.group("year")
+            if year_act != year_str:
+                exit = 1
+
+                eprint(f"File: {src}")
+                eprint(f"=> License should say {year_str}")
+                eprint(err(f"{CROSS_SYMBOL} But says: {year_act}"))
+
+                if args.fix:
                     eprint("-> fixing file (patch year)")
-                    year_str = "2016-{}".format(year)
-                    if args.check_years:
-                        if git_add_year == git_mod_year:
-                            year_str = "{}".format(git_add_year)
-                        else:
-                            year_str = "{}-{}".format(git_add_year, git_mod_year)
+
                     new_license = raw.format(year=year_str)
 
                     # preserve rest of file as is
-                    if args.check_years:
-                        old_license_len = len(license)
-                        f.seek(old_license_len)
-                        file_body = f.read()
-                        f.seek(0)
-                        f.truncate()
+                    old_license_len = len(license)
+                    f.seek(old_license_len)
+                    file_body = f.read()
+                    f.seek(0)
+                    f.truncate()
 
                     f.seek(0)
                     f.write(new_license)
+                    f.write(file_body)
 
-                    if args.check_years:
-                        f.write(file_body)
+                eprint("")
 
-    print("\n--- INFO ---\n")
-    print(info_summary)
-    print("\n--- ERROR ---\n")
     print(error_summary)
 
     if exit != 0 and not args.fix:
diff --git a/CI/check_math_macros.py b/CI/check_math_macros.py
new file mode 100755
index 00000000000..29da233372e
--- /dev/null
+++ b/CI/check_math_macros.py
@@ -0,0 +1,120 @@
+#!/usr/bin/env python3
+
+from pathlib import Path
+import os
+import argparse
+from fnmatch import fnmatch
+import re
+import sys
+
+
+math_constants = [
+    ("M_PI", "std::numbers::pi"),
+    ("M_PI_2", "std::numbers::pi / 2."),
+    ("M_PI_4", "std::numbers::pi / 4."),
+    ("M_1_PI", "std::numbers::inv_pi"),
+    ("M_2_PI", "2. * std::numbers::inv_pi"),
+    ("M_2_SQRTPI", "2. * std::numbers::inv_sqrtpi"),
+    ("M_E", "std::numbers::e"),
+    ("M_LOG2E", "std::numbers::log2e"),
+    ("M_LOG10E", "std::numbers::log10e"),
+    ("M_LN2", "std::numbers::ln2"),
+    ("M_LN10", "std::numbers::ln10"),
+    ("M_SQRT2", "std::numbers::sqrt2"),
+    ("M_SQRT1_2", "1. / std::numbers::sqrt2"),
+    ("M_SQRT3", "std::numbers::sqrt3"),
+    ("M_INV_SQRT3", "std::numbers::inv_sqrt3"),
+    ("M_EGAMMA", "std::numbers::egamma"),
+    ("M_PHI", "std::numbers::phi"),
+]
+
+
+github = "GITHUB_ACTIONS" in os.environ
+
+
+def handle_file(
+    file: Path, fix: bool, math_const: tuple[str, str]
+) -> list[tuple[int, str]]:
+    ex = re.compile(rf"(?<!\w){math_const[0]}(?!\w)")
+
+    content = file.read_text()
+    lines = content.splitlines()
+
+    changed_lines = []
+
+    for i, oline in enumerate(lines):
+        line, n_subs = ex.subn(rf"{math_const[1]}", oline)
+        lines[i] = line
+        if n_subs > 0:
+            changed_lines.append((i, oline))
+
+    if fix and len(changed_lines) > 0:
+        file.write_text("\n".join(lines) + "\n")
+
+    return changed_lines
+
+
+def main():
+    p = argparse.ArgumentParser()
+    p.add_argument("input", nargs="+")
+    p.add_argument("--fix", action="store_true", help="Attempt to fix M_* macros.")
+    p.add_argument("--exclude", "-e", action="append", default=[])
+
+    args = p.parse_args()
+
+    exit_code = 0
+
+    inputs = []
+
+    if len(args.input) == 1 and os.path.isdir(args.input[0]):
+        # walk over all files
+        for root, _, files in os.walk(args.input[0]):
+            root = Path(root)
+            for filename in files:
+                # get the full path of the file
+                filepath = root / filename
+                if filepath.suffix not in (
+                    ".hpp",
+                    ".cpp",
+                    ".ipp",
+                    ".h",
+                    ".C",
+                    ".c",
+                    ".cu",
+                    ".cuh",
+                ):
+                    continue
+
+                if any([fnmatch(str(filepath), e) for e in args.exclude]):
+                    continue
+
+                inputs.append(filepath)
+    else:
+        for file in args.input:
+            inputs.append(Path(file))
+
+    for filepath in inputs:
+        for math_const in math_constants:
+            changed_lines = handle_file(
+                file=filepath, fix=args.fix, math_const=math_const
+            )
+            if len(changed_lines) > 0:
+                exit_code = 1
+                print()
+                print(filepath)
+                for i, oline in changed_lines:
+                    print(f"{i}: {oline}")
+
+                    if github:
+                        print(
+                            f"::error file={filepath},line={i+1},title=Do not use macro {math_const[0]}::Replace {math_const[0]} with std::{math_const[1]}"
+                        )
+
+    if exit_code == 1 and github:
+        print(f"::info You will need in each flagged file #include <numbers>")
+
+    return exit_code
+
+
+if "__main__" == __name__:
+    sys.exit(main())
diff --git a/CI/check_pragma_once.sh b/CI/check_pragma_once.sh
index baafd9cfc28..9333367dcda 100755
--- a/CI/check_pragma_once.sh
+++ b/CI/check_pragma_once.sh
@@ -2,7 +2,13 @@
 
 ec=0
 
-for file in $(find Core Examples Tests Plugins -name "*.hpp"); do
+files="$@"
+
+if [ -z "$files" ]; then
+    files=$(find Core Examples Tests Plugins -name "*.hpp")
+fi
+
+for file in $files; do
     res=$(grep -e "^[[:space:]]*#pragma once" $file)
     if [[ "$res" != "#pragma once" ]]; then
         ec=1
diff --git a/CI/check_smearing_config.py b/CI/check_smearing_config.py
index b3b9ad0d4c8..629095976ea 100755
--- a/CI/check_smearing_config.py
+++ b/CI/check_smearing_config.py
@@ -1,12 +1,12 @@
 #!/usr/bin/env python3
 
-# This file is part of the Acts project.
+# This file is part of the ACTS project.
 #
-# Copyright (C) 2021 CERN for the benefit of the Acts project
+# Copyright (C) 2016 CERN for the benefit of the ACTS project
 #
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http:#mozilla.org/MPL/2.0/.
+# file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 # Configuration taken from: https://arxiv.org/pdf/1904.06778.pdf
 # See also https://github.com/acts-project/acts/issues/946
diff --git a/CI/check_type_t.py b/CI/check_type_t.py
index b7fa05fd274..793b91274ea 100755
--- a/CI/check_type_t.py
+++ b/CI/check_type_t.py
@@ -48,7 +48,7 @@ def handle_file(file: Path, fix: bool, c_type: str) -> list[tuple[int, str]]:
 
 def main():
     p = argparse.ArgumentParser()
-    p.add_argument("input")
+    p.add_argument("input", nargs="+")
     p.add_argument("--fix", action="store_true", help="Attempt to fix C-style types.")
     p.add_argument("--exclude", "-e", action="append", default=[])
 
@@ -56,40 +56,49 @@ def main():
 
     exit_code = 0
 
-    # walk over all files
-    for root, _, files in os.walk("."):
-        root = Path(root)
-        for filename in files:
-            # get the full path of the file
-            filepath = root / filename
-            if filepath.suffix not in (
-                ".hpp",
-                ".cpp",
-                ".ipp",
-                ".h",
-                ".C",
-                ".c",
-                ".cu",
-                ".cuh",
-            ):
-                continue
-
-            if any([fnmatch(str(filepath), e) for e in args.exclude]):
-                continue
-
-            for c_type in type_list:
-                changed_lines = handle_file(file=filepath, fix=args.fix, c_type=c_type)
-                if len(changed_lines) > 0:
-                    exit_code = 1
-                    print()
-                    print(filepath)
-                    for i, oline in changed_lines:
-                        print(f"{i}: {oline}")
-
-                        if github:
-                            print(
-                                f"::error file={filepath},line={i+1},title=Do not use C-style {c_type}::Replace {c_type} with std::{c_type}"
-                            )
+    inputs = []
+
+    if len(args.input) == 1 and os.path.isdir(args.input[0]):
+        # walk over all files
+        for root, _, files in os.walk(args.input[0]):
+            root = Path(root)
+            for filename in files:
+                # get the full path of the file
+                filepath = root / filename
+                if filepath.suffix not in (
+                    ".hpp",
+                    ".cpp",
+                    ".ipp",
+                    ".h",
+                    ".C",
+                    ".c",
+                    ".cu",
+                    ".cuh",
+                ):
+                    continue
+
+                if any([fnmatch(str(filepath), e) for e in args.exclude]):
+                    continue
+
+                inputs.append(filepath)
+    else:
+        for file in args.input:
+            inputs.append(Path(file))
+
+    for filepath in inputs:
+        for c_type in type_list:
+            changed_lines = handle_file(file=filepath, fix=args.fix, c_type=c_type)
+            if len(changed_lines) > 0:
+                exit_code = 1
+                print()
+                print(filepath)
+                for i, oline in changed_lines:
+                    print(f"{i}: {oline}")
+
+                    if github:
+                        print(
+                            f"::error file={filepath},line={i+1},title=Do not use C-style {c_type}::Replace {c_type} with std::{c_type}"
+                        )
 
     return exit_code
 
diff --git a/CI/check_unused_files.py b/CI/check_unused_files.py
index 420ba932d14..c1f099d672a 100755
--- a/CI/check_unused_files.py
+++ b/CI/check_unused_files.py
@@ -41,8 +41,6 @@ def main():
         ".gitignore",
         "README.md",
         "CMakeLists.txt",
-        "DetUtils.h",
-        "CommandLineArguments.h",
         # Filename not completed in source
         "vertexing_event_mu20_beamspot.csv",
         "vertexing_event_mu20_tracks.csv",
diff --git a/CI/codespell_ignore.txt b/CI/codespell_ignore.txt
index e95603fc5b5..13a3328440f 100644
--- a/CI/codespell_ignore.txt
+++ b/CI/codespell_ignore.txt
@@ -22,3 +22,5 @@ dthe
 dthe
 vart
 pixelx
+millepede
+dependees
diff --git a/CI/dependencies.sh b/CI/dependencies.sh
new file mode 100755
index 00000000000..7c8879b499e
--- /dev/null
+++ b/CI/dependencies.sh
@@ -0,0 +1,103 @@
+#!/bin/bash
+
+function run() {
+    set -x
+    "$@"
+    { set +x;  } 2> /dev/null
+}
+
+function set_env {
+  key="$1"
+  value="$2"
+
+  echo "=> ${key}=${value}"
+
+  if [ -n "${GITHUB_ACTIONS:-}" ]; then
+    echo "${key}=${value}" >> $GITHUB_ENV
+  else
+    export ${key}=${value}
+  fi
+}
+
+url=${1:-${DEPENDENCY_URL:-}}
+
+if [ -n "${GITHUB_ACTIONS:-}" ]; then
+    destination="${GITHUB_WORKSPACE}/dependencies"
+elif [ -n "${GITLAB_CI:-}" ];then
+    destination="${CI_PROJECT_DIR}/dependencies"
+else
+    destination=${2}
+fi
+
+set_env DEPENDENCY_DIR "${destination}"
+
+if [ -z "${url}" ]; then
+    echo "url is not set"
+    exit 1
+fi
+
+echo "URL: $url"
+echo "DESTINATION: $destination"
+
+# check curl location
+CURL=$(command -v curl)
+if [ -z "$CURL" ]; then
+    echo "curl is not available"
+    exit 1
+fi
+
+UNZSTD=$(command -v unzstd)
+if [ -z "$UNZSTD" ]; then
+    echo "unzstd is not available"
+    exit 1
+fi
+
+TAR=$(command -v tar)
+if [ -z "$TAR" ]; then
+    echo "tar is not available"
+    exit 1
+fi
+
+run mkdir -p "${destination}"
+
+run $CURL \
+  --retry 5 \
+  --connect-timeout 2 \
+  --location $url \
+  | unzstd \
+  | tar \
+    -x \
+    --strip-components=1 \
+    --directory "${destination}"
+
+# Patch up geant4-config data install script
+out=$(${destination}/bin/geant4-config --datasets)
+line=$(echo "$out" | head -n1)
+orig_share=$(echo "$line" | perl -pe 's|.*?(\/.*)\/share.*|\1|')
+orig_share_escaped=$(echo $orig_share|perl -pe 's|/|\\/|g')
+destination_escaped=$(echo "$destination"|perl -pe 's|/|\\/|g')
+perl -pi.bak -e "s/$orig_share_escaped/$destination_escaped/g" ${destination}/bin/geant4-config
+
+if [ -n "${GITHUB_ACTIONS:-}" ]; then
+  echo "Running in GitHub Actions"
+  venv="${GITHUB_WORKSPACE}/venv"
+fi
+
+if [ -n "${GITLAB_CI:-}" ];then
+  echo "Running in GitLab CI"
+  venv="${CI_PROJECT_DIR}/venv"
+fi
+
+if [ -n "${CI:-}" ];then
+  run "${destination}/bin/python3" -m venv "${venv}"
+  run "${venv}/bin/python3" -m pip install pyyaml jinja2
+  set_env PATH "${venv}/bin:${destination}/bin/:${PATH}"
+fi
+
+set_env CMAKE_PREFIX_PATH "${destination}"
+set_env LD_LIBRARY_PATH "${destination}/lib"
+set_env ROOT_INCLUDE_PATH "${destination}/include"
+# Geant4 puts CLHEP in a subdirectory
+set_env ROOT_INCLUDE_PATH "${destination}/include/Geant4"
+# Pythia8 looks for settings in this directory
+set_env PYTHIA8DATA "${destination}/share/Pythia8/xmldoc"
diff --git a/CI/physmon/config/pythia8_ttbar.yml b/CI/physmon/config/pythia8_ttbar.yml
index 301aba1c7e5..6a71fe03988 100644
--- a/CI/physmon/config/pythia8_ttbar.yml
+++ b/CI/physmon/config/pythia8_ttbar.yml
@@ -65,3 +65,8 @@ exclude:
   - particle
   - generation
   - sub_particle
+  - e_loss
+  - total_x0
+  - total_l0
+  - number_of_hits
+  - outcome
diff --git a/CI/physmon/phys_perf_mon.sh b/CI/physmon/phys_perf_mon.sh
index 8d5e9867dae..c2944f0dd06 100755
--- a/CI/physmon/phys_perf_mon.sh
+++ b/CI/physmon/phys_perf_mon.sh
@@ -15,13 +15,13 @@ function run() {
 
 export run
 
-
+run which python3
 shopt -s extglob
 
 
 mode=${1:-all}
-if ! [[ $mode = @(all|kf|gsf|gx2f|fullchains|simulation) ]]; then
-    echo "Usage: $0 <all|kf|gsf|gx2f|fullchains|simulation> (outdir)"
+if ! [[ $mode = @(all|kf|gsf|gx2f|refit_kf|refit_gsf|fullchains|simulation) ]]; then
+    echo "Usage: $0 <all|kf|gsf|gx2f|refit_kf|refit_gsf|fullchains|simulation> (outdir)"
     exit 1
 fi
 
@@ -83,11 +83,12 @@ elif [ "$(uname)" == "Linux" ]; then
         rec=$?
         # in kbytes
         max_rss=$(grep "Maximum resident set size (kbytes):" "$tmp" | awk '{printf $(NF)}')
-        max_rss=$(( 1000*max_rss ))
+        max_rss=$(( 1024 * max_rss ))
+        echo "Maximum resident set size: $(printf "%'d" $max_rss) bytes"
+
         wall_time=$(grep "Elapsed (wall clock)" "$tmp" | awk '{printf $(NF)}')
-        echo $max_rss
         wall_time=$(python3 -c "i='${wall_time}';p=i.split(':');p = p if len(p) == 3 else ['0', *p];t=float(p[0])*60*60 + float(p[1])*60 + float(p[2]);print(t)")
-        echo $wall_time
+        echo "Elapsed (wall clock) time: ${wall_time} seconds"
 
         of="${memory_dir}/mem_${slug}.csv"
         {
@@ -151,6 +152,12 @@ fi
 if [[ "$mode" == "all" || "$mode" == "gx2f" ]]; then
     run_physmon_gen "Truth Tracking GX2F" "trackfitting_gx2f"
 fi
+if [[ "$mode" == "all" || "$mode" == "refit_kf" ]]; then
+    run_physmon_gen "Truth Tracking KF refit" "trackrefitting_kf"
+fi
+if [[ "$mode" == "all" || "$mode" == "refit_gsf" ]]; then
+    run_physmon_gen "Truth Tracking GSF refit" "trackrefitting_gsf"
+fi
 if [[ "$mode" == "all" || "$mode" == "fullchains" ]]; then
     run_physmon_gen "CKF single muon" "trackfinding_1muon"
     run_physmon_gen "CKF muon 50" "trackfinding_4muon_50vertices"
@@ -216,13 +223,22 @@ function trackfinding() {
     fi
 
     run_histcmp \
-        $outdir/data/$path/performance_ckf.root \
-        $refdir/$path/performance_ckf.root \
-        "CKF | ${name}" \
-        $path/performance_ckf.html \
-        $path/performance_ckf_plots \
+        $outdir/data/$path/performance_finding_ckf.root \
+        $refdir/$path/performance_finding_ckf.root \
+        "CKF finding performance | ${name}" \
+        $path/performance_finding_ckf.html \
+        $path/performance_finding_ckf_plots \
         --config $default_config
 
+    run_histcmp \
+        $outdir/data/$path/performance_fitting_ckf.root \
+        $refdir/$path/performance_fitting_ckf.root \
+        "CKF fitting performance | ${name}" \
+        $path/performance_fitting_ckf.html \
+        $path/performance_fitting_ckf_plots \
+        --config $default_config
+
+
     run Examples/Scripts/generic_plotter.py \
         $outdir/data/$path/tracksummary_ckf.root \
         tracksummary \
@@ -237,17 +253,17 @@ function trackfinding() {
     run_histcmp \
         $outdir/data/$path/tracksummary_ckf_hist.root \
         $refdir/$path/tracksummary_ckf_hist.root \
-        "Track Summary CKF | ${name}" \
+        "CKF track summary | ${name}" \
         $path/tracksummary_ckf.html \
         $path/tracksummary_ckf_plots
 
-    if [ -f $refdir/$path/performance_ckf_ambi.root ]; then
+    if [ -f $refdir/$path/performance_finding_ckf_ambi.root ]; then
         run_histcmp \
-            $outdir/data/$path/performance_ckf_ambi.root \
-            $refdir/$path/performance_ckf_ambi.root \
-            "Ambisolver | ${name}" \
-            $path/performance_ckf_ambi.html \
-            $path/performance_ckf_ambi
+            $outdir/data/$path/performance_finding_ckf_ambi.root \
+            $refdir/$path/performance_finding_ckf_ambi.root \
+            "Ambisolver finding performance | ${name}" \
+            $path/performance_finding_ckf_ambi.html \
+            $path/performance_finding_ckf_ambi
     fi
 }
 
@@ -410,6 +426,26 @@ if [[ "$mode" == "all" || "$mode" == "gx2f" ]]; then
         --config CI/physmon/config/trackfitting_gx2f.yml
 fi
 
+if [[ "$mode" == "all" || "$mode" == "kf_refit" ]]; then
+    run_histcmp \
+        $outdir/data/trackrefitting_kf/performance_trackrefitting.root \
+        $refdir/trackrefitting_kf/performance_trackrefitting.root \
+        "Truth tracking (KF refit)" \
+        trackrefitting_kf/performance_trackrefitting.html \
+        trackrefitting_kf/performance_trackrefitting_plots \
+        --config CI/physmon/config/trackfitting_kf.yml
+fi
+
+if [[ "$mode" == "all" || "$mode" == "gsf_refit" ]]; then
+    run_histcmp \
+        $outdir/data/trackrefitting_gsf/performance_trackrefitting.root \
+        $refdir/trackrefitting_gsf/performance_trackrefitting.root \
+        "Truth tracking (GSF refit)" \
+        trackrefitting_gsf/performance_trackrefitting.html \
+        trackrefitting_gsf/performance_trackrefitting_plots \
+        --config CI/physmon/config/trackfitting_gsf.yml
+fi
+
 if [[ "$mode" == "all" || "$mode" == "fullchains" ]]; then
     trackfinding "trackfinding | single muon | truth smeared seeding" trackfinding_1muon/truth_smeared
     trackfinding "trackfinding | single muon | truth estimated seeding" trackfinding_1muon/truth_estimated
diff --git a/CI/physmon/reference/simulation/particles_ttbar_hist.root b/CI/physmon/reference/simulation/particles_ttbar_hist.root
index 9100c71418a..4b8b8c552e0 100644
Binary files a/CI/physmon/reference/simulation/particles_ttbar_hist.root and b/CI/physmon/reference/simulation/particles_ttbar_hist.root differ
diff --git a/CI/physmon/reference/simulation/vertices_ttbar_hist.root b/CI/physmon/reference/simulation/vertices_ttbar_hist.root
index 9e54eaed90e..7dc8182b96a 100644
Binary files a/CI/physmon/reference/simulation/vertices_ttbar_hist.root and b/CI/physmon/reference/simulation/vertices_ttbar_hist.root differ
diff --git a/CI/physmon/reference/trackfinding_1muon/orthogonal/performance_ckf.root b/CI/physmon/reference/trackfinding_1muon/orthogonal/performance_ckf.root
deleted file mode 100644
index d11ff3546ab..00000000000
Binary files a/CI/physmon/reference/trackfinding_1muon/orthogonal/performance_ckf.root and /dev/null differ
diff --git a/CI/physmon/reference/trackfinding_1muon/orthogonal/performance_finding_ckf.root b/CI/physmon/reference/trackfinding_1muon/orthogonal/performance_finding_ckf.root
new file mode 100644
index 00000000000..b2e59570e85
Binary files /dev/null and b/CI/physmon/reference/trackfinding_1muon/orthogonal/performance_finding_ckf.root differ
diff --git a/CI/physmon/reference/trackfinding_1muon/orthogonal/performance_fitting_ckf.root b/CI/physmon/reference/trackfinding_1muon/orthogonal/performance_fitting_ckf.root
new file mode 100644
index 00000000000..36c779d4846
Binary files /dev/null and b/CI/physmon/reference/trackfinding_1muon/orthogonal/performance_fitting_ckf.root differ
diff --git a/CI/physmon/reference/trackfinding_1muon/orthogonal/performance_seeding.root b/CI/physmon/reference/trackfinding_1muon/orthogonal/performance_seeding.root
index d55d3833570..1049ad5b18b 100644
Binary files a/CI/physmon/reference/trackfinding_1muon/orthogonal/performance_seeding.root and b/CI/physmon/reference/trackfinding_1muon/orthogonal/performance_seeding.root differ
diff --git a/CI/physmon/reference/trackfinding_1muon/orthogonal/tracksummary_ckf_hist.root b/CI/physmon/reference/trackfinding_1muon/orthogonal/tracksummary_ckf_hist.root
index ed8076f3217..6288387ee09 100644
Binary files a/CI/physmon/reference/trackfinding_1muon/orthogonal/tracksummary_ckf_hist.root and b/CI/physmon/reference/trackfinding_1muon/orthogonal/tracksummary_ckf_hist.root differ
diff --git a/CI/physmon/reference/trackfinding_1muon/seeded/performance_ckf.root b/CI/physmon/reference/trackfinding_1muon/seeded/performance_ckf.root
deleted file mode 100644
index 515090462a0..00000000000
Binary files a/CI/physmon/reference/trackfinding_1muon/seeded/performance_ckf.root and /dev/null differ
diff --git a/CI/physmon/reference/trackfinding_1muon/seeded/performance_finding_ckf.root b/CI/physmon/reference/trackfinding_1muon/seeded/performance_finding_ckf.root
new file mode 100644
index 00000000000..7f59b99cf7e
Binary files /dev/null and b/CI/physmon/reference/trackfinding_1muon/seeded/performance_finding_ckf.root differ
diff --git a/CI/physmon/reference/trackfinding_1muon/seeded/performance_fitting_ckf.root b/CI/physmon/reference/trackfinding_1muon/seeded/performance_fitting_ckf.root
new file mode 100644
index 00000000000..5ba97ecd168
Binary files /dev/null and b/CI/physmon/reference/trackfinding_1muon/seeded/performance_fitting_ckf.root differ
diff --git a/CI/physmon/reference/trackfinding_1muon/seeded/performance_seeding.root b/CI/physmon/reference/trackfinding_1muon/seeded/performance_seeding.root
index 0c64e9fe631..d91320f3d9a 100644
Binary files a/CI/physmon/reference/trackfinding_1muon/seeded/performance_seeding.root and b/CI/physmon/reference/trackfinding_1muon/seeded/performance_seeding.root differ
diff --git a/CI/physmon/reference/trackfinding_1muon/seeded/tracksummary_ckf_hist.root b/CI/physmon/reference/trackfinding_1muon/seeded/tracksummary_ckf_hist.root
index c5addb4d78b..71ece3a740b 100644
Binary files a/CI/physmon/reference/trackfinding_1muon/seeded/tracksummary_ckf_hist.root and b/CI/physmon/reference/trackfinding_1muon/seeded/tracksummary_ckf_hist.root differ
diff --git a/CI/physmon/reference/trackfinding_1muon/truth_estimated/performance_ckf.root b/CI/physmon/reference/trackfinding_1muon/truth_estimated/performance_ckf.root
deleted file mode 100644
index 3feb0e1e4c0..00000000000
Binary files a/CI/physmon/reference/trackfinding_1muon/truth_estimated/performance_ckf.root and /dev/null differ
diff --git a/CI/physmon/reference/trackfinding_1muon/truth_estimated/performance_finding_ckf.root b/CI/physmon/reference/trackfinding_1muon/truth_estimated/performance_finding_ckf.root
new file mode 100644
index 00000000000..b4def41bfb5
Binary files /dev/null and b/CI/physmon/reference/trackfinding_1muon/truth_estimated/performance_finding_ckf.root differ
diff --git a/CI/physmon/reference/trackfinding_1muon/truth_estimated/performance_fitting_ckf.root b/CI/physmon/reference/trackfinding_1muon/truth_estimated/performance_fitting_ckf.root
new file mode 100644
index 00000000000..3fcdb6021d1
Binary files /dev/null and b/CI/physmon/reference/trackfinding_1muon/truth_estimated/performance_fitting_ckf.root differ
diff --git a/CI/physmon/reference/trackfinding_1muon/truth_estimated/performance_seeding.root b/CI/physmon/reference/trackfinding_1muon/truth_estimated/performance_seeding.root
index 06abee42be7..4d134bc87d3 100644
Binary files a/CI/physmon/reference/trackfinding_1muon/truth_estimated/performance_seeding.root and b/CI/physmon/reference/trackfinding_1muon/truth_estimated/performance_seeding.root differ
diff --git a/CI/physmon/reference/trackfinding_1muon/truth_estimated/tracksummary_ckf_hist.root b/CI/physmon/reference/trackfinding_1muon/truth_estimated/tracksummary_ckf_hist.root
index 9ce90f1355b..d6061a509fb 100644
Binary files a/CI/physmon/reference/trackfinding_1muon/truth_estimated/tracksummary_ckf_hist.root and b/CI/physmon/reference/trackfinding_1muon/truth_estimated/tracksummary_ckf_hist.root differ
diff --git a/CI/physmon/reference/trackfinding_1muon/truth_smeared/performance_ckf.root b/CI/physmon/reference/trackfinding_1muon/truth_smeared/performance_ckf.root
deleted file mode 100644
index be2ac6376d8..00000000000
Binary files a/CI/physmon/reference/trackfinding_1muon/truth_smeared/performance_ckf.root and /dev/null differ
diff --git a/CI/physmon/reference/trackfinding_1muon/truth_smeared/performance_finding_ckf.root b/CI/physmon/reference/trackfinding_1muon/truth_smeared/performance_finding_ckf.root
new file mode 100644
index 00000000000..10f10907b8d
Binary files /dev/null and b/CI/physmon/reference/trackfinding_1muon/truth_smeared/performance_finding_ckf.root differ
diff --git a/CI/physmon/reference/trackfinding_1muon/truth_smeared/performance_fitting_ckf.root b/CI/physmon/reference/trackfinding_1muon/truth_smeared/performance_fitting_ckf.root
new file mode 100644
index 00000000000..1ca5e629d35
Binary files /dev/null and b/CI/physmon/reference/trackfinding_1muon/truth_smeared/performance_fitting_ckf.root differ
diff --git a/CI/physmon/reference/trackfinding_1muon/truth_smeared/tracksummary_ckf_hist.root b/CI/physmon/reference/trackfinding_1muon/truth_smeared/tracksummary_ckf_hist.root
index 632d9583785..4e51b3eb49c 100644
Binary files a/CI/physmon/reference/trackfinding_1muon/truth_smeared/tracksummary_ckf_hist.root and b/CI/physmon/reference/trackfinding_1muon/truth_smeared/tracksummary_ckf_hist.root differ
diff --git a/CI/physmon/reference/trackfinding_4muon_50vertices/performance_ckf.root b/CI/physmon/reference/trackfinding_4muon_50vertices/performance_ckf.root
deleted file mode 100644
index 6a6ecc7d054..00000000000
Binary files a/CI/physmon/reference/trackfinding_4muon_50vertices/performance_ckf.root and /dev/null differ
diff --git a/CI/physmon/reference/trackfinding_4muon_50vertices/performance_ckf_ambi.root b/CI/physmon/reference/trackfinding_4muon_50vertices/performance_ckf_ambi.root
deleted file mode 100644
index 49e0fcda2c1..00000000000
Binary files a/CI/physmon/reference/trackfinding_4muon_50vertices/performance_ckf_ambi.root and /dev/null differ
diff --git a/CI/physmon/reference/trackfinding_4muon_50vertices/performance_finding_ckf.root b/CI/physmon/reference/trackfinding_4muon_50vertices/performance_finding_ckf.root
new file mode 100644
index 00000000000..71bfd26dfb8
Binary files /dev/null and b/CI/physmon/reference/trackfinding_4muon_50vertices/performance_finding_ckf.root differ
diff --git a/CI/physmon/reference/trackfinding_4muon_50vertices/performance_finding_ckf_ambi.root b/CI/physmon/reference/trackfinding_4muon_50vertices/performance_finding_ckf_ambi.root
new file mode 100644
index 00000000000..39d7dc1a31f
Binary files /dev/null and b/CI/physmon/reference/trackfinding_4muon_50vertices/performance_finding_ckf_ambi.root differ
diff --git a/CI/physmon/reference/trackfinding_4muon_50vertices/performance_fitting_ckf.root b/CI/physmon/reference/trackfinding_4muon_50vertices/performance_fitting_ckf.root
new file mode 100644
index 00000000000..b90f40313eb
Binary files /dev/null and b/CI/physmon/reference/trackfinding_4muon_50vertices/performance_fitting_ckf.root differ
diff --git a/CI/physmon/reference/trackfinding_4muon_50vertices/performance_fitting_ckf_ambi.root b/CI/physmon/reference/trackfinding_4muon_50vertices/performance_fitting_ckf_ambi.root
new file mode 100644
index 00000000000..ff59dc310eb
Binary files /dev/null and b/CI/physmon/reference/trackfinding_4muon_50vertices/performance_fitting_ckf_ambi.root differ
diff --git a/CI/physmon/reference/trackfinding_4muon_50vertices/performance_seeding.root b/CI/physmon/reference/trackfinding_4muon_50vertices/performance_seeding.root
index 0a59b0fba85..e79e159caa2 100644
Binary files a/CI/physmon/reference/trackfinding_4muon_50vertices/performance_seeding.root and b/CI/physmon/reference/trackfinding_4muon_50vertices/performance_seeding.root differ
diff --git a/CI/physmon/reference/trackfinding_4muon_50vertices/performance_vertexing_amvf_gauss_notime_hist.root b/CI/physmon/reference/trackfinding_4muon_50vertices/performance_vertexing_amvf_gauss_notime_hist.root
index b72a71cbb42..ef6e14d59a0 100644
Binary files a/CI/physmon/reference/trackfinding_4muon_50vertices/performance_vertexing_amvf_gauss_notime_hist.root and b/CI/physmon/reference/trackfinding_4muon_50vertices/performance_vertexing_amvf_gauss_notime_hist.root differ
diff --git a/CI/physmon/reference/trackfinding_4muon_50vertices/performance_vertexing_amvf_grid_time_hist.root b/CI/physmon/reference/trackfinding_4muon_50vertices/performance_vertexing_amvf_grid_time_hist.root
index fed2ae9c28e..d99436fa0f5 100644
Binary files a/CI/physmon/reference/trackfinding_4muon_50vertices/performance_vertexing_amvf_grid_time_hist.root and b/CI/physmon/reference/trackfinding_4muon_50vertices/performance_vertexing_amvf_grid_time_hist.root differ
diff --git a/CI/physmon/reference/trackfinding_4muon_50vertices/performance_vertexing_ivf_notime_hist.root b/CI/physmon/reference/trackfinding_4muon_50vertices/performance_vertexing_ivf_notime_hist.root
index 377bf998d6c..c4c2af31ec4 100644
Binary files a/CI/physmon/reference/trackfinding_4muon_50vertices/performance_vertexing_ivf_notime_hist.root and b/CI/physmon/reference/trackfinding_4muon_50vertices/performance_vertexing_ivf_notime_hist.root differ
diff --git a/CI/physmon/reference/trackfinding_4muon_50vertices/tracksummary_ckf_hist.root b/CI/physmon/reference/trackfinding_4muon_50vertices/tracksummary_ckf_hist.root
index 07ad96265d6..4ea283d03da 100644
Binary files a/CI/physmon/reference/trackfinding_4muon_50vertices/tracksummary_ckf_hist.root and b/CI/physmon/reference/trackfinding_4muon_50vertices/tracksummary_ckf_hist.root differ
diff --git a/CI/physmon/reference/trackfinding_ttbar_pu200/performance_ckf.root b/CI/physmon/reference/trackfinding_ttbar_pu200/performance_ckf.root
deleted file mode 100644
index 2a692f3d751..00000000000
Binary files a/CI/physmon/reference/trackfinding_ttbar_pu200/performance_ckf.root and /dev/null differ
diff --git a/CI/physmon/reference/trackfinding_ttbar_pu200/performance_ckf_ambi.root b/CI/physmon/reference/trackfinding_ttbar_pu200/performance_ckf_ambi.root
deleted file mode 100644
index 8448a28ef8d..00000000000
Binary files a/CI/physmon/reference/trackfinding_ttbar_pu200/performance_ckf_ambi.root and /dev/null differ
diff --git a/CI/physmon/reference/trackfinding_ttbar_pu200/performance_finding_ckf.root b/CI/physmon/reference/trackfinding_ttbar_pu200/performance_finding_ckf.root
new file mode 100644
index 00000000000..d4b5a8b9dde
Binary files /dev/null and b/CI/physmon/reference/trackfinding_ttbar_pu200/performance_finding_ckf.root differ
diff --git a/CI/physmon/reference/trackfinding_ttbar_pu200/performance_finding_ckf_ambi.root b/CI/physmon/reference/trackfinding_ttbar_pu200/performance_finding_ckf_ambi.root
new file mode 100644
index 00000000000..a083efffaff
Binary files /dev/null and b/CI/physmon/reference/trackfinding_ttbar_pu200/performance_finding_ckf_ambi.root differ
diff --git a/CI/physmon/reference/trackfinding_ttbar_pu200/performance_fitting_ckf.root b/CI/physmon/reference/trackfinding_ttbar_pu200/performance_fitting_ckf.root
new file mode 100644
index 00000000000..09d2dc033af
Binary files /dev/null and b/CI/physmon/reference/trackfinding_ttbar_pu200/performance_fitting_ckf.root differ
diff --git a/CI/physmon/reference/trackfinding_ttbar_pu200/performance_fitting_ckf_ambi.root b/CI/physmon/reference/trackfinding_ttbar_pu200/performance_fitting_ckf_ambi.root
new file mode 100644
index 00000000000..949d8cebfc3
Binary files /dev/null and b/CI/physmon/reference/trackfinding_ttbar_pu200/performance_fitting_ckf_ambi.root differ
diff --git a/CI/physmon/reference/trackfinding_ttbar_pu200/performance_seeding.root b/CI/physmon/reference/trackfinding_ttbar_pu200/performance_seeding.root
index 7447c9e6b58..500783b48a4 100644
Binary files a/CI/physmon/reference/trackfinding_ttbar_pu200/performance_seeding.root and b/CI/physmon/reference/trackfinding_ttbar_pu200/performance_seeding.root differ
diff --git a/CI/physmon/reference/trackfinding_ttbar_pu200/performance_vertexing_amvf_gauss_notime_hist.root b/CI/physmon/reference/trackfinding_ttbar_pu200/performance_vertexing_amvf_gauss_notime_hist.root
index cb06eab079b..8d1bf337631 100644
Binary files a/CI/physmon/reference/trackfinding_ttbar_pu200/performance_vertexing_amvf_gauss_notime_hist.root and b/CI/physmon/reference/trackfinding_ttbar_pu200/performance_vertexing_amvf_gauss_notime_hist.root differ
diff --git a/CI/physmon/reference/trackfinding_ttbar_pu200/performance_vertexing_amvf_grid_time_hist.root b/CI/physmon/reference/trackfinding_ttbar_pu200/performance_vertexing_amvf_grid_time_hist.root
index 3c6a4b94200..25110c369be 100644
Binary files a/CI/physmon/reference/trackfinding_ttbar_pu200/performance_vertexing_amvf_grid_time_hist.root and b/CI/physmon/reference/trackfinding_ttbar_pu200/performance_vertexing_amvf_grid_time_hist.root differ
diff --git a/CI/physmon/reference/trackfinding_ttbar_pu200/tracksummary_ckf_hist.root b/CI/physmon/reference/trackfinding_ttbar_pu200/tracksummary_ckf_hist.root
index a5f58e1e065..f803f21ee8f 100644
Binary files a/CI/physmon/reference/trackfinding_ttbar_pu200/tracksummary_ckf_hist.root and b/CI/physmon/reference/trackfinding_ttbar_pu200/tracksummary_ckf_hist.root differ
diff --git a/CI/physmon/reference/trackfitting_gsf/performance_trackfitting.root b/CI/physmon/reference/trackfitting_gsf/performance_trackfitting.root
index 02975d42572..b3543963d9f 100644
Binary files a/CI/physmon/reference/trackfitting_gsf/performance_trackfitting.root and b/CI/physmon/reference/trackfitting_gsf/performance_trackfitting.root differ
diff --git a/CI/physmon/reference/trackfitting_gx2f/performance_trackfitting.root b/CI/physmon/reference/trackfitting_gx2f/performance_trackfitting.root
index 0b1e216915e..b2e2b47c2f5 100644
Binary files a/CI/physmon/reference/trackfitting_gx2f/performance_trackfitting.root and b/CI/physmon/reference/trackfitting_gx2f/performance_trackfitting.root differ
diff --git a/CI/physmon/reference/trackfitting_kf/performance_trackfitting.root b/CI/physmon/reference/trackfitting_kf/performance_trackfitting.root
index aade25ba5a2..4e3f44e2b34 100644
Binary files a/CI/physmon/reference/trackfitting_kf/performance_trackfitting.root and b/CI/physmon/reference/trackfitting_kf/performance_trackfitting.root differ
diff --git a/CI/physmon/reference/trackrefitting_gsf/performance_trackrefitting.root b/CI/physmon/reference/trackrefitting_gsf/performance_trackrefitting.root
new file mode 100644
index 00000000000..b6b8d6fd126
Binary files /dev/null and b/CI/physmon/reference/trackrefitting_gsf/performance_trackrefitting.root differ
diff --git a/CI/physmon/reference/trackrefitting_kf/performance_trackrefitting.root b/CI/physmon/reference/trackrefitting_kf/performance_trackrefitting.root
new file mode 100644
index 00000000000..99385589d48
Binary files /dev/null and b/CI/physmon/reference/trackrefitting_kf/performance_trackrefitting.root differ
diff --git a/CI/physmon/workflows/physmon_simulation.py b/CI/physmon/workflows/physmon_simulation.py
index c88d4a081e8..206890540b8 100755
--- a/CI/physmon/workflows/physmon_simulation.py
+++ b/CI/physmon/workflows/physmon_simulation.py
@@ -64,6 +64,14 @@
         )
     )
 
+    s.addWriter(
+        acts.examples.RootParticleWriter(
+            level=acts.logging.INFO,
+            inputParticles="particles_input",
+            filePath=tp / "particles.root",
+        )
+    )
+
     addFatras(
         s,
         setup.trackingGeometry,
@@ -73,8 +81,7 @@
         preSelectParticles=None,
         postSelectParticles=ParticleSelectorConfig(removeSecondaries=True),
         inputParticles="particles_input",
-        outputParticlesInitial="particles_initial_fatras",
-        outputParticlesFinal="particles_final_fatras",
+        outputParticles="particles_fatras",
         outputSimHits="simhits_fatras",
         outputDirRoot=tp / "fatras",
     )
@@ -87,12 +94,11 @@
         rnd,
         preSelectParticles=None,
         postSelectParticles=ParticleSelectorConfig(removeSecondaries=True),
-        killVolume=setup.trackingGeometry.worldVolume,
+        killVolume=setup.trackingGeometry.highestTrackingVolume,
         killAfterTime=25 * u.ns,
         killSecondaries=True,
         inputParticles="particles_input",
-        outputParticlesInitial="particles_initial_geant4",
-        outputParticlesFinal="particles_final_geant4",
+        outputParticles="particles_geant4",
         outputSimHits="simhits_geant4",
         outputDirRoot=tp / "geant4",
     )
@@ -100,6 +106,7 @@
     s.run()
 
     for file, name in [
+        (tp / "particles.root", "particles_gun.root"),
         (tp / "fatras" / "particles_simulation.root", "particles_fatras.root"),
         (tp / "geant4" / "particles_simulation.root", "particles_geant4.root"),
     ]:
@@ -135,8 +142,8 @@
     s.run()
 
     for file, name in [
-        (tp / "pythia8_particles.root", "particles_ttbar.root"),
-        (tp / "pythia8_vertices.root", "vertices_ttbar.root"),
+        (tp / "particles.root", "particles_ttbar.root"),
+        (tp / "vertices.root", "vertices_ttbar.root"),
     ]:
         assert file.exists(), "file not found"
         shutil.copy(file, setup.outdir / name)
diff --git a/CI/physmon/workflows/physmon_trackfinding_1muon.py b/CI/physmon/workflows/physmon_trackfinding_1muon.py
index 8dee557c794..aaa4bc9f71d 100755
--- a/CI/physmon/workflows/physmon_trackfinding_1muon.py
+++ b/CI/physmon/workflows/physmon_trackfinding_1muon.py
@@ -11,13 +11,13 @@
     EtaConfig,
     PhiConfig,
     ParticleConfig,
+    ParticleSelectorConfig,
     addFatras,
     addDigitization,
 )
 
 from acts.examples.reconstruction import (
     addSeeding,
-    TruthSeedRanges,
     ParticleSmearingSigmas,
     SeedFinderConfigArg,
     SeedFinderOptionsArg,
@@ -72,6 +72,11 @@ def run_ckf_tracking(label, seeding):
             setup.field,
             enableInteractions=True,
             rnd=rnd,
+            postSelectParticles=ParticleSelectorConfig(
+                pt=(0.9 * u.GeV, None),
+                measurements=(9, None),
+                removeNeutral=True,
+            ),
         )
 
         addDigitization(
@@ -86,7 +91,6 @@ def run_ckf_tracking(label, seeding):
             s,
             setup.trackingGeometry,
             setup.field,
-            TruthSeedRanges(pt=(500 * u.MeV, None), nHits=(9, None)),
             ParticleSmearingSigmas(  # only used by SeedingAlgorithm.TruthSmeared
                 # zero eveything so the CKF has a chance to find the measurements
                 d0=0,
@@ -108,7 +112,7 @@ def run_ckf_tracking(label, seeding):
                 maxSeedsPerSpM=1,
                 sigmaScattering=5,
                 radLengthPerSeed=0.1,
-                minPt=500 * u.MeV,
+                minPt=0.5 * u.GeV,
                 impactMax=3 * u.mm,
             ),
             SeedFinderOptionsArg(bFieldInZ=2 * u.T),
@@ -134,13 +138,16 @@ def run_ckf_tracking(label, seeding):
             setup.trackingGeometry,
             setup.field,
             TrackSelectorConfig(
-                pt=(500 * u.MeV, None),
+                pt=(0.9 * u.GeV, None),
                 loc0=(-4.0 * u.mm, 4.0 * u.mm),
                 nMeasurementsMin=6,
                 maxHoles=2,
                 maxOutliers=2,
             ),
             CkfConfig(
+                chi2CutOffMeasurement=15.0,
+                chi2CutOffOutlier=25.0,
+                numMeasurementsCutOff=10,
                 seedDeduplication=(
                     True if seeding != SeedingAlgorithm.TruthSmeared else False
                 ),
@@ -156,8 +163,9 @@ def run_ckf_tracking(label, seeding):
             if seeding != SeedingAlgorithm.TruthSmeared
             else []
         ) + [
-            "performance_ckf.root",
             "tracksummary_ckf.root",
+            "performance_finding_ckf.root",
+            "performance_fitting_ckf.root",
         ]:
             perf_file = tp / file
             assert perf_file.exists(), f"Performance file not found {perf_file}"
diff --git a/CI/physmon/workflows/physmon_trackfinding_4muon_50vertices.py b/CI/physmon/workflows/physmon_trackfinding_4muon_50vertices.py
index 0efeec3acf2..1a119c8ed6c 100755
--- a/CI/physmon/workflows/physmon_trackfinding_4muon_50vertices.py
+++ b/CI/physmon/workflows/physmon_trackfinding_4muon_50vertices.py
@@ -11,12 +11,12 @@
     EtaConfig,
     PhiConfig,
     ParticleConfig,
+    ParticleSelectorConfig,
     addFatras,
     addDigitization,
 )
 from acts.examples.reconstruction import (
     addSeeding,
-    TruthSeedRanges,
     SeedFinderConfigArg,
     SeedFinderOptionsArg,
     SeedingAlgorithm,
@@ -69,6 +69,11 @@
         setup.trackingGeometry,
         setup.field,
         rnd=rnd,
+        postSelectParticles=ParticleSelectorConfig(
+            pt=(0.9 * u.GeV, None),
+            measurements=(9, None),
+            removeNeutral=True,
+        ),
     )
 
     addDigitization(
@@ -83,7 +88,6 @@
         s,
         setup.trackingGeometry,
         setup.field,
-        TruthSeedRanges(pt=(500.0 * u.MeV, None), nHits=(9, None)),
         SeedFinderConfigArg(
             r=(33 * u.mm, 200 * u.mm),
             deltaR=(1 * u.mm, 60 * u.mm),
@@ -92,7 +96,7 @@
             maxSeedsPerSpM=1,
             sigmaScattering=5,
             radLengthPerSeed=0.1,
-            minPt=500 * u.MeV,
+            minPt=0.5 * u.GeV,
             impactMax=3 * u.mm,
         ),
         SeedFinderOptionsArg(bFieldInZ=2 * u.T, beamPos=(0.0, 0.0)),
@@ -116,13 +120,16 @@
         setup.trackingGeometry,
         setup.field,
         TrackSelectorConfig(
-            pt=(500 * u.MeV, None),
+            pt=(0.9 * u.GeV, None),
             loc0=(-4.0 * u.mm, 4.0 * u.mm),
             nMeasurementsMin=6,
             maxHoles=2,
             maxOutliers=2,
         ),
         CkfConfig(
+            chi2CutOffMeasurement=15.0,
+            chi2CutOffOutlier=25.0,
+            numMeasurementsCutOff=10,
             seedDeduplication=True,
             stayOnSeed=True,
         ),
@@ -189,8 +196,12 @@
     s.run()
 
     shutil.move(
-        tp / "performance_ambi.root",
-        tp / "performance_ckf_ambi.root",
+        tp / "performance_finding_ambi.root",
+        tp / "performance_finding_ckf_ambi.root",
+    )
+    shutil.move(
+        tp / "performance_fitting_ambi.root",
+        tp / "performance_fitting_ckf_ambi.root",
     )
     for vertexing in ["ivf_notime", "amvf_gauss_notime", "amvf_grid_time"]:
         shutil.move(
@@ -201,8 +212,10 @@
     for file in [
         "performance_seeding.root",
         "tracksummary_ckf.root",
-        "performance_ckf.root",
-        "performance_ckf_ambi.root",
+        "performance_finding_ckf.root",
+        "performance_fitting_ckf.root",
+        "performance_finding_ckf_ambi.root",
+        "performance_fitting_ckf_ambi.root",
         "performance_vertexing_ivf_notime.root",
         "performance_vertexing_amvf_gauss_notime.root",
         "performance_vertexing_amvf_grid_time.root",
diff --git a/CI/physmon/workflows/physmon_trackfinding_ttbar_pu200.py b/CI/physmon/workflows/physmon_trackfinding_ttbar_pu200.py
index a9414a89351..99f12d0170d 100755
--- a/CI/physmon/workflows/physmon_trackfinding_ttbar_pu200.py
+++ b/CI/physmon/workflows/physmon_trackfinding_ttbar_pu200.py
@@ -9,10 +9,10 @@
     addPythia8,
     addFatras,
     addDigitization,
+    ParticleSelectorConfig,
 )
 from acts.examples.reconstruction import (
     addSeeding,
-    TruthSeedRanges,
     SeedFinderConfigArg,
     SeedFinderOptionsArg,
     SeedingAlgorithm,
@@ -63,6 +63,15 @@
         setup.trackingGeometry,
         setup.field,
         rnd=rnd,
+        preSelectParticles=ParticleSelectorConfig(
+            rho=(0.0, 24 * u.mm),
+            absZ=(0.0, 1.0 * u.m),
+        ),
+        postSelectParticles=ParticleSelectorConfig(
+            pt=(0.5 * u.GeV, None),
+            measurements=(9, None),
+            removeNeutral=True,
+        ),
     )
 
     addDigitization(
@@ -77,7 +86,6 @@
         s,
         setup.trackingGeometry,
         setup.field,
-        TruthSeedRanges(pt=(500.0 * u.MeV, None), nHits=(9, None)),
         SeedFinderConfigArg(
             r=(33 * u.mm, 200 * u.mm),
             deltaR=(1 * u.mm, 60 * u.mm),
@@ -86,7 +94,7 @@
             maxSeedsPerSpM=1,
             sigmaScattering=5,
             radLengthPerSeed=0.1,
-            minPt=500 * u.MeV,
+            minPt=0.5 * u.GeV,
             impactMax=3 * u.mm,
         ),
         SeedFinderOptionsArg(bFieldInZ=2 * u.T, beamPos=(0.0, 0.0)),
@@ -110,13 +118,16 @@
         setup.trackingGeometry,
         setup.field,
         TrackSelectorConfig(
-            pt=(500 * u.MeV, None),
+            pt=(0.5 * u.GeV, None),
             loc0=(-4.0 * u.mm, 4.0 * u.mm),
             nMeasurementsMin=6,
             maxHoles=2,
             maxOutliers=2,
         ),
         CkfConfig(
+            chi2CutOffMeasurement=15.0,
+            chi2CutOffOutlier=25.0,
+            numMeasurementsCutOff=10,
             seedDeduplication=True,
             stayOnSeed=True,
         ),
@@ -169,8 +180,12 @@
     s.run()
 
     shutil.move(
-        tp / "performance_ambi.root",
-        tp / "performance_ckf_ambi.root",
+        tp / "performance_finding_ambi.root",
+        tp / "performance_finding_ckf_ambi.root",
+    )
+    shutil.move(
+        tp / "performance_fitting_ambi.root",
+        tp / "performance_fitting_ckf_ambi.root",
     )
     for vertexing in ["amvf_gauss_notime", "amvf_grid_time"]:
         shutil.move(
@@ -181,8 +196,10 @@
     for file in [
         "performance_seeding.root",
         "tracksummary_ckf.root",
-        "performance_ckf.root",
-        "performance_ckf_ambi.root",
+        "performance_finding_ckf.root",
+        "performance_fitting_ckf.root",
+        "performance_finding_ckf_ambi.root",
+        "performance_fitting_ckf_ambi.root",
         "performance_vertexing_amvf_gauss_notime.root",
         "performance_vertexing_amvf_grid_time.root",
     ]:
diff --git a/CI/physmon/workflows/physmon_trackrefitting_gsf.py b/CI/physmon/workflows/physmon_trackrefitting_gsf.py
new file mode 100755
index 00000000000..5477121942a
--- /dev/null
+++ b/CI/physmon/workflows/physmon_trackrefitting_gsf.py
@@ -0,0 +1,34 @@
+#!/usr/bin/env python3
+
+import tempfile
+from pathlib import Path
+import shutil
+
+import acts
+from truth_tracking_gsf_refitting import runRefittingGsf
+
+from physmon_common import makeSetup
+
+setup = makeSetup()
+
+with tempfile.TemporaryDirectory() as temp:
+    s = acts.examples.Sequencer(
+        events=10000,
+        numThreads=-1,
+        logLevel=acts.logging.INFO,
+    )
+
+    tp = Path(temp)
+    runRefittingGsf(
+        trackingGeometry=setup.trackingGeometry,
+        field=setup.field,
+        digiConfigFile=setup.digiConfig,
+        outputDir=tp,
+        s=s,
+    )
+
+    s.run()
+
+    perf_file = tp / "performance_gsf_refit.root"
+    assert perf_file.exists(), "Performance file not found"
+    shutil.copy(perf_file, setup.outdir / "performance_trackrefitting.root")
diff --git a/CI/physmon/workflows/physmon_trackrefitting_kf.py b/CI/physmon/workflows/physmon_trackrefitting_kf.py
new file mode 100755
index 00000000000..ea82d26c701
--- /dev/null
+++ b/CI/physmon/workflows/physmon_trackrefitting_kf.py
@@ -0,0 +1,34 @@
+#!/usr/bin/env python3
+
+import tempfile
+from pathlib import Path
+import shutil
+
+import acts
+from truth_tracking_kalman_refitting import runRefittingKf
+
+from physmon_common import makeSetup
+
+setup = makeSetup()
+
+with tempfile.TemporaryDirectory() as temp:
+    s = acts.examples.Sequencer(
+        events=10000,
+        numThreads=-1,
+        logLevel=acts.logging.INFO,
+    )
+
+    tp = Path(temp)
+    runRefittingKf(
+        trackingGeometry=setup.trackingGeometry,
+        field=setup.field,
+        digiConfigFile=setup.digiConfig,
+        outputDir=tp,
+        s=s,
+    )
+
+    s.run()
+
+    perf_file = tp / "performance_kf_refit.root"
+    assert perf_file.exists(), "Performance file not found"
+    shutil.copy(perf_file, setup.outdir / "performance_trackrefitting.root")
diff --git a/CI/test_coverage.py b/CI/test_coverage.py
index 06b13a06abb..0488a71d85d 100755
--- a/CI/test_coverage.py
+++ b/CI/test_coverage.py
@@ -41,7 +41,7 @@ def call(cmd):
 
 ret, gcovr_version_text = check_output(["gcovr", "--version"])
 gcovr_version = tuple(
-    map(int, re.match("gcovr (\d+\.\d+)", gcovr_version_text).group(1).split("."))
+    map(int, re.match(r"gcovr (\d+\.\d+)", gcovr_version_text).group(1).split("."))
 )
 
 extra_flags = []
@@ -63,7 +63,7 @@ def call(cmd):
 if not os.path.exists(coverage_dir):
     os.makedirs(coverage_dir)
 
-excludes = ["-e", "../Tests/", "-e", ".*json\.hpp"]
+excludes = ["-e", "../Tests/", "-e", r".*json\.hpp"]
 
 # create the html report
 call(
diff --git a/CITATION.cff b/CITATION.cff
index ff80a2e9eb9..910eade5312 100644
--- a/CITATION.cff
+++ b/CITATION.cff
@@ -23,7 +23,6 @@ authors:
   affiliation: Universite Paris-Saclay / CNRS/IN2P3
 - given-names: Robert
   family-names: Langenberg
-  affiliation: University of Massachussets
 - given-names: Corentin
   family-names: Allaire
   affiliation: CERN
diff --git a/CMakeLists.txt b/CMakeLists.txt
index a132cce73d3..601264badc0 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -31,7 +31,6 @@ option(ACTS_FORCE_ASSERTIONS "Force assertions regardless of build type" OFF)
 option(ACTS_USE_SYSTEM_LIBS "Use system libraries by default" OFF)
 # plugins related options
 option(ACTS_USE_SYSTEM_ACTSVG "Use the ActSVG system library" ${ACTS_USE_SYSTEM_LIBS})
-option(ACTS_USE_SYSTEM_GEOMODEL "Use a system-provided GeoModel installation" ${ACTS_USE_SYSTEM_LIBS})
 option(ACTS_USE_SYSTEM_COVFIE "Use a system-provided covfie installation" ${ACTS_USE_SYSTEM_LIBS})
 option(ACTS_USE_SYSTEM_DETRAY "Use a system-provided detray installation" ${ACTS_USE_SYSTEM_LIBS})
 option(ACTS_USE_SYSTEM_TRACCC "Use a system-provided traccc installation" ${ACTS_USE_SYSTEM_LIBS})
@@ -58,6 +57,8 @@ option(ACTS_BUILD_PLUGIN_JSON "Build json plugin" OFF)
 option(ACTS_BUILD_PLUGIN_LEGACY "Build legacy plugin" OFF)
 option(ACTS_BUILD_PLUGIN_ONNX "Build ONNX plugin" OFF)
 option(ACTS_BUILD_PLUGIN_TGEO "Build TGeo plugin" OFF)
+option(ACTS_SETUP_ANNOY "Explicitly set up Annoy for the project" OFF)
+option(ACTS_BUILD_PLUGIN_HASHING "Build Hashing plugin" OFF)
 # fatras related options
 option(ACTS_BUILD_FATRAS "Build FAst TRAcking Simulation package" OFF)
 option(ACTS_BUILD_FATRAS_GEANT4 "Build Geant4 Fatras package" OFF)
@@ -69,9 +70,9 @@ option(ACTS_BUILD_EXAMPLES_EDM4HEP "Build EDM4hep-based code in the examples" OF
 option(ACTS_BUILD_EXAMPLES_EXATRKX "Build the Exa.TrkX example code" OFF)
 option(ACTS_BUILD_EXAMPLES_GEANT4 "Build Geant4-based code in the examples" OFF)
 option(ACTS_BUILD_EXAMPLES_HEPMC3 "Build HepMC3-based code in the examples" OFF)
+option(ACTS_BUILD_EXAMPLES_HASHING "Build Hashing-based code in the examples" OFF)
 option(ACTS_BUILD_EXAMPLES_PYTHIA8 "Build Pythia8-based code in the examples" OFF)
 option(ACTS_BUILD_EXAMPLES_PYTHON_BINDINGS "Build python bindings for the examples" OFF)
-option(ACTS_USE_EXAMPLES_TBB "Use Threading Building Blocks library in the examples" ON)
 option(ACTS_BUILD_ANALYSIS_APPS "Build Analysis applications in the examples" OFF)
 # test related options
 option(ACTS_BUILD_BENCHMARKS "Build benchmarks" OFF)
@@ -90,7 +91,7 @@ option(ACTS_BUILD_DOCS "Build documentation" OFF)
 option(ACTS_SETUP_BOOST "Explicitly set up Boost for the project" ON)
 option(ACTS_SETUP_EIGEN3 "Explicitly set up Eigen3 for the project" ON)
 option(ACTS_BUILD_ODD "Build the OpenDataDetector" OFF)
-# profiling related optios
+# profiling related options
 option(ACTS_ENABLE_CPU_PROFILING "Enable CPU profiling using gperftools" OFF)
 option(ACTS_ENABLE_MEMORY_PROFILING "Enable memory profiling using gperftools" OFF)
 set(ACTS_GPERF_INSTALL_DIR "" CACHE STRING "Hint to help find gperf if profiling is enabled")
@@ -110,6 +111,7 @@ set_option_if(
   OR ACTS_BUILD_EXAMPLES_EDM4HEP
   OR ACTS_BUILD_EXAMPLES_GEANT4
   OR ACTS_BUILD_EXAMPLES_HEPMC3
+  OR ACTS_BUILD_EXAMPLES_HASHING
   OR ACTS_BUILD_EXAMPLES_PYTHIA8
   OR ACTS_BUILD_EXAMPLES_EXATRKX
   OR ACTS_BUILD_EXAMPLES_PYTHON_BINDINGS
@@ -164,6 +166,14 @@ set_option_if(
   ACTS_BUILD_PLUGIN_JSON
   ACTS_BUILD_PLUGIN_TRACCC
 )
+set_option_if(
+  ACTS_BUILD_PLUGIN_ACTSVG
+  ACTS_BUILD_PLUGIN_TRACCC
+)
+set_option_if(
+  ACTS_BUILD_PLUGIN_HASHING
+  ACTS_BUILD_EXAMPLES_HASHING
+)
 
 # feature tests
 include(CheckCXXSourceCompiles)
@@ -213,27 +223,28 @@ endif()
 # minimal dependency versions. they are defined here in a single place so
 # they can be easily upgraded, although they might not be used if the
 # dependency is included via `add_subdirectory(...)`.
-set(_acts_actsvg_version 0.4.40)
-set(_acts_autodiff_version 0.6)
+set(_acts_actsvg_version 0.4.50)
 set(_acts_boost_version 1.71.0)
 set(_acts_dd4hep_version 1.21)
+set(_acts_geant4_version 11.1.3)
 set(_acts_edm4hep_version 0.7)
-set(_acts_geomodel_version 6.3.0)
 set(_acts_eigen3_version 3.4.0)
 set(_acts_podio_version 1.0.1) # will try this first
 set(_acts_podio_fallback_version 0.16) # if not found, will try this one
 set(_acts_doxygen_version 1.9.4)
 set(_acts_hepmc3_version 3.2.1)
-set(_acts_nlohmanjson_version 3.2.0)
+set(_acts_nlohmanjson_version 3.10.5)
 set(_acts_onnxruntime_version 1.12.0)
 set(_acts_root_version 6.20)
 set(_acts_tbb_version 2020.1)
 set(_acts_pythia8_version 8.309)
-set(_acts_detray_version 0.72.0)
-set(_acts_traccc_version 0.13.0)
+set(_acts_pybind11_version 2.13.1)
+set(_acts_detray_version 0.75.3)
+set(_acts_traccc_version 0.16.0)
 set(_acts_covfie_version 0.10.0)
 set(_acts_vecmem_version 1.4.0)
 set(_acts_algebraplugins_version 0.22.0)
+set(_acts_annoy_version 1.17.3)
 
 # recommended dependency version. if there is an opportunity to reach
 # this version we will try so.
@@ -279,8 +290,12 @@ if(ACTS_SETUP_BOOST)
     endif()
 
     if(Boost_VERSION VERSION_EQUAL "1.85.0")
+        set(_boost_version_severity WARNING)
+        if(ACTS_BUILD_EXAMPLES)
+            set(_boost_version_severity FATAL_ERROR)
+        endif()
         message(
-            WARNING
+            ${_boost_version_severity}
             "Boost 1.85.0 is known to be broken (https://github.com/boostorg/container/issues/273). Please use a different version."
         )
     endif()
@@ -298,7 +313,7 @@ find_package(Filesystem REQUIRED)
 
 # the `<project_name>_VERSION` variables set by `setup(... VERSION ...)` have
 # only local scope, i.e. they are not accessible her for dependencies added
-# via `add_subdirectory`. this overrides the `project(...)` funcion for
+# via `add_subdirectory`. this overrides the `project(...)` function for
 # sub-projects such that the resulting `<project_name>_VERSION` has
 # global scope and is accessible within the main project later on.
 cmake_policy(SET CMP0048 NEW)
@@ -361,8 +376,24 @@ if(ACTS_BUILD_PLUGIN_JSON)
     endif()
 endif()
 if(ACTS_BUILD_PLUGIN_GEOMODEL)
-    find_package(GeoModelCore ${_acts_geomodel_version} REQUIRED CONFIG)
-    find_package(GeoModelIO ${_acts_geomodel_version} REQUIRED CONFIG)
+    find_package(GeoModelCore CONFIG)
+    if(NOT GeoModelCore_FOUND)
+        message(
+            FATAL_ERROR
+            "GeoModel not found. Please install GeoModel or set ACTS_BUILD_PLUGIN_GEOMODEL to OFF."
+        )
+    endif()
+
+    set(_gm_ver_min 6.3.0)
+
+    if(GeoModelCore_VERSION VERSION_LESS _gm_ver_min)
+        message(
+            FATAL_ERROR
+            "GeoModel version ${GeoModelCore_VERSION} is insufficient. Please install GeoModel version ${_gm_ver_min} or newer."
+        )
+    endif()
+    # find other GeoModel components of EXACT same version
+    find_package(GeoModelIO ${GeoModelCore_VERSION} REQUIRED EXACT CONFIG)
 endif()
 if(ACTS_BUILD_PLUGIN_TGEO)
     find_package(
@@ -426,7 +457,7 @@ if(ACTS_BUILD_PLUGIN_EDM4HEP)
     find_package(EDM4HEP ${_acts_edm4hep_version} REQUIRED CONFIG)
 endif()
 if(ACTS_BUILD_PLUGIN_GEANT4)
-    find_package(Geant4 REQUIRED CONFIG COMPONENTS gdml)
+    find_package(Geant4 ${_acts_geant4_version} REQUIRED CONFIG COMPONENTS gdml)
 endif()
 
 if(ACTS_BUILD_PLUGIN_TRACCC)
@@ -464,6 +495,9 @@ if(ACTS_BUILD_PLUGIN_TRACCC)
         add_subdirectory(thirdparty/traccc)
     endif()
 endif()
+if(ACTS_SETUP_ANNOY OR ACTS_BUILD_PLUGIN_HASHING)
+    add_subdirectory(thirdparty/Annoy)
+endif()
 
 # examples dependencies
 if(ACTS_BUILD_EXAMPLES)
diff --git a/CMakePresets.json b/CMakePresets.json
index b9181d2d0a1..2aef0f3fe94 100644
--- a/CMakePresets.json
+++ b/CMakePresets.json
@@ -46,7 +46,7 @@
             "inherits": "common",
             "cacheVariables": {
                 "CMAKE_BUILD_TYPE": "Release",
-                "CMAKE_CXX_FLAGS": "-Werror",
+                "CMAKE_COMPILE_WARNING_AS_ERROR": "ON",
                 "ACTS_FORCE_ASSERTIONS": "ON",
                 "ACTS_ENABLE_LOG_FAILURE_THRESHOLD": "ON",
                 "ACTS_BUILD_BENCHMARKS": "ON",
@@ -70,7 +70,8 @@
                 "ACTS_BUILD_EXAMPLES_EXATRKX": "OFF",
                 "ACTS_BUILD_EXAMPLES_GEANT4": "ON",
                 "ACTS_BUILD_EXAMPLES_HEPMC3": "ON",
-                "ACTS_BUILD_EXAMPLES_PYTHIA8": "ON"
+                "ACTS_BUILD_EXAMPLES_PYTHIA8": "ON",
+                "ACTS_BUILD_EXAMPLES_HASHING": "ON"
             }
         },
         {
@@ -95,7 +96,6 @@
             "displayName": "GitLab-CI",
             "inherits": "ci-common",
             "cacheVariables": {
-                "ACTS_BUILD_PLUGIN_ACTSVG": "OFF",
                 "ACTS_BUILD_ODD": "OFF",
                 "ACTS_BUILD_EXAMPLES_PYTHON_BINDINGS": "OFF",
                 "ACTS_RUN_CLANG_TIDY": "ON"
diff --git a/CONTRIBUTING.rst b/CONTRIBUTING.rst
index e680cab96ba..93fe1f04dec 100644
--- a/CONTRIBUTING.rst
+++ b/CONTRIBUTING.rst
@@ -220,7 +220,7 @@ bugfix should happen in a different branch. The recommended procedure
 for handling this situation is the following:
 
 #. Get into a clean state of your working directory on your feature
-   branch (either by commiting open changes or by stashing them).
+   branch (either by committing open changes or by stashing them).
 #. Checkout the branch the bugfix should be merged into (either *main*
    or *release/X.Y.Z*) and get the most recent version.
 #. Create a new branch for the bugfix.
@@ -238,7 +238,7 @@ Example: Backporting a feature or bugfix
 
 Suppose you have a bugfix or feature branch that is eventually going to
 be merged in ``main``. You might want to have the feature/bugfix
-avilable in a patch (say ``0.25.1``) tag. To to that, find the
+available in a patch (say ``0.25.1``) tag. To to that, find the
 corresponding release branch, for this example that would be
 ``release/v0.25.X``. You must create a dedicated branch that **only**
 contains the commits that relate to your feature/bugfix, otherwise the
diff --git a/Core/ActsVersion.hpp.in b/Core/ActsVersion.hpp.in
index 4dc1ba7acb7..982c9d4fb5c 100644
--- a/Core/ActsVersion.hpp.in
+++ b/Core/ActsVersion.hpp.in
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2016-2023 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
@@ -43,7 +43,6 @@ struct VersionInfo {
   static VersionInfo fromLibrary();
 
   bool operator==(const VersionInfo& other) const;
-  bool operator!=(const VersionInfo& other) const { return !(*this == other); }
 
   friend std::ostream& operator<<(std::ostream& os, const VersionInfo& vi);
 
diff --git a/Core/CMakeLists.txt b/Core/CMakeLists.txt
index b760ba576ed..554656f514c 100644
--- a/Core/CMakeLists.txt
+++ b/Core/CMakeLists.txt
@@ -108,7 +108,9 @@ add_subdirectory(src/Detector)
 add_subdirectory(src/Geometry)
 add_subdirectory(src/MagneticField)
 add_subdirectory(src/Material)
+add_subdirectory(src/Navigation)
 add_subdirectory(src/Propagator)
+add_subdirectory(src/Seeding)
 add_subdirectory(src/Surfaces)
 add_subdirectory(src/TrackFinding)
 add_subdirectory(src/TrackFitting)
diff --git a/Core/include/Acts/AmbiguityResolution/GreedyAmbiguityResolution.hpp b/Core/include/Acts/AmbiguityResolution/GreedyAmbiguityResolution.hpp
index cffdb128220..13bd9822c86 100644
--- a/Core/include/Acts/AmbiguityResolution/GreedyAmbiguityResolution.hpp
+++ b/Core/include/Acts/AmbiguityResolution/GreedyAmbiguityResolution.hpp
@@ -1,16 +1,17 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2023-2024 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
 #include "Acts/EventData/MultiTrajectoryHelpers.hpp"
 #include "Acts/EventData/SourceLink.hpp"
 #include "Acts/EventData/TrackContainer.hpp"
+#include "Acts/EventData/TrackContainerFrontendConcept.hpp"
 #include "Acts/Utilities/Delegate.hpp"
 #include "Acts/Utilities/Logger.hpp"
 
@@ -77,13 +78,11 @@ class GreedyAmbiguityResolution {
   /// @param state An empty state object which is expected to be default constructed.
   /// @param sourceLinkHash A functor to acquire a hash from a given source link.
   /// @param sourceLinkEquality A functor to check equality of two source links.
-  template <typename track_container_t, typename traj_t,
-            template <typename> class holder_t, typename source_link_hash_t,
-            typename source_link_equality_t>
-  void computeInitialState(
-      const TrackContainer<track_container_t, traj_t, holder_t>& tracks,
-      State& state, source_link_hash_t&& sourceLinkHash,
-      source_link_equality_t&& sourceLinkEquality) const;
+  template <TrackContainerFrontend track_container_t,
+            typename source_link_hash_t, typename source_link_equality_t>
+  void computeInitialState(const track_container_t& tracks, State& state,
+                           source_link_hash_t&& sourceLinkHash,
+                           source_link_equality_t&& sourceLinkEquality) const;
 
   /// Updates the state iteratively by evicting one track after the other until
   /// the final state conditions are met.
diff --git a/Core/include/Acts/AmbiguityResolution/GreedyAmbiguityResolution.ipp b/Core/include/Acts/AmbiguityResolution/GreedyAmbiguityResolution.ipp
index 2f231ff216b..32cbdbbd1e3 100644
--- a/Core/include/Acts/AmbiguityResolution/GreedyAmbiguityResolution.ipp
+++ b/Core/include/Acts/AmbiguityResolution/GreedyAmbiguityResolution.ipp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2023-2024 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
@@ -15,12 +15,11 @@
 
 namespace Acts {
 
-template <typename track_container_t, typename traj_t,
-          template <typename> class holder_t, typename source_link_hash_t,
+template <TrackContainerFrontend track_container_t, typename source_link_hash_t,
           typename source_link_equality_t>
 void GreedyAmbiguityResolution::computeInitialState(
-    const TrackContainer<track_container_t, traj_t, holder_t>& tracks,
-    State& state, source_link_hash_t&& sourceLinkHash,
+    const track_container_t& tracks, State& state,
+    source_link_hash_t&& sourceLinkHash,
     source_link_equality_t&& sourceLinkEquality) const {
   auto measurementIndexMap =
       std::unordered_map<SourceLink, std::size_t, source_link_hash_t,
diff --git a/Core/include/Acts/AmbiguityResolution/ScoreBasedAmbiguityResolution.hpp b/Core/include/Acts/AmbiguityResolution/ScoreBasedAmbiguityResolution.hpp
index afc19083117..fbccb611d1a 100644
--- a/Core/include/Acts/AmbiguityResolution/ScoreBasedAmbiguityResolution.hpp
+++ b/Core/include/Acts/AmbiguityResolution/ScoreBasedAmbiguityResolution.hpp
@@ -1,21 +1,24 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2024 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
 #include "Acts/Definitions/Units.hpp"
 #include "Acts/EventData/TrackContainer.hpp"
+#include "Acts/EventData/TrackContainerFrontendConcept.hpp"
+#include "Acts/EventData/TrackProxyConcept.hpp"
 #include "Acts/Utilities/Delegate.hpp"
 #include "Acts/Utilities/Logger.hpp"
 
 #include <cstddef>
 #include <map>
 #include <memory>
+#include <numbers>
 #include <string>
 #include <tuple>
 #include <vector>
@@ -101,8 +104,8 @@ class ScoreBasedAmbiguityResolution {
     double pTMin = 0 * UnitConstants::GeV;
     double pTMax = 1e5 * UnitConstants::GeV;
 
-    double phiMin = -M_PI * UnitConstants::rad;
-    double phiMax = M_PI * UnitConstants::rad;
+    double phiMin = -std::numbers::pi * UnitConstants::rad;
+    double phiMax = std::numbers::pi * UnitConstants::rad;
 
     double etaMin = -5;
     double etaMax = 5;
@@ -116,16 +119,12 @@ class ScoreBasedAmbiguityResolution {
   /// The optional cuts,weights and score are used to remove tracks that are not
   /// good enough, based on some criteria. Users are free to add their own cuts
   /// with the help of this struct.
-  template <typename track_container_t, typename traj_t,
-            template <typename> class holder_t, bool ReadOnly = true>
+  template <TrackProxyConcept track_proxy_t>
   struct OptionalCuts {
-    using OptionalFilter =
-        std::function<bool(const Acts::TrackProxy<track_container_t, traj_t,
-                                                  holder_t, ReadOnly>&)>;
+    using OptionalFilter = std::function<bool(const track_proxy_t&)>;
 
-    using OptionalScoreModifier = std::function<void(
-        const Acts::TrackProxy<track_container_t, traj_t, holder_t, ReadOnly>&,
-        double&)>;
+    using OptionalScoreModifier =
+        std::function<void(const track_proxy_t&, double&)>;
     std::vector<OptionalFilter> cuts = {};
     std::vector<OptionalScoreModifier> weights = {};
 
@@ -146,12 +145,10 @@ class ScoreBasedAmbiguityResolution {
   /// @param sourceLinkEquality is the equality function for the source links
   /// @param trackFeaturesVectors is the trackFeatures map from detector ID to trackFeatures
   /// @return a vector of the initial state of the tracks
-  template <typename track_container_t, typename traj_t,
-            template <typename> class holder_t, typename source_link_hash_t,
-            typename source_link_equality_t>
+  template <TrackContainerFrontend track_container_t,
+            typename source_link_hash_t, typename source_link_equality_t>
   std::vector<std::vector<MeasurementInfo>> computeInitialState(
-      const TrackContainer<track_container_t, traj_t, holder_t>& tracks,
-      source_link_hash_t sourceLinkHash,
+      const track_container_t& tracks, source_link_hash_t sourceLinkHash,
       source_link_equality_t sourceLinkEquality,
       std::vector<std::vector<TrackFeatures>>& trackFeaturesVectors) const;
 
@@ -161,12 +158,11 @@ class ScoreBasedAmbiguityResolution {
   /// @param trackFeaturesVectors is the trackFeatures map from detector ID to trackFeatures
   /// @param optionalCuts is the user defined optional cuts to be applied.
   /// @return a vector of scores for each track
-  template <typename track_container_t, typename traj_t,
-            template <typename> class holder_t, bool ReadOnly = true>
+  template <TrackContainerFrontend track_container_t>
   std::vector<double> simpleScore(
-      const TrackContainer<track_container_t, traj_t, holder_t>& tracks,
+      const track_container_t& tracks,
       const std::vector<std::vector<TrackFeatures>>& trackFeaturesVectors,
-      const OptionalCuts<track_container_t, traj_t, holder_t, ReadOnly>&
+      const OptionalCuts<typename track_container_t::ConstTrackProxy>&
           optionalCuts = {}) const;
 
   /// Compute the score of each track based on the ambiguity function.
@@ -175,12 +171,11 @@ class ScoreBasedAmbiguityResolution {
   /// @param trackFeaturesVectors is the trackFeatures map from detector ID to trackFeatures
   /// @param optionalCuts is the user defined optional cuts to be applied.
   /// @return a vector of scores for each track
-  template <typename track_container_t, typename traj_t,
-            template <typename> class holder_t, bool ReadOnly = true>
+  template <TrackContainerFrontend track_container_t>
   std::vector<double> ambiguityScore(
-      const TrackContainer<track_container_t, traj_t, holder_t>& tracks,
+      const track_container_t& tracks,
       const std::vector<std::vector<TrackFeatures>>& trackFeaturesVectors,
-      const OptionalCuts<track_container_t, traj_t, holder_t, ReadOnly>&
+      const OptionalCuts<typename track_container_t::ConstTrackProxy>&
           optionalCuts = {}) const;
 
   /// Remove hits that are not good enough for each track and removes tracks
@@ -205,13 +200,12 @@ class ScoreBasedAmbiguityResolution {
   /// @param trackFeaturesVectors is the map of detector id to trackFeatures for each track
   /// @param optionalCuts is the optional cuts to be applied
   /// @return a vector of IDs of the tracks we want to keep
-  template <typename track_container_t, typename traj_t,
-            template <typename> class holder_t, bool ReadOnly = true>
+  template <TrackContainerFrontend track_container_t>
   std::vector<int> solveAmbiguity(
-      const TrackContainer<track_container_t, traj_t, holder_t>& tracks,
+      const track_container_t& tracks,
       const std::vector<std::vector<MeasurementInfo>>& measurementsPerTrack,
       const std::vector<std::vector<TrackFeatures>>& trackFeaturesVectors,
-      const OptionalCuts<track_container_t, traj_t, holder_t, ReadOnly>&
+      const OptionalCuts<typename track_container_t::ConstTrackProxy>&
           optionalCuts = {}) const;
 
  private:
diff --git a/Core/include/Acts/AmbiguityResolution/ScoreBasedAmbiguityResolution.ipp b/Core/include/Acts/AmbiguityResolution/ScoreBasedAmbiguityResolution.ipp
index 5175248a05c..58742d7d11a 100644
--- a/Core/include/Acts/AmbiguityResolution/ScoreBasedAmbiguityResolution.ipp
+++ b/Core/include/Acts/AmbiguityResolution/ScoreBasedAmbiguityResolution.ipp
@@ -1,15 +1,16 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2024 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
 #include "Acts/AmbiguityResolution/ScoreBasedAmbiguityResolution.hpp"
 #include "Acts/Definitions/Units.hpp"
+#include "Acts/EventData/TrackContainerFrontendConcept.hpp"
 #include "Acts/Utilities/VectorHelpers.hpp"
 
 #include <unordered_map>
@@ -20,13 +21,11 @@ inline const Logger& ScoreBasedAmbiguityResolution::logger() const {
   return *m_logger;
 }
 
-template <typename track_container_t, typename traj_t,
-          template <typename> class holder_t, typename source_link_hash_t,
+template <TrackContainerFrontend track_container_t, typename source_link_hash_t,
           typename source_link_equality_t>
 std::vector<std::vector<ScoreBasedAmbiguityResolution::MeasurementInfo>>
 ScoreBasedAmbiguityResolution::computeInitialState(
-    const TrackContainer<track_container_t, traj_t, holder_t>& tracks,
-    source_link_hash_t sourceLinkHash,
+    const track_container_t& tracks, source_link_hash_t sourceLinkHash,
     source_link_equality_t sourceLinkEquality,
     std::vector<std::vector<TrackFeatures>>& trackFeaturesVectors) const {
   auto MeasurementIndexMap =
@@ -47,7 +46,7 @@ ScoreBasedAmbiguityResolution::computeInitialState(
 
     for (const auto& ts : track.trackStatesReversed()) {
       if (!ts.hasReferenceSurface()) {
-        ACTS_ERROR("Track state has no reference surface");
+        ACTS_DEBUG("Track state has no reference surface");
         continue;
       }
       auto iVolume = ts.referenceSurface().geometryId().volume();
@@ -98,12 +97,11 @@ ScoreBasedAmbiguityResolution::computeInitialState(
   return measurementsPerTrack;
 }
 
-template <typename track_container_t, typename traj_t,
-          template <typename> class holder_t, bool ReadOnly>
+template <TrackContainerFrontend track_container_t>
 std::vector<double> Acts::ScoreBasedAmbiguityResolution::simpleScore(
-    const TrackContainer<track_container_t, traj_t, holder_t>& tracks,
+    const track_container_t& tracks,
     const std::vector<std::vector<TrackFeatures>>& trackFeaturesVectors,
-    const OptionalCuts<track_container_t, traj_t, holder_t, ReadOnly>&
+    const OptionalCuts<typename track_container_t::ConstTrackProxy>&
         optionalCuts) const {
   std::vector<double> trackScore;
   trackScore.reserve(tracks.size());
@@ -184,7 +182,6 @@ std::vector<double> Acts::ScoreBasedAmbiguityResolution::simpleScore(
       ACTS_DEBUG("---> Number of outliers: " << trackFeatures.nOutliers);
 
       if ((trackFeatures.nHits < detector.minHits) ||
-          (trackFeatures.nHits > detector.maxHits) ||
           (trackFeatures.nHoles > detector.maxHoles) ||
           (trackFeatures.nOutliers > detector.maxOutliers)) {
         score = 0;
@@ -248,12 +245,11 @@ std::vector<double> Acts::ScoreBasedAmbiguityResolution::simpleScore(
   return trackScore;
 }
 
-template <typename track_container_t, typename traj_t,
-          template <typename> class holder_t, bool ReadOnly>
+template <TrackContainerFrontend track_container_t>
 std::vector<double> Acts::ScoreBasedAmbiguityResolution::ambiguityScore(
-    const TrackContainer<track_container_t, traj_t, holder_t>& tracks,
+    const track_container_t& tracks,
     const std::vector<std::vector<TrackFeatures>>& trackFeaturesVectors,
-    const OptionalCuts<track_container_t, traj_t, holder_t, ReadOnly>&
+    const OptionalCuts<typename track_container_t::ConstTrackProxy>&
         optionalCuts) const {
   std::vector<double> trackScore;
   trackScore.reserve(tracks.size());
@@ -336,7 +332,6 @@ std::vector<double> Acts::ScoreBasedAmbiguityResolution::ambiguityScore(
       ACTS_DEBUG("---> Number of outliers: " << trackFeatures.nOutliers);
 
       if ((trackFeatures.nHits < detector.minHits) ||
-          (trackFeatures.nHits > detector.maxHits) ||
           (trackFeatures.nHoles > detector.maxHoles) ||
           (trackFeatures.nOutliers > detector.maxOutliers)) {
         score = 0;
@@ -425,13 +420,13 @@ std::vector<double> Acts::ScoreBasedAmbiguityResolution::ambiguityScore(
 
   return trackScore;
 }
-template <typename track_container_t, typename traj_t,
-          template <typename> class holder_t, bool ReadOnly>
+
+template <TrackContainerFrontend track_container_t>
 std::vector<int> Acts::ScoreBasedAmbiguityResolution::solveAmbiguity(
-    const TrackContainer<track_container_t, traj_t, holder_t>& tracks,
+    const track_container_t& tracks,
     const std::vector<std::vector<MeasurementInfo>>& measurementsPerTrack,
     const std::vector<std::vector<TrackFeatures>>& trackFeaturesVectors,
-    const OptionalCuts<track_container_t, traj_t, holder_t, ReadOnly>&
+    const OptionalCuts<typename track_container_t::ConstTrackProxy>&
         optionalCuts) const {
   ACTS_INFO("Number of tracks before Ambiguty Resolution: " << tracks.size());
   // vector of trackFeaturesVectors. where each trackFeaturesVector contains the
diff --git a/Core/include/Acts/Clusterization/Clusterization.hpp b/Core/include/Acts/Clusterization/Clusterization.hpp
index 39a1dc9b656..a7b4d853b20 100644
--- a/Core/include/Acts/Clusterization/Clusterization.hpp
+++ b/Core/include/Acts/Clusterization/Clusterization.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2022 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
@@ -13,6 +13,26 @@
 
 namespace Acts::Ccl {
 
+template <typename Cell>
+concept HasRetrievableColumnInfo = requires(Cell cell) {
+  { getCellColumn(cell) } -> std::same_as<int>;
+};
+
+template <typename Cell>
+concept HasRetrievableRowInfo = requires(Cell cell) {
+  { getCellRow(cell) } -> std::same_as<int>;
+};
+
+template <typename Cell>
+concept HasRetrievableLabelInfo = requires(Cell cell) {
+  { getCellLabel(cell) } -> std::same_as<int&>;
+};
+
+template <typename Cell, typename Cluster>
+concept CanAcceptCell = requires(Cell cell, Cluster cluster) {
+  { clusterAddCell(cluster, cell) } -> std::same_as<void>;
+};
+
 using Label = int;
 constexpr Label NO_LABEL = 0;
 
@@ -28,17 +48,21 @@ enum class ConnectResult {
 
 // Default connection type for 2-D grids: 4- or 8-cell connectivity
 template <typename Cell>
+  requires(Acts::Ccl::HasRetrievableColumnInfo<Cell> &&
+           Acts::Ccl::HasRetrievableRowInfo<Cell>)
 struct Connect2D {
-  bool conn8;
-  Connect2D() : conn8{true} {}
+  bool conn8{true};
+  Connect2D() = default;
   explicit Connect2D(bool commonCorner) : conn8{commonCorner} {}
-  ConnectResult operator()(const Cell& ref, const Cell& iter) const;
+  virtual ConnectResult operator()(const Cell& ref, const Cell& iter) const;
+  virtual ~Connect2D() = default;
 };
 
 // Default connection type for 1-D grids: 2-cell connectivity
-template <typename Cell>
+template <Acts::Ccl::HasRetrievableColumnInfo Cell>
 struct Connect1D {
-  ConnectResult operator()(const Cell& ref, const Cell& iter) const;
+  virtual ConnectResult operator()(const Cell& ref, const Cell& iter) const;
+  virtual ~Connect1D() = default;
 };
 
 // Default connection type based on GridDim
@@ -49,13 +73,16 @@ struct DefaultConnect {
 };
 
 template <typename Cell>
-struct DefaultConnect<Cell, 2> : public Connect2D<Cell> {
-  explicit DefaultConnect(bool commonCorner) : Connect2D<Cell>(commonCorner) {}
-  DefaultConnect() : DefaultConnect(true) {}
+struct DefaultConnect<Cell, 1> : public Connect1D<Cell> {
+  ~DefaultConnect() override = default;
 };
 
 template <typename Cell>
-struct DefaultConnect<Cell, 1> : public Connect1D<Cell> {};
+struct DefaultConnect<Cell, 2> : public Connect2D<Cell> {
+  explicit DefaultConnect(bool commonCorner) : Connect2D<Cell>(commonCorner) {}
+  DefaultConnect() = default;
+  ~DefaultConnect() override = default;
+};
 
 /// @brief labelClusters
 ///
@@ -70,6 +97,8 @@ struct DefaultConnect<Cell, 1> : public Connect1D<Cell> {};
 template <typename CellCollection, std::size_t GridDim = 2,
           typename Connect =
               DefaultConnect<typename CellCollection::value_type, GridDim>>
+  requires(
+      Acts::Ccl::HasRetrievableLabelInfo<typename CellCollection::value_type>)
 void labelClusters(CellCollection& cells, Connect connect = Connect());
 
 /// @brief mergeClusters
@@ -82,6 +111,9 @@ void labelClusters(CellCollection& cells, Connect connect = Connect());
 /// @return nothing
 template <typename CellCollection, typename ClusterCollection,
           std::size_t GridDim>
+  requires(GridDim == 1 || GridDim == 2) &&
+          Acts::Ccl::HasRetrievableLabelInfo<
+              typename CellCollection::value_type>
 ClusterCollection mergeClusters(CellCollection& /*cells*/);
 
 /// @brief createClusters
diff --git a/Core/include/Acts/Clusterization/Clusterization.ipp b/Core/include/Acts/Clusterization/Clusterization.ipp
index 44f8abd1267..90a69930ce1 100644
--- a/Core/include/Acts/Clusterization/Clusterization.ipp
+++ b/Core/include/Acts/Clusterization/Clusterization.ipp
@@ -1,11 +1,12 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2022 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
+#include <algorithm>
 #include <array>
 #include <vector>
 
@@ -13,60 +14,6 @@
 
 namespace Acts::Ccl::internal {
 
-// Machinery for validating generic Cell/Cluster types at compile-time
-
-template <typename, std::size_t, typename T = void>
-struct cellTypeHasRequiredFunctions : std::false_type {};
-
-template <typename T>
-struct cellTypeHasRequiredFunctions<
-    T, 2,
-    std::void_t<decltype(getCellRow(std::declval<T>())),
-                decltype(getCellColumn(std::declval<T>())),
-                decltype(getCellLabel(std::declval<T&>()))>> : std::true_type {
-};
-
-template <typename T>
-struct cellTypeHasRequiredFunctions<
-    T, 1,
-    std::void_t<decltype(getCellColumn(std::declval<T>())),
-                decltype(getCellLabel(std::declval<T&>()))>> : std::true_type {
-};
-
-template <typename, typename, typename T = void>
-struct clusterTypeHasRequiredFunctions : std::false_type {};
-
-template <typename T, typename U>
-struct clusterTypeHasRequiredFunctions<
-    T, U,
-    std::void_t<decltype(clusterAddCell(std::declval<T>(), std::declval<U>()))>>
-    : std::true_type {};
-
-template <std::size_t GridDim>
-constexpr void staticCheckGridDim() {
-  static_assert(
-      GridDim == 1 || GridDim == 2,
-      "mergeClusters is only defined for grid dimensions of 1 or 2. ");
-}
-
-template <typename T, std::size_t GridDim>
-constexpr void staticCheckCellType() {
-  constexpr bool hasFns = cellTypeHasRequiredFunctions<T, GridDim>();
-  static_assert(hasFns,
-                "Cell type should have the following functions: "
-                "'int getCellRow(const Cell&)', "
-                "'int getCellColumn(const Cell&)', "
-                "'Label& getCellLabel(Cell&)'");
-}
-
-template <typename T, typename U>
-constexpr void staticCheckClusterType() {
-  constexpr bool hasFns = clusterTypeHasRequiredFunctions<T, U>();
-  static_assert(hasFns,
-                "Cluster type should have the following function: "
-                "'void clusterAddCell(Cluster&, const Cell&)'");
-}
-
 template <typename Cell, std::size_t GridDim>
 struct Compare {
   static_assert(GridDim != 1 && GridDim != 2,
@@ -74,25 +21,27 @@ struct Compare {
 };
 
 // Comparator function object for cells, column-wise ordering
-// Specialization for 2-D grid
-template <typename Cell>
-struct Compare<Cell, 2> {
+// Specialization for 1-D grids
+template <Acts::Ccl::HasRetrievableColumnInfo Cell>
+struct Compare<Cell, 1> {
   bool operator()(const Cell& c0, const Cell& c1) const {
-    int row0 = getCellRow(c0);
-    int row1 = getCellRow(c1);
     int col0 = getCellColumn(c0);
     int col1 = getCellColumn(c1);
-    return (col0 == col1) ? row0 < row1 : col0 < col1;
+    return col0 < col1;
   }
 };
 
-// Specialization for 1-D grids
+// Specialization for 2-D grid
 template <typename Cell>
-struct Compare<Cell, 1> {
+  requires(Acts::Ccl::HasRetrievableColumnInfo<Cell> &&
+           Acts::Ccl::HasRetrievableRowInfo<Cell>)
+struct Compare<Cell, 2> {
   bool operator()(const Cell& c0, const Cell& c1) const {
+    int row0 = getCellRow(c0);
+    int row1 = getCellRow(c1);
     int col0 = getCellColumn(c0);
     int col1 = getCellColumn(c1);
-    return col0 < col1;
+    return (col0 == col1) ? row0 < row1 : col0 < col1;
   }
 };
 
@@ -183,6 +132,10 @@ Connections<GridDim> getConnections(typename std::vector<Cell>::iterator it,
 }
 
 template <typename CellCollection, typename ClusterCollection>
+  requires(
+      Acts::Ccl::HasRetrievableLabelInfo<typename CellCollection::value_type> &&
+      Acts::Ccl::CanAcceptCell<typename CellCollection::value_type,
+                               typename ClusterCollection::value_type>)
 ClusterCollection mergeClustersImpl(CellCollection& cells) {
   using Cluster = typename ClusterCollection::value_type;
 
@@ -214,6 +167,8 @@ ClusterCollection mergeClustersImpl(CellCollection& cells) {
 namespace Acts::Ccl {
 
 template <typename Cell>
+  requires(Acts::Ccl::HasRetrievableColumnInfo<Cell> &&
+           Acts::Ccl::HasRetrievableRowInfo<Cell>)
 ConnectResult Connect2D<Cell>::operator()(const Cell& ref,
                                           const Cell& iter) const {
   int deltaRow = std::abs(getCellRow(ref) - getCellRow(iter));
@@ -236,7 +191,7 @@ ConnectResult Connect2D<Cell>::operator()(const Cell& ref,
   return ConnectResult::eNoConn;
 }
 
-template <typename Cell>
+template <Acts::Ccl::HasRetrievableColumnInfo Cell>
 ConnectResult Connect1D<Cell>::operator()(const Cell& ref,
                                           const Cell& iter) const {
   int deltaCol = std::abs(getCellColumn(ref) - getCellColumn(iter));
@@ -266,17 +221,19 @@ void recordEquivalences(const internal::Connections<GridDim> seen,
 }
 
 template <typename CellCollection, std::size_t GridDim, typename Connect>
+  requires(
+      Acts::Ccl::HasRetrievableLabelInfo<typename CellCollection::value_type>)
 void labelClusters(CellCollection& cells, Connect connect) {
   using Cell = typename CellCollection::value_type;
-  internal::staticCheckCellType<Cell, GridDim>();
 
   internal::DisjointSets ds{};
 
   // Sort cells by position to enable in-order scan
-  std::sort(cells.begin(), cells.end(), internal::Compare<Cell, GridDim>());
+  std::ranges::sort(cells, internal::Compare<Cell, GridDim>());
 
   // First pass: Allocate labels and record equivalences
-  for (auto it = cells.begin(); it != cells.end(); ++it) {
+  for (auto it = std::ranges::begin(cells); it != std::ranges::end(cells);
+       ++it) {
     const internal::Connections<GridDim> seen =
         internal::getConnections<Cell, Connect, GridDim>(it, cells, connect);
     if (seen.nconn == 0) {
@@ -298,19 +255,15 @@ void labelClusters(CellCollection& cells, Connect connect) {
 
 template <typename CellCollection, typename ClusterCollection,
           std::size_t GridDim = 2>
+  requires(GridDim == 1 || GridDim == 2) &&
+          Acts::Ccl::HasRetrievableLabelInfo<
+              typename CellCollection::value_type>
 ClusterCollection mergeClusters(CellCollection& cells) {
   using Cell = typename CellCollection::value_type;
-  using Cluster = typename ClusterCollection::value_type;
-  internal::staticCheckGridDim<GridDim>();
-  internal::staticCheckCellType<Cell, GridDim>();
-  internal::staticCheckClusterType<Cluster&, const Cell&>();
-
   if constexpr (GridDim > 1) {
     // Sort the cells by their cluster label, only needed if more than
     // one spatial dimension
-    std::sort(cells.begin(), cells.end(), [](Cell& lhs, Cell& rhs) {
-      return getCellLabel(lhs) < getCellLabel(rhs);
-    });
+    std::ranges::sort(cells, {}, [](Cell& c) { return getCellLabel(c); });
   }
 
   return internal::mergeClustersImpl<CellCollection, ClusterCollection>(cells);
@@ -319,10 +272,6 @@ ClusterCollection mergeClusters(CellCollection& cells) {
 template <typename CellCollection, typename ClusterCollection,
           std::size_t GridDim, typename Connect>
 ClusterCollection createClusters(CellCollection& cells, Connect connect) {
-  using Cell = typename CellCollection::value_type;
-  using Cluster = typename ClusterCollection::value_type;
-  internal::staticCheckCellType<Cell, GridDim>();
-  internal::staticCheckClusterType<Cluster&, const Cell&>();
   labelClusters<CellCollection, GridDim, Connect>(cells, connect);
   return mergeClusters<CellCollection, ClusterCollection, GridDim>(cells);
 }
diff --git a/Core/include/Acts/Clusterization/TimedClusterization.hpp b/Core/include/Acts/Clusterization/TimedClusterization.hpp
new file mode 100644
index 00000000000..e92ebce44e2
--- /dev/null
+++ b/Core/include/Acts/Clusterization/TimedClusterization.hpp
@@ -0,0 +1,38 @@
+// This file is part of the ACTS project.
+//
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
+//
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
+
+#pragma once
+
+#include "Acts/Clusterization/Clusterization.hpp"
+#include "Acts/Definitions/Algebra.hpp"
+
+#include <limits>
+
+namespace Acts::Ccl {
+
+template <typename Cell>
+concept HasRetrievableTimeInfo = requires(Cell cell) {
+  { getCellTime(cell) } -> std::same_as<Acts::ActsScalar>;
+};
+
+template <Acts::Ccl::HasRetrievableTimeInfo Cell, std::size_t N>
+struct TimedConnect : public Acts::Ccl::DefaultConnect<Cell, N> {
+  Acts::ActsScalar timeTolerance{std::numeric_limits<Acts::ActsScalar>::max()};
+
+  TimedConnect() = default;
+  TimedConnect(Acts::ActsScalar time);
+  TimedConnect(Acts::ActsScalar time, bool commonCorner)
+    requires(N == 2);
+  ~TimedConnect() override = default;
+
+  ConnectResult operator()(const Cell& ref, const Cell& iter) const override;
+};
+
+}  // namespace Acts::Ccl
+
+#include "Acts/Clusterization/TimedClusterization.ipp"
diff --git a/Core/include/Acts/Clusterization/TimedClusterization.ipp b/Core/include/Acts/Clusterization/TimedClusterization.ipp
new file mode 100644
index 00000000000..0e7b3e5bda8
--- /dev/null
+++ b/Core/include/Acts/Clusterization/TimedClusterization.ipp
@@ -0,0 +1,36 @@
+// This file is part of the ACTS project.
+//
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
+//
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
+
+namespace Acts::Ccl {
+
+template <Acts::Ccl::HasRetrievableTimeInfo Cell, std::size_t N>
+TimedConnect<Cell, N>::TimedConnect(Acts::ActsScalar time)
+    : timeTolerance(time) {}
+
+template <Acts::Ccl::HasRetrievableTimeInfo Cell, std::size_t N>
+TimedConnect<Cell, N>::TimedConnect(Acts::ActsScalar time, bool commonCorner)
+  requires(N == 2)
+    : Acts::Ccl::DefaultConnect<Cell, N>(commonCorner), timeTolerance(time) {}
+
+template <Acts::Ccl::HasRetrievableTimeInfo Cell, std::size_t N>
+Acts::Ccl::ConnectResult TimedConnect<Cell, N>::operator()(
+    const Cell& ref, const Cell& iter) const {
+  Acts::Ccl::ConnectResult spaceCompatibility =
+      Acts::Ccl::DefaultConnect<Cell, N>::operator()(ref, iter);
+  if (spaceCompatibility != Acts::Ccl::ConnectResult::eConn) {
+    return spaceCompatibility;
+  }
+
+  if (std::abs(getCellTime(ref) - getCellTime(iter)) < timeTolerance) {
+    return Acts::Ccl::ConnectResult::eConn;
+  }
+
+  return Acts::Ccl::ConnectResult::eNoConn;
+}
+
+}  // namespace Acts::Ccl
diff --git a/Core/include/Acts/Definitions/Algebra.hpp b/Core/include/Acts/Definitions/Algebra.hpp
index fa5edcc2252..843958a3282 100644
--- a/Core/include/Acts/Definitions/Algebra.hpp
+++ b/Core/include/Acts/Definitions/Algebra.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2016-2020 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
@@ -100,4 +100,6 @@ using AngleAxis3 = Eigen::AngleAxis<ActsScalar>;
 using Transform2 = Eigen::Transform<ActsScalar, 2, Eigen::AffineCompact>;
 using Transform3 = Eigen::Transform<ActsScalar, 3, Eigen::Affine>;
 
+constexpr ActsScalar s_transformEquivalentTolerance = 1e-9;
+
 }  // namespace Acts
diff --git a/Core/include/Acts/Definitions/Alignment.hpp b/Core/include/Acts/Definitions/Alignment.hpp
index 68e9cfa358d..77d8cd8c1e7 100644
--- a/Core/include/Acts/Definitions/Alignment.hpp
+++ b/Core/include/Acts/Definitions/Alignment.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2016-2020 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
diff --git a/Core/include/Acts/Definitions/Common.hpp b/Core/include/Acts/Definitions/Common.hpp
index 538de54a945..854c54e2bde 100644
--- a/Core/include/Acts/Definitions/Common.hpp
+++ b/Core/include/Acts/Definitions/Common.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2016-2018 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
diff --git a/Core/include/Acts/Definitions/Direction.hpp b/Core/include/Acts/Definitions/Direction.hpp
index 9254b35a40c..d07646bab26 100644
--- a/Core/include/Acts/Definitions/Direction.hpp
+++ b/Core/include/Acts/Definitions/Direction.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2016-2018 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
@@ -41,7 +41,7 @@ class Direction final {
   /// @param scalar is the signed value
   ///
   /// @return a direction enum
-  static inline constexpr Direction fromScalar(ActsScalar scalar) {
+  static constexpr Direction fromScalar(ActsScalar scalar) {
     assert(scalar != 0);
     return scalar >= 0 ? Value::Positive : Value::Negative;
   }
@@ -53,8 +53,7 @@ class Direction final {
   /// @param scalar is the signed value
   ///
   /// @return a direction enum
-  static inline constexpr Direction fromScalarZeroAsPositive(
-      ActsScalar scalar) {
+  static constexpr Direction fromScalarZeroAsPositive(ActsScalar scalar) {
     return scalar >= 0 ? Value::Positive : Value::Negative;
   }
 
@@ -62,7 +61,7 @@ class Direction final {
   /// std::array<T, 2u>
   ///
   /// @param index is the direction at input
-  static inline constexpr Direction fromIndex(std::size_t index) {
+  static constexpr Direction fromIndex(std::size_t index) {
     if (index == 0u) {
       return Value::Negative;
     }
@@ -73,7 +72,7 @@ class Direction final {
   /// objects in std::array<T, 2u>
   ///
   /// @return either 0 or 1
-  inline constexpr std::size_t index() const {
+  constexpr std::size_t index() const {
     if (m_value == Value::Negative) {
       return 0u;
     }
@@ -83,28 +82,24 @@ class Direction final {
   /// Turns the direction into a signed value
   ///
   /// @return a signed value
-  inline constexpr int sign() const { return static_cast<int>(m_value); }
+  constexpr int sign() const { return static_cast<int>(m_value); }
 
   /// Reverse the direction
   ///
   /// @return an opposite direction
-  inline constexpr Direction invert() const {
+  constexpr Direction invert() const {
     return (m_value == Value::Positive) ? Value::Negative : Value::Positive;
   }
 
   std::string toString() const;
 
-  inline constexpr Direction() = default;
-  inline constexpr Direction(Value value) : m_value(value) {}
+  constexpr Direction() = default;
+  constexpr Direction(Value value) : m_value(value) {}
 
-  inline constexpr bool operator==(Direction other) const {
+  constexpr bool operator==(Direction other) const {
     return m_value == other.m_value;
   }
 
-  inline constexpr bool operator!=(Direction other) const {
-    return m_value != other.m_value;
-  }
-
  private:
   Value m_value = Value::Positive;
 };
@@ -113,15 +108,15 @@ std::ostream& operator<<(std::ostream& os, Direction dir);
 
 // Direction * T
 
-inline constexpr int operator*(Direction dir, int value) {
+constexpr int operator*(Direction dir, int value) {
   return dir.sign() * value;
 }
 
-inline constexpr float operator*(Direction dir, float value) {
+constexpr float operator*(Direction dir, float value) {
   return dir.sign() * value;
 }
 
-inline constexpr double operator*(Direction dir, double value) {
+constexpr double operator*(Direction dir, double value) {
   return dir.sign() * value;
 }
 
@@ -131,15 +126,15 @@ inline Acts::Vector3 operator*(Direction dir, const Acts::Vector3& value) {
 
 // T * Direction
 
-inline constexpr int operator*(int value, Direction dir) {
+constexpr int operator*(int value, Direction dir) {
   return value * dir.sign();
 }
 
-inline constexpr float operator*(float value, Direction dir) {
+constexpr float operator*(float value, Direction dir) {
   return value * dir.sign();
 }
 
-inline constexpr double operator*(double value, Direction dir) {
+constexpr double operator*(double value, Direction dir) {
   return value * dir.sign();
 }
 
@@ -149,17 +144,17 @@ inline Acts::Vector3 operator*(const Acts::Vector3& value, Direction dir) {
 
 // T *= Direction
 
-inline constexpr int operator*=(int& value, Direction dir) {
+constexpr int operator*=(int& value, Direction dir) {
   value *= dir.sign();
   return value;
 }
 
-inline constexpr float operator*=(float& value, Direction dir) {
+constexpr float operator*=(float& value, Direction dir) {
   value *= dir.sign();
   return value;
 }
 
-inline constexpr double operator*=(double& value, Direction dir) {
+constexpr double operator*=(double& value, Direction dir) {
   value *= dir.sign();
   return value;
 }
diff --git a/Core/include/Acts/Definitions/ParticleData.hpp b/Core/include/Acts/Definitions/ParticleData.hpp
index 420121f4bcf..8cb97a9df9d 100644
--- a/Core/include/Acts/Definitions/ParticleData.hpp
+++ b/Core/include/Acts/Definitions/ParticleData.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2020-2023 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
diff --git a/Core/include/Acts/Definitions/PdgParticle.hpp b/Core/include/Acts/Definitions/PdgParticle.hpp
index 28f7d248493..f6967671136 100644
--- a/Core/include/Acts/Definitions/PdgParticle.hpp
+++ b/Core/include/Acts/Definitions/PdgParticle.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2019-2024 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
@@ -36,7 +36,7 @@ enum PdgParticle : std::int32_t {
 };
 
 /// Convert an anti-particle to its particle and leave particles as-is.
-static constexpr inline PdgParticle makeAbsolutePdgParticle(PdgParticle pdg) {
+static constexpr PdgParticle makeAbsolutePdgParticle(PdgParticle pdg) {
   const auto value = static_cast<std::int32_t>(pdg);
   return static_cast<PdgParticle>((0 <= value) ? value : -value);
 }
diff --git a/Core/include/Acts/Definitions/Tolerance.hpp b/Core/include/Acts/Definitions/Tolerance.hpp
index 0380c732408..0b8ef36e55f 100644
--- a/Core/include/Acts/Definitions/Tolerance.hpp
+++ b/Core/include/Acts/Definitions/Tolerance.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2023 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
diff --git a/Core/include/Acts/Definitions/TrackParametrization.hpp b/Core/include/Acts/Definitions/TrackParametrization.hpp
index 952fe24c512..ac5f0e09b1b 100644
--- a/Core/include/Acts/Definitions/TrackParametrization.hpp
+++ b/Core/include/Acts/Definitions/TrackParametrization.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2016-2020 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
diff --git a/Core/include/Acts/Definitions/Units.hpp b/Core/include/Acts/Definitions/Units.hpp
index b61515234a9..65d7cee775d 100644
--- a/Core/include/Acts/Definitions/Units.hpp
+++ b/Core/include/Acts/Definitions/Units.hpp
@@ -1,13 +1,15 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2016-2019 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
+#include <numbers>
+
 namespace Acts {
 
 /// @verbatim embed:rst:leading-slashes
@@ -170,7 +172,7 @@ constexpr double h = 3600.0 * s;
 // Angles, native unit radian
 constexpr double mrad = 1e-3;
 constexpr double rad = 1.0;
-constexpr double degree = 0.017453292519943295;  // = M_PI / 180.0 * rad;
+constexpr double degree = std::numbers::pi / 180. / rad;
 // Energy/mass/momentum, native unit GeV
 constexpr double GeV = 1.0;
 constexpr double eV = 1e-9 * GeV;
diff --git a/Core/include/Acts/Detector/Blueprint.hpp b/Core/include/Acts/Detector/Blueprint.hpp
index 63f442dae0b..3be0d6353db 100644
--- a/Core/include/Acts/Detector/Blueprint.hpp
+++ b/Core/include/Acts/Detector/Blueprint.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2023 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
diff --git a/Core/include/Acts/Detector/CuboidalContainerBuilder.hpp b/Core/include/Acts/Detector/CuboidalContainerBuilder.hpp
index 9ec69348116..ea5b98675cf 100644
--- a/Core/include/Acts/Detector/CuboidalContainerBuilder.hpp
+++ b/Core/include/Acts/Detector/CuboidalContainerBuilder.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2023 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
diff --git a/Core/include/Acts/Detector/CylindricalContainerBuilder.hpp b/Core/include/Acts/Detector/CylindricalContainerBuilder.hpp
index c3023cea84e..4520eea5e07 100644
--- a/Core/include/Acts/Detector/CylindricalContainerBuilder.hpp
+++ b/Core/include/Acts/Detector/CylindricalContainerBuilder.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2022-2023 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
diff --git a/Core/include/Acts/Detector/Detector.hpp b/Core/include/Acts/Detector/Detector.hpp
index 6ce3d4bc488..fa61327089a 100644
--- a/Core/include/Acts/Detector/Detector.hpp
+++ b/Core/include/Acts/Detector/Detector.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2022-2023 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
diff --git a/Core/include/Acts/Detector/DetectorBuilder.hpp b/Core/include/Acts/Detector/DetectorBuilder.hpp
index 11fc60d67a7..d5e0ab7e16b 100644
--- a/Core/include/Acts/Detector/DetectorBuilder.hpp
+++ b/Core/include/Acts/Detector/DetectorBuilder.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2022-2023 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
diff --git a/Core/include/Acts/Detector/DetectorComponents.hpp b/Core/include/Acts/Detector/DetectorComponents.hpp
index 5f6cf73d6e8..ed5a0c342de 100644
--- a/Core/include/Acts/Detector/DetectorComponents.hpp
+++ b/Core/include/Acts/Detector/DetectorComponents.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2023 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
diff --git a/Core/include/Acts/Detector/DetectorVolume.hpp b/Core/include/Acts/Detector/DetectorVolume.hpp
index ac1164342d3..1617721d62f 100644
--- a/Core/include/Acts/Detector/DetectorVolume.hpp
+++ b/Core/include/Acts/Detector/DetectorVolume.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2022-2023 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
diff --git a/Core/include/Acts/Detector/DetectorVolumeBuilder.hpp b/Core/include/Acts/Detector/DetectorVolumeBuilder.hpp
index c7b4ae8c6f6..6cb5e6647db 100644
--- a/Core/include/Acts/Detector/DetectorVolumeBuilder.hpp
+++ b/Core/include/Acts/Detector/DetectorVolumeBuilder.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2022-2023 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
diff --git a/Core/include/Acts/Detector/DetectorVolumeVisitorConcept.hpp b/Core/include/Acts/Detector/DetectorVolumeVisitorConcept.hpp
index 95998fdb716..b43ec35277d 100644
--- a/Core/include/Acts/Detector/DetectorVolumeVisitorConcept.hpp
+++ b/Core/include/Acts/Detector/DetectorVolumeVisitorConcept.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2024 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
diff --git a/Core/include/Acts/Detector/GeometryCompatibilityConcept.hpp b/Core/include/Acts/Detector/GeometryCompatibilityConcept.hpp
index 4879fb9533d..643efa1b138 100644
--- a/Core/include/Acts/Detector/GeometryCompatibilityConcept.hpp
+++ b/Core/include/Acts/Detector/GeometryCompatibilityConcept.hpp
@@ -1,49 +1,32 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2023 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
 #include "Acts/Detector/DetectorVolume.hpp"
 #include "Acts/Geometry/TrackingVolume.hpp"
-#include "Acts/Utilities/TypeTraits.hpp"
+#include "Acts/Utilities/Concepts.hpp"
 
-namespace Acts::Concepts {
-
-// Types to check compatibility of
-template <typename propagator_state_t, typename navigator_t>
-using ReturnTypeCurrentVolume =
-    decltype(std::declval<navigator_t>().currentVolume(
-        std::declval<propagator_state_t>().navigation));
+namespace Acts {
 
 /// @brief Concept ensuring compatibility TrackingGeometry
 /// and Detector navigation interfaces with the client code
 /// @tparam propagator_state_t Type of the object for navigation state
 /// @tparam navigator_t Type of the navigator object
 template <typename propagator_state_t, typename navigator_t>
-struct NavigationCompatibilityConceptImpl {
-  /// @brief Ensure that the currentVolume method
-  /// returns one of the known volume types
-  constexpr static bool isCurrentVolumePtr =
-      (Acts::Concepts::identical_to<const TrackingVolume*,
-                                    ReturnTypeCurrentVolume, propagator_state_t,
-                                    navigator_t> ||
-       Acts::Concepts::identical_to<const Acts::Experimental::DetectorVolume*,
-                                    ReturnTypeCurrentVolume, propagator_state_t,
-                                    navigator_t>);
-
-  static_assert(isCurrentVolumePtr,
-                "Return type is not a known volume pointer type");
-
-  constexpr static bool value = Acts::Concepts::require<isCurrentVolumePtr>;
+concept NavigationCompatibleConcept = requires(propagator_state_t &p,
+                                               navigator_t &n) {
+  requires requires {
+    {
+      n.currentVolume(p.navigation)
+    } -> Concepts::same_as_any_of<const TrackingVolume *,
+                                  const Acts::Experimental::DetectorVolume *>;
+  };
 };
 
-template <typename propagator_state_t, typename navigator_t>
-constexpr bool NavigationCompatibilityConcept =
-    NavigationCompatibilityConceptImpl<propagator_state_t, navigator_t>::value;
-
-}  // namespace Acts::Concepts
+}  // namespace Acts
diff --git a/Core/include/Acts/Detector/GeometryIdGenerator.hpp b/Core/include/Acts/Detector/GeometryIdGenerator.hpp
index 83e2ed90b9b..ff8e36cc451 100644
--- a/Core/include/Acts/Detector/GeometryIdGenerator.hpp
+++ b/Core/include/Acts/Detector/GeometryIdGenerator.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2023 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
diff --git a/Core/include/Acts/Detector/GeometryIdMapper.hpp b/Core/include/Acts/Detector/GeometryIdMapper.hpp
index f4d6a4163b2..0b9215011e2 100644
--- a/Core/include/Acts/Detector/GeometryIdMapper.hpp
+++ b/Core/include/Acts/Detector/GeometryIdMapper.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2023 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
diff --git a/Core/include/Acts/Detector/IndexedRootVolumeFinderBuilder.hpp b/Core/include/Acts/Detector/IndexedRootVolumeFinderBuilder.hpp
index f985ea3975e..64483115c61 100644
--- a/Core/include/Acts/Detector/IndexedRootVolumeFinderBuilder.hpp
+++ b/Core/include/Acts/Detector/IndexedRootVolumeFinderBuilder.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2023 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
diff --git a/Core/include/Acts/Detector/KdtSurfacesProvider.hpp b/Core/include/Acts/Detector/KdtSurfacesProvider.hpp
index dda69aeefc7..fd7086e01df 100644
--- a/Core/include/Acts/Detector/KdtSurfacesProvider.hpp
+++ b/Core/include/Acts/Detector/KdtSurfacesProvider.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2023 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
diff --git a/Core/include/Acts/Detector/LayerStructureBuilder.hpp b/Core/include/Acts/Detector/LayerStructureBuilder.hpp
index afc04463cc5..02fd726824e 100644
--- a/Core/include/Acts/Detector/LayerStructureBuilder.hpp
+++ b/Core/include/Acts/Detector/LayerStructureBuilder.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2023 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
@@ -91,8 +91,9 @@ class LayerStructureBuilder : public IInternalStructureBuilder {
     /// Minimum number of surfaces to build an internal structure
     /// - otherwise the tryAll options is used
     unsigned int nMinimalSurfaces = 4u;
-    /// Polyhedron approximations
-    unsigned int nSegments = 1u;
+    /// Polyhedron approximations: number of segments to be used
+    /// to approximate a quarter of a circle
+    unsigned int quarterSegments = 1u;
     /// Extra information, mainly for screen output
     std::string auxiliary = "";
   };
diff --git a/Core/include/Acts/Detector/MultiWireStructureBuilder.hpp b/Core/include/Acts/Detector/MultiWireStructureBuilder.hpp
index 86cce7fce56..939388c223a 100644
--- a/Core/include/Acts/Detector/MultiWireStructureBuilder.hpp
+++ b/Core/include/Acts/Detector/MultiWireStructureBuilder.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2022-2023 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
diff --git a/Core/include/Acts/Detector/Portal.hpp b/Core/include/Acts/Detector/Portal.hpp
index 4c4bc7fe8a4..3cdfce02dc4 100644
--- a/Core/include/Acts/Detector/Portal.hpp
+++ b/Core/include/Acts/Detector/Portal.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2022 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
diff --git a/Core/include/Acts/Detector/PortalGenerators.hpp b/Core/include/Acts/Detector/PortalGenerators.hpp
index d8f8bf50614..9468e63d2cc 100644
--- a/Core/include/Acts/Detector/PortalGenerators.hpp
+++ b/Core/include/Acts/Detector/PortalGenerators.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2022-2023 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
diff --git a/Core/include/Acts/Detector/ProtoBinning.hpp b/Core/include/Acts/Detector/ProtoBinning.hpp
index 8d5d4db8374..371bfe60bd2 100644
--- a/Core/include/Acts/Detector/ProtoBinning.hpp
+++ b/Core/include/Acts/Detector/ProtoBinning.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2023 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
diff --git a/Core/include/Acts/Detector/ProtoDetector.hpp b/Core/include/Acts/Detector/ProtoDetector.hpp
index b1d7877d65d..5e4e4d426c2 100644
--- a/Core/include/Acts/Detector/ProtoDetector.hpp
+++ b/Core/include/Acts/Detector/ProtoDetector.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2022 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
diff --git a/Core/include/Acts/Detector/ProtoSupport.hpp b/Core/include/Acts/Detector/ProtoSupport.hpp
index 55f8110a3a2..8f1e2581e77 100644
--- a/Core/include/Acts/Detector/ProtoSupport.hpp
+++ b/Core/include/Acts/Detector/ProtoSupport.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2023 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
diff --git a/Core/include/Acts/Detector/VolumeStructureBuilder.hpp b/Core/include/Acts/Detector/VolumeStructureBuilder.hpp
index 812f2e761ec..aede963c78c 100644
--- a/Core/include/Acts/Detector/VolumeStructureBuilder.hpp
+++ b/Core/include/Acts/Detector/VolumeStructureBuilder.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2023 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
diff --git a/Core/include/Acts/Detector/detail/BlueprintDrawer.hpp b/Core/include/Acts/Detector/detail/BlueprintDrawer.hpp
index cc589bf8e06..775eb83f45b 100644
--- a/Core/include/Acts/Detector/detail/BlueprintDrawer.hpp
+++ b/Core/include/Acts/Detector/detail/BlueprintDrawer.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2023 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
diff --git a/Core/include/Acts/Detector/detail/BlueprintHelper.hpp b/Core/include/Acts/Detector/detail/BlueprintHelper.hpp
index 06cc3e2046f..a1c0368a0ad 100644
--- a/Core/include/Acts/Detector/detail/BlueprintHelper.hpp
+++ b/Core/include/Acts/Detector/detail/BlueprintHelper.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2023 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
diff --git a/Core/include/Acts/Detector/detail/CuboidalDetectorHelper.hpp b/Core/include/Acts/Detector/detail/CuboidalDetectorHelper.hpp
index 34be7576be2..c9ad46744d3 100644
--- a/Core/include/Acts/Detector/detail/CuboidalDetectorHelper.hpp
+++ b/Core/include/Acts/Detector/detail/CuboidalDetectorHelper.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2023 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
diff --git a/Core/include/Acts/Detector/detail/CylindricalDetectorHelper.hpp b/Core/include/Acts/Detector/detail/CylindricalDetectorHelper.hpp
index 91b7935482c..05815b1325f 100644
--- a/Core/include/Acts/Detector/detail/CylindricalDetectorHelper.hpp
+++ b/Core/include/Acts/Detector/detail/CylindricalDetectorHelper.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2023 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
diff --git a/Core/include/Acts/Detector/detail/DetectorVolumeConsistency.hpp b/Core/include/Acts/Detector/detail/DetectorVolumeConsistency.hpp
index ffc9ae97985..ebea6a7a4d6 100644
--- a/Core/include/Acts/Detector/detail/DetectorVolumeConsistency.hpp
+++ b/Core/include/Acts/Detector/detail/DetectorVolumeConsistency.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2023 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
diff --git a/Core/include/Acts/Detector/detail/IndexedGridFiller.hpp b/Core/include/Acts/Detector/detail/IndexedGridFiller.hpp
index b79cafa93ad..3bbbee0569c 100644
--- a/Core/include/Acts/Detector/detail/IndexedGridFiller.hpp
+++ b/Core/include/Acts/Detector/detail/IndexedGridFiller.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2023-2024 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
@@ -17,6 +17,7 @@
 #include "Acts/Utilities/Delegate.hpp"
 #include "Acts/Utilities/Enumerate.hpp"
 #include "Acts/Utilities/GridAccessHelpers.hpp"
+#include "Acts/Utilities/Helpers.hpp"
 #include "Acts/Utilities/IAxis.hpp"
 #include "Acts/Utilities/Logger.hpp"
 
@@ -193,7 +194,7 @@ struct IndexedGridFiller {
     // Loop over the surfaces to be filled
     for (auto [io, o] : enumerate(iObjects)) {
       // Exclude indices that should be handled differently
-      if (std::find(aToAll.begin(), aToAll.end(), io) != aToAll.end()) {
+      if (rangeContainsValue(aToAll, io)) {
         continue;
       }
       // Get the reference positions
@@ -216,7 +217,7 @@ struct IndexedGridFiller {
       // Now fill the surface indices
       for (const auto& li : lIndices) {
         auto& bContent = iGrid.grid.atLocalBins(li);
-        if (std::find(bContent.begin(), bContent.end(), io) == bContent.end()) {
+        if (!rangeContainsValue(bContent, io)) {
           bContent.push_back(io);
         }
       }
@@ -238,7 +239,7 @@ struct IndexedGridFiller {
     for (std::size_t gi = 0; gi < iGrid.grid.size(true); ++gi) {
       auto& bContent = iGrid.grid.at(gi);
       for (const auto& io : idcs) {
-        if (std::find(bContent.begin(), bContent.end(), io) == bContent.end()) {
+        if (!rangeContainsValue(bContent, io)) {
           bContent.push_back(io);
         }
       }
diff --git a/Core/include/Acts/Detector/detail/IndexedSurfacesGenerator.hpp b/Core/include/Acts/Detector/detail/IndexedSurfacesGenerator.hpp
index 6d87d9f3a50..83dc9170208 100644
--- a/Core/include/Acts/Detector/detail/IndexedSurfacesGenerator.hpp
+++ b/Core/include/Acts/Detector/detail/IndexedSurfacesGenerator.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2023 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
diff --git a/Core/include/Acts/Detector/detail/PortalHelper.hpp b/Core/include/Acts/Detector/detail/PortalHelper.hpp
index 52245ee4a66..ec17c487098 100644
--- a/Core/include/Acts/Detector/detail/PortalHelper.hpp
+++ b/Core/include/Acts/Detector/detail/PortalHelper.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2022-2023 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
diff --git a/Core/include/Acts/Detector/detail/ProtoMaterialHelper.hpp b/Core/include/Acts/Detector/detail/ProtoMaterialHelper.hpp
index eb483a2f680..a43e96ac521 100644
--- a/Core/include/Acts/Detector/detail/ProtoMaterialHelper.hpp
+++ b/Core/include/Acts/Detector/detail/ProtoMaterialHelper.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2023 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
diff --git a/Core/include/Acts/Detector/detail/ReferenceGenerators.hpp b/Core/include/Acts/Detector/detail/ReferenceGenerators.hpp
index 8d03d515bb3..db77685a2bc 100644
--- a/Core/include/Acts/Detector/detail/ReferenceGenerators.hpp
+++ b/Core/include/Acts/Detector/detail/ReferenceGenerators.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2023 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
diff --git a/Core/include/Acts/Detector/detail/SupportSurfacesHelper.hpp b/Core/include/Acts/Detector/detail/SupportSurfacesHelper.hpp
index 1cfef5fdb5b..e956e215e4f 100644
--- a/Core/include/Acts/Detector/detail/SupportSurfacesHelper.hpp
+++ b/Core/include/Acts/Detector/detail/SupportSurfacesHelper.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2023 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
diff --git a/Core/include/Acts/Detector/interface/IDetectorBuilder.hpp b/Core/include/Acts/Detector/interface/IDetectorBuilder.hpp
index 73a167e08ba..b9950cbd283 100644
--- a/Core/include/Acts/Detector/interface/IDetectorBuilder.hpp
+++ b/Core/include/Acts/Detector/interface/IDetectorBuilder.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2023 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
diff --git a/Core/include/Acts/Detector/interface/IDetectorComponentBuilder.hpp b/Core/include/Acts/Detector/interface/IDetectorComponentBuilder.hpp
index e2b8f5fdd6d..cc9d207aef0 100644
--- a/Core/include/Acts/Detector/interface/IDetectorComponentBuilder.hpp
+++ b/Core/include/Acts/Detector/interface/IDetectorComponentBuilder.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2023 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
diff --git a/Core/include/Acts/Detector/interface/IExternalStructureBuilder.hpp b/Core/include/Acts/Detector/interface/IExternalStructureBuilder.hpp
index 483ddf6299a..7f5177b8e92 100644
--- a/Core/include/Acts/Detector/interface/IExternalStructureBuilder.hpp
+++ b/Core/include/Acts/Detector/interface/IExternalStructureBuilder.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2023 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
diff --git a/Core/include/Acts/Detector/interface/IGeometryIdGenerator.hpp b/Core/include/Acts/Detector/interface/IGeometryIdGenerator.hpp
index bb161cb9d58..61a1461bd6b 100644
--- a/Core/include/Acts/Detector/interface/IGeometryIdGenerator.hpp
+++ b/Core/include/Acts/Detector/interface/IGeometryIdGenerator.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2023 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
diff --git a/Core/include/Acts/Detector/interface/IInternalStructureBuilder.hpp b/Core/include/Acts/Detector/interface/IInternalStructureBuilder.hpp
index 4ae2e242bf0..0d453248834 100644
--- a/Core/include/Acts/Detector/interface/IInternalStructureBuilder.hpp
+++ b/Core/include/Acts/Detector/interface/IInternalStructureBuilder.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2023 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
diff --git a/Core/include/Acts/Detector/interface/IRootVolumeFinderBuilder.hpp b/Core/include/Acts/Detector/interface/IRootVolumeFinderBuilder.hpp
index aacb5c5dfc3..ea96a05de8e 100644
--- a/Core/include/Acts/Detector/interface/IRootVolumeFinderBuilder.hpp
+++ b/Core/include/Acts/Detector/interface/IRootVolumeFinderBuilder.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2023 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
diff --git a/Core/include/Acts/Detector/interface/ISurfacesProvider.hpp b/Core/include/Acts/Detector/interface/ISurfacesProvider.hpp
index 7cedfbf6a82..65d810a24dc 100644
--- a/Core/include/Acts/Detector/interface/ISurfacesProvider.hpp
+++ b/Core/include/Acts/Detector/interface/ISurfacesProvider.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2023 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
diff --git a/Core/include/Acts/EventData/Charge.hpp b/Core/include/Acts/EventData/Charge.hpp
index 020aa87ce83..6ae62b3d963 100644
--- a/Core/include/Acts/EventData/Charge.hpp
+++ b/Core/include/Acts/EventData/Charge.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2020 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
diff --git a/Core/include/Acts/EventData/ChargeConcept.hpp b/Core/include/Acts/EventData/ChargeConcept.hpp
index 4b0540ac407..448722bd4b3 100644
--- a/Core/include/Acts/EventData/ChargeConcept.hpp
+++ b/Core/include/Acts/EventData/ChargeConcept.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2023 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
diff --git a/Core/include/Acts/EventData/GenericBoundTrackParameters.hpp b/Core/include/Acts/EventData/GenericBoundTrackParameters.hpp
index 3d256630f76..38f297764b1 100644
--- a/Core/include/Acts/EventData/GenericBoundTrackParameters.hpp
+++ b/Core/include/Acts/EventData/GenericBoundTrackParameters.hpp
@@ -1,14 +1,15 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2016-2020 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
 #include "Acts/Definitions/Tolerance.hpp"
+#include "Acts/EventData/TrackParameterHelpers.hpp"
 #include "Acts/EventData/TransformationHelpers.hpp"
 #include "Acts/EventData/detail/PrintParameters.hpp"
 #include "Acts/Surfaces/Surface.hpp"
@@ -18,7 +19,6 @@
 #include <cassert>
 #include <cmath>
 #include <memory>
-#include <type_traits>
 
 namespace Acts {
 
@@ -61,7 +61,10 @@ class GenericBoundTrackParameters {
         m_cov(std::move(cov)),
         m_surface(std::move(surface)),
         m_particleHypothesis(std::move(particleHypothesis)) {
-    assert(m_surface);
+    // TODO set `validateAngleRange` to `true` after fixing caller code
+    assert(isBoundVectorValid(m_params, false) &&
+           "Invalid bound parameters vector");
+    assert(m_surface != nullptr && "Reference surface must not be null");
     normalizePhiTheta();
   }
 
@@ -250,6 +253,17 @@ class GenericBoundTrackParameters {
     return m_surface->referenceFrame(geoCtx, position(geoCtx), momentum());
   }
 
+  /// Reflect the parameters in place.
+  void reflectInPlace() { m_params = reflectBoundParameters(m_params); }
+
+  /// Reflect the parameters.
+  /// @return Reflected parameters.
+  GenericBoundTrackParameters<ParticleHypothesis> reflect() const {
+    GenericBoundTrackParameters<ParticleHypothesis> reflected = *this;
+    reflected.reflectInPlace();
+    return reflected;
+  }
+
  private:
   BoundVector m_params;
   std::optional<BoundSquareMatrix> m_cov;
@@ -282,11 +296,7 @@ class GenericBoundTrackParameters {
            (lhs.m_surface == rhs.m_surface) &&
            (lhs.m_particleHypothesis == rhs.m_particleHypothesis);
   }
-  /// Compare two bound track parameters for bitwise in-equality.
-  friend bool operator!=(const GenericBoundTrackParameters& lhs,
-                         const GenericBoundTrackParameters& rhs) {
-    return !(lhs == rhs);
-  }
+
   /// Print information to the output stream.
   friend std::ostream& operator<<(std::ostream& os,
                                   const GenericBoundTrackParameters& tp) {
diff --git a/Core/include/Acts/EventData/GenericCurvilinearTrackParameters.hpp b/Core/include/Acts/EventData/GenericCurvilinearTrackParameters.hpp
index ec4b49be9bb..6e4ed9bae7a 100644
--- a/Core/include/Acts/EventData/GenericCurvilinearTrackParameters.hpp
+++ b/Core/include/Acts/EventData/GenericCurvilinearTrackParameters.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2016-2020 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
@@ -82,8 +82,7 @@ class GenericCurvilinearTrackParameters
   template <typename other_track_parameter_t>
   static GenericCurvilinearTrackParameters create(
       const other_track_parameter_t& other) {
-    static_assert(
-        Concepts::BoundTrackParametersConcept<other_track_parameter_t>);
+    static_assert(BoundTrackParametersConcept<other_track_parameter_t>);
 
     return GenericCurvilinearTrackParameters(
         other.fourPosition(), other.particleHypothesis(), other.covariance());
@@ -112,6 +111,14 @@ class GenericCurvilinearTrackParameters
   Vector3 position() const {
     return GenericBoundTrackParameters<ParticleHypothesis>::position({});
   }
+
+  /// Reflect the parameters.
+  /// @return Reflected parameters.
+  GenericCurvilinearTrackParameters<ParticleHypothesis> reflect() const {
+    GenericCurvilinearTrackParameters<ParticleHypothesis> reflected = *this;
+    reflected.reflectInPlace();
+    return reflected;
+  }
 };
 
 }  // namespace Acts
diff --git a/Core/include/Acts/EventData/GenericFreeTrackParameters.hpp b/Core/include/Acts/EventData/GenericFreeTrackParameters.hpp
index c54ce44697c..7a2b4b46522 100644
--- a/Core/include/Acts/EventData/GenericFreeTrackParameters.hpp
+++ b/Core/include/Acts/EventData/GenericFreeTrackParameters.hpp
@@ -1,24 +1,26 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2019-2020 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
 #include "Acts/Definitions/Algebra.hpp"
 #include "Acts/Definitions/Common.hpp"
 #include "Acts/Definitions/TrackParametrization.hpp"
+#include "Acts/EventData/TrackParameterHelpers.hpp"
 #include "Acts/EventData/TrackParametersConcept.hpp"
+#include "Acts/EventData/TransformationHelpers.hpp"
 #include "Acts/EventData/detail/PrintParameters.hpp"
+#include "Acts/Utilities/MathHelpers.hpp"
 #include "Acts/Utilities/UnitVectors.hpp"
+#include "Acts/Utilities/VectorHelpers.hpp"
 
-#include <cassert>
 #include <cmath>
 #include <optional>
-#include <type_traits>
 
 namespace Acts {
 
@@ -52,7 +54,34 @@ class GenericFreeTrackParameters {
                              ParticleHypothesis particleHypothesis)
       : m_params(params),
         m_cov(std::move(cov)),
-        m_particleHypothesis(std::move(particleHypothesis)) {}
+        m_particleHypothesis(std::move(particleHypothesis)) {
+    assert(isFreeVectorValid(m_params) && "Invalid free parameters vector");
+  }
+
+  /// Construct from four-position, direction, absolute momentum, and charge.
+  ///
+  /// @param pos4 Track position/time four-vector
+  /// @param dir Track direction three-vector; normalization is ignored.
+  /// @param qOverP Charge over momentum
+  /// @param cov Free parameters covariance matrix
+  /// @param particleHypothesis Particle hypothesis
+  GenericFreeTrackParameters(const Vector4& pos4, const Vector3& dir,
+                             Scalar qOverP, std::optional<CovarianceMatrix> cov,
+                             ParticleHypothesis particleHypothesis)
+      : m_params(FreeVector::Zero()),
+        m_cov(std::move(cov)),
+        m_particleHypothesis(std::move(particleHypothesis)) {
+    m_params[eFreePos0] = pos4[ePos0];
+    m_params[eFreePos1] = pos4[ePos1];
+    m_params[eFreePos2] = pos4[ePos2];
+    m_params[eFreeTime] = pos4[eTime];
+    m_params[eFreeDir0] = dir[eMom0];
+    m_params[eFreeDir1] = dir[eMom1];
+    m_params[eFreeDir2] = dir[eMom2];
+    m_params[eFreeQOverP] = qOverP;
+
+    assert(isFreeVectorValid(m_params) && "Invalid free parameters vector");
+  }
 
   /// Construct from four-position, angles, absolute momentum, and charge.
   ///
@@ -77,6 +106,8 @@ class GenericFreeTrackParameters {
     m_params[eFreeDir1] = dir[eMom1];
     m_params[eFreeDir2] = dir[eMom2];
     m_params[eFreeQOverP] = qOverP;
+
+    assert(isFreeVectorValid(m_params) && "Invalid free parameters vector");
   }
 
   /// Converts a free track parameter with a different hypothesis.
@@ -91,8 +122,7 @@ class GenericFreeTrackParameters {
   template <typename other_track_parameter_t>
   static GenericFreeTrackParameters create(
       const other_track_parameter_t& other) {
-    static_assert(
-        Concepts::FreeTrackParametersConcept<other_track_parameter_t>);
+    static_assert(FreeTrackParametersConcept<other_track_parameter_t>);
 
     return GenericFreeTrackParameters(
         other.parameters(), other.particleHypothesis(), other.covariance());
@@ -135,9 +165,9 @@ class GenericFreeTrackParameters {
   Scalar time() const { return m_params[eFreeTime]; }
 
   /// Phi direction.
-  Scalar phi() const { return phi(direction()); }
+  Scalar phi() const { return VectorHelpers::phi(direction()); }
   /// Theta direction.
-  Scalar theta() const { return theta(direction()); }
+  Scalar theta() const { return VectorHelpers::theta(direction()); }
   /// Charge over momentum.
   Scalar qOverP() const { return m_params[eFreeQOverP]; }
 
@@ -155,12 +185,12 @@ class GenericFreeTrackParameters {
     //   [f*sin(theta)*cos(phi), f*sin(theta)*sin(phi), f*cos(theta)]
     // w/ f,sin(theta) positive, the transverse magnitude is then
     //   sqrt(f^2*sin^2(theta)) = f*sin(theta)
-    Scalar transverseMagnitude =
-        std::hypot(m_params[eFreeDir0], m_params[eFreeDir1]);
+    Scalar transverseMagnitude2 =
+        square(m_params[eFreeDir0]) + square(m_params[eFreeDir1]);
     // absolute magnitude is f by construction
-    Scalar magnitude = std::hypot(transverseMagnitude, m_params[eFreeDir2]);
+    Scalar magnitude2 = transverseMagnitude2 + square(m_params[eFreeDir2]);
     // such that we can extract sin(theta) = f*sin(theta) / f
-    return (transverseMagnitude / magnitude) * absoluteMomentum();
+    return std::sqrt(transverseMagnitude2 / magnitude2) * absoluteMomentum();
   }
   /// Momentum three-vector.
   Vector3 momentum() const { return absoluteMomentum() * direction(); }
@@ -175,6 +205,17 @@ class GenericFreeTrackParameters {
     return m_particleHypothesis;
   }
 
+  /// Reflect the parameters in place.
+  void reflectInPlace() { m_params = reflectFreeParameters(m_params); }
+
+  /// Reflect the parameters.
+  /// @return Reflected parameters.
+  GenericFreeTrackParameters<ParticleHypothesis> reflect() const {
+    GenericFreeTrackParameters<ParticleHypothesis> reflected = *this;
+    reflected.reflectInPlace();
+    return reflected;
+  }
+
  private:
   FreeVector m_params;
   std::optional<FreeSquareMatrix> m_cov;
diff --git a/Core/include/Acts/EventData/GenericParticleHypothesis.hpp b/Core/include/Acts/EventData/GenericParticleHypothesis.hpp
index 38c70409dc6..46ebe4ff298 100644
--- a/Core/include/Acts/EventData/GenericParticleHypothesis.hpp
+++ b/Core/include/Acts/EventData/GenericParticleHypothesis.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2023 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
@@ -133,11 +133,6 @@ class GenericParticleHypothesis {
     return (lhs.m_absPdg == rhs.m_absPdg) && (lhs.m_mass == rhs.m_mass) &&
            (lhs.m_chargeType == rhs.m_chargeType);
   }
-  friend bool operator!=(const GenericParticleHypothesis<ChargeType>& lhs,
-                         const GenericParticleHypothesis<ChargeType>& rhs) {
-    return (lhs.m_absPdg != rhs.m_absPdg) || (lhs.m_mass != rhs.m_mass) ||
-           (lhs.m_chargeType != rhs.m_chargeType);
-  }
 };
 
 }  // namespace Acts
diff --git a/Core/include/Acts/EventData/MeasurementHelpers.hpp b/Core/include/Acts/EventData/MeasurementHelpers.hpp
index 9d927e40447..d4aae9b7565 100644
--- a/Core/include/Acts/EventData/MeasurementHelpers.hpp
+++ b/Core/include/Acts/EventData/MeasurementHelpers.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2019-2020 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
diff --git a/Core/include/Acts/EventData/MultiComponentTrackParameters.hpp b/Core/include/Acts/EventData/MultiComponentTrackParameters.hpp
index dd3496910f7..70ad87f8d77 100644
--- a/Core/include/Acts/EventData/MultiComponentTrackParameters.hpp
+++ b/Core/include/Acts/EventData/MultiComponentTrackParameters.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2021 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
@@ -262,7 +262,7 @@ class MultiComponentCurvilinearTrackParameters
       avgDir += w * dir;
     }
 
-    auto s = Surface::makeShared<PlaneSurface>(avgPos, avgDir);
+    auto s = CurvilinearSurface(avgPos, avgDir).planeSurface();
 
     std::vector<std::tuple<double, BoundVector, covariance_t>> bound;
     bound.reserve(curvi.size());
diff --git a/Core/include/Acts/EventData/MultiTrajectory.hpp b/Core/include/Acts/EventData/MultiTrajectory.hpp
index d5766844403..1c065fd7e12 100644
--- a/Core/include/Acts/EventData/MultiTrajectory.hpp
+++ b/Core/include/Acts/EventData/MultiTrajectory.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2019-2024 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
@@ -21,7 +21,6 @@
 #include "Acts/Utilities/HashedString.hpp"
 #include "Acts/Utilities/Helpers.hpp"
 #include "Acts/Utilities/ThrowAssert.hpp"
-#include "Acts/Utilities/TypeTraits.hpp"
 
 #include <bitset>
 #include <cstddef>
@@ -88,6 +87,12 @@ class TrackStateRange {
       }
     }
 
+    Iterator operator++(int) {
+      Iterator tmp(*this);
+      operator++();
+      return tmp;
+    }
+
     bool operator==(const Iterator& other) const {
       if (!proxy && !other.proxy) {
         return true;
@@ -98,8 +103,6 @@ class TrackStateRange {
       return false;
     }
 
-    bool operator!=(const Iterator& other) const { return !(*this == other); }
-
     ProxyType operator*() const { return *proxy; }
     ProxyType operator*() { return *proxy; }
   };
@@ -110,18 +113,18 @@ class TrackStateRange {
   Iterator begin() { return m_begin; }
   Iterator end() { return Iterator{std::nullopt}; }
 
+  Iterator cbegin() const { return m_begin; }
+  Iterator cend() const { return Iterator{std::nullopt}; }
+
  private:
   Iterator m_begin;
 };
 
 // implement track state visitor concept
 template <typename T, typename TS>
-using call_operator_t = decltype(std::declval<T>()(std::declval<TS>()));
-
-template <typename T, typename TS>
-constexpr bool VisitorConcept = Concepts ::require<
-    Concepts ::either<Concepts ::identical_to<bool, call_operator_t, T, TS>,
-                      Concepts ::identical_to<void, call_operator_t, T, TS>>>;
+concept VisitorConcept = requires(T& t, TS& ts) {
+  { t(ts) } -> Concepts::same_as_any_of<void, bool>;
+};
 
 }  // namespace detail_lt
 
@@ -269,7 +272,8 @@ class MultiTrajectory {
   /// @param iendpoint  index of the last state
   /// @param callable   non-modifying functor to be called with each point
   template <typename F>
-  void visitBackwards(IndexType iendpoint, F&& callable) const;
+  void visitBackwards(IndexType iendpoint, F&& callable) const
+    requires detail_lt::VisitorConcept<F, ConstTrackStateProxy>;
 
   /// Apply a function to all previous states starting at a given endpoint.
   ///
@@ -281,11 +285,8 @@ class MultiTrajectory {
   /// @note Only available if the MultiTrajectory is not read-only
   template <typename F>
   void applyBackwards(IndexType iendpoint, F&& callable)
-    requires(!ReadOnly)
+    requires(!ReadOnly) && detail_lt::VisitorConcept<F, TrackStateProxy>
   {
-    static_assert(detail_lt::VisitorConcept<F, TrackStateProxy>,
-                  "Callable needs to satisfy VisitorConcept");
-
     if (iendpoint == MultiTrajectoryTraits::kInvalid) {
       throw std::runtime_error(
           "Cannot apply backwards with kInvalid as endpoint");
@@ -695,13 +696,10 @@ class MultiTrajectory {
     self().allocateCalibrated_impl(istate, measdim);
   }
 
-  // This function will move to an rvalue reference in the next major version
-  template <typename source_link_t>
-  void setUncalibratedSourceLink(IndexType istate, source_link_t&& sourceLink)
+  void setUncalibratedSourceLink(IndexType istate, SourceLink&& sourceLink)
     requires(!ReadOnly)
   {
-    self().setUncalibratedSourceLink_impl(
-        istate, std::forward<source_link_t>(sourceLink));
+    self().setUncalibratedSourceLink_impl(istate, std::move(sourceLink));
   }
 
   SourceLink getUncalibratedSourceLink(IndexType istate) const {
diff --git a/Core/include/Acts/EventData/MultiTrajectory.ipp b/Core/include/Acts/EventData/MultiTrajectory.ipp
index 3b1e3d8a184..c8f12967cd2 100644
--- a/Core/include/Acts/EventData/MultiTrajectory.ipp
+++ b/Core/include/Acts/EventData/MultiTrajectory.ipp
@@ -1,13 +1,12 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2019 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include "Acts/Utilities/AlgebraHelpers.hpp"
-#include "Acts/Utilities/TypeTraits.hpp"
 
 #include <bitset>
 #include <cstdint>
@@ -20,11 +19,9 @@ namespace Acts {
 
 template <typename D>
 template <typename F>
-void MultiTrajectory<D>::visitBackwards(IndexType iendpoint,
-                                        F&& callable) const {
-  static_assert(detail_lt::VisitorConcept<F, ConstTrackStateProxy>,
-                "Callable needs to satisfy VisitorConcept");
-
+void MultiTrajectory<D>::visitBackwards(IndexType iendpoint, F&& callable) const
+  requires detail_lt::VisitorConcept<F, ConstTrackStateProxy>
+{
   if (iendpoint == MultiTrajectoryTraits::kInvalid) {
     throw std::runtime_error(
         "Cannot visit backwards with kInvalid as endpoint");
diff --git a/Core/include/Acts/EventData/MultiTrajectoryBackendConcept.hpp b/Core/include/Acts/EventData/MultiTrajectoryBackendConcept.hpp
index 7898a336754..92ae47270bc 100644
--- a/Core/include/Acts/EventData/MultiTrajectoryBackendConcept.hpp
+++ b/Core/include/Acts/EventData/MultiTrajectoryBackendConcept.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2023 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
diff --git a/Core/include/Acts/EventData/MultiTrajectoryHelpers.hpp b/Core/include/Acts/EventData/MultiTrajectoryHelpers.hpp
index 84d4c763a7b..2cc417bc133 100644
--- a/Core/include/Acts/EventData/MultiTrajectoryHelpers.hpp
+++ b/Core/include/Acts/EventData/MultiTrajectoryHelpers.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2020-2024 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
@@ -14,6 +14,7 @@
 #include "Acts/Geometry/Layer.hpp"
 #include "Acts/Geometry/TrackingVolume.hpp"
 #include "Acts/Surfaces/Surface.hpp"
+#include "Acts/Utilities/Helpers.hpp"
 
 #include <functional>
 #include <unordered_map>
@@ -102,8 +103,7 @@ VolumeTrajectoryStateContainer trajectoryState(
     const auto& volume = geoID.volume();
     const auto& layer = geoID.layer();
     // Check if the track info for this sub-detector is requested
-    auto it = std::find(volumeIds.begin(), volumeIds.end(), volume);
-    if (it == volumeIds.end()) {
+    if (!rangeContainsValue(volumeIds, volume)) {
       return true;
     }
     // The trajectory state for this volume
diff --git a/Core/include/Acts/EventData/ParticleHypothesis.hpp b/Core/include/Acts/EventData/ParticleHypothesis.hpp
index 8fb7fe9ec03..f236441ede6 100644
--- a/Core/include/Acts/EventData/ParticleHypothesis.hpp
+++ b/Core/include/Acts/EventData/ParticleHypothesis.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2023 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
diff --git a/Core/include/Acts/EventData/ProxyAccessor.hpp b/Core/include/Acts/EventData/ProxyAccessor.hpp
index 6e6ffec53ae..429c0ef670b 100644
--- a/Core/include/Acts/EventData/ProxyAccessor.hpp
+++ b/Core/include/Acts/EventData/ProxyAccessor.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2023 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
@@ -74,15 +74,17 @@ struct ProxyAccessorBase {
 
   /// Create the accessor from a string key
   /// @param _key the key
-  ProxyAccessorBase(const std::string& _key) : key{hashString(_key)} {}
+  constexpr ProxyAccessorBase(const std::string& _key)
+      : key{hashString(_key)} {}
 
   /// Access the stored key on the proxy given as an argument. Mutable version
   /// @tparam proxy_t the type of the proxy
   /// @param proxy the proxy object to access
   /// @return mutable reference to the column behind the key
-  template <detail::MutableProxyType proxy_t, bool RO = ReadOnly,
-            typename = std::enable_if_t<!RO>>
-  T& operator()(proxy_t proxy) const {
+  template <detail::MutableProxyType proxy_t>
+  T& operator()(proxy_t proxy) const
+    requires(!ReadOnly)
+  {
     static_assert(!proxy_t::ReadOnly,
                   "Cannot get mutable ref for const track proxy");
     return proxy.template component<T>(key);
@@ -92,9 +94,10 @@ struct ProxyAccessorBase {
   /// @tparam proxy_t the type of the track proxy
   /// @param proxy the proxy to access
   /// @return const reference to the column behind the key
-  template <detail::ProxyType proxy_t, bool RO = ReadOnly,
-            typename = std::enable_if_t<RO>>
-  const T& operator()(proxy_t proxy) const {
+  template <detail::ProxyType proxy_t>
+  const T& operator()(proxy_t proxy) const
+    requires(ReadOnly)
+  {
     if constexpr (proxy_t::ReadOnly) {
       return proxy.template component<T>(key);
 
diff --git a/Core/include/Acts/EventData/Seed.hpp b/Core/include/Acts/EventData/Seed.hpp
new file mode 100644
index 00000000000..f3c6707b2e1
--- /dev/null
+++ b/Core/include/Acts/EventData/Seed.hpp
@@ -0,0 +1,44 @@
+// This file is part of the ACTS project.
+//
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
+//
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
+
+#pragma once
+
+#include <array>
+#include <limits>
+
+namespace Acts {
+
+template <typename external_spacepoint_t, std::size_t N = 3ul>
+class Seed {
+  static_assert(N >= 3ul);
+
+ public:
+  using value_type = external_spacepoint_t;
+  static constexpr std::size_t DIM = N;
+
+  template <typename... args_t>
+    requires(sizeof...(args_t) == N) &&
+            (std::same_as<external_spacepoint_t, args_t> && ...)
+  explicit Seed(const args_t&... points);
+
+  void setVertexZ(float vertex);
+  void setQuality(float seedQuality);
+
+  const std::array<const external_spacepoint_t*, N>& sp() const;
+  float z() const;
+  float seedQuality() const;
+
+ private:
+  std::array<const external_spacepoint_t*, N> m_spacepoints{};
+  float m_vertexZ{0.f};
+  float m_seedQuality{-std::numeric_limits<float>::infinity()};
+};
+
+}  // namespace Acts
+
+#include "Acts/EventData/Seed.ipp"
diff --git a/Core/include/Acts/EventData/Seed.ipp b/Core/include/Acts/EventData/Seed.ipp
new file mode 100644
index 00000000000..e977a3d67d7
--- /dev/null
+++ b/Core/include/Acts/EventData/Seed.ipp
@@ -0,0 +1,44 @@
+// This file is part of the ACTS project.
+//
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
+//
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
+
+namespace Acts {
+
+template <typename external_spacepoint_t, std::size_t N>
+template <typename... args_t>
+  requires(sizeof...(args_t) == N) &&
+          (std::same_as<external_spacepoint_t, args_t> && ...)
+Seed<external_spacepoint_t, N>::Seed(const args_t&... points)
+    : m_spacepoints({&points...}) {}
+
+template <typename external_spacepoint_t, std::size_t N>
+void Seed<external_spacepoint_t, N>::setVertexZ(float vertex) {
+  m_vertexZ = vertex;
+}
+
+template <typename external_spacepoint_t, std::size_t N>
+void Seed<external_spacepoint_t, N>::setQuality(float seedQuality) {
+  m_seedQuality = seedQuality;
+}
+
+template <typename external_spacepoint_t, std::size_t N>
+const std::array<const external_spacepoint_t*, N>&
+Seed<external_spacepoint_t, N>::sp() const {
+  return m_spacepoints;
+}
+
+template <typename external_spacepoint_t, std::size_t N>
+float Seed<external_spacepoint_t, N>::z() const {
+  return m_vertexZ;
+}
+
+template <typename external_spacepoint_t, std::size_t N>
+float Seed<external_spacepoint_t, N>::seedQuality() const {
+  return m_seedQuality;
+}
+
+}  // namespace Acts
diff --git a/Core/include/Acts/EventData/SourceLink.hpp b/Core/include/Acts/EventData/SourceLink.hpp
index 4d26b7589c9..ba1515738e6 100644
--- a/Core/include/Acts/EventData/SourceLink.hpp
+++ b/Core/include/Acts/EventData/SourceLink.hpp
@@ -1,20 +1,19 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2021 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
 #include "Acts/Geometry/GeometryIdentifier.hpp"
 #include "Acts/Utilities/Any.hpp"
 #include "Acts/Utilities/Delegate.hpp"
-#include "Acts/Utilities/TypeTraits.hpp"
 
 #include <cassert>
-#include <iostream>
+#include <concepts>
 #include <type_traits>
 #include <utility>
 
@@ -34,12 +33,13 @@ class SourceLink final {
   SourceLink& operator=(const SourceLink& other) = default;
   SourceLink& operator=(SourceLink&& other) = default;
 
-  /// Constructor from concrete sourcelink
+  /// Constructor from concrete source link
   /// @tparam T The source link type
   /// @param upstream The upstream source link to store
-  template <typename T, typename = std::enable_if_t<
-                            !std::is_same_v<std::decay_t<T>, SourceLink>>>
-  explicit SourceLink(T&& upstream) : m_upstream(std::forward<T>(upstream)) {
+  template <typename T>
+  explicit SourceLink(T&& upstream)
+    requires(!std::same_as<std::decay_t<T>, SourceLink>)
+      : m_upstream(std::forward<T>(upstream)) {
     static_assert(!std::is_same_v<std::decay_t<T>, SourceLink>,
                   "Cannot wrap SourceLink in SourceLink");
   }
@@ -85,10 +85,6 @@ struct SourceLinkAdapterIterator {
     return m_iterator == other.m_iterator;
   }
 
-  bool operator!=(const SourceLinkAdapterIterator& other) const {
-    return !(*this == other);
-  }
-
   Acts::SourceLink operator*() const { return Acts::SourceLink{*m_iterator}; }
 
   auto operator-(const SourceLinkAdapterIterator& other) const {
diff --git a/Core/include/Acts/EventData/SpacePointContainer.hpp b/Core/include/Acts/EventData/SpacePointContainer.hpp
new file mode 100644
index 00000000000..619a1393ecc
--- /dev/null
+++ b/Core/include/Acts/EventData/SpacePointContainer.hpp
@@ -0,0 +1,163 @@
+// This file is part of the ACTS project.
+//
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
+//
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
+
+#pragma once
+
+#include "Acts/Definitions/Algebra.hpp"
+#include "Acts/Definitions/Units.hpp"
+#include "Acts/EventData/SpacePointData.hpp"
+#include "Acts/EventData/SpacePointProxy.hpp"
+#include "Acts/EventData/Utils.hpp"
+#include "Acts/Utilities/HashedString.hpp"
+#include "Acts/Utilities/Iterator.hpp"
+
+#include <any>
+#include <vector>
+
+namespace Acts {
+
+struct SpacePointContainerConfig {
+  bool useDetailedDoubleMeasurementInfo = false;
+  bool isInInternalUnits = false;
+
+  SpacePointContainerConfig toInternalUnits() const {
+    if (isInInternalUnits) {
+      throw std::runtime_error(
+          "Repeated conversion to internal units for "
+          "SpacePointContainerConfig");
+    }
+    using namespace Acts::UnitLiterals;
+    SpacePointContainerConfig config = *this;
+    config.isInInternalUnits = true;
+    return config;
+  };
+};
+
+struct SpacePointContainerOptions {
+  // location of beam in x,y plane.
+  // used as offset for Space Points
+  Acts::Vector2 beamPos{0 * Acts::UnitConstants::mm,
+                        0 * Acts::UnitConstants::mm};
+  bool isInInternalUnits = false;
+
+  SpacePointContainerOptions toInternalUnits() const {
+    if (isInInternalUnits) {
+      throw std::runtime_error(
+          "Repeated conversion to internal units for "
+          "SpacePointContainerOptions");
+    }
+    using namespace Acts::UnitLiterals;
+    SpacePointContainerOptions options = *this;
+    options.isInInternalUnits = true;
+    options.beamPos[0] /= 1_mm;
+    options.beamPos[1] /= 1_mm;
+    return options;
+  }
+};
+
+template <typename container_t, template <typename> class holder_t>
+class SpacePointContainer {
+ public:
+  friend class Acts::SpacePointProxy<
+      Acts::SpacePointContainer<container_t, holder_t>>;
+
+ public:
+  using SpacePointProxyType =
+      Acts::SpacePointProxy<Acts::SpacePointContainer<container_t, holder_t>>;
+
+  using iterator =
+      ContainerIndexIterator<Acts::SpacePointContainer<container_t, holder_t>,
+                             SpacePointProxyType&, false>;
+  using const_iterator =
+      ContainerIndexIterator<Acts::SpacePointContainer<container_t, holder_t>,
+                             const SpacePointProxyType&, true>;
+
+  using ValueType = typename container_t::ValueType;
+  using ProxyType = SpacePointProxyType;
+  using value_type = ProxyType;
+  using size_type = std::size_t;
+
+ public:
+  // Constructors
+  // It makes sense to support both options of
+  // taking or not the ownership
+
+  // Do not take ownership
+  // Activate only if holder_t is RefHolder
+  template <template <typename> class H = holder_t,
+            typename = std::enable_if_t<Acts::detail::is_same_template<
+                H, Acts::detail::RefHolder>::value>>
+  SpacePointContainer(const Acts::SpacePointContainerConfig& config,
+                      const Acts::SpacePointContainerOptions& options,
+                      const container_t& container);
+
+  // Take the ownership
+  // Activate only if holder_t is ValueHolder
+  template <template <typename> class H = holder_t,
+            typename = std::enable_if_t<Acts::detail::is_same_template<
+                H, Acts::detail::ValueHolder>::value>>
+  SpacePointContainer(const Acts::SpacePointContainerConfig& config,
+                      const Acts::SpacePointContainerOptions& options,
+                      container_t&& container);
+
+  // No copy operations
+  SpacePointContainer(SpacePointContainer& other) = delete;
+  SpacePointContainer& operator=(SpacePointContainer& other) = delete;
+
+  // move operations
+  SpacePointContainer(SpacePointContainer&& other) noexcept = default;
+  SpacePointContainer& operator=(SpacePointContainer&& other) noexcept =
+      default;
+
+  // Destructor
+  ~SpacePointContainer() = default;
+
+  std::size_t size() const;
+
+  iterator begin();
+  iterator end();
+  const_iterator cbegin() const;
+  const_iterator cend() const;
+  const_iterator begin() const;
+  const_iterator end() const;
+
+  ProxyType& at(const std::size_t n);
+  const ProxyType& at(const std::size_t n) const;
+  const ValueType& sp(const std::size_t n) const;
+
+ private:
+  void initialize();
+
+  const container_t& container() const;
+  const ProxyType& proxy(const std::size_t n) const;
+  std::vector<ProxyType>& proxies();
+  const std::vector<ProxyType>& proxies() const;
+
+  float x(const std::size_t n) const;
+  float y(const std::size_t n) const;
+  float z(const std::size_t n) const;
+  float phi(const std::size_t n) const;
+  float radius(const std::size_t n) const;
+  float varianceR(const std::size_t n) const;
+  float varianceZ(const std::size_t n) const;
+
+  const Acts::Vector3& topStripVector(const std::size_t n) const;
+  const Acts::Vector3& bottomStripVector(const std::size_t n) const;
+  const Acts::Vector3& stripCenterDistance(const std::size_t n) const;
+  const Acts::Vector3& topStripCenterPosition(const std::size_t n) const;
+
+  Acts::SpacePointContainerConfig m_config;
+  Acts::SpacePointContainerOptions m_options;
+  Acts::SpacePointData m_data;
+  holder_t<const container_t> m_container;
+  std::vector<ProxyType> m_proxies;
+};
+
+}  // namespace Acts
+
+#include "Acts/EventData/SpacePointContainer.ipp"
diff --git a/Core/include/Acts/EventData/SpacePointContainer.ipp b/Core/include/Acts/EventData/SpacePointContainer.ipp
new file mode 100644
index 00000000000..e0c381e4a50
--- /dev/null
+++ b/Core/include/Acts/EventData/SpacePointContainer.ipp
@@ -0,0 +1,225 @@
+// This file is part of the ACTS project.
+//
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
+//
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
+
+#include <cmath>
+
+namespace Acts {
+
+template <typename container_t, template <typename> class holder_t>
+template <template <typename> class, typename>
+SpacePointContainer<container_t, holder_t>::SpacePointContainer(
+    const Acts::SpacePointContainerConfig& config,
+    const Acts::SpacePointContainerOptions& options,
+    const container_t& container)
+    : m_config(config.toInternalUnits()),
+      m_options(options.toInternalUnits()),
+      m_container(container) {
+  initialize();
+}
+
+template <typename container_t, template <typename> class holder_t>
+template <template <typename> class, typename>
+SpacePointContainer<container_t, holder_t>::SpacePointContainer(
+    const Acts::SpacePointContainerConfig& config,
+    const Acts::SpacePointContainerOptions& options, container_t&& container)
+    : m_config(config.toInternalUnits()),
+      m_options(options.toInternalUnits()),
+      m_container(std::move(container)) {
+  initialize();
+}
+
+template <typename container_t, template <typename> class holder_t>
+void SpacePointContainer<container_t, holder_t>::initialize() {
+  m_data.resize(size(), m_config.useDetailedDoubleMeasurementInfo);
+  m_proxies.reserve(size());
+  const auto& external_container = container();
+  for (std::size_t i(0); i < size(); ++i) {
+    m_data.setX(i, external_container.x_impl(i) - m_options.beamPos[0]);
+    m_data.setY(i, external_container.y_impl(i) - m_options.beamPos[1]);
+    m_data.setZ(i, external_container.z_impl(i));
+    m_data.setRadius(
+        i, std::sqrt(m_data.x(i) * m_data.x(i) + m_data.y(i) * m_data.y(i)));
+    m_data.setPhi(i, std::atan2(m_data.y(i), m_data.x(i)));
+    m_data.setVarianceR(i, external_container.varianceR_impl(i));
+    m_data.setVarianceZ(i, external_container.varianceZ_impl(i));
+
+    m_proxies.emplace_back(*this, i);
+  }
+
+  // Dynamic variables
+  if (m_config.useDetailedDoubleMeasurementInfo) {
+    using namespace Acts::HashedStringLiteral;
+    for (std::size_t i(0); i < size(); ++i) {
+      m_data.setTopStripVector(
+          i, std::any_cast<Acts::Vector3>(
+                 external_container.component_impl("TopStripVector"_hash, i)));
+      m_data.setBottomStripVector(
+          i, std::any_cast<Acts::Vector3>(external_container.component_impl(
+                 "BottomStripVector"_hash, i)));
+      m_data.setStripCenterDistance(
+          i, std::any_cast<Acts::Vector3>(external_container.component_impl(
+                 "StripCenterDistance"_hash, i)));
+      m_data.setTopStripCenterPosition(
+          i, std::any_cast<Acts::Vector3>(external_container.component_impl(
+                 "TopStripCenterPosition"_hash, i)));
+    }
+  }
+}
+
+template <typename container_t, template <typename> class holder_t>
+const Acts::Vector3& SpacePointContainer<container_t, holder_t>::topStripVector(
+    const std::size_t n) const {
+  return m_data.topStripVector(n);
+}
+
+template <typename container_t, template <typename> class holder_t>
+const Acts::Vector3&
+SpacePointContainer<container_t, holder_t>::bottomStripVector(
+    const std::size_t n) const {
+  return m_data.bottomStripVector(n);
+}
+
+template <typename container_t, template <typename> class holder_t>
+const Acts::Vector3&
+SpacePointContainer<container_t, holder_t>::stripCenterDistance(
+    const std::size_t n) const {
+  return m_data.stripCenterDistance(n);
+}
+
+template <typename container_t, template <typename> class holder_t>
+const Acts::Vector3&
+SpacePointContainer<container_t, holder_t>::topStripCenterPosition(
+    const std::size_t n) const {
+  return m_data.topStripCenterPosition(n);
+}
+
+template <typename container_t, template <typename> class holder_t>
+std::size_t SpacePointContainer<container_t, holder_t>::size() const {
+  return container().size_impl();
+}
+
+template <typename container_t, template <typename> class holder_t>
+typename SpacePointContainer<container_t, holder_t>::iterator
+SpacePointContainer<container_t, holder_t>::begin() {
+  return {*this, 0};
+}
+
+template <typename container_t, template <typename> class holder_t>
+typename SpacePointContainer<container_t, holder_t>::iterator
+SpacePointContainer<container_t, holder_t>::end() {
+  return {*this, size()};
+}
+
+template <typename container_t, template <typename> class holder_t>
+typename SpacePointContainer<container_t, holder_t>::const_iterator
+SpacePointContainer<container_t, holder_t>::begin() const {
+  return {*this, 0};
+}
+
+template <typename container_t, template <typename> class holder_t>
+typename SpacePointContainer<container_t, holder_t>::const_iterator
+SpacePointContainer<container_t, holder_t>::end() const {
+  return {*this, size()};
+}
+
+template <typename container_t, template <typename> class holder_t>
+typename SpacePointContainer<container_t, holder_t>::const_iterator
+SpacePointContainer<container_t, holder_t>::cbegin() const {
+  return {*this, 0};
+}
+
+template <typename container_t, template <typename> class holder_t>
+typename SpacePointContainer<container_t, holder_t>::const_iterator
+SpacePointContainer<container_t, holder_t>::cend() const {
+  return {*this, size()};
+}
+
+template <typename container_t, template <typename> class holder_t>
+const container_t& SpacePointContainer<container_t, holder_t>::container()
+    const {
+  return *m_container;
+}
+
+template <typename container_t, template <typename> class holder_t>
+typename SpacePointContainer<container_t, holder_t>::ProxyType&
+SpacePointContainer<container_t, holder_t>::at(const std::size_t n) {
+  return proxies().at(n);
+}
+
+template <typename container_t, template <typename> class holder_t>
+const typename SpacePointContainer<container_t, holder_t>::ProxyType&
+SpacePointContainer<container_t, holder_t>::at(const std::size_t n) const {
+  return proxies().at(n);
+}
+
+template <typename container_t, template <typename> class holder_t>
+const typename SpacePointContainer<container_t, holder_t>::ValueType&
+SpacePointContainer<container_t, holder_t>::sp(const std::size_t n) const {
+  return container().get_impl(n);
+}
+
+template <typename container_t, template <typename> class holder_t>
+float SpacePointContainer<container_t, holder_t>::x(const std::size_t n) const {
+  return m_data.x(n);
+}
+
+template <typename container_t, template <typename> class holder_t>
+float SpacePointContainer<container_t, holder_t>::y(const std::size_t n) const {
+  return m_data.y(n);
+}
+
+template <typename container_t, template <typename> class holder_t>
+float SpacePointContainer<container_t, holder_t>::z(const std::size_t n) const {
+  return m_data.z(n);
+}
+
+template <typename container_t, template <typename> class holder_t>
+float SpacePointContainer<container_t, holder_t>::phi(
+    const std::size_t n) const {
+  return m_data.phi(n);
+}
+
+template <typename container_t, template <typename> class holder_t>
+float SpacePointContainer<container_t, holder_t>::radius(
+    const std::size_t n) const {
+  return m_data.radius(n);
+}
+
+template <typename container_t, template <typename> class holder_t>
+float SpacePointContainer<container_t, holder_t>::varianceR(
+    const std::size_t n) const {
+  return m_data.varianceR(n);
+}
+
+template <typename container_t, template <typename> class holder_t>
+float SpacePointContainer<container_t, holder_t>::varianceZ(
+    const std::size_t n) const {
+  return m_data.varianceZ(n);
+}
+
+template <typename container_t, template <typename> class holder_t>
+const typename SpacePointContainer<container_t, holder_t>::ProxyType&
+SpacePointContainer<container_t, holder_t>::proxy(const std::size_t n) const {
+  assert(n < proxies().size());
+  return proxies()[n];
+}
+
+template <typename container_t, template <typename> class holder_t>
+std::vector<typename SpacePointContainer<container_t, holder_t>::ProxyType>&
+SpacePointContainer<container_t, holder_t>::proxies() {
+  return m_proxies;
+}
+
+template <typename container_t, template <typename> class holder_t>
+const std::vector<
+    typename SpacePointContainer<container_t, holder_t>::ProxyType>&
+SpacePointContainer<container_t, holder_t>::proxies() const {
+  return m_proxies;
+}
+
+}  // namespace Acts
diff --git a/Core/include/Acts/EventData/SpacePointData.hpp b/Core/include/Acts/EventData/SpacePointData.hpp
index 7f64fe04e65..60684cc5242 100644
--- a/Core/include/Acts/EventData/SpacePointData.hpp
+++ b/Core/include/Acts/EventData/SpacePointData.hpp
@@ -1,25 +1,27 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2023 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
 #include "Acts/Definitions/Algebra.hpp"
+#include "Acts/Utilities/HashedString.hpp"
 
+#include <any>
 #include <limits>
 #include <vector>
 
 namespace Acts {
 
 /// @class SpacePointData
-/// This class contains auxiliary and mutable data associated to the
+/// This class contains auxiliary data associated to the
 /// external space points provided by the customers
 /// These variables are used internally by the seeding algorithm, that
-/// reads and updates them
+/// reads them
 /// The variables collected here are also dynamic variables only present
 /// for strip space points
 class SpacePointData {
@@ -39,58 +41,53 @@ class SpacePointData {
   ~SpacePointData() = default;
 
   /// @brief Getters
-  float quality(std::size_t idx) const;
-  float deltaR(std::size_t idx) const;
+  float x(const std::size_t idx) const;
+  float y(const std::size_t idx) const;
+  float z(const std::size_t idx) const;
+  float radius(const std::size_t idx) const;
+  float phi(const std::size_t idx) const;
+  float varianceZ(const std::size_t idx) const;
+  float varianceR(const std::size_t idx) const;
 
   /// @brief Setters
-  void setQuality(std::size_t idx, const float value);
-  void setDeltaR(std::size_t idx, const float value);
+  void setX(const std::size_t idx, const float value);
+  void setY(const std::size_t idx, const float value);
+  void setZ(const std::size_t idx, const float value);
+  void setRadius(const std::size_t idx, const float value);
+  void setPhi(const std::size_t idx, const float value);
+  void setVarianceZ(const std::size_t idx, const float value);
+  void setVarianceR(const std::size_t idx, const float value);
 
   /// @brief Resize vectors
-  void resize(std::size_t n, bool resizeDynamic = false);
+  void resize(const std::size_t n, bool resizeDynamic = false);
 
   /// @brief clear vectors
   void clear();
 
   ///
-  bool hasDynamicVariable() const { return !m_topStripVector.empty(); }
+  bool hasDynamicVariable() const;
 
-  const Acts::Vector3& getTopStripVector(std::size_t idx) const {
-    return m_topStripVector[idx];
-  }
+  const Acts::Vector3& topStripVector(const std::size_t idx) const;
+  const Acts::Vector3& bottomStripVector(const std::size_t idx) const;
+  const Acts::Vector3& stripCenterDistance(const std::size_t idx) const;
+  const Acts::Vector3& topStripCenterPosition(const std::size_t idx) const;
 
-  const Acts::Vector3& getBottomStripVector(std::size_t idx) const {
-    return m_bottomStripVector[idx];
-  }
-
-  const Acts::Vector3& getStripCenterDistance(std::size_t idx) const {
-    return m_stripCenterDistance[idx];
-  }
-
-  const Acts::Vector3& getTopStripCenterPosition(std::size_t idx) const {
-    return m_topStripCenterPosition[idx];
-  }
-
-  void setTopStripVector(std::size_t idx, const Acts::Vector3& value) {
-    m_topStripVector[idx] = value;
-  }
-
-  void setBottomStripVector(std::size_t idx, const Acts::Vector3& value) {
-    m_bottomStripVector[idx] = value;
-  }
-
-  void setStripCenterDistance(std::size_t idx, const Acts::Vector3& value) {
-    m_stripCenterDistance[idx] = value;
-  }
-
-  void setTopStripCenterPosition(std::size_t idx, const Acts::Vector3& value) {
-    m_topStripCenterPosition[idx] = value;
-  }
+  void setTopStripVector(const std::size_t idx, const Acts::Vector3& value);
+  void setBottomStripVector(const std::size_t idx, const Acts::Vector3& value);
+  void setStripCenterDistance(const std::size_t idx,
+                              const Acts::Vector3& value);
+  void setTopStripCenterPosition(const std::size_t idx,
+                                 const Acts::Vector3& value);
 
  private:
-  /// Mutable variables
-  std::vector<float> m_quality{};
-  std::vector<float> m_deltaR{};
+  /// base variables
+  std::vector<float> m_x{};
+  std::vector<float> m_y{};
+  std::vector<float> m_z{};
+  std::vector<float> m_radius{};
+  std::vector<float> m_phi{};
+  std::vector<float> m_varianceR{};
+  std::vector<float> m_varianceZ{};
 
   /// dynamic variables
   std::vector<Acts::Vector3> m_topStripVector{};
@@ -99,47 +96,6 @@ class SpacePointData {
   std::vector<Acts::Vector3> m_topStripCenterPosition{};
 };
 
-inline float SpacePointData::quality(std::size_t idx) const {
-  return m_quality[idx];
-}
-
-inline float SpacePointData::deltaR(std::size_t idx) const {
-  return m_deltaR[idx];
-}
-
-inline void SpacePointData::setQuality(std::size_t idx, const float value) {
-  if (value > m_quality[idx]) {
-    m_quality[idx] = value;
-  }
-}
-
-inline void SpacePointData::setDeltaR(std::size_t idx, const float value) {
-  m_deltaR[idx] = value;
-}
-
-inline void SpacePointData::resize(std::size_t n, bool resizeDynamic) {
-  clear();
-
-  m_quality.resize(n, -std::numeric_limits<float>::infinity());
-  m_deltaR.resize(n, 0.);
-
-  if (resizeDynamic) {
-    m_topStripVector.resize(n, {0, 0, 0});
-    m_bottomStripVector.resize(n, {0, 0, 0});
-    m_stripCenterDistance.resize(n, {0, 0, 0});
-    m_topStripCenterPosition.resize(n, {0, 0, 0});
-  }
-}
-
-inline void SpacePointData::clear() {
-  // mutable variables
-  m_quality.clear();
-  m_deltaR.clear();
-  // dynamicvariables
-  m_topStripVector.clear();
-  m_bottomStripVector.clear();
-  m_stripCenterDistance.clear();
-  m_topStripCenterPosition.clear();
-}
-
 }  // namespace Acts
+
+#include "Acts/EventData/SpacePointData.ipp"
diff --git a/Core/include/Acts/EventData/SpacePointData.ipp b/Core/include/Acts/EventData/SpacePointData.ipp
new file mode 100644
index 00000000000..1f5bd6c9534
--- /dev/null
+++ b/Core/include/Acts/EventData/SpacePointData.ipp
@@ -0,0 +1,172 @@
+// This file is part of the ACTS project.
+//
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
+//
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
+
+#include <iostream>
+
+namespace Acts {
+
+inline float SpacePointData::x(const std::size_t idx) const {
+  assert(idx < m_x.size());
+  return m_x[idx];
+}
+
+inline float SpacePointData::y(const std::size_t idx) const {
+  assert(idx < m_y.size());
+  return m_y[idx];
+}
+
+inline float SpacePointData::z(const std::size_t idx) const {
+  assert(idx < m_z.size());
+  return m_z[idx];
+}
+
+inline float SpacePointData::radius(const std::size_t idx) const {
+  assert(idx < m_radius.size());
+  return m_radius[idx];
+}
+
+inline float SpacePointData::phi(const std::size_t idx) const {
+  assert(idx < m_phi.size());
+  return m_phi[idx];
+}
+
+inline float SpacePointData::varianceZ(const std::size_t idx) const {
+  assert(idx < m_varianceZ.size());
+  return m_varianceZ[idx];
+}
+
+inline float SpacePointData::varianceR(const std::size_t idx) const {
+  assert(idx < m_varianceR.size());
+  return m_varianceR[idx];
+}
+
+inline void SpacePointData::setX(const std::size_t idx, const float value) {
+  assert(idx < m_x.size());
+  m_x[idx] = value;
+}
+
+inline void SpacePointData::setY(const std::size_t idx, const float value) {
+  assert(idx < m_y.size());
+  m_y[idx] = value;
+}
+
+inline void SpacePointData::setZ(const std::size_t idx, const float value) {
+  assert(idx < m_z.size());
+  m_z[idx] = value;
+}
+
+inline void SpacePointData::setRadius(const std::size_t idx,
+                                      const float value) {
+  assert(idx < m_radius.size());
+  m_radius[idx] = value;
+}
+
+inline void SpacePointData::setPhi(const std::size_t idx, const float value) {
+  assert(idx < m_phi.size());
+  m_phi[idx] = value;
+}
+
+inline void SpacePointData::setVarianceZ(const std::size_t idx,
+                                         const float value) {
+  assert(idx < m_varianceZ.size());
+  m_varianceZ[idx] = value;
+}
+
+inline void SpacePointData::setVarianceR(const std::size_t idx,
+                                         const float value) {
+  assert(idx < m_varianceR.size());
+  m_varianceR[idx] = value;
+}
+
+inline bool SpacePointData::hasDynamicVariable() const {
+  return !m_topStripVector.empty();
+}
+
+inline const Acts::Vector3& SpacePointData::topStripVector(
+    const std::size_t idx) const {
+  assert(idx < m_topStripVector.size());
+  return m_topStripVector[idx];
+}
+
+inline const Acts::Vector3& SpacePointData::bottomStripVector(
+    const std::size_t idx) const {
+  assert(idx < m_bottomStripVector.size());
+  return m_bottomStripVector[idx];
+}
+
+inline const Acts::Vector3& SpacePointData::stripCenterDistance(
+    const std::size_t idx) const {
+  assert(idx < m_stripCenterDistance.size());
+  return m_stripCenterDistance[idx];
+}
+
+inline const Acts::Vector3& SpacePointData::topStripCenterPosition(
+    const std::size_t idx) const {
+  assert(idx < m_topStripCenterPosition.size());
+  return m_topStripCenterPosition[idx];
+}
+
+inline void SpacePointData::setTopStripVector(const std::size_t idx,
+                                              const Acts::Vector3& value) {
+  assert(idx < m_topStripVector.size());
+  m_topStripVector[idx] = value;
+}
+
+inline void SpacePointData::setBottomStripVector(const std::size_t idx,
+                                                 const Acts::Vector3& value) {
+  assert(idx < m_bottomStripVector.size());
+  m_bottomStripVector[idx] = value;
+}
+
+inline void SpacePointData::setStripCenterDistance(const std::size_t idx,
+                                                   const Acts::Vector3& value) {
+  assert(idx < m_stripCenterDistance.size());
+  m_stripCenterDistance[idx] = value;
+}
+
+inline void SpacePointData::setTopStripCenterPosition(
+    const std::size_t idx, const Acts::Vector3& value) {
+  assert(idx < m_topStripCenterPosition.size());
+  m_topStripCenterPosition[idx] = value;
+}
+
+inline void SpacePointData::resize(const std::size_t n, bool resizeDynamic) {
+  clear();
+
+  m_x.resize(n, 0.f);
+  m_y.resize(n, 0.f);
+  m_z.resize(n, 0.f);
+  m_radius.resize(n, 0.f);
+  m_phi.resize(n, 0.f);
+  m_varianceZ.resize(n, 0.f);
+  m_varianceR.resize(n, 0.f);
+
+  if (resizeDynamic) {
+    m_topStripVector.resize(n, {0, 0, 0});
+    m_bottomStripVector.resize(n, {0, 0, 0});
+    m_stripCenterDistance.resize(n, {0, 0, 0});
+    m_topStripCenterPosition.resize(n, {0, 0, 0});
+  }
+}
+
+inline void SpacePointData::clear() {
+  m_x.clear();
+  m_y.clear();
+  m_z.clear();
+  m_radius.clear();
+  m_phi.clear();
+  m_varianceZ.clear();
+  m_varianceR.clear();
+  // dynamic variables
+  m_topStripVector.clear();
+  m_bottomStripVector.clear();
+  m_stripCenterDistance.clear();
+  m_topStripCenterPosition.clear();
+}
+
+}  // namespace Acts
diff --git a/Core/include/Acts/EventData/SpacePointMutableData.hpp b/Core/include/Acts/EventData/SpacePointMutableData.hpp
new file mode 100644
index 00000000000..baeb5829b3d
--- /dev/null
+++ b/Core/include/Acts/EventData/SpacePointMutableData.hpp
@@ -0,0 +1,66 @@
+// This file is part of the ACTS project.
+//
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
+//
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
+
+#pragma once
+
+#include "Acts/Definitions/Algebra.hpp"
+#include "Acts/Utilities/HashedString.hpp"
+
+#include <any>
+#include <limits>
+#include <vector>
+
+namespace Acts {
+
+/// @class SpacePointMutableData
+/// This class contains mutable data associated to the
+/// external space points provided by the customers
+/// These variables are used mainly internally by the seeding algorithm, that
+/// reads and updates them for seed selection purposes.
+/// The quality is also accessed after the seeding for an additional selection
+/// round on the candidates
+class SpacePointMutableData {
+ public:
+  /// @brief Default constructor
+  SpacePointMutableData() = default;
+
+  /// No copies
+  SpacePointMutableData(const SpacePointMutableData& other) = delete;
+  SpacePointMutableData& operator=(const SpacePointMutableData& other) = delete;
+
+  /// @brief Move operations
+  SpacePointMutableData(SpacePointMutableData&& other) noexcept = default;
+  SpacePointMutableData& operator=(SpacePointMutableData&& other) noexcept =
+      default;
+
+  /// @brief Destructor
+  ~SpacePointMutableData() = default;
+
+  /// @brief Getters
+  float quality(const std::size_t idx) const;
+  float deltaR(const std::size_t idx) const;
+
+  /// @brief Setters
+  void setQuality(const std::size_t idx, const float value);
+  void setDeltaR(const std::size_t idx, const float value);
+
+  /// @brief Resize vectors
+  void resize(const std::size_t n);
+
+  /// @brief clear vectors
+  void clear();
+
+ private:
+  /// Variables
+  std::vector<float> m_quality{};
+  std::vector<float> m_deltaR{};
+};
+
+}  // namespace Acts
+
+#include "Acts/EventData/SpacePointMutableData.ipp"
diff --git a/Core/include/Acts/EventData/SpacePointMutableData.ipp b/Core/include/Acts/EventData/SpacePointMutableData.ipp
new file mode 100644
index 00000000000..c846c535c6d
--- /dev/null
+++ b/Core/include/Acts/EventData/SpacePointMutableData.ipp
@@ -0,0 +1,48 @@
+// This file is part of the ACTS project.
+//
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
+//
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
+
+#include <iostream>
+
+namespace Acts {
+
+inline float SpacePointMutableData::quality(const std::size_t idx) const {
+  assert(idx < m_quality.size());
+  return m_quality[idx];
+}
+
+inline float SpacePointMutableData::deltaR(const std::size_t idx) const {
+  assert(idx < m_deltaR.size());
+  return m_deltaR[idx];
+}
+
+inline void SpacePointMutableData::setQuality(const std::size_t idx,
+                                              const float value) {
+  assert(idx < m_quality.size());
+  if (value > m_quality[idx]) {
+    m_quality[idx] = value;
+  }
+}
+
+inline void SpacePointMutableData::setDeltaR(const std::size_t idx,
+                                             const float value) {
+  assert(idx < m_deltaR.size());
+  m_deltaR[idx] = value;
+}
+
+inline void SpacePointMutableData::resize(const std::size_t n) {
+  clear();
+  m_quality.resize(n, -std::numeric_limits<float>::infinity());
+  m_deltaR.resize(n, 0.f);
+}
+
+inline void SpacePointMutableData::clear() {
+  m_quality.clear();
+  m_deltaR.clear();
+}
+
+}  // namespace Acts
diff --git a/Core/include/Acts/EventData/SpacePointProxy.hpp b/Core/include/Acts/EventData/SpacePointProxy.hpp
new file mode 100644
index 00000000000..757fedd7b83
--- /dev/null
+++ b/Core/include/Acts/EventData/SpacePointProxy.hpp
@@ -0,0 +1,58 @@
+// This file is part of the ACTS project.
+//
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
+//
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
+
+#pragma once
+
+#include "Acts/Definitions/Algebra.hpp"
+#include "Acts/Utilities/HashedString.hpp"
+#include "Acts/Utilities/Holders.hpp"
+
+#include <any>
+#include <iostream>
+#include <string_view>
+#include <type_traits>
+
+namespace Acts {
+
+template <typename container_t>
+class SpacePointProxy {
+ public:
+  using ContainerType = container_t;
+  using ValueType = typename ContainerType::ValueType;
+
+  // Never take the ownership of the container
+  SpacePointProxy(container_t&& container, std::size_t index) = delete;
+  // Only get the reference
+  SpacePointProxy(const container_t& container, std::size_t index);
+
+  const ValueType& externalSpacePoint() const;
+  std::size_t index() const;
+
+  float x() const;
+  float y() const;
+  float z() const;
+  float phi() const;
+  float radius() const;
+  float varianceR() const;
+  float varianceZ() const;
+
+  const Acts::Vector3& topStripVector() const;
+  const Acts::Vector3& bottomStripVector() const;
+  const Acts::Vector3& stripCenterDistance() const;
+  const Acts::Vector3& topStripCenterPosition() const;
+
+ private:
+  const container_t& container() const;
+
+  const container_t* m_container{nullptr};
+  std::size_t m_index{0ul};
+};
+
+}  // namespace Acts
+
+#include "Acts/EventData/SpacePointProxy.ipp"
diff --git a/Core/include/Acts/EventData/SpacePointProxy.ipp b/Core/include/Acts/EventData/SpacePointProxy.ipp
new file mode 100644
index 00000000000..fe3b9e0e824
--- /dev/null
+++ b/Core/include/Acts/EventData/SpacePointProxy.ipp
@@ -0,0 +1,89 @@
+// This file is part of the ACTS project.
+//
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
+//
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
+
+namespace Acts {
+
+// Implementation
+template <typename container_t>
+SpacePointProxy<container_t>::SpacePointProxy(const container_t& container,
+                                              std::size_t index)
+    : m_container(&container), m_index(index) {}
+
+template <typename container_t>
+const typename SpacePointProxy<container_t>::ValueType&
+SpacePointProxy<container_t>::externalSpacePoint() const {
+  return container().sp(m_index);
+}
+
+template <typename container_t>
+std::size_t SpacePointProxy<container_t>::index() const {
+  return m_index;
+}
+
+template <typename container_t>
+float SpacePointProxy<container_t>::x() const {
+  return container().x(m_index);
+}
+
+template <typename container_t>
+float SpacePointProxy<container_t>::y() const {
+  return container().y(m_index);
+}
+
+template <typename container_t>
+float SpacePointProxy<container_t>::z() const {
+  return container().z(m_index);
+}
+
+template <typename container_t>
+float SpacePointProxy<container_t>::phi() const {
+  return container().phi(m_index);
+}
+
+template <typename container_t>
+float SpacePointProxy<container_t>::radius() const {
+  return container().radius(m_index);
+}
+
+template <typename container_t>
+float SpacePointProxy<container_t>::varianceR() const {
+  return container().varianceR(m_index);
+}
+
+template <typename container_t>
+float SpacePointProxy<container_t>::varianceZ() const {
+  return container().varianceZ(m_index);
+}
+
+template <typename container_t>
+const Acts::Vector3& SpacePointProxy<container_t>::topStripVector() const {
+  return container().topStripVector(m_index);
+}
+
+template <typename container_t>
+const Acts::Vector3& SpacePointProxy<container_t>::bottomStripVector() const {
+  return container().bottomStripVector(m_index);
+}
+
+template <typename container_t>
+const Acts::Vector3& SpacePointProxy<container_t>::stripCenterDistance() const {
+  return container().stripCenterDistance(m_index);
+}
+
+template <typename container_t>
+const Acts::Vector3& SpacePointProxy<container_t>::topStripCenterPosition()
+    const {
+  return container().topStripCenterPosition(m_index);
+}
+
+template <typename container_t>
+const container_t& SpacePointProxy<container_t>::container() const {
+  return *m_container;
+}
+
+}  // namespace Acts
diff --git a/Core/include/Acts/EventData/SubspaceHelpers.hpp b/Core/include/Acts/EventData/SubspaceHelpers.hpp
new file mode 100644
index 00000000000..029dbf372b3
--- /dev/null
+++ b/Core/include/Acts/EventData/SubspaceHelpers.hpp
@@ -0,0 +1,360 @@
+// This file is part of the ACTS project.
+//
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
+//
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
+
+#pragma once
+
+#include "Acts/Definitions/Algebra.hpp"
+#include "Acts/Definitions/TrackParametrization.hpp"
+#include "Acts/EventData/Types.hpp"
+#include "Acts/Utilities/AlgebraHelpers.hpp"
+#include "Acts/Utilities/Enumerate.hpp"
+
+#include <bitset>
+#include <span>
+
+#include <boost/container/static_vector.hpp>
+
+namespace Acts {
+
+/// @brief Check subspace indices for consistency
+///
+/// Indices must be unique and within the full size of the subspace
+///
+/// @tparam Container type of the container
+///
+/// @param container the container of indices
+/// @param fullSize the full size of the subspace
+/// @param subspaceSize the size of the subspace
+///
+/// @return true if the indices are consistent
+template <typename Container>
+inline static bool checkSubspaceIndices(const Container& container,
+                                        std::size_t fullSize,
+                                        std::size_t subspaceSize) {
+  if (subspaceSize > fullSize) {
+    return false;
+  }
+  if (static_cast<std::size_t>(container.size()) != subspaceSize) {
+    return false;
+  }
+  for (auto it = container.begin(); it != container.end();) {
+    auto index = *it;
+    if (index >= fullSize) {
+      return false;
+    }
+    ++it;
+    if (std::find(it, container.end(), index) != container.end()) {
+      return false;
+    }
+  }
+  return true;
+}
+
+/// Serialize subspace indices to a single 64 bit integer
+///
+/// @tparam FullSize the full size of the subspace
+///
+/// @param indices the subspace indices
+///
+/// @return the serialized subspace indices
+template <std::size_t FullSize>
+inline static SerializedSubspaceIndices serializeSubspaceIndices(
+    const SubspaceIndices<FullSize>& indices)
+  requires(FullSize <= 8)
+{
+  SerializedSubspaceIndices result = 0;
+  for (std::size_t i = 0; i < FullSize; ++i) {
+    result |= static_cast<SerializedSubspaceIndices>(indices[i]) << (i * 8);
+  }
+  return result;
+}
+
+/// Deserialize subspace indices from a single 64 bit integer
+///
+/// @tparam FullSize the full size of the subspace
+///
+/// @param serialized the serialized subspace indices
+///
+/// @return the subspace indices
+template <std::size_t FullSize>
+inline static SubspaceIndices<FullSize> deserializeSubspaceIndices(
+    SerializedSubspaceIndices serialized)
+  requires(FullSize <= 8)
+{
+  SubspaceIndices<FullSize> result;
+  for (std::size_t i = 0; i < FullSize; ++i) {
+    result[i] = static_cast<std::uint8_t>(serialized >> (i * 8));
+  }
+  return result;
+}
+
+namespace detail {
+
+/// Helper base class for subspace operations which provides common
+/// functionality for fixed and variable subspace helpers
+///
+/// @tparam Derived the derived type
+/// @tparam FullSize the full size of the subspace
+template <typename Derived, std::size_t FullSize>
+class SubspaceHelperBase {
+ public:
+  static constexpr std::size_t kFullSize = FullSize;
+
+  using FullSquareMatrix = ActsSquareMatrix<kFullSize>;
+
+  bool empty() const { return self().empty(); }
+  std::size_t size() const { return self().size(); }
+
+  auto operator[](std::size_t i) const { return self()[i]; }
+
+  auto begin() const { return self().begin(); }
+  auto end() const { return self().end(); }
+
+  bool contains(std::uint8_t index) const {
+    return std::find(begin(), end(), index) != end();
+  }
+  std::size_t indexOf(std::uint8_t index) const {
+    auto it = std::find(begin(), end(), index);
+    return it != end() ? std::distance(begin(), it) : kFullSize;
+  }
+
+  template <typename EigenDerived>
+  ActsVector<kFullSize> expandVector(
+      const Eigen::DenseBase<EigenDerived>& vector) const {
+    ActsVector<kFullSize> result = ActsVector<kFullSize>::Zero();
+    for (auto [i, index] : enumerate(*this)) {
+      result(index) = vector(i);
+    }
+    return result;
+  }
+
+  template <typename EigenDerived>
+  FullSquareMatrix expandMatrix(
+      const Eigen::DenseBase<EigenDerived>& matrix) const {
+    FullSquareMatrix result = FullSquareMatrix::Zero();
+    for (auto [i, indexI] : enumerate(*this)) {
+      for (auto [j, indexJ] : enumerate(*this)) {
+        result(indexI, indexJ) = matrix(i, j);
+      }
+    }
+    return result;
+  }
+
+  FullSquareMatrix fullProjector() const {
+    FullSquareMatrix result = FullSquareMatrix::Zero();
+    for (auto [i, index] : enumerate(*this)) {
+      result(i, index) = 1;
+    }
+    return result;
+  }
+
+  FullSquareMatrix fullExpander() const {
+    FullSquareMatrix result = FullSquareMatrix::Zero();
+    for (auto [i, index] : enumerate(*this)) {
+      result(index, i) = 1;
+    }
+    return result;
+  }
+
+  ProjectorBitset projectorBitset() const
+    requires(kFullSize <= 8)
+  {
+    return matrixToBitset(fullProjector()).to_ullong();
+  }
+
+ private:
+  const Derived& self() const { return static_cast<const Derived&>(*this); }
+};
+
+}  // namespace detail
+
+/// Helper class for variable subspace operations
+///
+/// @tparam FullSize the full size of the subspace
+/// @tparam index_t the index type
+template <std::size_t FullSize, typename index_t = std::uint8_t>
+class VariableSubspaceHelper
+    : public detail::SubspaceHelperBase<
+          VariableSubspaceHelper<FullSize, index_t>, FullSize> {
+ public:
+  static constexpr std::size_t kFullSize = FullSize;
+
+  using IndexType = index_t;
+  using Container = boost::container::static_vector<IndexType, FullSize>;
+
+  template <typename OtherContainer>
+  explicit VariableSubspaceHelper(const OtherContainer& indices) {
+    assert(checkSubspaceIndices(indices, kFullSize, indices.size()) &&
+           "Invalid indices");
+    m_indices.resize(indices.size());
+    std::transform(indices.begin(), indices.end(), m_indices.begin(),
+                   [](auto index) { return static_cast<IndexType>(index); });
+  }
+
+  bool empty() const { return m_indices.empty(); }
+  std::size_t size() const { return m_indices.size(); }
+  const Container& indices() const { return m_indices; }
+
+  IndexType operator[](std::size_t i) const { return m_indices[i]; }
+
+  auto begin() const { return m_indices.begin(); }
+  auto end() const { return m_indices.end(); }
+
+ private:
+  Container m_indices;
+};
+
+/// Helper class for fixed subspace operations
+///
+/// @tparam FullSize the full size of the subspace
+/// @tparam SubspaceSize the size of the subspace
+/// @tparam index_t the index type
+template <std::size_t FullSize, std::size_t SubspaceSize,
+          typename index_t = std::uint8_t>
+class FixedSubspaceHelper
+    : public detail::SubspaceHelperBase<
+          FixedSubspaceHelper<FullSize, SubspaceSize, index_t>, FullSize> {
+ public:
+  static constexpr std::size_t kFullSize = FullSize;
+  static constexpr std::size_t kSubspaceSize = SubspaceSize;
+  static_assert(kSubspaceSize <= kFullSize, "Invalid subspace size");
+
+  using Projector = ActsMatrix<kSubspaceSize, kFullSize>;
+  using Expander = ActsMatrix<kFullSize, kSubspaceSize>;
+  using Vector = ActsVector<kSubspaceSize>;
+  using SquareMatrix = ActsSquareMatrix<kSubspaceSize>;
+  template <std::size_t K>
+  using ApplyLeftResult = ActsMatrix<kSubspaceSize, kSubspaceSize>;
+  template <std::size_t N>
+  using ApplyRightResult = ActsMatrix<kSubspaceSize, kSubspaceSize>;
+
+  using IndexType = index_t;
+  using Container = std::array<IndexType, kSubspaceSize>;
+
+  template <typename OtherContainer>
+  explicit FixedSubspaceHelper(const OtherContainer& indices) {
+    assert(checkSubspaceIndices(indices, kFullSize, kSubspaceSize) &&
+           "Invalid indices");
+    std::transform(indices.begin(), indices.end(), m_indices.begin(),
+                   [](auto index) { return static_cast<IndexType>(index); });
+  }
+
+  bool empty() const { return m_indices.empty(); }
+  std::size_t size() const { return m_indices.size(); }
+  const Container& indices() const { return m_indices; }
+
+  IndexType operator[](std::uint32_t i) const { return m_indices[i]; }
+
+  auto begin() const { return m_indices.begin(); }
+  auto end() const { return m_indices.end(); }
+
+  Projector projector() const {
+    Projector result = Projector::Zero();
+    for (auto [i, index] : enumerate(*this)) {
+      result(i, index) = 1;
+    }
+    return result;
+  }
+
+  Expander expander() const {
+    Expander result = Expander::Zero();
+    for (auto [i, index] : enumerate(*this)) {
+      result(index, i) = 1;
+    }
+    return result;
+  }
+
+  template <std::size_t K, typename Derived>
+  ApplyLeftResult<K> applyLeftOf(
+      const Eigen::DenseBase<Derived>& matrix) const {
+    assert(matrix.rows() == kFullSize && "Invalid matrix size");
+    ApplyLeftResult<K> result = ApplyLeftResult<K>::Zero();
+    for (auto [i, indexI] : enumerate(*this)) {
+      for (std::size_t j = 0; j < K; ++j) {
+        result(i, j) = matrix(indexI, j);
+      }
+    }
+    return result;
+  }
+
+  template <std::size_t N, typename Derived>
+  ApplyRightResult<N> applyRightOf(
+      const Eigen::DenseBase<Derived>& matrix) const {
+    assert(matrix.cols() == kSubspaceSize && "Invalid matrix size");
+    ApplyRightResult<N> result = ApplyRightResult<N>::Zero();
+    for (std::size_t i = 0; i < N; ++i) {
+      for (auto [j, indexJ] : enumerate(*this)) {
+        result(i, j) = matrix(i, indexJ);
+      }
+    }
+    return result;
+  }
+
+  template <typename Derived>
+  Vector projectVector(const Eigen::DenseBase<Derived>& fullVector) const {
+    assert(fullVector.size() == kFullSize && "Invalid full vector size");
+    Vector result = Vector::Zero();
+    for (auto [i, index] : enumerate(*this)) {
+      result(i) = fullVector(index);
+    }
+    return result;
+  }
+
+  template <typename Derived>
+  SquareMatrix projectMatrix(
+      const Eigen::DenseBase<Derived>& fullMatrix) const {
+    assert(fullMatrix.rows() == kFullSize && fullMatrix.cols() == kFullSize &&
+           "Invalid full matrix size");
+    SquareMatrix result = SquareMatrix::Zero();
+    for (auto [i, indexI] : enumerate(*this)) {
+      for (auto [j, indexJ] : enumerate(*this)) {
+        result(i, j) = fullMatrix(indexI, indexJ);
+      }
+    }
+    return result;
+  }
+
+ private:
+  Container m_indices{};
+};
+
+template <std::size_t SubspaceSize>
+using FixedBoundSubspaceHelper =
+    FixedSubspaceHelper<Acts::eBoundSize, SubspaceSize, std::uint8_t>;
+using VariableBoundSubspaceHelper =
+    VariableSubspaceHelper<Acts::eBoundSize, std::uint8_t>;
+
+/// Convert a projector to subspace indices
+///
+/// @tparam kFullSize the full size of the subspace
+/// @tparam Derived the derived type
+///
+/// @param projector the projector
+///
+/// @return the subspace indices
+template <std::size_t kFullSize, typename Derived>
+SubspaceIndices<kFullSize> projectorToSubspaceIndices(
+    const Eigen::DenseBase<Derived>& projector) {
+  auto rows = static_cast<std::size_t>(projector.rows());
+  auto cols = static_cast<std::size_t>(projector.cols());
+  assert(cols == kFullSize && rows <= kFullSize && "Invalid projector size");
+  SubspaceIndices<kFullSize> result;
+  result.fill(kFullSize);
+  for (std::size_t i = 0; i < rows; ++i) {
+    for (std::size_t j = 0; j < cols; ++j) {
+      assert((projector(i, j) == 0 || projector(i, j) == 1) &&
+             "Invalid projector value");
+      if (projector(i, j) == 1) {
+        result[i] = j;
+      }
+    }
+  }
+  return result;
+}
+
+}  // namespace Acts
diff --git a/Core/include/Acts/EventData/TrackContainer.hpp b/Core/include/Acts/EventData/TrackContainer.hpp
index 24702870bdb..f70c430f002 100644
--- a/Core/include/Acts/EventData/TrackContainer.hpp
+++ b/Core/include/Acts/EventData/TrackContainer.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2023-2024 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
@@ -19,6 +19,8 @@
 #include "Acts/EventData/Utils.hpp"
 #include "Acts/Utilities/HashedString.hpp"
 #include "Acts/Utilities/Holders.hpp"
+#include "Acts/Utilities/Iterator.hpp"
+#include "Acts/Utilities/TypeTraits.hpp"
 #include "Acts/Utilities/UnitVectors.hpp"
 
 #include <any>
@@ -78,6 +80,12 @@ class TrackContainer {
   using ConstTrackStateProxy =
       typename MultiTrajectory<traj_t>::ConstTrackStateProxy;
 
+  using size_type = IndexType;
+  using iterator =
+      Acts::ContainerIndexIterator<TrackContainer, TrackProxy, false>;
+  using const_iterator =
+      Acts::ContainerIndexIterator<TrackContainer, ConstTrackProxy, true>;
+
 #ifndef DOXYGEN
   friend TrackProxy;
   friend ConstTrackProxy;
@@ -148,6 +156,21 @@ class TrackContainer {
     return {*this, itrack};
   }
 
+  /// Get a const track proxy for a track index
+  /// @param itrack the track index in the container
+  /// @return A const track proxy for the index
+  ConstTrackProxy at(IndexType itrack) const { return getTrack(itrack); }
+
+  /// Get a mutable track proxy for a track index
+  /// @note Only available if the track container is not read-only
+  /// @param itrack the track index in the container
+  /// @return A mutable track proxy for the index
+  TrackProxy at(IndexType itrack)
+    requires(!ReadOnly)
+  {
+    return {*this, itrack};
+  }
+
   /// Add a track to the container. Note this only creates the logical track and
   /// allocates memory. You can combine this with @c getTrack to obtain a track proxy
   /// @note Only available if the track container is not read-only
@@ -184,36 +207,28 @@ class TrackContainer {
   /// Get a mutable iterator to the first track in the container
   /// @note Only available if the track container is not read-only
   /// @return a mutable iterator to the first track
-  auto begin()
+  iterator begin()
     requires(!ReadOnly)
   {
-    return detail_tc::TrackProxyIterator<std::decay_t<decltype(*this)>,
-                                         TrackProxy, false>{*this, 0};
+    return iterator{*this, 0};
   }
 
   /// Get a past-the-end iterator for this container
   /// @note Only available if the track container is not read-only
   /// @return a past-the-end iterator
-  auto end()
+  iterator end()
     requires(!ReadOnly)
   {
-    return detail_tc::TrackProxyIterator<std::decay_t<decltype(*this)>,
-                                         TrackProxy, false>{*this, size()};
+    return iterator{*this, size()};
   }
 
   /// Get an const iterator to the first track in the container
   /// @return a const iterator to the first track
-  auto begin() const {
-    return detail_tc::TrackProxyIterator<std::decay_t<decltype(*this)>,
-                                         ConstTrackProxy, true>{*this, 0};
-  }
+  const_iterator begin() const { return const_iterator{*this, 0}; }
 
   /// Get a past-the-end iterator for this container
   /// @return a past-the-end iterator
-  auto end() const {
-    return detail_tc::TrackProxyIterator<std::decay_t<decltype(*this)>,
-                                         ConstTrackProxy, true>{*this, size()};
-  }
+  const_iterator end() const { return const_iterator{*this, size()}; }
 
   /// @}
 
@@ -411,8 +426,8 @@ class TrackContainer {
     }
   }
 
-  detail_tc::ConstIf<holder_t<track_container_t>, ReadOnly> m_container;
-  detail_tc::ConstIf<holder_t<traj_t>, ReadOnly> m_traj;
+  const_if_t<ReadOnly, holder_t<track_container_t>> m_container;
+  const_if_t<ReadOnly, holder_t<traj_t>> m_traj;
 };
 
 template <TrackContainerBackend track_container_t, typename traj_t>
diff --git a/Core/include/Acts/EventData/TrackContainerBackendConcept.hpp b/Core/include/Acts/EventData/TrackContainerBackendConcept.hpp
index a66e27c36e2..bf9fb1e46f7 100644
--- a/Core/include/Acts/EventData/TrackContainerBackendConcept.hpp
+++ b/Core/include/Acts/EventData/TrackContainerBackendConcept.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2023 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
diff --git a/Core/include/Acts/EventData/TrackContainerFrontendConcept.hpp b/Core/include/Acts/EventData/TrackContainerFrontendConcept.hpp
new file mode 100644
index 00000000000..82b9579b010
--- /dev/null
+++ b/Core/include/Acts/EventData/TrackContainerFrontendConcept.hpp
@@ -0,0 +1,33 @@
+// This file is part of the ACTS project.
+//
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
+//
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
+
+#pragma once
+
+#include "Acts/EventData/TrackContainerBackendConcept.hpp"
+#include "Acts/EventData/Types.hpp"
+
+#include <concepts>
+
+namespace Acts {
+
+template <typename T>
+concept TrackContainerFrontend = requires() {
+  { T::ReadOnly } -> std::same_as<const bool &>;
+
+  requires std::same_as<typename T::IndexType, TrackIndexType>;
+
+  requires TrackContainerBackend<typename T::TrackContainerBackend>;
+  requires CommonMultiTrajectoryBackend<typename T::TrackStateContainerBackend>;
+
+  typename T::TrackProxy;
+  typename T::ConstTrackProxy;
+  typename T::TrackStateProxy;
+  typename T::ConstTrackStateProxy;
+};
+
+}  // namespace Acts
diff --git a/Core/include/Acts/EventData/TrackHelpers.hpp b/Core/include/Acts/EventData/TrackHelpers.hpp
deleted file mode 100644
index f51e5428af0..00000000000
--- a/Core/include/Acts/EventData/TrackHelpers.hpp
+++ /dev/null
@@ -1,27 +0,0 @@
-// This file is part of the Acts project.
-//
-// Copyright (C) 2023-2024 CERN for the benefit of the Acts project
-//
-// This Source Code Form is subject to the terms of the Mozilla Public
-// License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-#pragma once
-
-// This header is deprecated and will be removed in the future.
-// Please use the new header instead:
-#include "Acts/Utilities/TrackHelpers.hpp"
-
-namespace Acts {
-
-// Funny header deprecation strategy
-namespace {
-[[deprecated(
-    "This header is deprecated - use "
-    "Acts/Utilities/TrackHelpers.hpp")]] constexpr static int
-    utilities_trackhelpers_hpp_is_deprecated = 0;
-constexpr static int please_dont_use_utilities_trackhelpers_hpp =
-    utilities_trackhelpers_hpp_is_deprecated;
-}  // namespace
-
-}  // namespace Acts
diff --git a/Core/include/Acts/EventData/TrackParameterHelpers.hpp b/Core/include/Acts/EventData/TrackParameterHelpers.hpp
new file mode 100644
index 00000000000..df40c934824
--- /dev/null
+++ b/Core/include/Acts/EventData/TrackParameterHelpers.hpp
@@ -0,0 +1,85 @@
+// This file is part of the ACTS project.
+//
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
+//
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
+
+#pragma once
+
+#include "Acts/Definitions/TrackParametrization.hpp"
+#include "Acts/Utilities/detail/periodic.hpp"
+
+#include <limits>
+
+namespace Acts {
+
+/// Check if a bound vector is valid. This checks the following:
+/// - All values are finite
+/// - (optionally) The phi value is in the range [-pi, pi)
+/// - (optionally) The theta value is in the range [0, pi]
+///
+/// @param v The bound vector to check
+/// @param validateAngleRange If true, the phi and theta values are range checked
+/// @param epsilon The epsilon to use for the checks
+/// @param maxAbsEta The maximum allowed eta value
+///
+/// @return True if the bound vector is valid
+bool isBoundVectorValid(
+    const BoundVector& v, bool validateAngleRange, double epsilon = 1e-6,
+    double maxAbsEta = std::numeric_limits<double>::infinity());
+
+/// Check if a free vector is valid. This checks the following:
+/// - All values are finite
+/// - Direction is normalized
+///
+/// @param v The free vector to check
+/// @param epsilon The epsilon to use for the checks
+/// @param maxAbsEta The maximum allowed eta value
+///
+/// @return True if the free vector is valid
+bool isFreeVectorValid(
+    const FreeVector& v, double epsilon = 1e-6,
+    double maxAbsEta = std::numeric_limits<double>::infinity());
+
+/// Normalize the bound parameter angles
+///
+/// @param boundParams The bound parameters to normalize
+///
+/// @return The normalized bound parameters
+inline BoundVector normalizeBoundParameters(const BoundVector& boundParams) {
+  BoundVector result = boundParams;
+  std::tie(result[eBoundPhi], result[eBoundTheta]) =
+      detail::normalizePhiTheta(result[eBoundPhi], result[eBoundTheta]);
+  return result;
+}
+
+/// Add bound parameters and take care of angle periodicity for phi and theta.
+/// This is intended for small differences only i.e. KF updates.
+///
+/// @param lhs The left hand side bound parameters
+/// @param rhs The right hand side bound parameters
+///
+/// @return The sum of the bound parameters
+inline BoundVector addBoundParameters(const BoundVector& lhs,
+                                      const BoundVector& rhs) {
+  return normalizeBoundParameters(lhs + rhs);
+}
+
+/// Subtract bound parameters and take care of angle periodicity for phi and
+/// theta. This is intended for small differences only i.e. KF updates.
+///
+/// @param lhs The left hand side bound parameters
+/// @param rhs The right hand side bound parameters
+///
+/// @return The difference of the bound parameters
+inline BoundVector subtractBoundParameters(const BoundVector& lhs,
+                                           const BoundVector& rhs) {
+  BoundVector result = lhs - rhs;
+  result[eBoundPhi] = detail::radian_sym(result[eBoundPhi]);
+  result[eBoundTheta] = detail::radian_sym(result[eBoundTheta]);
+  return result;
+}
+
+}  // namespace Acts
diff --git a/Core/include/Acts/EventData/TrackParameters.hpp b/Core/include/Acts/EventData/TrackParameters.hpp
index c8f388ef858..20797791688 100644
--- a/Core/include/Acts/EventData/TrackParameters.hpp
+++ b/Core/include/Acts/EventData/TrackParameters.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2016-2020 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
diff --git a/Core/include/Acts/EventData/TrackParametersConcept.hpp b/Core/include/Acts/EventData/TrackParametersConcept.hpp
index 02d99ec6270..5e4982545a4 100644
--- a/Core/include/Acts/EventData/TrackParametersConcept.hpp
+++ b/Core/include/Acts/EventData/TrackParametersConcept.hpp
@@ -1,175 +1,70 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2019-2020 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
 #include "Acts/Definitions/Algebra.hpp"
 #include "Acts/Definitions/TrackParametrization.hpp"
 #include "Acts/Geometry/GeometryContext.hpp"
-#include "Acts/Utilities/TypeTraits.hpp"
 
 #include <optional>
-#include <type_traits>
 
 namespace Acts {
 
 class Surface;
 
 namespace Concepts {
-
-// nested types that must be available
-template <typename T>
-using TypeScalar = typename T::Scalar;
-template <typename T>
-using TypeParametersVector = typename T::ParametersVector;
-template <typename T>
-using TypeCovarianceMatrix = typename T::CovarianceMatrix;
-
-template <typename T>
-using ReturnTypeParameters = decltype(std::declval<T>().parameters());
-template <typename T>
-using ReturnTypeCovariance = decltype(std::declval<T>().covariance());
-template <typename T>
-using ReturnTypeFourPositionFromContext =
-    decltype(std::declval<T>().fourPosition(std::declval<GeometryContext>()));
-template <typename T>
-using ReturnTypeFourPosition = decltype(std::declval<T>().fourPosition());
-template <typename T>
-using ReturnTypePositionFromContext =
-    decltype(std::declval<T>().position(std::declval<GeometryContext>()));
-template <typename T>
-using ReturnTypePosition = decltype(std::declval<T>().position());
-template <typename T>
-using ReturnTypeTime = decltype(std::declval<T>().time());
-template <typename T>
-using ReturnTypeDirection = decltype(std::declval<T>().direction());
-template <typename T>
-using ReturnTypeAbsoluteMomentum =
-    decltype(std::declval<T>().absoluteMomentum());
-template <typename T>
-using ReturnTypeCharge = decltype(std::declval<T>().charge());
-template <typename T>
-using ReturnTypeReferenceSurface =
-    decltype(std::declval<T>().referenceSurface());
-
-template <typename T>
-struct BoundTrackParametersConceptImpl {
-  // check for required nested types
-  constexpr static bool hasTypeScalar = exists<TypeScalar, const T>;
-  constexpr static bool hasTypeParametersVector =
-      exists<TypeParametersVector, const T>;
-  constexpr static bool hasTypeCovarianceMatrix =
-      exists<TypeCovarianceMatrix, const T>;
-
-  // check for required methods
-  constexpr static bool hasMethodParameters =
-      std::is_convertible_v<ReturnTypeParameters<T>, BoundVector>;
-  constexpr static bool hasMethodCovariance =
-      std::is_convertible_v<ReturnTypeCovariance<T>,
-                            std::optional<BoundSquareMatrix>>;
-  constexpr static bool hasMethodFourPositionFromContext =
-      identical_to<Vector4, ReturnTypeFourPositionFromContext, const T>;
-  constexpr static bool hasMethodPositionFromContext =
-      identical_to<Vector3, ReturnTypePositionFromContext, const T>;
-  constexpr static bool hasMethodTime =
-      identical_to<TypeScalar<T>, ReturnTypeTime, const T>;
-  constexpr static bool hasMethodDirection =
-      identical_to<Vector3, ReturnTypeDirection, const T>;
-  constexpr static bool hasMethodAbsoluteMomentum =
-      identical_to<TypeScalar<T>, ReturnTypeAbsoluteMomentum, const T>;
-  constexpr static bool hasMethodCharge =
-      identical_to<TypeScalar<T>, ReturnTypeCharge, const T>;
-  constexpr static bool hasMethodReferenceSurface =
-      identical_to<const Surface&, ReturnTypeReferenceSurface, const T>;
-
-  // provide meaningful error messages in case of non-compliance
-  static_assert(hasTypeScalar, "Scalar type is missing");
-  static_assert(hasTypeParametersVector, "Parameters vector type is missing");
-  static_assert(hasTypeCovarianceMatrix, "Covariance matrix type is missing");
-  static_assert(hasMethodParameters, "Missing or invalid 'parameters' method");
-  static_assert(hasMethodCovariance, "Missing or invalid 'covariance' method");
-  static_assert(hasMethodFourPositionFromContext,
-                "Missing or invalid 'fourPosition' method");
-  static_assert(hasMethodPositionFromContext,
-                "Missing or invalid 'position' method");
-  static_assert(hasMethodTime, "Missing or invalid 'time' method");
-  static_assert(hasMethodDirection, "Missing or invalid 'direction' method");
-  static_assert(hasMethodAbsoluteMomentum,
-                "Missing or invalid 'absoluteMomentum' method");
-  static_assert(hasMethodCharge, "Missing or invalid 'charge' method");
-  static_assert(hasMethodReferenceSurface,
-                "Missing or invalid 'referenceSurface' method");
-
-  constexpr static bool value =
-      require<hasTypeScalar, hasTypeParametersVector, hasTypeCovarianceMatrix,
-              hasMethodParameters, hasMethodCovariance,
-              hasMethodFourPositionFromContext, hasMethodPositionFromContext,
-              hasMethodTime, hasMethodDirection, hasMethodAbsoluteMomentum,
-              hasMethodCharge, hasMethodReferenceSurface>;
-};
-
-template <typename T>
-struct FreeTrackParametersConceptImpl {
-  // check for required nested types
-  constexpr static bool hasTypeScalar = exists<TypeScalar, const T>;
-  constexpr static bool hasTypeParametersVector =
-      exists<TypeParametersVector, const T>;
-  constexpr static bool hasTypeCovarianceMatrix =
-      exists<TypeCovarianceMatrix, const T>;
-
-  // check for required methods
-  constexpr static bool hasMethodParameters =
-      std::is_convertible_v<ReturnTypeParameters<T>, FreeVector>;
-  constexpr static bool hasMethodCovariance =
-      std::is_convertible_v<ReturnTypeCovariance<T>,
-                            std::optional<FreeSquareMatrix>>;
-  constexpr static bool hasMethodFourPosition =
-      identical_to<Vector4, ReturnTypeFourPosition, const T>;
-  constexpr static bool hasMethodPosition =
-      identical_to<Vector3, ReturnTypePosition, const T>;
-  constexpr static bool hasMethodTime =
-      identical_to<TypeScalar<T>, ReturnTypeTime, const T>;
-  constexpr static bool hasMethodDirection =
-      identical_to<Vector3, ReturnTypeDirection, const T>;
-  constexpr static bool hasMethodAbsoluteMomentum =
-      identical_to<TypeScalar<T>, ReturnTypeAbsoluteMomentum, const T>;
-  constexpr static bool hasMethodCharge =
-      identical_to<TypeScalar<T>, ReturnTypeCharge, const T>;
-
-  // provide meaningful error messages in case of non-compliance
-  static_assert(hasTypeScalar, "Scalar type is missing");
-  static_assert(hasTypeParametersVector, "Parameters vector type is missing");
-  static_assert(hasTypeCovarianceMatrix, "Covariance matrix type is missing");
-  static_assert(hasMethodParameters, "Missing or invalid 'parameters' method");
-  static_assert(hasMethodCovariance, "Missing or invalid 'covariance' method");
-  static_assert(hasMethodFourPosition,
-                "Missing or invalid 'fourPosition' method");
-  static_assert(hasMethodPosition, "Missing or invalid 'position' method");
-  static_assert(hasMethodTime, "Missing or invalid 'time' method");
-  static_assert(hasMethodDirection, "Missing or invalid 'direction' method");
-  static_assert(hasMethodAbsoluteMomentum,
-                "Missing or invalid 'absoluteMomentum' method");
-  static_assert(hasMethodCharge, "Missing or invalid 'charge' method");
-
-  constexpr static bool value =
-      require<hasTypeScalar, hasTypeParametersVector, hasTypeCovarianceMatrix,
-              hasMethodParameters, hasMethodCovariance, hasMethodFourPosition,
-              hasMethodPosition, hasMethodTime, hasMethodDirection,
-              hasMethodAbsoluteMomentum, hasMethodCharge>;
+template <typename Parameters>
+concept BasicTrackParameters = requires {
+  typename Parameters::Scalar;
+  typename Parameters::ParametersVector;
+  typename Parameters::CovarianceMatrix;
+
+  requires requires(const Parameters &p) {
+    { p.time() } -> std::floating_point;
+    { p.direction() } -> std::same_as<Vector3>;
+    { p.absoluteMomentum() } -> std::floating_point;
+    { p.charge() } -> std::floating_point;
+  };
 };
+}  // namespace Concepts
 
-template <typename parameters_t>
-constexpr bool BoundTrackParametersConcept =
-    BoundTrackParametersConceptImpl<parameters_t>::value;
-
-template <typename parameters_t>
-constexpr bool FreeTrackParametersConcept =
-    FreeTrackParametersConceptImpl<parameters_t>::value;
+/// @brief Concept that asserts that a given type meets the requirements to be
+/// considered free track parameters in Acts.
+template <typename Parameters>
+concept FreeTrackParametersConcept =
+    Concepts::BasicTrackParameters<Parameters> &&
+    requires(const Parameters &p) {
+      { p.parameters() } -> std::convertible_to<FreeVector>;
+      {
+        p.covariance()
+      } -> std::convertible_to<std::optional<FreeSquareMatrix>>;
+      { p.fourPosition() } -> std::same_as<Vector4>;
+      { p.position() } -> std::same_as<Vector3>;
+    };
+
+/// @brief Concept that asserts that a given type meets the requirements to be
+/// considered bound track parameters in Acts.
+template <typename Parameters>
+concept BoundTrackParametersConcept =
+    Concepts::BasicTrackParameters<Parameters> &&
+    requires(const Parameters &p) {
+      { p.parameters() } -> std::convertible_to<BoundVector>;
+      {
+        p.covariance()
+      } -> std::convertible_to<std::optional<BoundSquareMatrix>>;
+      { p.referenceSurface() } -> std::same_as<const Surface &>;
+
+      requires requires(GeometryContext &c) {
+        { p.position(c) } -> std::same_as<Vector3>;
+        { p.fourPosition(c) } -> std::same_as<Vector4>;
+        { p.position(c) } -> std::same_as<Vector3>;
+      };
+    };
 
-}  // namespace Concepts
 }  // namespace Acts
diff --git a/Core/include/Acts/EventData/TrackProxy.hpp b/Core/include/Acts/EventData/TrackProxy.hpp
index b60d6ca2a22..5939022e2e8 100644
--- a/Core/include/Acts/EventData/TrackProxy.hpp
+++ b/Core/include/Acts/EventData/TrackProxy.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2023 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
@@ -14,8 +14,10 @@
 #include "Acts/EventData/ParticleHypothesis.hpp"
 #include "Acts/EventData/TrackContainerBackendConcept.hpp"
 #include "Acts/EventData/TrackParameters.hpp"
+#include "Acts/EventData/TrackProxyConcept.hpp"
 #include "Acts/EventData/TrackStatePropMask.hpp"
 #include "Acts/Utilities/HashedString.hpp"
+#include "Acts/Utilities/TypeTraits.hpp"
 #include "Acts/Utilities/UnitVectors.hpp"
 
 #include <iterator>
@@ -28,124 +30,6 @@ template <TrackContainerBackend track_container_t,
           template <typename> class holder_t>
 class TrackContainer;
 
-namespace detail_tc {
-template <typename T, bool select>
-using ConstIf = std::conditional_t<select, const T, T>;
-
-/// Helper iterator to allow iteration over tracks via track proxies.
-template <typename container_t, typename proxy_t, bool ReadOnly>
-class TrackProxyIterator {
-  using ProxyType = proxy_t;
-  using IndexType = typename ProxyType::IndexType;
-  using ContainerType = container_t;
-
- public:
-  using iterator_category = std::random_access_iterator_tag;
-  using value_type = ProxyType;
-  using difference_type = std::ptrdiff_t;
-  using pointer = void;
-  using reference = void;
-
-  TrackProxyIterator(container_t& container, IndexType itrack)
-    requires(!ReadOnly)
-      : m_container(&container), m_itrack(itrack) {}
-
-  TrackProxyIterator(const container_t& container, IndexType itrack)
-    requires ReadOnly
-      : m_container(&container), m_itrack(itrack) {}
-
-  TrackProxyIterator& operator++() {
-    m_itrack++;
-    return *this;
-  }
-  TrackProxyIterator& operator--() {
-    m_itrack--;
-    return *this;
-  }
-
-  bool operator==(const TrackProxyIterator& other) const {
-    return m_container == other.m_container && m_itrack == other.m_itrack;
-  }
-
-  bool operator!=(const TrackProxyIterator& other) const {
-    return !(*this == other);
-  }
-
-  bool operator<(const TrackProxyIterator& other) const {
-    return m_itrack < other.m_itrack;
-  }
-
-  bool operator>(const TrackProxyIterator& other) const {
-    return m_itrack > other.m_itrack;
-  }
-
-  bool operator<=(const TrackProxyIterator& other) const {
-    return m_itrack <= other.m_itrack;
-  }
-
-  bool operator>=(const TrackProxyIterator& other) const {
-    return m_itrack >= other.m_itrack;
-  }
-
-  ProxyType operator*() const { return m_container->getTrack(m_itrack); }
-
-  ProxyType operator*()
-    requires(!ReadOnly)
-  {
-    return m_container->getTrack(m_itrack);
-  }
-
-  TrackProxyIterator operator[](difference_type n) const {
-    TrackProxyIterator copy = *this;
-    copy += n;
-    return copy;
-  };
-
-  TrackProxyIterator& operator+=(difference_type n) {
-    m_itrack += n;
-    return *this;
-  }
-
-  TrackProxyIterator operator-=(difference_type n) {
-    m_itrack -= n;
-    return *this;
-  }
-
-  friend difference_type operator-(const TrackProxyIterator& lhs,
-                                   const TrackProxyIterator& rhs) {
-    return lhs.m_itrack - rhs.m_itrack;
-  }
-
-  friend TrackProxyIterator operator+(const TrackProxyIterator& lhs,
-                                      difference_type rhs) {
-    TrackProxyIterator copy = lhs;
-    copy += rhs;
-    return copy;
-  }
-
-  friend TrackProxyIterator operator+(difference_type lhs,
-                                      const TrackProxyIterator& rhs) {
-    return rhs + lhs;
-  }
-
-  friend TrackProxyIterator operator-(const TrackProxyIterator& lhs,
-                                      difference_type rhs) {
-    return lhs + (-rhs);
-  }
-
-  friend TrackProxyIterator operator-(difference_type lhs,
-                                      const TrackProxyIterator& rhs) {
-    return rhs + (-lhs);
-  }
-
- private:
-  detail_lt::TransitiveConstPointer<ConstIf<ContainerType, ReadOnly>>
-      m_container;
-  IndexType m_itrack;
-};
-
-}  // namespace detail_tc
-
 /// Proxy class representing a single track.
 /// This class provides a **view** into an associated @ref TrackContainer, and
 /// has **reference semantics**. You can think of it as a pointer to a vector
@@ -440,7 +324,8 @@ class TrackProxy {
     return std::distance(tsRange.begin(), tsRange.end());
   }
 
-  /// Return the number of measurements for the track. Const version
+  /// Return a mutable reference to the number of measurements for the track.
+  /// Mutable version
   /// @note Only available if the track proxy is not read-only
   /// @return The number of measurements
   unsigned int& nMeasurements()
@@ -449,8 +334,7 @@ class TrackProxy {
     return component<unsigned int, hashString("nMeasurements")>();
   }
 
-  /// Return a mutable reference to the number of measurements for the track.
-  /// Mutable version
+  /// Return the number of measurements for the track. Const version
   /// @return The number of measurements
   unsigned int nMeasurements() const {
     return component<unsigned int, hashString("nMeasurements")>();
@@ -682,7 +566,7 @@ class TrackProxy {
   /// @tparam track_proxy_t the other track proxy's type
   /// @param other The track proxy
   /// @param copyTrackStates Copy the track state sequence from @p other
-  template <typename track_proxy_t>
+  template <TrackProxyConcept track_proxy_t>
   void copyFrom(const track_proxy_t& other, bool copyTrackStates = true)
     requires(!ReadOnly)
   {
@@ -710,6 +594,8 @@ class TrackProxy {
       setReferenceSurface(other.referenceSurface().getSharedPtr());
       parameters() = other.parameters();
       covariance() = other.covariance();
+    } else {
+      setReferenceSurface(nullptr);
     }
 
     nMeasurements() = other.nMeasurements();
@@ -889,13 +775,14 @@ class TrackProxy {
   const auto& container() const { return *m_container; }
 
  private:
-  TrackProxy(detail_tc::ConstIf<TrackContainer<Container, Trajectory, holder_t>,
-                                ReadOnly>& container,
-             IndexType itrack)
+  TrackProxy(
+      const_if_t<ReadOnly, TrackContainer<Container, Trajectory, holder_t>>&
+          container,
+      IndexType itrack)
       : m_container{&container}, m_index{itrack} {}
 
-  detail_lt::TransitiveConstPointer<detail_tc::ConstIf<
-      TrackContainer<Container, Trajectory, holder_t>, ReadOnly>>
+  detail_lt::TransitiveConstPointer<
+      const_if_t<ReadOnly, TrackContainer<Container, Trajectory, holder_t>>>
       m_container;
   IndexType m_index;
 };
diff --git a/Core/include/Acts/EventData/TrackProxyConcept.hpp b/Core/include/Acts/EventData/TrackProxyConcept.hpp
new file mode 100644
index 00000000000..b7058a3b590
--- /dev/null
+++ b/Core/include/Acts/EventData/TrackProxyConcept.hpp
@@ -0,0 +1,30 @@
+// This file is part of the ACTS project.
+//
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
+//
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
+
+#pragma once
+
+#include "Acts/EventData/MultiTrajectoryBackendConcept.hpp"
+#include "Acts/EventData/TrackContainerBackendConcept.hpp"
+#include "Acts/EventData/Types.hpp"
+
+#include <concepts>
+
+namespace Acts {
+
+template <typename T>
+concept TrackProxyConcept = requires() {
+  { T::ReadOnly } -> std::same_as<const bool &>;
+
+  requires TrackContainerBackend<typename T::Container>;
+
+  requires CommonMultiTrajectoryBackend<typename T::Trajectory>;
+
+  requires std::same_as<typename T::IndexType, TrackIndexType>;
+};
+
+}  // namespace Acts
diff --git a/Core/include/Acts/EventData/TrackStatePropMask.hpp b/Core/include/Acts/EventData/TrackStatePropMask.hpp
index 2bba7d6932c..305c8a98f73 100644
--- a/Core/include/Acts/EventData/TrackStatePropMask.hpp
+++ b/Core/include/Acts/EventData/TrackStatePropMask.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2019 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
diff --git a/Core/include/Acts/EventData/TrackStateProxy.hpp b/Core/include/Acts/EventData/TrackStateProxy.hpp
index 1e68994fad8..34de86cd3d7 100644
--- a/Core/include/Acts/EventData/TrackStateProxy.hpp
+++ b/Core/include/Acts/EventData/TrackStateProxy.hpp
@@ -1,16 +1,17 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2023 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
 #include "Acts/Definitions/Algebra.hpp"
 #include "Acts/Definitions/TrackParametrization.hpp"
 #include "Acts/EventData/SourceLink.hpp"
+#include "Acts/EventData/SubspaceHelpers.hpp"
 #include "Acts/EventData/TrackStatePropMask.hpp"
 #include "Acts/EventData/TrackStateProxyConcept.hpp"
 #include "Acts/EventData/TrackStateType.hpp"
@@ -21,6 +22,7 @@
 #include "Acts/Utilities/Helpers.hpp"
 
 #include <cstddef>
+#include <span>
 
 #include <Eigen/Core>
 
@@ -395,8 +397,9 @@ class TrackStateProxy {
   /// This overloaded is only enabled if not read-only, and returns a mutable
   /// reference.
   /// @return Mutable reference to the pathlength.
-  template <bool RO = ReadOnly, typename = std::enable_if_t<!RO>>
-  double& pathLength() {
+  double& pathLength()
+    requires(!ReadOnly)
+  {
     return component<double, hashString("pathLength")>();
   }
 
@@ -451,8 +454,9 @@ class TrackStateProxy {
         component<IndexType, hashString("predicted")>());
   }
 
-  template <bool RO = ReadOnly, typename = std::enable_if_t<!RO>>
-  Parameters predicted() {
+  Parameters predicted()
+    requires(!ReadOnly)
+  {
     assert(has<hashString("predicted")>());
     return m_traj->self().parameters(
         component<IndexType, hashString("predicted")>());
@@ -646,7 +650,8 @@ class TrackStateProxy {
   /// @param projector The projector in the form of a dense matrix
   /// @note @p projector is assumed to only have 0s or 1s as components.
   template <typename Derived>
-  void setProjector(const Eigen::MatrixBase<Derived>& projector)
+  [[deprecated("use setProjector(span) instead")]] void setProjector(
+      const Eigen::MatrixBase<Derived>& projector)
     requires(!ReadOnly)
   {
     constexpr int rows = Eigen::MatrixBase<Derived>::RowsAtCompileTime;
@@ -669,9 +674,8 @@ class TrackStateProxy {
     fullProjector.template topLeftCorner<rows, cols>() = projector;
 
     // convert to bitset before storing
-    auto projectorBitset = matrixToBitset(fullProjector);
-    component<ProjectorBitset, hashString("projector")>() =
-        projectorBitset.to_ullong();
+    ProjectorBitset projectorBitset = matrixToBitset(fullProjector).to_ulong();
+    setProjectorBitset(projectorBitset);
   }
 
   /// Directly get the projector bitset, a compressed form of a projection
@@ -680,9 +684,9 @@ class TrackStateProxy {
   ///       to another. Use the `projector` or `effectiveProjector` method if
   ///       you want to access the matrix.
   /// @return The projector bitset
-  ProjectorBitset projectorBitset() const {
-    assert(has<hashString("projector")>());
-    return component<ProjectorBitset, hashString("projector")>();
+  [[deprecated("use projector() instead")]] ProjectorBitset projectorBitset()
+      const {
+    return variableBoundSubspaceHelper().projectorBitset();
   }
 
   /// Set the projector bitset, a compressed form of a projection matrix
@@ -691,36 +695,84 @@ class TrackStateProxy {
   /// @note This is mainly to copy explicitly a projector from one state
   ///       to another. If you have a projection matrix, set it with
   ///       `setProjector`.
-  void setProjectorBitset(ProjectorBitset proj)
+  [[deprecated("use setProjector(span) instead")]] void setProjectorBitset(
+      ProjectorBitset proj)
     requires(!ReadOnly)
   {
+    BoundMatrix projMatrix = bitsetToMatrix<BoundMatrix>(proj);
+    BoundSubspaceIndices boundSubspace =
+        projectorToSubspaceIndices<eBoundSize>(projMatrix);
+    setBoundSubspaceIndices(boundSubspace);
+  }
+
+  BoundSubspaceIndices boundSubspaceIndices() const {
     assert(has<hashString("projector")>());
-    component<ProjectorBitset, hashString("projector")>() = proj;
+    return deserializeSubspaceIndices<eBoundSize>(
+        component<SerializedSubspaceIndices, hashString("projector")>());
   }
 
-  /// Uncalibrated measurement in the form of a source link. Const version
-  /// @return The uncalibrated measurement source link
-  SourceLink getUncalibratedSourceLink() const;
+  template <std::size_t measdim>
+  SubspaceIndices<measdim> subspaceIndices() const {
+    BoundSubspaceIndices boundSubspace = BoundSubspaceIndices();
+    SubspaceIndices<measdim> subspace;
+    std::copy(boundSubspace.begin(), boundSubspace.begin() + measdim,
+              subspace.begin());
+    return subspace;
+  }
 
-  // This function will move to an rvalue reference in the next major version
-  /// Set an uncalibrated source link
-  /// @param sourceLink The uncalibrated source link to set
-  template <typename source_link_t>
-  void setUncalibratedSourceLink(source_link_t&& sourceLink)
+  void setBoundSubspaceIndices(BoundSubspaceIndices boundSubspace)
     requires(!ReadOnly)
   {
-    m_traj->setUncalibratedSourceLink(m_istate,
-                                      std::forward<source_link_t>(sourceLink));
+    assert(has<hashString("projector")>());
+    component<SerializedSubspaceIndices, hashString("projector")>() =
+        serializeSubspaceIndices(boundSubspace);
   }
 
+  template <std::size_t measdim>
+  void setSubspaceIndices(SubspaceIndices<measdim> subspace)
+    requires(!ReadOnly && measdim <= eBoundSize)
+  {
+    assert(has<hashString("projector")>());
+    BoundSubspaceIndices boundSubspace{};
+    std::copy(subspace.begin(), subspace.end(), boundSubspace.begin());
+    setBoundSubspaceIndices(boundSubspace);
+  }
+
+  template <std::size_t measdim, typename index_t>
+  void setSubspaceIndices(std::array<index_t, measdim> subspaceIndices)
+    requires(!ReadOnly && measdim <= eBoundSize)
+  {
+    assert(has<hashString("projector")>());
+    BoundSubspaceIndices boundSubspace{};
+    std::transform(subspaceIndices.begin(), subspaceIndices.end(),
+                   boundSubspace.begin(),
+                   [](index_t i) { return static_cast<std::uint8_t>(i); });
+    setBoundSubspaceIndices(boundSubspace);
+  }
+
+  VariableBoundSubspaceHelper variableBoundSubspaceHelper() const {
+    BoundSubspaceIndices boundSubspace = boundSubspaceIndices();
+    std::span<std::uint8_t> validSubspaceIndices(
+        boundSubspace.begin(), boundSubspace.begin() + calibratedSize());
+    return VariableBoundSubspaceHelper(validSubspaceIndices);
+  }
+
+  template <std::size_t measdim>
+  FixedBoundSubspaceHelper<measdim> fixedBoundSubspaceHelper() const {
+    SubspaceIndices<measdim> subspace = subspaceIndices<measdim>();
+    return FixedBoundSubspaceHelper<measdim>(subspace);
+  }
+
+  /// Uncalibrated measurement in the form of a source link. Const version
+  /// @return The uncalibrated measurement source link
+  SourceLink getUncalibratedSourceLink() const;
+
   /// Set an uncalibrated source link
   /// @param sourceLink The uncalibrated source link to set
-  /// @note Use the overload with an rvalue reference, this
-  ///       overload will be removed ith the next major version
-  void setUncalibratedSourceLink(const SourceLink& sourceLink)
+  void setUncalibratedSourceLink(SourceLink&& sourceLink)
     requires(!ReadOnly)
   {
-    m_traj->setUncalibratedSourceLink(m_istate, SourceLink{sourceLink});
+    m_traj->setUncalibratedSourceLink(m_istate, std::move(sourceLink));
   }
 
   /// Check if the point has an associated uncalibrated measurement.
@@ -960,7 +1012,7 @@ class TrackStateProxy {
               other.template calibratedCovariance<measdim>();
         });
 
-        setProjectorBitset(other.projectorBitset());
+        setBoundSubspaceIndices(other.boundSubspaceIndices());
       }
     } else {
       if (ACTS_CHECK_BIT(mask, PM::Predicted) &&
@@ -991,8 +1043,9 @@ class TrackStateProxy {
         jacobian() = other.jacobian();
       }
 
+      // NOTE: we should not check hasCalibrated on this, since it
+      // may be not yet allocated
       if (ACTS_CHECK_BIT(mask, PM::Calibrated) &&
-          has<hashString("calibrated")>() &&
           other.template has<hashString("calibrated")>()) {
         allocateCalibrated(other.calibratedSize());
 
@@ -1007,7 +1060,7 @@ class TrackStateProxy {
               other.template calibratedCovariance<measdim>();
         });
 
-        setProjectorBitset(other.projectorBitset());
+        setBoundSubspaceIndices(other.boundSubspaceIndices());
       }
     }
 
diff --git a/Core/include/Acts/EventData/TrackStateProxy.ipp b/Core/include/Acts/EventData/TrackStateProxy.ipp
index cfce0d9648c..e36be5f3c25 100644
--- a/Core/include/Acts/EventData/TrackStateProxy.ipp
+++ b/Core/include/Acts/EventData/TrackStateProxy.ipp
@@ -1,12 +1,13 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2023 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 namespace Acts {
+
 template <typename D, std::size_t M, bool ReadOnly>
 inline TrackStateProxy<D, M, ReadOnly>::TrackStateProxy(
     detail_lt::ConstIf<MultiTrajectory<D>, ReadOnly>& trajectory,
@@ -62,9 +63,7 @@ inline auto TrackStateProxy<D, M, ReadOnly>::covariance() const
 
 template <typename D, std::size_t M, bool ReadOnly>
 inline auto TrackStateProxy<D, M, ReadOnly>::projector() const -> Projector {
-  assert(has<hashString("projector")>());
-  return bitsetToMatrix<Projector>(
-      component<ProjectorBitset, hashString("projector")>());
+  return variableBoundSubspaceHelper().fullProjector();
 }
 
 template <typename D, std::size_t M, bool ReadOnly>
diff --git a/Core/include/Acts/EventData/TrackStateProxyConcept.hpp b/Core/include/Acts/EventData/TrackStateProxyConcept.hpp
index c74a46eba32..d148d3c4940 100644
--- a/Core/include/Acts/EventData/TrackStateProxyConcept.hpp
+++ b/Core/include/Acts/EventData/TrackStateProxyConcept.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2023 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
diff --git a/Core/include/Acts/EventData/TrackStateType.hpp b/Core/include/Acts/EventData/TrackStateType.hpp
index 3901eb7852c..4820ffe6e19 100644
--- a/Core/include/Acts/EventData/TrackStateType.hpp
+++ b/Core/include/Acts/EventData/TrackStateType.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2023-2024 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
@@ -14,6 +14,7 @@
 #include <cstdint>
 #include <limits>
 #include <ostream>
+#include <type_traits>
 
 namespace Acts {
 
@@ -38,7 +39,7 @@ class TrackStateType {
  public:
   using raw_type = std::uint64_t;
   static constexpr std::size_t kRawBits =
-      std::numeric_limits<std::make_unsigned<raw_type>::type>::digits;
+      std::numeric_limits<std::make_unsigned_t<raw_type>>::digits;
 
   // Delete default constructor
   TrackStateType() = delete;
@@ -106,7 +107,7 @@ class ConstTrackStateType {
  public:
   using raw_type = std::uint64_t;
   static constexpr std::size_t kRawBits =
-      std::numeric_limits<std::make_unsigned<raw_type>::type>::digits;
+      std::numeric_limits<std::make_unsigned_t<raw_type>>::digits;
 
   // Delete default constructor
   ConstTrackStateType() = delete;
diff --git a/Core/include/Acts/EventData/TransformationHelpers.hpp b/Core/include/Acts/EventData/TransformationHelpers.hpp
index 0bafd8a4553..e31e29fd3c0 100644
--- a/Core/include/Acts/EventData/TransformationHelpers.hpp
+++ b/Core/include/Acts/EventData/TransformationHelpers.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2024 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
@@ -13,11 +13,42 @@
 #include "Acts/Definitions/TrackParametrization.hpp"
 #include "Acts/Geometry/GeometryContext.hpp"
 #include "Acts/Utilities/Result.hpp"
+#include "Acts/Utilities/detail/periodic.hpp"
+
+#include <numbers>
 
 namespace Acts {
 
 class Surface;
 
+/// Reflect bound track parameters.
+///
+/// @param boundParams Bound track parameters vector
+/// @return Reflected bound track parameters vector
+inline BoundVector reflectBoundParameters(const BoundVector& boundParams) {
+  BoundVector reflected = boundParams;
+  auto [phi, theta] =
+      detail::normalizePhiTheta(boundParams[eBoundPhi] - std::numbers::pi,
+                                std::numbers::pi - boundParams[eBoundTheta]);
+  reflected[eBoundPhi] = phi;
+  reflected[eBoundTheta] = theta;
+  reflected[eBoundQOverP] = -boundParams[eBoundQOverP];
+  return reflected;
+}
+
+/// Reflect free track parameters.
+///
+/// @param freeParams Free track parameters vector
+/// @return Reflected free track parameters vector
+inline FreeVector reflectFreeParameters(const FreeVector& freeParams) {
+  FreeVector reflected = freeParams;
+  reflected[eFreeDir0] = -freeParams[eFreeDir0];
+  reflected[eFreeDir1] = -freeParams[eFreeDir1];
+  reflected[eFreeDir2] = -freeParams[eFreeDir2];
+  reflected[eFreeQOverP] = -freeParams[eFreeQOverP];
+  return reflected;
+}
+
 /// Transform bound track parameters into equivalent free track parameters.
 ///
 /// @param surface Surface onto which the input parameters are bound
diff --git a/Core/include/Acts/EventData/Types.hpp b/Core/include/Acts/EventData/Types.hpp
index c212e0bf5d0..0fbef9b2e50 100644
--- a/Core/include/Acts/EventData/Types.hpp
+++ b/Core/include/Acts/EventData/Types.hpp
@@ -1,21 +1,31 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2023 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
+#include "Acts/Definitions/TrackParametrization.hpp"
+
 #include <cstdint>
 #include <limits>
 
 namespace Acts {
+
 using TrackIndexType = std::uint32_t;
 static constexpr TrackIndexType kTrackIndexInvalid =
     std::numeric_limits<TrackIndexType>::max();
 
 using ProjectorBitset = std::uint64_t;
 
+template <std::size_t measdim>
+using SubspaceIndices = std::array<std::uint8_t, measdim>;
+using BoundSubspaceIndices = SubspaceIndices<eBoundSize>;
+static constexpr BoundSubspaceIndices kBoundSubspaceIndicesInvalid = {
+    eBoundSize, eBoundSize, eBoundSize, eBoundSize, eBoundSize, eBoundSize};
+using SerializedSubspaceIndices = std::uint64_t;
+
 }  // namespace Acts
diff --git a/Core/include/Acts/EventData/Utils.hpp b/Core/include/Acts/EventData/Utils.hpp
index 79a410ba53c..4db85f95460 100644
--- a/Core/include/Acts/EventData/Utils.hpp
+++ b/Core/include/Acts/EventData/Utils.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2023 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
diff --git a/Core/include/Acts/EventData/VectorMultiTrajectory.hpp b/Core/include/Acts/EventData/VectorMultiTrajectory.hpp
index 8db631b9d33..7d2d05cc9b9 100644
--- a/Core/include/Acts/EventData/VectorMultiTrajectory.hpp
+++ b/Core/include/Acts/EventData/VectorMultiTrajectory.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2022-2024 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
@@ -13,6 +13,7 @@
 #include "Acts/EventData/MultiTrajectoryBackendConcept.hpp"
 #include "Acts/EventData/SourceLink.hpp"
 #include "Acts/EventData/TrackStatePropMask.hpp"
+#include "Acts/EventData/Types.hpp"
 #include "Acts/EventData/detail/DynamicColumn.hpp"
 #include "Acts/EventData/detail/DynamicKeyIterator.hpp"
 #include "Acts/Utilities/HashedString.hpp"
@@ -132,7 +133,7 @@ class VectorMultiTrajectoryBase {
         h("meas", isMeas, weight(meas_size));
         h("measCov", isMeas, weight(meas_cov_size));
         h("sourceLinks", isMeas, weight(sizeof(const SourceLink)));
-        h("projectors", isMeas, weight(sizeof(ProjectorBitset)));
+        h("projectors", isMeas, weight(sizeof(SerializedSubspaceIndices)));
       }
 
       if (ts.hasJacobian() &&
@@ -156,8 +157,8 @@ class VectorMultiTrajectoryBase {
     double pathLength = 0;
     TrackStateType::raw_type typeFlags{};
 
-    IndexType iuncalibrated = kInvalid;
-    IndexType icalibratedsourcelink = kInvalid;
+    IndexType iUncalibrated = kInvalid;
+    IndexType iCalibratedSourceLink = kInvalid;
     IndexType measdim = kInvalid;
 
     TrackStatePropMask allocMask = TrackStatePropMask::None;
@@ -208,7 +209,7 @@ class VectorMultiTrajectoryBase {
       case "projector"_hash:
         return instance.m_index[istate].iprojector != kInvalid;
       case "uncalibratedSourceLink"_hash:
-        return instance.m_sourceLinks[instance.m_index[istate].iuncalibrated]
+        return instance.m_sourceLinks[instance.m_index[istate].iUncalibrated]
             .has_value();
       case "previous"_hash:
       case "next"_hash:
@@ -219,7 +220,7 @@ class VectorMultiTrajectoryBase {
       case "typeFlags"_hash:
         return true;
       default:
-        return instance.m_dynamic.find(key) != instance.m_dynamic.end();
+        return instance.m_dynamic.contains(key);
     }
   }
 
@@ -286,7 +287,7 @@ class VectorMultiTrajectoryBase {
       case "typeFlags"_hash:
         return true;
       default:
-        return instance.m_dynamic.find(key) != instance.m_dynamic.end();
+        return instance.m_dynamic.contains(key);
     }
   }
 
@@ -303,7 +304,7 @@ class VectorMultiTrajectoryBase {
   }
 
   SourceLink getUncalibratedSourceLink_impl(IndexType istate) const {
-    return m_sourceLinks[m_index[istate].iuncalibrated].value();
+    return m_sourceLinks[m_index[istate].iUncalibrated].value();
   }
 
   const Surface* referenceSurface_impl(IndexType istate) const {
@@ -326,7 +327,7 @@ class VectorMultiTrajectoryBase {
 
   std::vector<typename detail_lt::FixedSizeTypes<eBoundSize>::Covariance> m_jac;
   std::vector<std::optional<SourceLink>> m_sourceLinks;
-  std::vector<ProjectorBitset> m_projectors;
+  std::vector<SerializedSubspaceIndices> m_projectors;
 
   // owning vector of shared pointers to surfaces
   //
@@ -484,7 +485,7 @@ class VectorMultiTrajectory final
 
   void setUncalibratedSourceLink_impl(IndexType istate,
                                       SourceLink&& sourceLink) {
-    m_sourceLinks[m_index[istate].iuncalibrated] = std::move(sourceLink);
+    m_sourceLinks[m_index[istate].iUncalibrated] = std::move(sourceLink);
   }
 
   void setReferenceSurface_impl(IndexType istate,
diff --git a/Core/include/Acts/EventData/VectorTrackContainer.hpp b/Core/include/Acts/EventData/VectorTrackContainer.hpp
index 54ae7cdb2b5..09ecf7b5b2e 100644
--- a/Core/include/Acts/EventData/VectorTrackContainer.hpp
+++ b/Core/include/Acts/EventData/VectorTrackContainer.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2022 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
@@ -147,7 +147,7 @@ class VectorTrackContainerBase {
     using namespace Acts::HashedStringLiteral;
     switch (key) {
       default:
-        return m_dynamic.find(key) != m_dynamic.end();
+        return m_dynamic.contains(key);
     }
   }
 
diff --git a/Core/include/Acts/EventData/detail/CalculateResiduals.hpp b/Core/include/Acts/EventData/detail/CalculateResiduals.hpp
deleted file mode 100644
index 38adc0df822..00000000000
--- a/Core/include/Acts/EventData/detail/CalculateResiduals.hpp
+++ /dev/null
@@ -1,96 +0,0 @@
-// This file is part of the Acts project.
-//
-// Copyright (C) 2020 CERN for the benefit of the Acts project
-//
-// This Source Code Form is subject to the terms of the Mozilla Public
-// License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-#pragma once
-
-#include "Acts/Definitions/TrackParametrization.hpp"
-#include "Acts/Utilities/detail/periodic.hpp"
-
-#include <cassert>
-
-#include <Eigen/Core>
-
-namespace Acts::detail {
-
-/// Residuals between bound reference parameters and a measured subspace.
-///
-/// @tparam index_container_t SequenceContainer for measured indices
-/// @tparam measured_t Measured parameters vector type
-/// @tparam residuals_t Residuals vector type
-/// @param[in] size Size of the measured parameters subspace
-/// @param[in] indices Indices of measured subspace, must have `size` entries
-/// @param[in] reference Reference bound parameters
-/// @param[in] measured Measured parameters subspace
-/// @param[out] residuals Resulting residuals in the measured subspace
-///
-/// @note The separate `size` parameter is also used to allow the selection of
-///   the correct residuals methods depending on the parameters type.
-template <typename index_container_t, typename measured_t, typename residuals_t>
-inline void calculateResiduals(BoundIndices size,
-                               const index_container_t& indices,
-                               const BoundVector& reference,
-                               const Eigen::MatrixBase<measured_t>& measured,
-                               Eigen::MatrixBase<residuals_t>& residuals) {
-  using OutputScalar = typename residuals_t::Scalar;
-
-  EIGEN_STATIC_ASSERT_VECTOR_ONLY(measured_t);
-  EIGEN_STATIC_ASSERT_VECTOR_ONLY(residuals_t);
-  assert((size <= eBoundSize) && "Measured subspace is too large");
-  assert((size <= measured.size()) && "Inconsistent measured size");
-  assert((size <= residuals.size()) && "Inconsistent residuals size");
-
-  for (std::size_t i = 0; i < size; ++i) {
-    std::size_t fullIndex = indices[i];
-    // this is neither elegant nor smart but it is the simplest solution.
-    //
-    // only phi must be handled specially here. the theta limits can only be
-    // correctly handled if phi is updated, too. since we can not ensure that
-    // both are available, it is probably less error-prone to treat theta as a
-    // regular, unrestricted parameter.
-    if (fullIndex == eBoundPhi) {
-      residuals[i] = difference_periodic<OutputScalar>(
-          measured[i], reference[fullIndex],
-          static_cast<OutputScalar>(2 * M_PI));
-    } else {
-      residuals[i] = measured[i] - reference[fullIndex];
-    }
-  }
-}
-
-/// Residuals between free reference parameters and a measured subspace.
-///
-/// @tparam index_container_t SequenceContainer for measured inidices
-/// @tparam measured_t Measured parameters vector type
-/// @tparam residuals_t Residuals vector type
-/// @param[in] size Size of the measured parameters subspace
-/// @param[in] indices Indices of measured subspace, must have `size` entries
-/// @param[in] reference Reference free parameters
-/// @param[in] measured Measured parameters subspace
-/// @param[out] residuals Resulting residuals in the measured subspace
-///
-/// @note The separate `size` parameter is also used to allow the selection of
-///   the correct residuals methods depending on the parameters type.
-template <typename index_container_t, typename measured_t, typename residuals_t>
-inline void calculateResiduals(FreeIndices size,
-                               const index_container_t& indices,
-                               const FreeVector& reference,
-                               const Eigen::MatrixBase<measured_t>& measured,
-                               Eigen::MatrixBase<residuals_t>& residuals) {
-  EIGEN_STATIC_ASSERT_VECTOR_ONLY(measured_t);
-  EIGEN_STATIC_ASSERT_VECTOR_ONLY(residuals_t);
-  assert((size <= eFreeSize) && "Measured subspace is too large");
-  assert((size <= measured.size()) && "Inconsistent measured size");
-  assert((size <= residuals.size()) && "Inconsistent residuals size");
-
-  for (std::size_t i = 0; i < size; ++i) {
-    // all free parameters are unrestricted. no need to call parameter traits
-    residuals[i] = measured[i] - reference[indices[i]];
-  }
-}
-
-}  // namespace Acts::detail
diff --git a/Core/include/Acts/EventData/detail/CorrectedTransformationFreeToBound.hpp b/Core/include/Acts/EventData/detail/CorrectedTransformationFreeToBound.hpp
index a6fc0727ad0..58283dcfebe 100644
--- a/Core/include/Acts/EventData/detail/CorrectedTransformationFreeToBound.hpp
+++ b/Core/include/Acts/EventData/detail/CorrectedTransformationFreeToBound.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2021-2022 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
diff --git a/Core/include/Acts/EventData/detail/CovarianceHelper.hpp b/Core/include/Acts/EventData/detail/CovarianceHelper.hpp
index 06d3d31bfe5..d3469d4124d 100644
--- a/Core/include/Acts/EventData/detail/CovarianceHelper.hpp
+++ b/Core/include/Acts/EventData/detail/CovarianceHelper.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2019-2024 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
diff --git a/Core/include/Acts/EventData/detail/DynamicColumn.hpp b/Core/include/Acts/EventData/detail/DynamicColumn.hpp
index 58bf59e367d..0a3b7bd6da4 100644
--- a/Core/include/Acts/EventData/detail/DynamicColumn.hpp
+++ b/Core/include/Acts/EventData/detail/DynamicColumn.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2022 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
diff --git a/Core/include/Acts/EventData/detail/DynamicKeyIterator.hpp b/Core/include/Acts/EventData/detail/DynamicKeyIterator.hpp
index 95fb5ef18c4..df0f1ceeaf2 100644
--- a/Core/include/Acts/EventData/detail/DynamicKeyIterator.hpp
+++ b/Core/include/Acts/EventData/detail/DynamicKeyIterator.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2023 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
@@ -44,10 +44,6 @@ class DynamicKeyIterator {
     return m_it == other.m_it;
   }
 
-  bool operator!=(const DynamicKeyIterator& other) const {
-    return m_it != other.m_it;
-  }
-
   value_type operator*() const { return m_it->first; }
 
  private:
diff --git a/Core/include/Acts/EventData/detail/GenerateParameters.hpp b/Core/include/Acts/EventData/detail/GenerateParameters.hpp
index 4042ef5bba6..64e7bc3405b 100644
--- a/Core/include/Acts/EventData/detail/GenerateParameters.hpp
+++ b/Core/include/Acts/EventData/detail/GenerateParameters.hpp
@@ -1,40 +1,55 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2020 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
+#include "Acts/Definitions/Algebra.hpp"
 #include "Acts/Definitions/TrackParametrization.hpp"
-#include "Acts/Utilities/detail/periodic.hpp"
+#include "Acts/Definitions/Units.hpp"
+#include "Acts/Utilities/AngleHelpers.hpp"
 
 #include <cmath>
+#include <numbers>
 #include <random>
 #include <utility>
 
 namespace Acts::detail::Test {
 
-/// Generate a random parameters vector and covariance matrix.
-///
-/// @return std:::pair<ParametersVector, CovarianceMatrix>
 template <typename scalar_t, std::size_t kSize, typename generator_t>
-inline auto generateParametersCovariance(generator_t& rng)
-    -> std::pair<Eigen::Matrix<scalar_t, kSize, 1>,
-                 Eigen::Matrix<scalar_t, kSize, kSize>> {
+inline auto generateParameters(generator_t& rng)
+    -> Eigen::Matrix<scalar_t, kSize, 1> {
+  using Scalar = scalar_t;
+  using ParametersVector = Eigen::Matrix<scalar_t, kSize, 1>;
+
+  std::normal_distribution<Scalar> standardNormal(0, 1);
+
+  ParametersVector params;
+  for (auto i = 0u; i < kSize; ++i) {
+    params[i] = standardNormal(rng);
+  }
+
+  return params;
+}
+
+template <typename scalar_t, std::size_t kSize, typename generator_t>
+inline auto generateCovariance(generator_t& rng)
+    -> Eigen::Matrix<scalar_t, kSize, kSize> {
   using Scalar = scalar_t;
   using ParametersVector = Eigen::Matrix<scalar_t, kSize, 1>;
   using CovarianceMatrix = Eigen::Matrix<scalar_t, kSize, kSize>;
 
-  std::normal_distribution<Scalar> distNormal(0, 1);
+  std::normal_distribution<Scalar> standardNormal(0, 1);
   std::uniform_real_distribution<Scalar> distCorr(-1, 1);
 
   // generate standard deviations
   ParametersVector stddev;
   for (auto i = 0u; i < kSize; ++i) {
-    stddev[i] = std::abs(distNormal(rng));
+    stddev[i] = std::abs(standardNormal(rng));
   }
   // generate correlation matrix
   CovarianceMatrix corr;
@@ -48,32 +63,238 @@ inline auto generateParametersCovariance(generator_t& rng)
   // construct the covariance matrix
   CovarianceMatrix cov = stddev.asDiagonal() * corr * stddev.asDiagonal();
 
-  // generate random parameters
-  // this is ignoring the correlations; since this does not need to generate
-  // credible data, this should be fine.
-  ParametersVector params;
-  for (auto i = 0u; i < kSize; ++i) {
-    params[i] = stddev[i] * distNormal(rng);
+  return cov;
+}
+
+/// Generate a random parameters vector and covariance matrix.
+///
+/// @return std:::pair<ParametersVector, CovarianceMatrix>
+template <typename scalar_t, std::size_t kSize, typename generator_t>
+inline auto generateParametersCovariance(generator_t& rng)
+    -> std::pair<Eigen::Matrix<scalar_t, kSize, 1>,
+                 Eigen::Matrix<scalar_t, kSize, kSize>> {
+  auto params = generateParameters<scalar_t, kSize, generator_t>(rng);
+  auto cov = generateCovariance<scalar_t, kSize, generator_t>(rng);
+  return {params, cov};
+}
+
+struct GenerateBoundDirectionOptions {
+  /// Low, high (exclusive) for the transverse direction angle.
+  double phiMin = -std::numbers::pi;
+  double phiMax = std::numbers::pi;
+
+  /// Low, high (inclusive) for  the longitudinal direction angle.
+  ///
+  /// This intentionally uses theta instead of eta so it can represent the
+  /// full direction space with finite values.
+  ///
+  /// @note This is the standard generation, for detector performance
+  /// classification, where a flat distribution in eta can be useful,
+  /// this can be set by the etaUniform flag;
+  ///
+  double thetaMin = AngleHelpers::thetaFromEta(6.0);
+  double thetaMax = AngleHelpers::thetaFromEta(-6.0);
+
+  bool etaUniform = true;
+};
+
+template <typename generator_t>
+inline std::pair<double, double> generateBoundDirection(
+    generator_t& rng, const GenerateBoundDirectionOptions& options) {
+  using UniformReal = std::uniform_real_distribution<double>;
+
+  // since we want to draw the direction uniform on the unit sphere, we must
+  // draw from cos(theta) instead of theta. see e.g.
+  // https://mathworld.wolfram.com/SpherePointPicking.html
+  double cosThetaMin = std::cos(options.thetaMin);
+  // ensure upper bound is included. see e.g.
+  // https://en.cppreference.com/w/cpp/numeric/random/uniform_real_distribution
+  double cosThetaMax = std::nextafter(std::cos(options.thetaMax),
+                                      std::numeric_limits<double>::max());
+
+  // in case we force uniform eta generation
+  double etaMin = Acts::AngleHelpers::etaFromTheta(options.thetaMin);
+  double etaMax = Acts::AngleHelpers::etaFromTheta(options.thetaMax);
+
+  UniformReal phiDist(options.phiMin, options.phiMax);
+  UniformReal cosThetaDist(cosThetaMin, cosThetaMax);
+  UniformReal etaDist(etaMin, etaMax);
+
+  // draw parameters
+  double phi = phiDist(rng);
+
+  double theta = 0;
+  if (!options.etaUniform) {
+    const double cosTheta = cosThetaDist(rng);
+    theta = std::acos(cosTheta);
+  } else {
+    const double eta = etaDist(rng);
+    theta = AngleHelpers::thetaFromEta(eta);
   }
 
+  return {phi, theta};
+}
+
+struct GenerateQoverPOptions {
+  /// Low, high (exclusive) for absolute/transverse momentum.
+  double pMin = 1 * UnitConstants::GeV;
+  double pMax = 100 * UnitConstants::GeV;
+
+  /// Indicate if the momentum referse to transverse momentum
+  bool pTransverse = true;
+
+  /// Indicate if the momentum should be uniformly distributed in log space.
+  bool pLogUniform = false;
+
+  /// Charge of the parameters.
+  double charge = 1;
+
+  /// Randomize the charge and flip the PDG particle number sign accordingly.
+  bool randomizeCharge = true;
+};
+
+template <typename generator_t>
+inline double generateQoverP(generator_t& rng,
+                             const GenerateQoverPOptions& options,
+                             double theta) {
+  using UniformIndex = std::uniform_int_distribution<std::uint8_t>;
+  using UniformReal = std::uniform_real_distribution<double>;
+
+  auto drawP = [&options](generator_t& rng_, double theta_) -> double {
+    const double pTransverseScaling =
+        options.pTransverse ? 1. / std::sin(theta_) : 1.;
+
+    if (options.pLogUniform) {
+      UniformReal pLogDist(std::log(options.pMin), std::log(options.pMax));
+      return std::exp(pLogDist(rng_)) * pTransverseScaling;
+    }
+
+    UniformReal pDist(options.pMin, options.pMax);
+    return pDist(rng_) * pTransverseScaling;
+  };
+
+  // choose between particle/anti-particle if requested
+  // the upper limit of the distribution is inclusive
+  UniformIndex particleTypeChoice(0u, options.randomizeCharge ? 1u : 0u);
+  // (anti-)particle choice is one random draw but defines two properties
+  const double qChoices[] = {
+      options.charge,
+      -options.charge,
+  };
+
+  // draw parameters
+  const std::uint8_t type = particleTypeChoice(rng);
+  const double q = qChoices[type];
+
+  const double p = drawP(rng, theta);
+  const double qOverP = (q != 0) ? q / p : 1 / p;
+
+  return qOverP;
+}
+
+struct GenerateBoundParametersOptions {
+  struct {
+    double loc0Mean = 0 * UnitConstants::mm;
+    double loc0Std = 1 * UnitConstants::mm;
+
+    double loc1Mean = 0 * UnitConstants::mm;
+    double loc1Std = 1 * UnitConstants::mm;
+
+    double timeMean = 0 * UnitConstants::ns;
+    double timeStd = 1 * UnitConstants::ns;
+  } position;
+
+  GenerateBoundDirectionOptions direction;
+
+  GenerateQoverPOptions qOverP;
+};
+
+inline BoundVector someBoundParametersA() {
+  return {0.0, 0.0, 0.0, std::numbers::pi / 2, 1.0, 0.0};
+}
+
+template <typename generator_t>
+inline BoundVector generateBoundParameters(
+    generator_t& rng, const GenerateBoundParametersOptions& options) {
+  std::normal_distribution<double> standardNormal(0, 1);
+
+  const double loc0 = options.position.loc0Mean +
+                      options.position.loc0Std * standardNormal(rng);
+  const double loc1 = options.position.loc1Mean +
+                      options.position.loc1Std * standardNormal(rng);
+
+  auto [phi, theta] = generateBoundDirection(rng, options.direction);
+  auto qOverP = generateQoverP(rng, options.qOverP, theta);
+
+  const double time = options.position.timeMean +
+                      options.position.timeStd * standardNormal(rng);
+
+  return {loc0, loc1, phi, theta, qOverP, time};
+}
+
+template <typename generator_t>
+inline std::pair<BoundVector, BoundMatrix> generateBoundParametersCovariance(
+    generator_t& rng, const GenerateBoundParametersOptions& options) {
+  auto params = generateBoundParameters(rng, options);
+  auto cov = generateCovariance<ActsScalar, eBoundSize>(rng);
   return {params, cov};
 }
 
-/// Generate a random bound parameters vector and covariance matrix.
+struct GenerateFreeParametersOptions {
+  struct {
+    double xMean = 0 * UnitConstants::mm;
+    double xStd = 1 * UnitConstants::mm;
+
+    double yMean = 0 * UnitConstants::mm;
+    double yStd = 1 * UnitConstants::mm;
+
+    double zMean = 0 * UnitConstants::mm;
+    double zStd = 1 * UnitConstants::mm;
+
+    double timeMean = 0 * UnitConstants::ns;
+    double timeStd = 1 * UnitConstants::ns;
+  } position;
+
+  GenerateBoundDirectionOptions direction;
+
+  GenerateQoverPOptions qOverP;
+};
+
+inline FreeVector someFreeParametersA() {
+  return {0.0, 0.0, 0.0, 0.0, 1.0, 0.0, 0.0, 1.0};
+}
+
 template <typename generator_t>
-inline auto generateBoundParametersCovariance(generator_t& rng) {
-  auto parCov = generateParametersCovariance<ActsScalar, eBoundSize>(rng);
-  auto [phi, theta] = detail::normalizePhiTheta(parCov.first[eBoundPhi],
-                                                parCov.first[eBoundTheta]);
-  parCov.first[eBoundPhi] = phi;
-  parCov.first[eBoundTheta] = theta;
-  return parCov;
+inline FreeVector generateFreeParameters(
+    generator_t& rng, const GenerateFreeParametersOptions& options) {
+  std::normal_distribution<double> standardNormal(0, 1);
+
+  const double x =
+      options.position.xMean + options.position.xStd * standardNormal(rng);
+  const double y =
+      options.position.yMean + options.position.yStd * standardNormal(rng);
+  const double z =
+      options.position.zMean + options.position.zStd * standardNormal(rng);
+  const double time = options.position.timeMean +
+                      options.position.timeStd * standardNormal(rng);
+
+  auto [phi, theta] = generateBoundDirection(rng, options.direction);
+
+  Vector3 direction = makeDirectionFromPhiTheta(phi, theta);
+
+  auto qOverP = generateQoverP(rng, options.qOverP, theta);
+
+  FreeVector freeParams;
+  freeParams << x, y, z, time, direction, qOverP;
+  return freeParams;
 }
 
-/// Generate a random free parameters vector and covariance matrix.
 template <typename generator_t>
-inline auto generateFreeParametersCovariance(generator_t& rng) {
-  return generateParametersCovariance<ActsScalar, eFreeSize>(rng);
+inline std::pair<FreeVector, FreeMatrix> generateFreeParametersCovariance(
+    generator_t& rng, const GenerateFreeParametersOptions& options) {
+  auto params = generateFreeParameters(rng, options);
+  auto cov = generateCovariance<ActsScalar, eFreeSize>(rng);
+  return {params, cov};
 }
 
 }  // namespace Acts::detail::Test
diff --git a/Core/include/Acts/EventData/detail/MultiTrajectoryTestsCommon.hpp b/Core/include/Acts/EventData/detail/MultiTrajectoryTestsCommon.hpp
index 7d688e631e8..93ef7a3eb7c 100644
--- a/Core/include/Acts/EventData/detail/MultiTrajectoryTestsCommon.hpp
+++ b/Core/include/Acts/EventData/detail/MultiTrajectoryTestsCommon.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2023 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
@@ -331,7 +331,7 @@ class MultiTrajectoryTestsCommon {
     auto tsb = traj.getTrackState(index);
     // then modify one and check that the other was modified as well
     {
-      auto [par, cov] = generateBoundParametersCovariance(rng);
+      auto [par, cov] = generateBoundParametersCovariance(rng, {});
       tsb.predicted() = par;
       tsb.predictedCovariance() = cov;
       BOOST_CHECK_EQUAL(tsa.predicted(), par);
@@ -340,7 +340,7 @@ class MultiTrajectoryTestsCommon {
       BOOST_CHECK_EQUAL(tsb.predictedCovariance(), cov);
     }
     {
-      auto [par, cov] = generateBoundParametersCovariance(rng);
+      auto [par, cov] = generateBoundParametersCovariance(rng, {});
       tsb.filtered() = par;
       tsb.filteredCovariance() = cov;
       BOOST_CHECK_EQUAL(tsa.filtered(), par);
@@ -349,7 +349,7 @@ class MultiTrajectoryTestsCommon {
       BOOST_CHECK_EQUAL(tsb.filteredCovariance(), cov);
     }
     {
-      auto [par, cov] = generateBoundParametersCovariance(rng);
+      auto [par, cov] = generateBoundParametersCovariance(rng, {});
       tsb.smoothed() = par;
       tsb.smoothedCovariance() = cov;
       BOOST_CHECK_EQUAL(tsa.smoothed(), par);
@@ -377,7 +377,7 @@ class MultiTrajectoryTestsCommon {
     }
     {
       // reset measurements w/ full parameters
-      auto [measPar, measCov] = generateBoundParametersCovariance(rng);
+      auto [measPar, measCov] = generateBoundParametersCovariance(rng, {});
       tsb.allocateCalibrated(eBoundSize);
       tsb.template calibrated<eBoundSize>() = measPar;
       tsb.template calibratedCovariance<eBoundSize>() = measCov;
@@ -390,7 +390,7 @@ class MultiTrajectoryTestsCommon {
     }
     {
       // reset only the effective measurements
-      auto [measPar, measCov] = generateBoundParametersCovariance(rng);
+      auto [measPar, measCov] = generateBoundParametersCovariance(rng, {});
       std::size_t nMeasurements = tsb.effectiveCalibrated().rows();
       auto effPar = measPar.head(nMeasurements);
       auto effCov = measCov.topLeftCorner(nMeasurements, nMeasurements);
diff --git a/Core/include/Acts/EventData/detail/ParameterTraits.hpp b/Core/include/Acts/EventData/detail/ParameterTraits.hpp
index 6252a474af2..ff3cdd81835 100644
--- a/Core/include/Acts/EventData/detail/ParameterTraits.hpp
+++ b/Core/include/Acts/EventData/detail/ParameterTraits.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2016-2020 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
@@ -13,6 +13,7 @@
 #include <algorithm>
 #include <cmath>
 #include <cstddef>
+#include <numbers>
 
 namespace Acts::detail {
 
@@ -106,12 +107,12 @@ struct CyclicParameterTraits {
 //
 // The functions names are chosen to be consistent w/ std::numeric_limits
 struct PhiBoundParameterLimits {
-  static constexpr double lowest() { return -M_PI; }
-  static constexpr double max() { return M_PI; }
+  static constexpr double lowest() { return -std::numbers::pi; }
+  static constexpr double max() { return std::numbers::pi; }
 };
 struct ThetaBoundParameterLimits {
   static constexpr double lowest() { return 0; }
-  static constexpr double max() { return M_PI; }
+  static constexpr double max() { return std::numbers::pi; }
 };
 
 // Traits implementation structs for single parameters.
diff --git a/Core/include/Acts/EventData/detail/PrintParameters.hpp b/Core/include/Acts/EventData/detail/PrintParameters.hpp
index 6b37cbfb09d..38670c230e0 100644
--- a/Core/include/Acts/EventData/detail/PrintParameters.hpp
+++ b/Core/include/Acts/EventData/detail/PrintParameters.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2020 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
diff --git a/Core/include/Acts/EventData/detail/TestSourceLink.hpp b/Core/include/Acts/EventData/detail/TestSourceLink.hpp
index d0bedcce0ef..affec84aafa 100644
--- a/Core/include/Acts/EventData/detail/TestSourceLink.hpp
+++ b/Core/include/Acts/EventData/detail/TestSourceLink.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2020 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
@@ -17,7 +17,6 @@
 #include "Acts/Geometry/GeometryIdentifier.hpp"
 #include "Acts/Geometry/TrackingGeometry.hpp"
 #include "Acts/Utilities/CalibrationContext.hpp"
-#include "Acts/Utilities/detail/Subspace.hpp"
 
 #include <algorithm>
 #include <array>
@@ -73,12 +72,13 @@ struct TestSourceLink final {
   TestSourceLink(TestSourceLink&&) = default;
   TestSourceLink& operator=(const TestSourceLink&) = default;
   TestSourceLink& operator=(TestSourceLink&&) = default;
+
   bool operator==(const TestSourceLink& rhs) const {
     return (m_geometryId == rhs.m_geometryId) && (sourceId == rhs.sourceId) &&
            (indices == rhs.indices) && (parameters == rhs.parameters) &&
            (covariance == rhs.covariance);
   }
-  bool operator!=(const TestSourceLink& rhs) const { return !(*this == rhs); }
+
   std::ostream& print(std::ostream& os) const {
     os << "TestsSourceLink(geometryId=" << m_geometryId
        << ",sourceId=" << sourceId;
@@ -139,22 +139,19 @@ void testSourceLinkCalibratorReturn(
     trackState.allocateCalibrated(2);
     trackState.template calibrated<2>() = sl.parameters;
     trackState.template calibratedCovariance<2>() = sl.covariance;
-    trackState.setProjector(FixedSizeSubspace<BoundIndices::eBoundSize, 2>(
-                                std::array{sl.indices[0], sl.indices[1]})
-                                .projector<double>());
+    trackState.setSubspaceIndices(std::array{sl.indices[0], sl.indices[1]});
   } else if (sl.indices[0] != Acts::eBoundSize) {
     trackState.allocateCalibrated(1);
     trackState.template calibrated<1>() = sl.parameters.head<1>();
     trackState.template calibratedCovariance<1>() =
         sl.covariance.topLeftCorner<1, 1>();
-    trackState.setProjector(FixedSizeSubspace<BoundIndices::eBoundSize, 1>(
-                                std::array{sl.indices[0]})
-                                .projector<double>());
+    trackState.setSubspaceIndices(std::array{sl.indices[0]});
   } else {
     throw std::runtime_error(
         "Tried to extract measurement from invalid TestSourceLink");
   }
 }
+
 /// Extract the measurement from a TestSourceLink.
 ///
 /// @param gctx Unused
diff --git a/Core/include/Acts/EventData/detail/TestTrackState.hpp b/Core/include/Acts/EventData/detail/TestTrackState.hpp
index c68096e40a4..514ae073c2f 100644
--- a/Core/include/Acts/EventData/detail/TestTrackState.hpp
+++ b/Core/include/Acts/EventData/detail/TestTrackState.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2022 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
@@ -38,11 +38,11 @@ struct TestTrackState {
       : surface(
             CurvilinearSurface(Vector3::Zero(), Vector3::UnitZ()).surface()),
         // set bogus parameters first since they are not default-constructible
-        predicted(surface, BoundVector::Zero(), std::nullopt,
+        predicted(surface, someBoundParametersA(), std::nullopt,
                   ParticleHypothesis::pion()),
-        filtered(surface, BoundVector::Zero(), std::nullopt,
+        filtered(surface, someBoundParametersA(), std::nullopt,
                  ParticleHypothesis::pion()),
-        smoothed(surface, BoundVector::Zero(), std::nullopt,
+        smoothed(surface, someBoundParametersA(), std::nullopt,
                  ParticleHypothesis::pion()),
         jacobian(BoundMatrix::Identity()),
         chi2(std::chi_squared_distribution<double>(measdim)(rng)),
@@ -65,7 +65,7 @@ struct TestTrackState {
     }
 
     // create track parameters
-    auto [trkPar, trkCov] = generateBoundParametersCovariance(rng);
+    auto [trkPar, trkCov] = generateBoundParametersCovariance(rng, {});
     // trkPar[eBoundPhi] = 45_degree;
     // trkPar[eBoundTheta] = 90_degree;
     // trkPar[eBoundQOverP] = 5.;
diff --git a/Core/include/Acts/Geometry/ApproachDescriptor.hpp b/Core/include/Acts/Geometry/ApproachDescriptor.hpp
index 7f96060099f..b56a1a8f26f 100644
--- a/Core/include/Acts/Geometry/ApproachDescriptor.hpp
+++ b/Core/include/Acts/Geometry/ApproachDescriptor.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2016-2020 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
diff --git a/Core/include/Acts/Geometry/BoundarySurfaceFace.hpp b/Core/include/Acts/Geometry/BoundarySurfaceFace.hpp
index 2575619aa2a..bd35bca7a4c 100644
--- a/Core/include/Acts/Geometry/BoundarySurfaceFace.hpp
+++ b/Core/include/Acts/Geometry/BoundarySurfaceFace.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2016-2018 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
diff --git a/Core/include/Acts/Geometry/BoundarySurfaceT.hpp b/Core/include/Acts/Geometry/BoundarySurfaceT.hpp
index 9179aec59f7..60fd4be9dc4 100644
--- a/Core/include/Acts/Geometry/BoundarySurfaceT.hpp
+++ b/Core/include/Acts/Geometry/BoundarySurfaceT.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2016-2018 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
diff --git a/Core/include/Acts/Geometry/CompositePortalLink.hpp b/Core/include/Acts/Geometry/CompositePortalLink.hpp
new file mode 100644
index 00000000000..6586d875b79
--- /dev/null
+++ b/Core/include/Acts/Geometry/CompositePortalLink.hpp
@@ -0,0 +1,114 @@
+// This file is part of the ACTS project.
+//
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
+//
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
+
+#pragma once
+
+#include "Acts/Definitions/Tolerance.hpp"
+#include "Acts/Geometry/PortalLinkBase.hpp"
+
+#include <iosfwd>
+
+#include <boost/container/small_vector.hpp>
+
+namespace Acts {
+
+class GridPortalLink;
+class Surface;
+
+/// Composite portal links can graft together other portal link instances, for
+/// example grids that could not be merged due to invalid binnings.
+///
+/// +-------+      +-------+
+/// |       |      |       |
+/// |       |      |       |
+/// |       |      |       |
+/// +-------+      |       |
+/// |       |      |       |
+/// |       |  +   +-------+
+/// |       |      |       |
+/// +-------+      |       |
+/// |       |      |       |
+/// |       |      +-------+
+/// |       |      |       |
+/// +-------+      +-------+
+///
+/// During resolution, it will consult each of it's children and return
+/// the result on the first surface where the lookup position is within
+/// bounds.
+class CompositePortalLink final : public PortalLinkBase {
+ public:
+  /// Construct a composite portal from two arbitrary other portal links. The
+  /// only requirement is that the portal link surfaces are mergeable.
+  /// @param a The first portal link
+  /// @param b The second portal link
+  /// @param direction The binning direction
+  /// @param flatten If true, the composite will flatten any nested composite
+  CompositePortalLink(std::unique_ptr<PortalLinkBase> a,
+                      std::unique_ptr<PortalLinkBase> b, BinningValue direction,
+                      bool flatten = true);
+
+  /// Construct a composite portal from any number of arbitrary other portal
+  /// links. The only requirement is that the portal link surfaces are
+  /// mergeable.
+  /// @param links The portal links
+  /// @param direction The binning direction
+  /// @param flatten If true, the composite will flatten any nested composite
+  CompositePortalLink(std::vector<std::unique_ptr<PortalLinkBase>> links,
+                      BinningValue direction, bool flatten = true);
+
+  /// Print the composite portal link
+  /// @param os The output stream
+  void toStream(std::ostream& os) const override;
+
+  /// Resolve the volume for a 2D position
+  /// @note This will transform the position to global coordinates before
+  ///       consulting its children.
+  /// @note @p position is assumed to be on surface
+  /// @param gctx The geometry context
+  /// @param position The 2D position
+  /// @param tolerance The on-surface tolerance
+  Result<const TrackingVolume*> resolveVolume(
+      const GeometryContext& gctx, const Vector2& position,
+      double tolerance = s_onSurfaceTolerance) const override;
+
+  /// Resolve the volume for a 3D position
+  /// @note @p position is assumed to be on surface
+  /// @param gctx The geometry context
+  /// @param position The 3D position
+  /// @param tolerance The tolerance
+  Result<const TrackingVolume*> resolveVolume(
+      const GeometryContext& gctx, const Vector3& position,
+      double tolerance = s_onSurfaceTolerance) const override;
+
+  /// Get the depth of the composite tree
+  /// @return The depth
+  std::size_t depth() const;
+
+  /// Get the number of children
+  /// @return The number of children
+  std::size_t size() const;
+
+  /// (Potentially) create a grid portal link that represents this composite
+  /// portal link.
+  /// @note This only works, if the composite is **flat** and only contains
+  ///       **trivial portal links**. If these preconditions are not met, this
+  ///       function returns a nullptr.
+  /// @param gctx The geometry context
+  /// @param logger The logger
+  /// @return The grid portal link
+  std::unique_ptr<GridPortalLink> makeGrid(const GeometryContext& gctx,
+                                           const Logger& logger) const;
+
+ private:
+  boost::container::small_vector<std::unique_ptr<PortalLinkBase>, 4>
+      m_children{};
+
+  BinningValue m_direction;
+};
+
+}  // namespace Acts
diff --git a/Core/include/Acts/Geometry/ConeLayer.hpp b/Core/include/Acts/Geometry/ConeLayer.hpp
index bd24bef9fe1..d496710a472 100644
--- a/Core/include/Acts/Geometry/ConeLayer.hpp
+++ b/Core/include/Acts/Geometry/ConeLayer.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2016-2020 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
diff --git a/Core/include/Acts/Geometry/ConeVolumeBounds.hpp b/Core/include/Acts/Geometry/ConeVolumeBounds.hpp
index f946705f6ce..23c8d33b26d 100644
--- a/Core/include/Acts/Geometry/ConeVolumeBounds.hpp
+++ b/Core/include/Acts/Geometry/ConeVolumeBounds.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2020 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
diff --git a/Core/include/Acts/Geometry/CuboidVolumeBounds.hpp b/Core/include/Acts/Geometry/CuboidVolumeBounds.hpp
index d0c7a1b604d..8b8437a91a5 100644
--- a/Core/include/Acts/Geometry/CuboidVolumeBounds.hpp
+++ b/Core/include/Acts/Geometry/CuboidVolumeBounds.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2016-2020 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
diff --git a/Core/include/Acts/Geometry/CuboidVolumeBuilder.hpp b/Core/include/Acts/Geometry/CuboidVolumeBuilder.hpp
index 6ebccf761d7..5912b21ed98 100644
--- a/Core/include/Acts/Geometry/CuboidVolumeBuilder.hpp
+++ b/Core/include/Acts/Geometry/CuboidVolumeBuilder.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2018-2020 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
diff --git a/Core/include/Acts/Geometry/CutoutCylinderVolumeBounds.hpp b/Core/include/Acts/Geometry/CutoutCylinderVolumeBounds.hpp
index 2930b0fb22d..fb9d6ca15a7 100644
--- a/Core/include/Acts/Geometry/CutoutCylinderVolumeBounds.hpp
+++ b/Core/include/Acts/Geometry/CutoutCylinderVolumeBounds.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2019-2020 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
diff --git a/Core/include/Acts/Geometry/CylinderLayer.hpp b/Core/include/Acts/Geometry/CylinderLayer.hpp
index ba99af59a9b..374d4b1da0c 100644
--- a/Core/include/Acts/Geometry/CylinderLayer.hpp
+++ b/Core/include/Acts/Geometry/CylinderLayer.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2016-2020 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
diff --git a/Core/include/Acts/Geometry/CylinderVolumeBounds.hpp b/Core/include/Acts/Geometry/CylinderVolumeBounds.hpp
index c5a28a4edb7..7f368442f40 100644
--- a/Core/include/Acts/Geometry/CylinderVolumeBounds.hpp
+++ b/Core/include/Acts/Geometry/CylinderVolumeBounds.hpp
@@ -1,14 +1,15 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2016-2020 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
 #include "Acts/Definitions/Algebra.hpp"
+#include "Acts/Geometry/BoundarySurfaceFace.hpp"
 #include "Acts/Geometry/Volume.hpp"
 #include "Acts/Geometry/VolumeBounds.hpp"
 #include "Acts/Utilities/BinningType.hpp"
@@ -17,6 +18,7 @@
 #include <initializer_list>
 #include <iosfwd>
 #include <memory>
+#include <numbers>
 #include <ostream>
 #include <vector>
 
@@ -80,6 +82,18 @@ class CylinderVolumeBounds : public VolumeBounds {
     eSize
   };
 
+  /// Enum describing the possible faces of a cylinder volume
+  /// @note These values are synchronized with the BoundarySurfaceFace enum.
+  ///       Once Gen1 is removed, this can be changed.
+  enum class Face : unsigned int {
+    PositiveDisc = BoundarySurfaceFace::positiveFaceXY,
+    NegativeDisc = BoundarySurfaceFace::negativeFaceXY,
+    OuterCylinder = BoundarySurfaceFace::tubeOuterCover,
+    InnerCylinder = BoundarySurfaceFace::tubeInnerCover,
+    NegativePhiPlane = BoundarySurfaceFace::tubeSectorNegativePhi,
+    PositivePhiPlane = BoundarySurfaceFace::tubeSectorPositivePhi
+  };
+
   CylinderVolumeBounds() = delete;
 
   /// Constructor
@@ -92,8 +106,9 @@ class CylinderVolumeBounds : public VolumeBounds {
   /// @param bevelMinZ The bevel angle, in radians, for the negative side
   /// @param bevelMaxZ The bevel angle, in radians, for the positive side
   CylinderVolumeBounds(ActsScalar rmin, ActsScalar rmax, ActsScalar halfz,
-                       ActsScalar halfphi = M_PI, ActsScalar avgphi = 0.,
-                       ActsScalar bevelMinZ = 0., ActsScalar bevelMaxZ = 0.);
+                       ActsScalar halfphi = std::numbers::pi_v<ActsScalar>,
+                       ActsScalar avgphi = 0., ActsScalar bevelMinZ = 0.,
+                       ActsScalar bevelMaxZ = 0.);
 
   /// Constructor - from a fixed size array
   ///
@@ -115,7 +130,7 @@ class CylinderVolumeBounds : public VolumeBounds {
   /// Copy Constructor
   ///
   /// @param cylbo is the source cylinder volume bounds for the copy
-  CylinderVolumeBounds(const CylinderVolumeBounds& cylbo) = default;
+  CylinderVolumeBounds(const CylinderVolumeBounds& cylbo);
 
   ~CylinderVolumeBounds() override = default;
   CylinderVolumeBounds& operator=(const CylinderVolumeBounds& cylbo) = default;
diff --git a/Core/include/Acts/Geometry/CylinderVolumeBuilder.hpp b/Core/include/Acts/Geometry/CylinderVolumeBuilder.hpp
index c2b0e52c2ea..1e09b95e114 100644
--- a/Core/include/Acts/Geometry/CylinderVolumeBuilder.hpp
+++ b/Core/include/Acts/Geometry/CylinderVolumeBuilder.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2016-2018 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
diff --git a/Core/include/Acts/Geometry/CylinderVolumeHelper.hpp b/Core/include/Acts/Geometry/CylinderVolumeHelper.hpp
index ec1ee433a88..6156230817d 100644
--- a/Core/include/Acts/Geometry/CylinderVolumeHelper.hpp
+++ b/Core/include/Acts/Geometry/CylinderVolumeHelper.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2016-2020 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
@@ -60,8 +60,6 @@ class CylinderVolumeHelper : public ITrackingVolumeHelper {
                        std::unique_ptr<const Logger> logger = getDefaultLogger(
                            "CylinderVolumeHelper", Logging::INFO));
 
-  ~CylinderVolumeHelper() override = default;
-
   /// Create a TrackingVolume* from a set of layers and (optional) parameters
   ///
   /// @param gctx is the geometry context for witch the volume is built
diff --git a/Core/include/Acts/Geometry/CylinderVolumeStack.hpp b/Core/include/Acts/Geometry/CylinderVolumeStack.hpp
index 4c83b6c0678..3fcb8f1039b 100644
--- a/Core/include/Acts/Geometry/CylinderVolumeStack.hpp
+++ b/Core/include/Acts/Geometry/CylinderVolumeStack.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2024 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
@@ -85,23 +85,12 @@ class CylinderVolumeStack : public Volume {
   /// construction.
   /// @param volbounds is the new bounds
   /// @param transform is the new transform
-  /// @pre The volume bounds need to be of type
-  ///      @c CylinderVolumeBounds.
-  void update(std::shared_ptr<const VolumeBounds> volbounds,
-              std::optional<Transform3> transform = std::nullopt) override;
-
-  /// Update the volume bounds and transform. This
-  /// will update the bounds of all volumes in the stack
-  /// to accommodate the new bounds and optionally create
-  /// gap volumes according to the resize strategy set during
-  /// construction.
-  /// @param newBounds is the new bounds
-  /// @param transform is the new transform
   /// @param logger is the logger
   /// @pre The volume bounds need to be of type
   ///      @c CylinderVolumeBounds.
-  void update(std::shared_ptr<const CylinderVolumeBounds> newBounds,
-              std::optional<Transform3> transform, const Logger& logger);
+  void update(std::shared_ptr<VolumeBounds> volbounds,
+              std::optional<Transform3> transform = std::nullopt,
+              const Logger& logger = getDummyLogger()) override;
 
   /// Access the gap volume that were created during attachment or resizing.
   /// @return the vector of gap volumes
@@ -133,11 +122,12 @@ class CylinderVolumeStack : public Volume {
                                   Acts::Logging::Level lvl);
 
   /// Helper function that prints output helping in debugging overlaps
+  /// @param direction is the overlap check direction
   /// @param a is the first volume
   /// @param b is the second volume
   /// @param logger is the logger
-  static void overlapPrint(const VolumeTuple& a, const VolumeTuple& b,
-                           const Logger& logger);
+  static void overlapPrint(BinningValue direction, const VolumeTuple& a,
+                           const VolumeTuple& b, const Logger& logger);
 
   /// Helper function that checks if volumes are properly aligned
   /// for attachment.
diff --git a/Core/include/Acts/Geometry/DetectorElementBase.hpp b/Core/include/Acts/Geometry/DetectorElementBase.hpp
index 484e8849ba3..5e5af633d97 100644
--- a/Core/include/Acts/Geometry/DetectorElementBase.hpp
+++ b/Core/include/Acts/Geometry/DetectorElementBase.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2016-2018 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
diff --git a/Core/include/Acts/Geometry/DiscLayer.hpp b/Core/include/Acts/Geometry/DiscLayer.hpp
index 478bbef6583..8968b6c42d2 100644
--- a/Core/include/Acts/Geometry/DiscLayer.hpp
+++ b/Core/include/Acts/Geometry/DiscLayer.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2016-2018 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
diff --git a/Core/include/Acts/Geometry/Extent.hpp b/Core/include/Acts/Geometry/Extent.hpp
index ac9a01e2386..8728728996b 100644
--- a/Core/include/Acts/Geometry/Extent.hpp
+++ b/Core/include/Acts/Geometry/Extent.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2022 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
@@ -52,12 +52,6 @@ struct ExtentEnvelope {
     }
   }
 
-  /// Constructor from an array of envelopes
-  /// @param values the array of envelopes
-  constexpr explicit ExtentEnvelope(
-      const std::array<Envelope, numBinningValues()>& values)
-      : m_values(values) {}
-
   /// Static factory for a zero envelope
   /// @return the zero envelope
   constexpr static ExtentEnvelope Zero() {
@@ -74,6 +68,33 @@ struct ExtentEnvelope {
     }};
   }
 
+  /// Helper struct for designated initializer construction
+  struct Arguments {
+    Envelope x = zeroEnvelope;
+    Envelope y = zeroEnvelope;
+    Envelope z = zeroEnvelope;
+    Envelope r = zeroEnvelope;
+    Envelope phi = zeroEnvelope;
+    Envelope rPhi = zeroEnvelope;
+    Envelope h = zeroEnvelope;
+    Envelope eta = zeroEnvelope;
+    Envelope mag = zeroEnvelope;
+  };
+
+  /// Constructor using a helper struct for designated initializaion
+  /// @param args the arguments
+  constexpr explicit ExtentEnvelope(Arguments&& args) {
+    using enum BinningValue;
+    m_values[toUnderlying(binX)] = args.x;
+    m_values[toUnderlying(binY)] = args.y;
+    m_values[toUnderlying(binZ)] = args.z;
+    m_values[toUnderlying(binR)] = args.r;
+    m_values[toUnderlying(binPhi)] = args.phi;
+    m_values[toUnderlying(binH)] = args.h;
+    m_values[toUnderlying(binEta)] = args.eta;
+    m_values[toUnderlying(binMag)] = args.mag;
+  }
+
   /// Comparison operator between envelope sets
   /// @param lhs the left hand side
   /// @param rhs the right hand side
@@ -82,14 +103,6 @@ struct ExtentEnvelope {
     return lhs.m_values == rhs.m_values;
   }
 
-  /// Comparison operator between envelope sets
-  /// @param lhs the left hand side
-  /// @param rhs the right hand side
-  /// @return true if the envelopes are not equal
-  friend bool operator!=(const ExtentEnvelope& lhs, const ExtentEnvelope& rhs) {
-    return !(lhs.m_values == rhs.m_values);
-  }
-
  private:
   std::array<Envelope, numBinningValues()> m_values{};
 };
@@ -108,9 +121,6 @@ class Extent {
   /// Define a comparison operator
   bool operator==(const Extent& e) const;
 
-  /// Define a comparison operator
-  bool operator!=(const Extent& e) const { return (!operator==(e)); }
-
   /// Extend with a position vertex
   ///
   /// @param vtx the vertex to be used for extending
diff --git a/Core/include/Acts/Geometry/GenericApproachDescriptor.hpp b/Core/include/Acts/Geometry/GenericApproachDescriptor.hpp
index b26e3e7e518..e4c855fe762 100644
--- a/Core/include/Acts/Geometry/GenericApproachDescriptor.hpp
+++ b/Core/include/Acts/Geometry/GenericApproachDescriptor.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2016-2018 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
diff --git a/Core/include/Acts/Geometry/GenericCuboidVolumeBounds.hpp b/Core/include/Acts/Geometry/GenericCuboidVolumeBounds.hpp
index a905f79f4a4..5f063a62842 100644
--- a/Core/include/Acts/Geometry/GenericCuboidVolumeBounds.hpp
+++ b/Core/include/Acts/Geometry/GenericCuboidVolumeBounds.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2019-2020 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
diff --git a/Core/include/Acts/Geometry/GeometryContext.hpp b/Core/include/Acts/Geometry/GeometryContext.hpp
index 2e46e911ba4..9d76417f768 100644
--- a/Core/include/Acts/Geometry/GeometryContext.hpp
+++ b/Core/include/Acts/Geometry/GeometryContext.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2019 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
diff --git a/Core/include/Acts/Geometry/GeometryHierarchyMap.hpp b/Core/include/Acts/Geometry/GeometryHierarchyMap.hpp
index 1106761d372..3bdfc63425b 100644
--- a/Core/include/Acts/Geometry/GeometryHierarchyMap.hpp
+++ b/Core/include/Acts/Geometry/GeometryHierarchyMap.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2020 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
@@ -64,13 +64,13 @@ class GeometryHierarchyMap {
   /// Combined geometry identifier and value element. Only used for input.
   using InputElement = typename std::pair<GeometryIdentifier, value_t>;
   using Iterator = typename std::vector<value_t>::const_iterator;
-  using Size = typename std::vector<value_t>::size_type;
   using Value = value_t;
 
   /// Construct the container from the given elements.
   ///
   /// @param elements input elements (must be unique with respect to identifier)
   GeometryHierarchyMap(std::vector<InputElement> elements);
+
   /// Construct the container from an initializer list.
   ///
   /// @param elements input initializer list
@@ -86,21 +86,25 @@ class GeometryHierarchyMap {
 
   /// Return an iterator pointing to the beginning of the stored values.
   Iterator begin() const { return m_values.begin(); }
+
   /// Return an iterator pointing to the end of the stored values.
   Iterator end() const { return m_values.end(); }
+
   /// Check if any elements are stored.
   bool empty() const { return m_values.empty(); }
+
   /// Return the number of stored elements.
-  Size size() const { return m_values.size(); }
+  std::size_t size() const { return m_values.size(); }
 
   /// Access the geometry identifier for the i-th element with bounds check.
   ///
   /// @throws std::out_of_range for invalid indices
-  GeometryIdentifier idAt(Size index) const { return m_ids.at(index); }
+  GeometryIdentifier idAt(std::size_t index) const { return m_ids.at(index); }
+
   /// Access the value of the i-th element in the container with bounds check.
   ///
   /// @throws std::out_of_range for invalid indices
-  const Value& valueAt(Size index) const { return m_values.at(index); }
+  const Value& valueAt(std::size_t index) const { return m_values.at(index); }
 
   /// Find the most specific value for a given geometry identifier.
   ///
@@ -111,7 +115,18 @@ class GeometryHierarchyMap {
   /// @param id geometry identifier for which information is requested
   /// @retval iterator to an existing value
   /// @retval `.end()` iterator if no matching element exists
-  Iterator find(GeometryIdentifier id) const;
+  Iterator find(const GeometryIdentifier& id) const;
+
+  /// Check if the most specific value exists for a given geometry identifier.
+  ///
+  /// This function checks if there is an element matching exactly the given
+  /// geometry id, or from the element for the next available higher level
+  /// within the geometry hierarchy.
+  ///
+  /// @param id geometry identifier for which existence is being checked
+  /// @retval `true` if a matching element exists
+  /// @retval `false` if no matching element exists
+  bool contains(const GeometryIdentifier& id) const;
 
  private:
   // NOTE this class assumes that it knows the ordering of the levels within
@@ -171,25 +186,26 @@ class GeometryHierarchyMap {
     // no valid levels; all bits are zero.
     return Identifier{0u};
   }
+
   /// Construct a mask where only the highest level is set.
   static constexpr Identifier makeHighestLevelMask() {
     return makeLeadingLevelsMask(GeometryIdentifier(0u).setVolume(1u));
   }
+
   /// Compare the two identifiers only within the masked bits.
   static constexpr bool equalWithinMask(Identifier lhs, Identifier rhs,
                                         Identifier mask) {
     return (lhs & mask) == (rhs & mask);
   }
+
   /// Ensure identifier ordering and uniqueness.
-  template <typename iterator_t>
-  static void sortAndCheckDuplicates(iterator_t beg, iterator_t end);
+  static void sortAndCheckDuplicates(std::vector<InputElement>& elements);
 
   /// Fill the container from the input elements.
   ///
   /// This assumes that the elements are ordered and unique with respect to
   /// their identifiers.
-  template <typename iterator_t>
-  void fill(iterator_t beg, iterator_t end);
+  void fill(const std::vector<InputElement>& elements);
 };
 
 // implementations
@@ -197,8 +213,8 @@ class GeometryHierarchyMap {
 template <typename value_t>
 inline GeometryHierarchyMap<value_t>::GeometryHierarchyMap(
     std::vector<InputElement> elements) {
-  sortAndCheckDuplicates(elements.begin(), elements.end());
-  fill(elements.begin(), elements.end());
+  sortAndCheckDuplicates(elements);
+  fill(elements);
 }
 
 template <typename value_t>
@@ -208,43 +224,44 @@ inline GeometryHierarchyMap<value_t>::GeometryHierarchyMap(
           std::vector<InputElement>(elements.begin(), elements.end())) {}
 
 template <typename value_t>
-template <typename iterator_t>
 inline void GeometryHierarchyMap<value_t>::sortAndCheckDuplicates(
-    iterator_t beg, iterator_t end) {
+    std::vector<InputElement>& elements) {
   // ensure elements are sorted by identifier
-  std::sort(beg, end, [=](const auto& lhs, const auto& rhs) {
+  std::ranges::sort(elements, [=](const auto& lhs, const auto& rhs) {
     return lhs.first < rhs.first;
   });
-  // check that all elements have unique identifier
-  auto dup = std::adjacent_find(beg, end, [](const auto& lhs, const auto& rhs) {
-    return lhs.first == rhs.first;
-  });
-  if (dup != end) {
+
+  // Check that all elements have unique identifier
+  auto dup = std::ranges::adjacent_find(
+      elements,
+      [](const auto& lhs, const auto& rhs) { return lhs.first == rhs.first; });
+
+  if (dup != elements.end()) {
     throw std::invalid_argument("Input elements contain duplicates");
   }
 }
 
 template <typename value_t>
-template <typename iterator_t>
-inline void GeometryHierarchyMap<value_t>::fill(iterator_t beg,
-                                                iterator_t end) {
-  const auto n = std::distance(beg, end);
+inline void GeometryHierarchyMap<value_t>::fill(
+    const std::vector<InputElement>& elements) {
   m_ids.clear();
-  m_ids.reserve(n);
   m_masks.clear();
-  m_masks.reserve(n);
   m_values.clear();
-  m_values.reserve(n);
-  for (; beg != end; ++beg) {
-    m_ids.push_back(beg->first.value());
-    m_masks.push_back(makeLeadingLevelsMask(beg->first.value()));
-    m_values.push_back(std::move(beg->second));
+
+  m_ids.reserve(elements.size());
+  m_masks.reserve(elements.size());
+  m_values.reserve(elements.size());
+
+  for (const auto& element : elements) {
+    m_ids.push_back(element.first.value());
+    m_masks.push_back(makeLeadingLevelsMask(element.first.value()));
+    m_values.push_back(std::move(element.second));
   }
 }
 
 template <typename value_t>
-inline auto GeometryHierarchyMap<value_t>::find(GeometryIdentifier id) const
-    -> Iterator {
+inline auto GeometryHierarchyMap<value_t>::find(
+    const GeometryIdentifier& id) const -> Iterator {
   assert((m_ids.size() == m_values.size()) &&
          "Inconsistent container state: #ids != # values");
   assert((m_masks.size() == m_values.size()) &&
@@ -297,4 +314,10 @@ inline auto GeometryHierarchyMap<value_t>::find(GeometryIdentifier id) const
   return end();
 }
 
+template <typename value_t>
+inline auto GeometryHierarchyMap<value_t>::contains(
+    const GeometryIdentifier& id) const -> bool {
+  return this->find(id) != this->end();
+}
+
 }  // namespace Acts
diff --git a/Core/include/Acts/Geometry/GeometryIdentifier.hpp b/Core/include/Acts/Geometry/GeometryIdentifier.hpp
index d28be53ef75..f1bf7a26736 100644
--- a/Core/include/Acts/Geometry/GeometryIdentifier.hpp
+++ b/Core/include/Acts/Geometry/GeometryIdentifier.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2016-2020 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
@@ -126,7 +126,7 @@ class GeometryIdentifier {
   /// Set the masked bits to id in the encoded value.
   constexpr GeometryIdentifier& setBits(Value mask, Value id) {
     m_value = (m_value & ~mask) | ((id << extractShift(mask)) & mask);
-    // return *this here so we need to write less lines in the set... methods
+    // return *this here that we need to write fewer lines in the setXXX methods
     return *this;
   }
 
@@ -134,10 +134,7 @@ class GeometryIdentifier {
                                    GeometryIdentifier rhs) {
     return lhs.m_value == rhs.m_value;
   }
-  friend constexpr bool operator!=(GeometryIdentifier lhs,
-                                   GeometryIdentifier rhs) {
-    return lhs.m_value != rhs.m_value;
-  }
+
   friend constexpr bool operator<(GeometryIdentifier lhs,
                                   GeometryIdentifier rhs) {
     return lhs.m_value < rhs.m_value;
diff --git a/Core/include/Acts/Geometry/GeometryObject.hpp b/Core/include/Acts/Geometry/GeometryObject.hpp
index d0fe88fc6cf..a3754996a1e 100644
--- a/Core/include/Acts/Geometry/GeometryObject.hpp
+++ b/Core/include/Acts/Geometry/GeometryObject.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2016-2020 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
diff --git a/Core/include/Acts/Geometry/GeometryObjectSorter.hpp b/Core/include/Acts/Geometry/GeometryObjectSorter.hpp
index 26b0114db1b..5783103d6af 100644
--- a/Core/include/Acts/Geometry/GeometryObjectSorter.hpp
+++ b/Core/include/Acts/Geometry/GeometryObjectSorter.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2016-2018 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
diff --git a/Core/include/Acts/Geometry/GlueVolumesDescriptor.hpp b/Core/include/Acts/Geometry/GlueVolumesDescriptor.hpp
index d04fdfe5050..11f0197b891 100644
--- a/Core/include/Acts/Geometry/GlueVolumesDescriptor.hpp
+++ b/Core/include/Acts/Geometry/GlueVolumesDescriptor.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2016-2018 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
diff --git a/Core/include/Acts/Geometry/GridPortalLink.hpp b/Core/include/Acts/Geometry/GridPortalLink.hpp
new file mode 100644
index 00000000000..411e6bb9962
--- /dev/null
+++ b/Core/include/Acts/Geometry/GridPortalLink.hpp
@@ -0,0 +1,614 @@
+// This file is part of the ACTS project.
+//
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
+//
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
+
+#pragma once
+
+#include "Acts/Definitions/Tolerance.hpp"
+#include "Acts/Geometry/PortalLinkBase.hpp"
+#include "Acts/Geometry/TrackingVolume.hpp"
+#include "Acts/Surfaces/BoundaryTolerance.hpp"
+#include "Acts/Surfaces/CylinderSurface.hpp"
+#include "Acts/Surfaces/DiscSurface.hpp"
+#include "Acts/Surfaces/PlaneSurface.hpp"
+#include "Acts/Utilities/Grid.hpp"
+#include "Acts/Utilities/Logger.hpp"
+
+#include <iosfwd>
+
+namespace Acts {
+
+class IGrid;
+
+template <typename... Axes>
+  requires(sizeof...(Axes) <= 2)
+class GridPortalLinkT;
+
+/// GridPortalLink implements a subdivided surface where the target volume
+/// depends on the position on the surface. The link can be in two states:
+/// 1. One-dimensional binning with an associated *direction* to determine which
+///    local coordinate to use for the lookup
+/// 2. Two-dimensional binning
+/// @note The grid dimensions and boundaries are **required** (and checked) to be
+///       consistent with the surface bounds.
+class GridPortalLink : public PortalLinkBase {
+ protected:
+  /// Constructor from a surface and a direction, for initialization by derived
+  /// class
+  /// @param surface The surface
+  /// @param direction The binning direction
+  GridPortalLink(std::shared_ptr<RegularSurface> surface,
+                 BinningValue direction)
+      : PortalLinkBase(std::move(surface)), m_direction(direction) {}
+
+ public:
+  /// Factory function for a one-dimensional grid portal link, which allows
+  /// using template deduction to figure out the right type
+  /// @tparam axis_t The axis type
+  /// @param surface The surface
+  /// @param direction The binning direction
+  /// @param axis The axis to use for the binning
+  /// @note The axis boundaries are checked against the bounds of @p surface.
+  /// @return A unique pointer to the grid portal link
+  template <AxisConcept axis_t>
+  static std::unique_ptr<GridPortalLinkT<axis_t>> make(
+      std::shared_ptr<RegularSurface> surface, BinningValue direction,
+      axis_t&& axis) {
+    using enum BinningValue;
+    if (dynamic_cast<const CylinderSurface*>(surface.get()) != nullptr) {
+      if (direction != binZ && direction != binRPhi) {
+        throw std::invalid_argument{"Invalid binning direction"};
+      }
+    } else if (dynamic_cast<const DiscSurface*>(surface.get()) != nullptr &&
+               direction != binR && direction != binPhi) {
+      throw std::invalid_argument{"Invalid binning direction"};
+    }
+
+    return std::make_unique<GridPortalLinkT<axis_t>>(
+        surface, direction, std::forward<axis_t>(axis));
+  }
+
+  /// Factory function for a two-dimensional grid portal link, which allows
+  /// using template deduction to figure out the right type.
+  /// @tparam axis_1_t The first axis type
+  /// @tparam axis_2_t The second axis type
+  /// @param surface The surface
+  /// @param axis1 The first axis to use for the binning
+  /// @param axis2 The second axis to use for the binning
+  /// @note The axis boundaries are checked against the bounds of @p surface.
+  /// @return A unique pointer to the grid portal link
+  template <AxisConcept axis_1_t, AxisConcept axis_2_t>
+  static std::unique_ptr<GridPortalLinkT<axis_1_t, axis_2_t>> make(
+      std::shared_ptr<RegularSurface> surface, axis_1_t axis1, axis_2_t axis2) {
+    std::optional<BinningValue> direction;
+    if (dynamic_cast<const CylinderSurface*>(surface.get()) != nullptr) {
+      direction = BinningValue::binRPhi;
+    } else if (dynamic_cast<const DiscSurface*>(surface.get()) != nullptr) {
+      direction = BinningValue::binR;
+    }
+
+    return std::make_unique<GridPortalLinkT<axis_1_t, axis_2_t>>(
+        surface, direction.value(), std::move(axis1), std::move(axis2));
+  }
+
+  /// Factory function for an automatically sized one-dimensional grid. This produces a single-bin grid with boundaries taken from the bounds of @p surface along @p direction.
+  /// @param surface The surface
+  /// @param volume The tracking volume
+  /// @param direction The binning direction
+  /// @return A unique pointer to the grid portal link
+  static std::unique_ptr<GridPortalLink> make(
+      const std::shared_ptr<RegularSurface>& surface, TrackingVolume& volume,
+      BinningValue direction);
+
+  /// Merge two grid portal links into a single one. The routine can merge
+  /// one-dimenaional, tow-dimensional and mixed links. The merge will try to
+  /// preserve equidistant binning in case bin widths match. Otherwise, the
+  /// merge falls back to variable binning.
+  ///
+  /// 1D merge scenarios:
+  ///
+  /// +----------------------------------------------------------+
+  /// |Colinear                                                  |
+  /// |                                                          |
+  /// | +-------+-------+-------+     +-------+-------+-------+  |
+  /// | |       |       |       |     |       |       |       |  |
+  /// | |       |       |       |  +  |       |       |       |  |
+  /// | |       |       |       |     |       |       |       |  |
+  /// | +-------+-------+-------+     +-------+-------+-------+  |
+  /// |       +-------+-------+-------+-------+-------+-------+  |
+  /// |       |       |       |       |       |       |       |  |
+  /// |    =  |       |       |       |       |       |       |  |
+  /// |       |       |       |       |       |       |       |  |
+  /// |       +-------+-------+-------+-------+-------+-------+  |
+  /// |                                                          |
+  /// +----------------------------------------------------------+
+  ///
+  /// Two grid along a shared direction are merged along their shared direction
+  ///
+  /// +-------------------------------------------------+
+  /// |Parallel                                         |
+  /// |                                                 |
+  /// | +-------+      +-------+     +-------+-------+  |
+  /// | |       |      |       |     |       |       |  |
+  /// | |       |      |       |     |       |       |  |
+  /// | |       |      |       |     |       |       |  |
+  /// | +-------+      +-------+     +-------+-------+  |
+  /// | |       |      |       |     |       |       |  |
+  /// | |       |  +   |       |  =  |       |       |  |
+  /// | |       |      |       |     |       |       |  |
+  /// | +-------+      +-------+     +-------+-------+  |
+  /// | |       |      |       |     |       |       |  |
+  /// | |       |      |       |     |       |       |  |
+  /// | |       |      |       |     |       |       |  |
+  /// | +-------+      +-------+     +-------+-------+  |
+  /// |                                                 |
+  /// +-------------------------------------------------+
+  ///
+  /// Two grids along a shared direction a merged in the direction that is
+  /// orthogonal to their shared direction.
+  ///
+  /// +-------------------------------------------+
+  /// |Perpendicular                              |
+  /// |                                           |
+  /// |  +-------+                                |
+  /// |  |       |                                |
+  /// |  |       |                                |
+  /// |  |       |                                |
+  /// |  +-------+     +-------+-------+-------+  |
+  /// |  |       |     |       |       |       |  |
+  /// |  |       |  +  |       |       |       |  |
+  /// |  |       |     |       |       |       |  |
+  /// |  +-------+     +-------+-------+-------+  |
+  /// |  |       |                                |
+  /// |  |       |                                |
+  /// |  |       |     +-------+-------+-------+  |
+  /// |  +-------+     |       |       |       |  |
+  /// |                |       |       |       |  |
+  /// |                |       |       |       |  |
+  /// |                +-------+-------+-------+  |
+  /// |                |       |       |       |  |
+  /// |             =  |       |       |       |  |
+  /// |                |       |       |       |  |
+  /// |                +-------+-------+-------+  |
+  /// |                |       |       |       |  |
+  /// |                |       |       |       |  |
+  /// |                |       |       |       |  |
+  /// |                +-------+-------+-------+  |
+  /// |                                           |
+  /// +-------------------------------------------+
+  ///
+  /// Two grids whose directions are not shared are merged (ordering does not
+  /// matter here). The routine will expand one of the grids to match the
+  /// other's binning, by subdividing the grid in the as-of-yet unbinned
+  /// direction, while filling all bins with the original bin contents.
+  /// Afterwards, a conventional mixed-dimension merge is performed.
+  ///
+  /// Mixed merge scenarios
+  /// The order is normalized by always taking the 2D grid as the left hand
+  /// side. The 1D grid is expanded to match the binning in the as-of-yet
+  /// unbinned direction with the binning taken from the 2D grid.
+  ///
+  /// +-----------------------------------------+
+  /// |2D + 1D                                  |
+  /// |                                         |
+  /// | +-------+-------+     +-------+-------+ |
+  /// | |       |       |     |       |       | |
+  /// | |       |       |     |       |       | |
+  /// | |       |       |     |       |       | |
+  /// | +-------+-------+     +-------+-------+ |
+  /// | |       |       |     |       |       | |
+  /// | |       |       |     |       |       | |
+  /// | |       |       |     |       |       | |
+  /// | +-------+-------+  =  +-------+-------+ |
+  /// | |       |       |     |       |       | |
+  /// | |       |       |     |       |       | |
+  /// | |       |       |     |       |       | |
+  /// | +-------+-------+     +-------+-------+ |
+  /// |         +             |       |       | |
+  /// | +-------+-------+     |       |       | |
+  /// | |       |       |     |       |       | |
+  /// | |       |       |     +-------+-------+ |
+  /// | |       |       |                       |
+  /// | +-------+-------+                       |
+  /// +-----------------------------------------+
+  ///
+  /// +--------------------------------------------------------------+
+  /// |2D + 1D                                                       |
+  /// |                                                              |
+  /// | +-------+-------+    +-------+     +-------+-------+-------+ |
+  /// | |       |       |    |       |     |       |       |       | |
+  /// | |       |       |    |       |     |       |       |       | |
+  /// | |       |       |    |       |     |       |       |       | |
+  /// | +-------+-------+    +-------+     +-------+-------+-------+ |
+  /// | |       |       |    |       |     |       |       |       | |
+  /// | |       |       |  + |       |  =  |       |       |       | |
+  /// | |       |       |    |       |     |       |       |       | |
+  /// | +-------+-------+    +-------+     +-------+-------+-------+ |
+  /// | |       |       |    |       |     |       |       |       | |
+  /// | |       |       |    |       |     |       |       |       | |
+  /// | |       |       |    |       |     |       |       |       | |
+  /// | +-------+-------+    +-------+     +-------+-------+-------+ |
+  /// |                                                              |
+  /// +--------------------------------------------------------------+
+  ///
+  /// 2D merges
+  /// The grids need to already share a common axis. If that is not the case,
+  /// the merge routine returns a `nullptr`. This can be handled by composite
+  /// merging as a fallback if needed.
+  /// Ordering and direction does not matter here.
+  ///
+  /// +-----------------------------------------+
+  /// |2D + 2D                                  |
+  /// |                                         |
+  /// | +-------+-------+     +-------+-------+ |
+  /// | |       |       |     |       |       | |
+  /// | |       |       |     |       |       | |
+  /// | |       |       |     |       |       | |
+  /// | +-------+-------+     +-------+-------+ |
+  /// | |       |       |     |       |       | |
+  /// | |       |       |  +  |       |       | |
+  /// | |       |       |     |       |       | |
+  /// | +-------+-------+     +-------+-------+ |
+  /// | |       |       |     |       |       | |
+  /// | |       |       |     |       |       | |
+  /// | |       |       |     |       |       | |
+  /// | +-------+-------+     +-------+-------+ |
+  /// |                                         |
+  /// |       +-------+-------+-------+-------+ |
+  /// |       |       |       |       |       | |
+  /// |       |       |       |       |       | |
+  /// |       |       |       |       |       | |
+  /// |       +-------+-------+-------+-------+ |
+  /// |       |       |       |       |       | |
+  /// |   =   |       |       |       |       | |
+  /// |       |       |       |       |       | |
+  /// |       +-------+-------+-------+-------+ |
+  /// |       |       |       |       |       | |
+  /// |       |       |       |       |       | |
+  /// |       |       |       |       |       | |
+  /// |       +-------+-------+-------+-------+ |
+  /// |                                         |
+  /// +-----------------------------------------+
+  ///
+  /// @param a The first grid portal link
+  /// @param b The second grid portal link
+  /// @param direction The merging direction
+  /// @param logger The logger to use for messages
+  /// @return The merged grid portal link or nullptr if grid merging did not succeed
+  /// @note The returned pointer can be nullptr, if the grids
+  ///       given are not mergeable, because their binnings are
+  ///       not compatible. This is not an error case, and needs
+  ///       to be handled by th caller! Invalid input is handled
+  ///       via exceptions.
+  static std::unique_ptr<PortalLinkBase> merge(
+      const GridPortalLink& a, const GridPortalLink& b, BinningValue direction,
+      const Logger& logger = getDummyLogger());
+
+  /// Return the associated grid in a type-erased form
+  /// @return The grid
+  virtual const IGrid& grid() const = 0;
+
+  /// Set the volume on all grid bins
+  /// @param volume The volume to set
+  virtual void setVolume(TrackingVolume* volume) = 0;
+
+  /// Get the number of dimensions of the grid
+  /// @return The number of dimensions
+  virtual unsigned int dim() const = 0;
+
+  /// Expand a 1D grid to a 2D one, by using the provided axis along the
+  /// *missing* direction.
+  /// @param other The axis to use for the missing direction,
+  ///              can be null for auto determination
+  /// @return A unique pointer to the 2D grid portal link
+  virtual std::unique_ptr<GridPortalLink> extendTo2d(
+      const IAxis* other) const = 0;
+
+  /// The binning direction of the grid
+  /// @note For 2D grids, this will always be the loc0
+  ///       direction, depending on the surface type.
+  /// @return The binning direction
+  BinningValue direction() const { return m_direction; }
+
+  /// Helper function to fill the bin contents after merging.
+  /// This called by the merging routine, and requires access to the internal
+  /// grid state.
+  /// @param a The first grid portal link
+  /// @param b The second grid portal link
+  /// @param merged The merged grid portal link
+  /// @param direction The merging direction
+  /// @param logger The logger to use for messages
+  static void fillMergedGrid(const GridPortalLink& a, const GridPortalLink& b,
+                             GridPortalLink& merged, BinningValue direction,
+                             const Logger& logger);
+
+  /// Helper function that prints a textual representation of the grid with the
+  /// volume names.
+  /// @param os The output stream
+  void printContents(std::ostream& os) const;
+
+ protected:
+  /// Helper function to check consistency for grid on a cylinder surface
+  /// @param cyl The cylinder surface
+  void checkConsistency(const CylinderSurface& cyl) const;
+
+  /// Helper function to check consistency for grid on a disc surface
+  /// @param disc The disc surface
+  void checkConsistency(const DiscSurface& disc) const;
+
+  /// Expand a 1D grid to a 2D one for a cylinder surface
+  /// @param surface The cylinder surface
+  /// @param other The axis to use for the missing direction,
+  ///              can be null for auto determination
+  /// @return A unique pointer to the 2D grid portal link
+  std::unique_ptr<GridPortalLink> extendTo2dImpl(
+      const std::shared_ptr<CylinderSurface>& surface,
+      const IAxis* other) const;
+
+  /// Expand a 1D grid to a 2D one for a disc surface
+  /// @param surface The disc surface
+  /// @param other The axis to use for the missing direction,
+  ///              can be null for auto determination
+  /// @return A unique pointer to the 2D grid portal link
+  std::unique_ptr<GridPortalLink> extendTo2dImpl(
+      const std::shared_ptr<DiscSurface>& surface, const IAxis* other) const;
+
+  /// Helper enum to declare which local direction to fill
+  enum class FillDirection {
+    loc0,
+    loc1,
+  };
+
+  /// Helper function to fill a 2D grid from a 1D grid, by extending all
+  /// bins along the different direction.
+  /// @param dir The direction to fill
+  /// @param grid1d The 1D grid
+  /// @param grid2d The 2D grid
+  static void fillGrid1dTo2d(FillDirection dir, const GridPortalLink& grid1d,
+                             GridPortalLink& grid2d);
+
+  /// Index type for type earsed (**slow**) bin access
+  using IndexType = boost::container::static_vector<std::size_t, 2>;
+
+  /// Helper function to get grid bin count in type-eraased way.
+  /// @return The number of bins in each direction
+  virtual IndexType numLocalBins() const = 0;
+
+  /// Helper function to get grid bin content in type-eraased way.
+  /// @param indices The bin indices
+  /// @return The tracking volume at the bin
+  virtual const TrackingVolume*& atLocalBins(IndexType indices) = 0;
+
+  /// Helper function to get grid bin content in type-eraased way.
+  /// @param indices The bin indices
+  /// @return The tracking volume at the bin
+  virtual const TrackingVolume* atLocalBins(IndexType indices) const = 0;
+
+ private:
+  BinningValue m_direction;
+};
+
+/// Concrete class deriving from @c GridPortalLink that boxes a concrete grid for lookup.
+/// @tparam Axes The axis types of the grid
+template <typename... Axes>
+  requires(sizeof...(Axes) <= 2)
+class GridPortalLinkT final : public GridPortalLink {
+ public:
+  /// The internal grid type
+  using GridType = Grid<const TrackingVolume*, Axes...>;
+
+  /// The dimension of the grid
+  static constexpr std::size_t DIM = sizeof...(Axes);
+
+  /// Constructor from a surface, axes and direction
+  /// @param surface The surface
+  /// @param direction The binning direction
+  /// @param axes The axes for the grid
+  /// @note The axes are checked for consistency with the bounds of @p surface.
+  GridPortalLinkT(std::shared_ptr<RegularSurface> surface,
+                  BinningValue direction, Axes&&... axes)
+      : GridPortalLink(std::move(surface), direction),
+        m_grid(std::tuple{std::move(axes)...}) {
+    using enum BinningValue;
+
+    if (const auto* cylinder =
+            dynamic_cast<const CylinderSurface*>(m_surface.get())) {
+      checkConsistency(*cylinder);
+
+      if (direction == binRPhi) {
+        m_projection = &projection<CylinderSurface, binRPhi>;
+      } else if (direction == binZ) {
+        m_projection = &projection<CylinderSurface, binZ>;
+      } else {
+        throw std::invalid_argument{"Invalid binning direction"};
+      }
+
+    } else if (const auto* disc =
+                   dynamic_cast<const DiscSurface*>(m_surface.get())) {
+      checkConsistency(*disc);
+
+      if (direction == binR) {
+        m_projection = &projection<DiscSurface, binR>;
+      } else if (direction == BinningValue::binPhi) {
+        m_projection = &projection<DiscSurface, binPhi>;
+      } else {
+        throw std::invalid_argument{"Invalid binning direction"};
+      }
+
+    } else {
+      throw std::logic_error{"Surface type is not supported"};
+    }
+  }
+
+  /// Get the grid
+  /// @return The grid
+  const GridType& grid() const override { return m_grid; }
+
+  /// Get the grid
+  /// @return The grid
+  GridType& grid() { return m_grid; }
+
+  /// Get the number of dimensions of the grid
+  /// @return The number of dimensions
+  unsigned int dim() const override { return DIM; }
+
+  /// Prints an identification to the output stream
+  /// @param os The output stream
+  void toStream(std::ostream& os) const override {
+    os << "GridPortalLink<dim=" << dim() << ">";
+  }
+
+  /// Makes a 2D grid from a 1D grid by extending it using an optional axis
+  /// @param other The axis to use for the missing direction,
+  ///              can be null for auto determination
+  /// @return A unique pointer to the 2D grid portal link
+  std::unique_ptr<GridPortalLink> extendTo2d(
+      const IAxis* other) const override {
+    if constexpr (DIM == 2) {
+      return std::make_unique<GridPortalLinkT<Axes...>>(*this);
+    } else {
+      if (auto cylinder =
+              std::dynamic_pointer_cast<CylinderSurface>(m_surface)) {
+        return extendTo2dImpl(cylinder, other);
+      } else if (auto disc =
+                     std::dynamic_pointer_cast<DiscSurface>(m_surface)) {
+        return extendTo2dImpl(disc, other);
+      } else {
+        throw std::logic_error{
+            "Surface type is not supported (this should not happen)"};
+      }
+    }
+  }
+
+  /// Set the volume on all grid bins
+  /// @param volume The volume to set
+  void setVolume(TrackingVolume* volume) override {
+    auto loc = m_grid.numLocalBins();
+    if constexpr (GridType::DIM == 1) {
+      for (std::size_t i = 1; i <= loc[0]; i++) {
+        m_grid.atLocalBins({i}) = volume;
+      }
+    } else {
+      for (std::size_t i = 1; i <= loc[0]; i++) {
+        for (std::size_t j = 1; j <= loc[1]; j++) {
+          m_grid.atLocalBins({i, j}) = volume;
+        }
+      }
+    }
+  }
+
+  /// Lookup the tracking volume at a position on the surface
+  /// @param gctx The geometry context
+  /// @param position The local position
+  /// @param tolerance The tolerance for the lookup
+  /// @note The position is required to be on the associated surface
+  /// @return The tracking volume (can be null)
+  Result<const TrackingVolume*> resolveVolume(
+      const GeometryContext& gctx, const Vector3& position,
+      double tolerance = s_onSurfaceTolerance) const override {
+    auto res = m_surface->globalToLocal(gctx, position, tolerance);
+    if (!res.ok()) {
+      return res.error();
+    }
+
+    const Vector2& local = *res;
+    return resolveVolume(gctx, local, tolerance);
+  }
+
+  /// Lookup the tracking volume at a position on the surface
+  /// @param position The local position
+  /// @note The position is required to be on the associated surface
+  /// @return The tracking volume (can be null)
+  Result<const TrackingVolume*> resolveVolume(
+      const GeometryContext& /*gctx*/, const Vector2& position,
+      double /*tolerance*/ = s_onSurfaceTolerance) const override {
+    assert(surface().insideBounds(position, BoundaryTolerance::None()));
+    return m_grid.atPosition(m_projection(position));
+  }
+
+  /// Type erased access to the number of bins
+  /// @return The number of bins in each direction
+  IndexType numLocalBins() const override {
+    typename GridType::index_t idx = m_grid.numLocalBins();
+    IndexType result;
+    for (std::size_t i = 0; i < DIM; i++) {
+      result.push_back(idx[i]);
+    }
+    return result;
+  }
+
+  /// Type erased local bin access
+  /// @param indices The bin indices
+  /// @return The tracking volume at the bin
+  const TrackingVolume*& atLocalBins(IndexType indices) override {
+    throw_assert(indices.size() == DIM, "Invalid number of indices");
+    typename GridType::index_t idx;
+    for (std::size_t i = 0; i < DIM; i++) {
+      idx[i] = indices[i];
+    }
+    return m_grid.atLocalBins(idx);
+  }
+
+  /// Type erased local bin access
+  /// @param indices The bin indices
+  /// @return The tracking volume at the bin
+  const TrackingVolume* atLocalBins(IndexType indices) const override {
+    throw_assert(indices.size() == DIM, "Invalid number of indices");
+    typename GridType::index_t idx;
+    for (std::size_t i = 0; i < DIM; i++) {
+      idx[i] = indices[i];
+    }
+    return m_grid.atLocalBins(idx);
+  }
+
+ private:
+  /// Helper function that's assigned to project from the 2D local position to a
+  /// possible 1D grid.
+  template <class surface_t, BinningValue direction>
+  static ActsVector<DIM> projection(const Vector2& position) {
+    using enum BinningValue;
+    if constexpr (DIM == 2) {
+      return position;
+    } else {
+      if constexpr (std::is_same_v<surface_t, CylinderSurface>) {
+        static_assert(direction == binRPhi || direction == binZ,
+                      "Invalid binning direction");
+
+        if constexpr (direction == binRPhi) {
+          return ActsVector<1>{position[0]};
+        } else if constexpr (direction == binZ) {
+          return ActsVector<1>{position[1]};
+        }
+      } else if constexpr (std::is_same_v<surface_t, DiscSurface>) {
+        static_assert(direction == binR || direction == binPhi,
+                      "Invalid binning direction");
+
+        if constexpr (direction == binR) {
+          return ActsVector<1>{position[0]};
+        } else if constexpr (direction == binPhi) {
+          return ActsVector<1>{position[1]};
+        }
+      } else if constexpr (std::is_same_v<surface_t, PlaneSurface>) {
+        static_assert(direction == binX || direction == binY,
+                      "Invalid binning direction");
+
+        if constexpr (direction == binX) {
+          return ActsVector<1>{position[0]};
+        } else if constexpr (direction == binY) {
+          return ActsVector<1>{position[1]};
+        }
+      }
+    }
+  }
+
+  GridType m_grid;
+
+  /// Stores a function pointer that can project from 2D to 1D if needed
+  ActsVector<DIM> (*m_projection)(const Vector2& position);
+};
+
+}  // namespace Acts
diff --git a/Core/include/Acts/Geometry/IConfinedTrackingVolumeBuilder.hpp b/Core/include/Acts/Geometry/IConfinedTrackingVolumeBuilder.hpp
index 30550a20e69..c37ea3e9eb5 100644
--- a/Core/include/Acts/Geometry/IConfinedTrackingVolumeBuilder.hpp
+++ b/Core/include/Acts/Geometry/IConfinedTrackingVolumeBuilder.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2016-2018 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 #include <memory>
diff --git a/Core/include/Acts/Geometry/ILayerArrayCreator.hpp b/Core/include/Acts/Geometry/ILayerArrayCreator.hpp
index 9cfabed7511..d2011c89a21 100644
--- a/Core/include/Acts/Geometry/ILayerArrayCreator.hpp
+++ b/Core/include/Acts/Geometry/ILayerArrayCreator.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2016-2018 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
diff --git a/Core/include/Acts/Geometry/ILayerBuilder.hpp b/Core/include/Acts/Geometry/ILayerBuilder.hpp
index 41ed9d2ee2e..671b6708bf6 100644
--- a/Core/include/Acts/Geometry/ILayerBuilder.hpp
+++ b/Core/include/Acts/Geometry/ILayerBuilder.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2016-2020 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
diff --git a/Core/include/Acts/Geometry/ITrackingGeometryBuilder.hpp b/Core/include/Acts/Geometry/ITrackingGeometryBuilder.hpp
index de0b2349e32..2967d3fe12a 100644
--- a/Core/include/Acts/Geometry/ITrackingGeometryBuilder.hpp
+++ b/Core/include/Acts/Geometry/ITrackingGeometryBuilder.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2016-2018 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 #include "Acts/Geometry/GeometryContext.hpp"
diff --git a/Core/include/Acts/Geometry/ITrackingVolumeArrayCreator.hpp b/Core/include/Acts/Geometry/ITrackingVolumeArrayCreator.hpp
index 003206d7c50..01a8efd850a 100644
--- a/Core/include/Acts/Geometry/ITrackingVolumeArrayCreator.hpp
+++ b/Core/include/Acts/Geometry/ITrackingVolumeArrayCreator.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2016-2018 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
diff --git a/Core/include/Acts/Geometry/ITrackingVolumeBuilder.hpp b/Core/include/Acts/Geometry/ITrackingVolumeBuilder.hpp
index eb477c203f8..f0263a1f510 100644
--- a/Core/include/Acts/Geometry/ITrackingVolumeBuilder.hpp
+++ b/Core/include/Acts/Geometry/ITrackingVolumeBuilder.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2016-2018 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
diff --git a/Core/include/Acts/Geometry/ITrackingVolumeHelper.hpp b/Core/include/Acts/Geometry/ITrackingVolumeHelper.hpp
index dce7319e8b5..a029a8ea494 100644
--- a/Core/include/Acts/Geometry/ITrackingVolumeHelper.hpp
+++ b/Core/include/Acts/Geometry/ITrackingVolumeHelper.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2016-2018 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
diff --git a/Core/include/Acts/Geometry/KDTreeTrackingGeometryBuilder.hpp b/Core/include/Acts/Geometry/KDTreeTrackingGeometryBuilder.hpp
index f44c51cbf74..25fc8ebf30b 100644
--- a/Core/include/Acts/Geometry/KDTreeTrackingGeometryBuilder.hpp
+++ b/Core/include/Acts/Geometry/KDTreeTrackingGeometryBuilder.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2022 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
diff --git a/Core/include/Acts/Geometry/Layer.hpp b/Core/include/Acts/Geometry/Layer.hpp
index fa748fa076f..15b1b98c621 100644
--- a/Core/include/Acts/Geometry/Layer.hpp
+++ b/Core/include/Acts/Geometry/Layer.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2016-2018 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
diff --git a/Core/include/Acts/Geometry/LayerArrayCreator.hpp b/Core/include/Acts/Geometry/LayerArrayCreator.hpp
index f142ec026c6..5358483cdde 100644
--- a/Core/include/Acts/Geometry/LayerArrayCreator.hpp
+++ b/Core/include/Acts/Geometry/LayerArrayCreator.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2016-2018 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
diff --git a/Core/include/Acts/Geometry/LayerCreator.hpp b/Core/include/Acts/Geometry/LayerCreator.hpp
index 0d490732b2c..b7996f68912 100644
--- a/Core/include/Acts/Geometry/LayerCreator.hpp
+++ b/Core/include/Acts/Geometry/LayerCreator.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2016-2020 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
diff --git a/Core/include/Acts/Geometry/NavigationLayer.hpp b/Core/include/Acts/Geometry/NavigationLayer.hpp
index b0d1cd5e4c7..6c80477d98a 100644
--- a/Core/include/Acts/Geometry/NavigationLayer.hpp
+++ b/Core/include/Acts/Geometry/NavigationLayer.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2016-2018 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
diff --git a/Core/include/Acts/Geometry/NavigationPolicyFactory.hpp b/Core/include/Acts/Geometry/NavigationPolicyFactory.hpp
new file mode 100644
index 00000000000..ed9acce9aa2
--- /dev/null
+++ b/Core/include/Acts/Geometry/NavigationPolicyFactory.hpp
@@ -0,0 +1,215 @@
+// This file is part of the ACTS project.
+//
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
+//
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
+
+#pragma once
+
+#include "Acts/Navigation/INavigationPolicy.hpp"
+#include "Acts/Navigation/MultiNavigationPolicy.hpp"
+
+#include <concepts>
+#include <memory>
+namespace Acts {
+
+class TrackingVolume;
+class GeometryContext;
+class Logger;
+class INavigationPolicy;
+
+namespace detail {
+template <typename... Factories>
+class NavigationPolicyFactoryImpl;
+}
+
+/// Base class for navigation policy factories. The factory can be assembled
+/// iteratively by using `make` followed by a number of calls to the `add`
+/// function of the helper type. Example:
+///
+/// ```cpp
+/// auto factory = NavigationPolicyFactory::make()
+///  .add<NavigationPolicy1>(arg1, arg2)
+///  .add<NavigationPolicy2>(/*no args*/)
+///  .asUniquePtr();
+/// ```
+class NavigationPolicyFactory {
+ public:
+  virtual ~NavigationPolicyFactory() = default;
+
+  // This needs to be listed here, but the return type cannot be spelled out
+  // yet.
+  static auto make();
+
+  // This will potentially get serialization interface and deserialization
+  // functionality
+
+  virtual std::unique_ptr<INavigationPolicy> build(
+      const GeometryContext& gctx, const TrackingVolume& volume,
+      const Logger& logger) const = 0;
+};
+
+namespace detail {
+
+template <typename F, typename... Args>
+concept NavigationPolicyIsolatedFactoryConcept = requires(
+    F f, const GeometryContext& gctx, const TrackingVolume& volume,
+    const Logger& logger, Args&&... args) {
+  { f(gctx, volume, logger, args...) } -> std::derived_from<INavigationPolicy>;
+
+  requires NavigationPolicyConcept<decltype(f(gctx, volume, logger, args...))>;
+
+  requires(std::is_copy_constructible_v<Args> && ...);
+};
+
+template <>
+class NavigationPolicyFactoryImpl<> {
+ public:
+  template <typename...>
+  friend class NavigationPolicyFactoryImpl;
+  NavigationPolicyFactoryImpl() = default;
+
+  /// Create a factory with the specified policy added
+  /// @tparam P The policy type to add
+  /// @param args The arguments to pass to the policy constructor
+  /// @note Arguments need to be copy constructible because the factory must be
+  ///       able to execute multiple times.
+  /// @return A new policy factory including the @c P policy.
+  template <NavigationPolicyConcept P, typename... Args>
+    requires(std::is_constructible_v<P, const GeometryContext&,
+                                     const TrackingVolume&, const Logger&,
+                                     Args...> &&
+             (std::is_copy_constructible_v<Args> && ...))
+  constexpr auto add(Args&&... args) && {
+    auto factory = [=](const GeometryContext& gctx,
+                       const TrackingVolume& volume, const Logger& logger) {
+      return P{gctx, volume, logger, args...};
+    };
+
+    return NavigationPolicyFactoryImpl<decltype(factory)>{
+        std::make_tuple(std::move(factory))};
+  }
+
+  /// Create a factory with a policy returned by a factory function
+  /// @tparam Fn The type of the function to construct the policy
+  /// @param args The arguments to pass to the policy factory
+  /// @note Arguments need to be copy constructible because the factory must be
+  ///       able to execute multiple times.
+  /// @return A new policy factory including the function
+  template <typename Fn, typename... Args>
+    requires(NavigationPolicyIsolatedFactoryConcept<Fn, Args...>)
+  constexpr auto add(Fn&& fn, Args&&... args) {
+    auto factory = [=](const GeometryContext& gctx,
+                       const TrackingVolume& volume, const Logger& logger) {
+      return fn(gctx, volume, logger, args...);
+    };
+
+    return NavigationPolicyFactoryImpl<decltype(factory)>{
+        std::make_tuple(std::move(factory))};
+  }
+};
+
+template <typename F, typename... Fs>
+class NavigationPolicyFactoryImpl<F, Fs...> : public NavigationPolicyFactory {
+ public:
+  /// Create a factory with the specified policy added
+  /// @tparam P The policy type to add
+  /// @param args The arguments to pass to the policy constructor
+  /// @note Arguments need to be copy constructible because the factory must be
+  ///       able to execute multiple times.
+  /// @return A new policy factory including the @c P policy.
+  template <NavigationPolicyConcept P, typename... Args>
+    requires(std::is_constructible_v<P, const GeometryContext&,
+                                     const TrackingVolume&, const Logger&,
+                                     Args...> &&
+             (std::is_copy_constructible_v<Args> && ...))
+  constexpr auto add(Args&&... args) && {
+    auto factory = [=](const GeometryContext& gctx,
+                       const TrackingVolume& volume, const Logger& logger) {
+      return P{gctx, volume, logger, args...};
+    };
+
+    return NavigationPolicyFactoryImpl<F, Fs..., decltype(factory)>{
+        std::tuple_cat(std::move(m_factories),
+                       std::make_tuple(std::move(factory)))};
+  }
+
+  /// Create a factory with a policy returned by a factory function
+  /// @tparam Fn The type of the function to construct the policy
+  /// @param args The arguments to pass to the policy factory
+  /// @note Arguments need to be copy constructible because the factory must be
+  ///       able to execute multiple times.
+  /// @return A new policy factory including the function
+  template <typename Fn, typename... Args>
+    requires(NavigationPolicyIsolatedFactoryConcept<Fn, Args...>)
+  constexpr auto add(Fn&& fn, Args&&... args) && {
+    auto factory = [=](const GeometryContext& gctx,
+                       const TrackingVolume& volume, const Logger& logger) {
+      return fn(gctx, volume, logger, args...);
+    };
+
+    return NavigationPolicyFactoryImpl<F, Fs..., decltype(factory)>{
+        std::tuple_cat(std::move(m_factories),
+                       std::make_tuple(std::move(factory)))};
+  }
+
+  /// Move the factory into a unique pointer
+  /// @note Only callable on rvalue references
+  /// @return A unique pointer to the factory
+  constexpr std::unique_ptr<NavigationPolicyFactoryImpl<F, Fs...>>
+  asUniquePtr() && {
+    return std::make_unique<NavigationPolicyFactoryImpl<F, Fs...>>(
+        std::move(*this));
+  }
+
+  /// Construct a navigation policy using the factories
+  /// @param gctx The geometry context
+  /// @param volume The tracking volume
+  /// @param logger The logger
+  auto operator()(const GeometryContext& gctx, const TrackingVolume& volume,
+                  const Logger& logger) const {
+    return std::apply(
+        [&](auto&&... factories) {
+          // Deduce policy type explicitly here...
+          using policy_type = decltype(MultiNavigationPolicy{
+              std::invoke(factories, std::declval<const GeometryContext&>(),
+                          std::declval<const TrackingVolume&>(),
+                          std::declval<const Logger&>())...});
+
+          // ... so we can create a unique_ptr of the concrete type here rather
+          // than the base. (`make_unique` can't do type deduction)
+          return std::make_unique<policy_type>(
+              std::invoke(factories, gctx, volume, logger)...);
+        },
+        m_factories);
+  }
+
+  /// Construct a navigation policy using the factories
+  /// @param gctx The geometry context
+  /// @param volume The tracking volume
+  /// @param logger The logger
+  std::unique_ptr<INavigationPolicy> build(
+      const GeometryContext& gctx, const TrackingVolume& volume,
+      const Logger& logger) const override {
+    return operator()(gctx, volume, logger);
+  }
+
+ private:
+  template <typename...>
+  friend class NavigationPolicyFactoryImpl;
+
+  explicit NavigationPolicyFactoryImpl(std::tuple<F, Fs...>&& factories)
+      : m_factories(std::move(factories)) {}
+
+  std::tuple<F, Fs...> m_factories;
+};
+
+}  // namespace detail
+
+inline auto NavigationPolicyFactory::make() {
+  return detail::NavigationPolicyFactoryImpl<>{};
+}
+
+}  // namespace Acts
diff --git a/Core/include/Acts/Geometry/PassiveLayerBuilder.hpp b/Core/include/Acts/Geometry/PassiveLayerBuilder.hpp
index e22f6a94115..b274c638846 100644
--- a/Core/include/Acts/Geometry/PassiveLayerBuilder.hpp
+++ b/Core/include/Acts/Geometry/PassiveLayerBuilder.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2016-2020 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
diff --git a/Core/include/Acts/Geometry/PlaneLayer.hpp b/Core/include/Acts/Geometry/PlaneLayer.hpp
index e7fd4bfe90d..2b86e3fb645 100644
--- a/Core/include/Acts/Geometry/PlaneLayer.hpp
+++ b/Core/include/Acts/Geometry/PlaneLayer.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2016-2018 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
diff --git a/Core/include/Acts/Geometry/Polyhedron.hpp b/Core/include/Acts/Geometry/Polyhedron.hpp
index 69ae109c52d..00ccaaab4c5 100644
--- a/Core/include/Acts/Geometry/Polyhedron.hpp
+++ b/Core/include/Acts/Geometry/Polyhedron.hpp
@@ -1,21 +1,24 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2018-2020 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
 #include "Acts/Definitions/Algebra.hpp"
 #include "Acts/Geometry/Extent.hpp"
+#include "Acts/Visualization/ViewConfig.hpp"
 
 #include <cstddef>
 #include <vector>
 
 namespace Acts {
 
+class IVisualization3D;
+
 /// @class Polyhedron
 ///
 /// Struct which contains a cartesian approximation for any surface type.
@@ -36,6 +39,7 @@ struct Polyhedron {
   /// @param facesIn List of lists of indices for faces.
   /// @param triangularMeshIn List of lists of indices for a triangular mesh
   /// @param isExact A dedicated flag if this is exact or not
+  ///
   /// @note This creates copies of the input vectors
   Polyhedron(const std::vector<Vector3>& verticesIn,
              const std::vector<FaceType>& facesIn,
@@ -79,5 +83,8 @@ struct Polyhedron {
   ///
   /// @return ranges that describe the space taken by this surface
   Extent extent(const Transform3& transform = Transform3::Identity()) const;
+
+  void visualize(IVisualization3D& helper,
+                 const ViewConfig& viewConfig = {}) const;
 };
 }  // namespace Acts
diff --git a/Core/include/Acts/Geometry/Portal.hpp b/Core/include/Acts/Geometry/Portal.hpp
new file mode 100644
index 00000000000..722b433d036
--- /dev/null
+++ b/Core/include/Acts/Geometry/Portal.hpp
@@ -0,0 +1,238 @@
+// This file is part of the ACTS project.
+//
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
+//
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
+
+#pragma once
+
+#include "Acts/Definitions/Algebra.hpp"
+#include "Acts/Definitions/Direction.hpp"
+#include "Acts/Utilities/BinningType.hpp"
+#include "Acts/Utilities/Logger.hpp"
+#include "Acts/Utilities/Result.hpp"
+
+#include <memory>
+
+namespace Acts {
+
+class RegularSurface;
+class GeometryContext;
+class TrackingVolume;
+class CylinderSurface;
+class PlaneSurface;
+class DiscSurface;
+class Surface;
+
+class PortalLinkBase;
+
+/// Exception thrown when portals cannot be merged
+class PortalMergingException : public std::exception {
+  const char* what() const noexcept override;
+};
+
+/// Exception thrown when portals cannot be fused
+class PortalFusingException : public std::exception {
+  const char* what() const noexcept override;
+};
+
+/// A portal connects two or more neighboring volumes. Each volume has a set of
+/// portals that describes which volumes lie behind the portal in that
+/// direction. Portals use associated portal links to perform lookups of target
+/// volumes.
+/// Each portal has two links, and a corresponding surface. One link is
+/// associated with the direction along the surface's normal vector, and one
+/// with the opposite direction.
+class Portal {
+ public:
+  /// Constructor for a portal from a single link
+  /// @param direction The direction of the link
+  /// @param link The portal link
+  Portal(Direction direction, std::unique_ptr<PortalLinkBase> link);
+
+  /// Constructor for a portal from a surface and volume, where a trivial portal
+  /// link is automatically constructed.
+  /// @param direction The direction of the link
+  /// @param surface The surface from which to create the portal link
+  /// @param volume The volume this portal connects to in the @p direction
+  ///               relative to the normal of @p surface.
+  Portal(Direction direction, std::shared_ptr<RegularSurface> surface,
+         TrackingVolume& volume);
+
+  /// Constructor for a portal from two links. One of the links can be
+  /// `nullptr`, but at least one of them needs to be set. If both are set, they
+  /// need to be valid compatible links that can be fused.
+  /// @param gctx The geometry context
+  /// @param alongNormal The link along the normal of the surface
+  /// @param oppositeNormal The link opposite to the normal of the
+  Portal(const GeometryContext& gctx,
+         std::unique_ptr<PortalLinkBase> alongNormal,
+         std::unique_ptr<PortalLinkBase> oppositeNormal);
+
+  /// Helper struct for the arguments to the portal constructor below using
+  /// designated initializers.
+  struct Arguments {
+    /// Aggregate over a surface and a volume with optional semantics
+    struct Link {
+      Link() = default;
+      /// Constructor from a surface and a volume
+      Link(std::shared_ptr<RegularSurface> surfaceIn, TrackingVolume& volumeIn)
+          : surface(std::move(surfaceIn)), volume(&volumeIn) {}
+
+      /// The associated surface
+      std::shared_ptr<RegularSurface> surface = nullptr;
+      /// The associated volume
+      TrackingVolume* volume = nullptr;
+    };
+
+    /// Entry for the link along normal
+    /// Entry for the link opposite normal
+    Link alongNormal{};
+    Link oppositeNormal{};
+  };
+
+  /// Constructor that takes a geometry context and an rvalue reference to a
+  /// helper struct from above. This pattern allows you to use designated
+  /// initializers to construct this object like:
+  /// ```cpp
+  /// Portal{gctx, {.oppositeNormal = {cyl1, *vol1}}};
+  /// Portal{gctx, {.alongNormal = {cyl2, *vol2}}};
+  /// ```
+  /// @param gctx The geometry context
+  /// @param args The struct containing the arguments
+  Portal(const GeometryContext& gctx, Arguments&& args);
+
+  /// Fuse two portals together. Fusing is the combination of two portal links
+  /// on the same logical surfaces. The actual surface instances can be
+  /// different, as long as they are geometrically equivalent (within numerical
+  /// precision). The resulting portal will have one portal along the shared
+  /// surface's normal vector, and one opposite that vector.
+  ///
+  ///    portal1   portal2
+  ///      +---+   +---+
+  ///      |   |   |   |
+  ///      |   |   |   |
+  /// <----+   | + |   +---->
+  ///      |   |   |   |
+  ///      |   |   |   |
+  ///      +---+   +---+
+  ///
+  /// @note The input portals need to have compatible link loadaout, e.g. one
+  ///       portal needs to have the *along normal* slot filled, and the
+  ///       otherone one needs to have the *opposite normal* slot filled. If
+  ///       portals share a filled slot, the function throws an exception.
+  /// @note This is a destructive operation on the portals involved
+  /// @param gctx The geometry context
+  /// @param aPortal The first portal
+  /// @param bPortal The second portal
+  /// @param logger The logger to push output to
+  static Portal fuse(const GeometryContext& gctx, Portal& aPortal,
+                     Portal& bPortal, const Logger& logger = getDummyLogger());
+
+  /// Merge two adjacent portals with each other to produce a new portal that
+  /// encompasses both inputs. It is the complementary operation to the fusing
+  /// of portals. To be able to merge portals, the surfaces of their associated
+  /// links need to be *mergeable*, and the portal links need to be compatible.
+  /// This means that both portals need to have a link along the portal surface
+  /// normal, opposite the normal, or both. If the equipped links are opposite
+  /// relative to one another (e.g. one along one opposite), the function will
+  /// throw an exception.
+  ///
+  ///         ^                     ^
+  ///         |                     |
+  ///  portal1|              portal2|
+  /// +-------+-------+     +-------+-------+
+  /// |               |  +  |               |
+  /// +-------+-------+     +-------+-------+
+  ///         |                     |
+  ///         |                     |
+  ///         v                     v
+  ///
+  /// @note This is a destructive operation on both portals, their
+  ///       links will be moved to produce merged links, which can fail
+  ///       if the portal links are not compatible
+  /// @param gctx The geometry context
+  /// @param aPortal The first portal
+  /// @param bPortal The second portal
+  /// @param direction The direction of the merge (e.g. along z)
+  /// @param logger The logger to push output to
+  static Portal merge(const GeometryContext& gctx, Portal& aPortal,
+                      Portal& bPortal, BinningValue direction,
+                      const Logger& logger = getDummyLogger());
+
+  /// Resolve the volume for a 3D position and a direction
+  /// The @p direction is used to select the right portal link, if it is set.
+  /// In case no link is found in the specified direction, a `nullptr` is
+  /// returned.
+  /// @param gctx The geometry context
+  /// @param position The 3D position
+  /// @param direction The direction
+  /// @return The target volume (can be `nullptr`)
+  Result<const TrackingVolume*> resolveVolume(const GeometryContext& gctx,
+                                              const Vector3& position,
+                                              const Vector3& direction) const;
+
+  /// Set a link on the portal into the slot specified by the direction.
+  /// @note The surface associated with @p link must be logically equivalent
+  ///       to the one of the link that's already set on the portal.
+  /// @param gctx The geometry context
+  /// @param direction The direction
+  /// @param link The link to set
+  void setLink(const GeometryContext& gctx, Direction direction,
+               std::unique_ptr<PortalLinkBase> link);
+
+  /// Helper function create a trivial portal link based on a surface.
+  /// @param gctx The geometry context
+  /// @param direction The direction of the link to create
+  /// @param surface The surface
+  /// @note The @p surface must be logically equivalent
+  ///       to the one of the link that's already set on the portal.
+  /// @param volume The target volume
+  void setLink(const GeometryContext& gctx, Direction direction,
+               std::shared_ptr<RegularSurface> surface, TrackingVolume& volume);
+
+  /// Get the link associated with the @p direction. Can be null if the associated link is unset.
+  /// @param direction The direction
+  /// @return The link (can be null)
+  const PortalLinkBase* getLink(Direction direction) const;
+
+  /// Returns true if the portal is valid, that means it has at least one
+  /// non-null link associated.Portals can be in an invalid state after they get
+  /// merged or fused with other portals.
+  /// @return True if the portal is valid
+  bool isValid() const;
+
+  /// Create and attach a trivial portal link to the empty slot of this portal
+  /// @param volume The target volume to connect to
+  void fill(TrackingVolume& volume);
+
+  /// Access the portal surface that is shared between the two links
+  /// @return The portal surface
+  const RegularSurface& surface() const;
+
+  /// Access the portal surface that is shared between the two links
+  /// @return The portal surface
+  RegularSurface& surface();
+
+ private:
+  /// Helper to check surface equivalence without checking material status. This
+  /// is needed because we allow fusing portals with surfaces that are
+  /// equivalent but one of them has material while the other does not. The
+  /// normal surface comparison would determine these surfaces as not
+  /// equivalent.
+  /// @param gctx The geometry context
+  /// @param a The first surface
+  /// @param b The second surface
+  /// @return True if the surfaces are equivalent
+  static bool isSameSurface(const GeometryContext& gctx, const Surface& a,
+                            const Surface& b);
+
+  std::shared_ptr<RegularSurface> m_surface;
+
+  std::unique_ptr<PortalLinkBase> m_alongNormal;
+  std::unique_ptr<PortalLinkBase> m_oppositeNormal;
+};
+
+}  // namespace Acts
diff --git a/Core/include/Acts/Geometry/PortalError.hpp b/Core/include/Acts/Geometry/PortalError.hpp
new file mode 100644
index 00000000000..0e1143228df
--- /dev/null
+++ b/Core/include/Acts/Geometry/PortalError.hpp
@@ -0,0 +1,29 @@
+// This file is part of the ACTS project.
+//
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
+//
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
+
+#pragma once
+
+#include <system_error>
+#include <type_traits>
+
+namespace Acts {
+
+enum class PortalError {
+  // ensure all values are non-zero
+  PositionNotOnAnyChildPortalLink = 1,
+};
+
+std::error_code make_error_code(Acts::PortalError e);
+
+}  // namespace Acts
+
+namespace std {
+// register with STL
+template <>
+struct is_error_code_enum<Acts::PortalError> : std::true_type {};
+}  // namespace std
diff --git a/Core/include/Acts/Geometry/PortalLinkBase.hpp b/Core/include/Acts/Geometry/PortalLinkBase.hpp
new file mode 100644
index 00000000000..2f8273f10b5
--- /dev/null
+++ b/Core/include/Acts/Geometry/PortalLinkBase.hpp
@@ -0,0 +1,119 @@
+// This file is part of the ACTS project.
+//
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
+//
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
+
+#pragma once
+
+#include "Acts/Definitions/Algebra.hpp"
+#include "Acts/Definitions/Tolerance.hpp"
+#include "Acts/Utilities/BinningType.hpp"
+#include "Acts/Utilities/Logger.hpp"
+#include "Acts/Utilities/Result.hpp"
+
+#include <memory>
+
+namespace Acts {
+
+class RegularSurface;
+class TrackingVolume;
+class GeometryContext;
+
+/// PortalLinkBase is the abstract base class for all portal links.
+/// A portal link is a mapping between a surface and a point on the surface and
+/// a destination tracking volum.
+/// The derived classes implement different ways to resolve a volume
+class PortalLinkBase {
+ protected:
+  /// Constructor from a surface. This constructor is only
+  /// called from derived classes
+  /// @param surface The surface
+  explicit PortalLinkBase(std::shared_ptr<RegularSurface> surface)
+      : m_surface(std::move(surface)) {
+    if (!m_surface) {
+      throw std::invalid_argument("Surface pointer must not be null");
+    }
+  }
+
+ public:
+  /// Virtual destructor in case the object is held as a derived
+  virtual ~PortalLinkBase() = default;
+
+  /// Resolve a volume given a global position. Depending on the derived class,
+  /// the global position might be converted to a local position before lookup.
+  /// @param gctx The geometry context
+  /// @param position The global position
+  /// @param tolerance The tolerance for the lookup
+  ///
+  /// @return The tracking volume or null if no connection was found
+  virtual Result<const TrackingVolume*> resolveVolume(
+      const GeometryContext& gctx, const Vector3& position,
+      double tolerance = s_onSurfaceTolerance) const = 0;
+
+  /// Resolve a volume given a local position. The local position is assumed to
+  /// be on surface.
+  /// @param gctx The geometry context
+  /// @param position The local position
+  /// @param tolerance The tolerance for the lookup
+  ///
+  /// @return The tracking volume or null if no connection was found
+  virtual Result<const TrackingVolume*> resolveVolume(
+      const GeometryContext& gctx, const Vector2& position,
+      double tolerance = s_onSurfaceTolerance) const = 0;
+
+  //// Merge two portal link into a single one. The merge can resolve
+  /// combinations of difference derived classes, and will try to flatten and
+  /// deep merge given links if possible.
+  /// @param a The first portal link
+  /// @param b The second portal link
+  /// @param direction The binning direction in which to merge. Valid values are
+  ///                  depend on the surface types associated with the links.
+  /// @param logger The logger to use for messages
+  /// @return The merged portal link
+  static std::unique_ptr<PortalLinkBase> merge(
+      std::unique_ptr<PortalLinkBase> a, std::unique_ptr<PortalLinkBase> b,
+      BinningValue direction, const Logger& logger = getDummyLogger());
+
+  /// Stream output function
+  /// @param os The output stream
+  virtual void toStream(std::ostream& os) const = 0;
+
+  /// Stream output operator
+  /// @param os The output stream
+  /// @param link The portal link
+  friend std::ostream& operator<<(std::ostream& os,
+                                  const PortalLinkBase& link) {
+    link.toStream(os);
+    return os;
+  }
+
+  /// Getter for the associated surface
+  /// @return The surface
+  const RegularSurface& surface() const { return *m_surface; }
+
+  /// Setter for the surface
+  /// @param surface The surface
+  void setSurface(std::shared_ptr<RegularSurface> surface) {
+    m_surface = std::move(surface);
+  }
+
+  /// Getter for the underlying shared pointer
+  /// @return The shared pointer to the surface
+  const std::shared_ptr<RegularSurface>& surfacePtr() const {
+    return m_surface;
+  }
+
+ protected:
+  /// Helper function to check a number of preconditions before merging is
+  /// executed.
+  static void checkMergePreconditions(const PortalLinkBase& a,
+                                      const PortalLinkBase& b,
+                                      BinningValue direction);
+
+  std::shared_ptr<RegularSurface> m_surface;
+};
+
+}  // namespace Acts
diff --git a/Core/include/Acts/Geometry/PortalShell.hpp b/Core/include/Acts/Geometry/PortalShell.hpp
new file mode 100644
index 00000000000..fe9f606c576
--- /dev/null
+++ b/Core/include/Acts/Geometry/PortalShell.hpp
@@ -0,0 +1,213 @@
+// This file is part of the ACTS project.
+//
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
+//
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
+
+#pragma once
+
+#include "Acts/Geometry/CylinderVolumeBounds.hpp"
+#include "Acts/Utilities/BinningType.hpp"
+#include "Acts/Utilities/Logger.hpp"
+
+#include <array>
+#include <memory>
+
+namespace Acts {
+
+class Portal;
+class TrackingVolume;
+class GeometryContext;
+
+/// @class PortalShellBase
+/// The portal shell of a volume is the set of portals that describes
+/// connections "outside" of the volume. Which boundary surfaces of a volume are
+/// included in the shell depends on the volume. Portal shells are only used
+/// during geometry construction, and are not part of the final geometry
+/// description.
+///
+/// This class is the base class for all portal shells
+class PortalShellBase {
+ public:
+  /// Virtusl destructor
+  virtual ~PortalShellBase() = default;
+
+  /// Fill the open slots of the shell with a @c TrivialPortalLink
+  /// to the given @p volume.
+  /// @param volume The volume to connect
+  virtual void fill(TrackingVolume& volume) = 0;
+
+  /// Get the number of portals in the shell. This number depends on the volume
+  /// type
+  /// @return The number of portals in the shell
+  virtual std::size_t size() const = 0;
+
+  /// Instruct the shell to register the portals with the volume, handing over
+  /// shared ownership in the process.
+  /// @note The target volume depends on the shell type, e.g. composite shells
+  ///       like the @c CylinerStackPortalShell register portals to the *correct*
+  ///       volumes.
+  virtual void applyToVolume() = 0;
+
+  /// Check if a portal is *valid*, e.g. if non of the portals has two
+  /// unconnected sides.
+  /// @return True if the shell is valid, false otherwise
+  virtual bool isValid() const = 0;
+
+  /// Get a label for the portal shell for debugging purposes
+  /// @return A label for the portal shell
+  virtual std::string label() const = 0;
+};
+
+/// @class CylinderPortalShell
+/// Base class for cylinder shaped portal shells, e.g. shells for cylinder
+/// volumes
+class CylinderPortalShell : public PortalShellBase {
+ public:
+  using Face = CylinderVolumeBounds::Face;
+
+  using enum CylinderVolumeBounds::Face;
+
+  /// Retrieve the portal associated to the given face. Can be nullptr if unset.
+  /// @param face The face to retrieve the portal for
+  /// @return The portal associated to the face
+  virtual Portal* portal(Face face) = 0;
+
+  /// Retrieve a shared_ptr for the portal associated to the given face. Can be
+  /// nullptr if unset.
+  /// @param face The face to retrieve the portal for
+  /// @return The portal associated to the face
+  virtual std::shared_ptr<Portal> portalPtr(Face face) = 0;
+
+  /// Set the portal associated to the given face.
+  /// @param portal The portal to set
+  /// @param face The face to set the portal
+  virtual void setPortal(std::shared_ptr<Portal> portal, Face face) = 0;
+
+  /// @copydoc PortalShellBase::fill
+  void fill(TrackingVolume& volume) override;
+};
+
+/// Output stream operator for the CylinderPortalShell::Face enum
+/// @param os The output stream
+/// @param face The face to output
+/// @return The output stream
+std::ostream& operator<<(std::ostream& os, CylinderPortalShell::Face face);
+
+/// @class SingleCylinderPortalShell
+/// This class describes a cylinder shell containing a single volume. The
+/// available faces depend on the configuration of the cylinder volume bounds.
+/// If a phi sector is configured, the shell will have corresponding portal
+/// slots. If the inner radius is non-zero, the shell will have an inner
+/// cylinder portal slot.
+class SingleCylinderPortalShell : public CylinderPortalShell {
+ public:
+  /// Construct a single cylinder portal shell for the given volume
+  /// @param volume The volume to create the shell for
+  explicit SingleCylinderPortalShell(TrackingVolume& volume);
+
+  /// @copydoc PortalShellBase::size
+  std::size_t size() const final;
+
+  /// @copydoc CylinderPortalShell::portal
+  Portal* portal(Face face) final;
+
+  /// @copydoc CylinderPortalShell::portalPtr
+  std::shared_ptr<Portal> portalPtr(Face face) final;
+
+  /// @copydoc CylinderPortalShell::setPortal
+  void setPortal(std::shared_ptr<Portal> portal, Face face) final;
+
+  /// @copydoc PortalShellBase::applyToVolume
+  void applyToVolume() override;
+
+  /// @copydoc PortalShellBase::isValid
+  bool isValid() const override;
+
+  /// @copydoc PortalShellBase::label
+  std::string label() const override;
+
+ private:
+  std::array<std::shared_ptr<Portal>, 6> m_portals{};
+
+  TrackingVolume* m_volume;
+};
+
+/// @class CylinderStackPortalShell
+/// This class describes a cylinder shell containing multiple volumes. The
+/// available faces depend on the configuration of the cylinder volume bounds.
+/// @note The stack shell currently does not support phi sectors
+/// The stack can be oriented along the (local) z or r direction, which drives
+/// the stacking. Depending on the direction, portals on the shells of children
+/// are merged or fused. Subsequently, portal access respects shared portals
+/// between shells. Below is an illustration of a stack in the r direction:
+///
+///  Fused         +-----------------+
+/// portals ----+  |                 |
+///   |         |  v           OuterCylinder
+///   |  +------+------+
+///   |  |      |      |
+///   |  |      |      |<--+
+///   +--+---+  v      |   |
+///      +---+---------+   |
+///      |   |         |   |      Shared portal
+///      |   |         |<--+---      (grid)
+///      |   v         |   |      PositiveDisc
+///      +-------------+   |
+/// r ^  |             |   |
+///   |  |             |<--+
+///   |  |             |
+///   |  +-------------+       InnerCylinder
+///   +----->      ^            (if rMin>0)
+///          z     |                 |
+///                +-----------------+
+///
+/// @note The shells must be ordered in the given direction
+/// Depending on the stack direction, the portal lookup will return different
+/// portals. In the illustration above, the `PositiveDisc` portal is shared
+/// among all shells, while the `OuterCylinder` and `InnerCylinder` portals are
+/// looked up from the innermost and outermost shell in the r direction.
+class CylinderStackPortalShell : public CylinderPortalShell {
+ public:
+  /// Construct the portal shell stack from the given shells
+  /// @param gctx The geometry context
+  /// @param shells The shells to stack
+  /// @note The shells must be ordered in the given direction
+  /// @param direction The stacking direction
+  /// @param logger A logging instance for debugging
+  CylinderStackPortalShell(const GeometryContext& gctx,
+                           std::vector<CylinderPortalShell*> shells,
+                           BinningValue direction,
+                           const Logger& logger = getDummyLogger());
+
+  /// @copydoc PortalShellBase::size
+  std::size_t size() const final;
+
+  /// @copydoc CylinderPortalShell::portal
+  Portal* portal(Face face) final;
+
+  /// @copydoc CylinderPortalShell::portalPtr
+  std::shared_ptr<Portal> portalPtr(Face face) final;
+
+  /// @copydoc CylinderPortalShell::setPortal
+  void setPortal(std::shared_ptr<Portal> portal, Face face) final;
+
+  void applyToVolume() override {
+    // No-op, because it's a composite portal shell
+  }
+
+  /// @copydoc PortalShellBase::isValid
+  bool isValid() const override;
+
+  /// @copydoc PortalShellBase::label
+  std::string label() const override;
+
+ private:
+  BinningValue m_direction;
+  std::vector<CylinderPortalShell*> m_shells;
+  bool m_hasInnerCylinder{true};
+};
+
+}  // namespace Acts
diff --git a/Core/include/Acts/Geometry/ProtoLayer.hpp b/Core/include/Acts/Geometry/ProtoLayer.hpp
index 39f6827b23f..1e5d95dc025 100644
--- a/Core/include/Acts/Geometry/ProtoLayer.hpp
+++ b/Core/include/Acts/Geometry/ProtoLayer.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2017-2018 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 #include "Acts/Geometry/Extent.hpp"
@@ -33,6 +33,9 @@ struct ProtoLayer {
   /// The envelope parameters
   ExtentEnvelope envelope = ExtentEnvelope::Zero();
 
+  /// The local transform
+  Transform3 transform = Transform3::Identity();
+
   /// Constructor
   ///
   /// Loops over a provided vector of surface and calculates the various
@@ -41,8 +44,10 @@ struct ProtoLayer {
   ///
   /// @param gctx The current geometry context object, e.g. alignment
   /// @param surfaces The vector of surfaces to consider
+  /// @param transformIn The local transform to evaluate the sizing in
   ProtoLayer(const GeometryContext& gctx,
-             const std::vector<const Surface*>& surfaces);
+             const std::vector<const Surface*>& surfaces,
+             const Transform3& transformIn = Transform3::Identity());
 
   /// Constructor
   ///
@@ -52,8 +57,23 @@ struct ProtoLayer {
   ///
   /// @param gctx The current geometry context object, e.g. alignment
   /// @param surfaces The vector of surfaces to consider
+  /// @param transformIn The local transform to evaluate the sizing in
   ProtoLayer(const GeometryContext& gctx,
-             const std::vector<std::shared_ptr<const Surface>>& surfaces);
+             const std::vector<std::shared_ptr<const Surface>>& surfaces,
+             const Transform3& transformIn = Transform3::Identity());
+
+  /// Constructor
+  ///
+  /// Loops over a provided vector of surface and calculates the various
+  /// min/max values in one go. Also takes into account the thickness
+  /// of an associated DetectorElement, if it exists.
+  ///
+  /// @param gctx The current geometry context object, e.g. alignment
+  /// @param surfaces The vector of surfaces to consider
+  /// @param transformIn The local transform to evaluate the sizing in
+  ProtoLayer(const GeometryContext& gctx,
+             const std::vector<std::shared_ptr<Surface>>& surfaces,
+             const Transform3& transformIn = Transform3::Identity());
 
   ProtoLayer() = default;
 
@@ -81,6 +101,14 @@ struct ProtoLayer {
   /// @param sl the input ostream
   std::ostream& toStream(std::ostream& sl) const;
 
+  /// Output stream operator
+  /// @param sl the input ostream
+  /// @param pl the ProtoLayer to be printed
+  /// @return the output ostream
+  friend std::ostream& operator<<(std::ostream& sl, const ProtoLayer& pl) {
+    return pl.toStream(sl);
+  }
+
   /// Give access to the surfaces used/assigned to the ProtoLayer
   const std::vector<const Surface*>& surfaces() const;
 
diff --git a/Core/include/Acts/Geometry/ProtoLayerHelper.hpp b/Core/include/Acts/Geometry/ProtoLayerHelper.hpp
index 3b912664d8e..33ca14718b4 100644
--- a/Core/include/Acts/Geometry/ProtoLayerHelper.hpp
+++ b/Core/include/Acts/Geometry/ProtoLayerHelper.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2020 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
diff --git a/Core/include/Acts/Geometry/SurfaceArrayCreator.hpp b/Core/include/Acts/Geometry/SurfaceArrayCreator.hpp
index 6b6db768a2d..584e8ee6992 100644
--- a/Core/include/Acts/Geometry/SurfaceArrayCreator.hpp
+++ b/Core/include/Acts/Geometry/SurfaceArrayCreator.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2016-2020 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
@@ -24,6 +24,7 @@
 #include <functional>
 #include <iterator>
 #include <memory>
+#include <numbers>
 #include <optional>
 #include <ostream>
 #include <tuple>
@@ -257,7 +258,7 @@ class SurfaceArrayCreator {
 
       // ...so by injecting them into atan2, we get the angle between them
       auto dPhi = std::atan2(sin_dPhi_n2, cos_dPhi_n2);
-      return std::abs(dPhi) < M_PI / 180.;
+      return std::abs(dPhi) < std::numbers::pi / 180.;
     }
 
     if (bValue == Acts::BinningValue::binZ) {
diff --git a/Core/include/Acts/Geometry/SurfaceBinningMatcher.hpp b/Core/include/Acts/Geometry/SurfaceBinningMatcher.hpp
index 624fe01193c..c15928ee1dc 100644
--- a/Core/include/Acts/Geometry/SurfaceBinningMatcher.hpp
+++ b/Core/include/Acts/Geometry/SurfaceBinningMatcher.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2020 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
diff --git a/Core/include/Acts/Geometry/TrackingGeometry.hpp b/Core/include/Acts/Geometry/TrackingGeometry.hpp
index d9a7081239a..e8d48c5ae5e 100644
--- a/Core/include/Acts/Geometry/TrackingGeometry.hpp
+++ b/Core/include/Acts/Geometry/TrackingGeometry.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2016-2020 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
@@ -17,7 +17,6 @@
 #include "Acts/Utilities/Logger.hpp"
 
 #include <memory>
-#include <string>
 #include <unordered_map>
 #include <utility>
 
@@ -29,9 +28,6 @@ class PerigeeSurface;
 class IMaterialDecorator;
 class TrackingVolume;
 
-using TrackingVolumePtr = std::shared_ptr<const TrackingVolume>;
-using MutableTrackingVolumePtr = std::shared_ptr<TrackingVolume>;
-
 ///  @class TrackingGeometry
 ///
 ///  The TrackingGeometry class is the owner of the constructed TrackingVolumes.
@@ -52,7 +48,7 @@ class TrackingGeometry {
   ///        surface or volume based material to the TrackingVolume
   /// @param hook Identifier hook to be applied to surfaces
   /// @param logger instance of a logger (defaulting to the "silent" one)
-  TrackingGeometry(const MutableTrackingVolumePtr& highestVolume,
+  TrackingGeometry(const std::shared_ptr<TrackingVolume>& highestVolume,
                    const IMaterialDecorator* materialDecorator = nullptr,
                    const GeometryIdentifierHook& hook = {},
                    const Logger& logger = getDummyLogger());
@@ -66,8 +62,7 @@ class TrackingGeometry {
 
   /// Access to the world volume
   /// @return shared pointer to the world volume
-  const std::shared_ptr<const TrackingVolume>& highestTrackingVolumeShared()
-      const;
+  std::shared_ptr<const TrackingVolume> highestTrackingVolumePtr() const;
 
   /// return the lowest tracking Volume
   ///
@@ -87,19 +82,6 @@ class TrackingGeometry {
   const Layer* associatedLayer(const GeometryContext& gctx,
                                const Vector3& gp) const;
 
-  /// Register the beam tube
-  ///
-  /// @param beam is the beam line surface
-  void registerBeamTube(std::shared_ptr<const PerigeeSurface> beam);
-
-  /// @brief surface representing the beam pipe
-  ///
-  /// @note The ownership is not passed, e.g. do not delete the pointer
-  ///
-  /// @return raw pointer to surface representing the beam pipe
-  ///         (could be a null pointer)
-  const Surface* getBeamline() const;
-
   /// @brief Visit all reachable surfaces
   ///
   /// @tparam visitor_t Type of the callable visitor
@@ -108,7 +90,7 @@ class TrackingGeometry {
   /// that is found, a selection of the surfaces can be done in the visitor
   /// @param restrictToSensitives If true, only sensitive surfaces are visited
   ///
-  /// @note If a context is needed for the visit, the vistitor has to provide
+  /// @note If a context is needed for the visit, the visitor has to provide
   /// this, e.g. as a private member
   template <SurfaceVisitor visitor_t>
   void visitSurfaces(visitor_t&& visitor, bool restrictToSensitives) const {
@@ -123,7 +105,7 @@ class TrackingGeometry {
   /// @param visitor The callable. Will be called for each sensitive surface
   /// that is found, a selection of the surfaces can be done in the visitor
   ///
-  /// @note If a context is needed for the visit, the vistitor has to provide
+  /// @note If a context is needed for the visit, the visitor has to provide
   /// this, e.g. as a private member
   template <SurfaceVisitor visitor_t>
   void visitSurfaces(visitor_t&& visitor) const {
@@ -137,7 +119,7 @@ class TrackingGeometry {
   /// @param visitor The callable. Will be called for each reachable volume
   /// that is found, a selection of the volumes can be done in the visitor
   ///
-  /// @note If a context is needed for the visit, the vistitor has to provide
+  /// @note If a context is needed for the visit, the visitor has to provide
   /// this, e.g. as a private member
   template <TrackingVolumeVisitor visitor_t>
   void visitVolumes(visitor_t&& visitor) const {
@@ -163,11 +145,20 @@ class TrackingGeometry {
   const std::unordered_map<GeometryIdentifier, const Surface*>&
   geoIdSurfaceMap() const;
 
+  /// Visualize a tracking geometry including substructure
+  /// @param helper The visualization helper that implement the output
+  /// @param gctx The geometry context
+  /// @param viewConfig Global view config
+  /// @param portalViewConfig View config for portals
+  /// @param sensitiveViewConfig View configuration for sensitive surfaces
+  void visualize(IVisualization3D& helper, const GeometryContext& gctx,
+                 const ViewConfig& viewConfig = s_viewVolume,
+                 const ViewConfig& portalViewConfig = s_viewPortal,
+                 const ViewConfig& sensitiveViewConfig = s_viewSensitive) const;
+
  private:
   // the known world
-  TrackingVolumePtr m_world;
-  // beam line
-  std::shared_ptr<const PerigeeSurface> m_beam;
+  std::shared_ptr<TrackingVolume> m_world;
   // lookup containers
   std::unordered_map<GeometryIdentifier, const TrackingVolume*> m_volumesById;
   std::unordered_map<GeometryIdentifier, const Surface*> m_surfacesById;
diff --git a/Core/include/Acts/Geometry/TrackingGeometryBuilder.hpp b/Core/include/Acts/Geometry/TrackingGeometryBuilder.hpp
index a3d1bf4a011..66eb55c4c86 100644
--- a/Core/include/Acts/Geometry/TrackingGeometryBuilder.hpp
+++ b/Core/include/Acts/Geometry/TrackingGeometryBuilder.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2016-2018 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
diff --git a/Core/include/Acts/Geometry/TrackingVolume.hpp b/Core/include/Acts/Geometry/TrackingVolume.hpp
index f4fc0c84c84..664faa39d46 100644
--- a/Core/include/Acts/Geometry/TrackingVolume.hpp
+++ b/Core/include/Acts/Geometry/TrackingVolume.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2016-2018 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
@@ -13,18 +13,20 @@
 #include "Acts/Geometry/BoundarySurfaceT.hpp"
 #include "Acts/Geometry/GeometryContext.hpp"
 #include "Acts/Geometry/GeometryIdentifier.hpp"
-#include "Acts/Geometry/GlueVolumesDescriptor.hpp"
 #include "Acts/Geometry/Layer.hpp"
+#include "Acts/Geometry/Portal.hpp"
 #include "Acts/Geometry/TrackingVolumeVisitorConcept.hpp"
 #include "Acts/Geometry/Volume.hpp"
 #include "Acts/Material/IVolumeMaterial.hpp"
-#include "Acts/Surfaces/BoundaryTolerance.hpp"
+#include "Acts/Navigation/NavigationDelegate.hpp"
+#include "Acts/Navigation/NavigationStream.hpp"
 #include "Acts/Surfaces/Surface.hpp"
 #include "Acts/Surfaces/SurfaceArray.hpp"
 #include "Acts/Surfaces/SurfaceVisitorConcept.hpp"
 #include "Acts/Utilities/BinnedArray.hpp"
 #include "Acts/Utilities/Logger.hpp"
 #include "Acts/Utilities/TransformRange.hpp"
+#include "Acts/Visualization/ViewConfig.hpp"
 
 #include <cstddef>
 #include <memory>
@@ -33,7 +35,7 @@
 #include <utility>
 #include <vector>
 
-#include <boost/container/small_vector.hpp>
+#include <boost/container/container_fwd.hpp>
 
 namespace Acts {
 
@@ -41,13 +43,14 @@ class GlueVolumesDescriptor;
 class VolumeBounds;
 template <typename object_t>
 struct NavigationOptions;
-class GeometryIdentifier;
 class IMaterialDecorator;
 class ISurfaceMaterial;
 class IVolumeMaterial;
 class Surface;
 class TrackingVolume;
 struct GeometryIdentifierHook;
+class Portal;
+class INavigationPolicy;
 
 /// Interface types of the Gen1 geometry model
 /// @note This interface is being replaced, and is subject to removal
@@ -114,6 +117,8 @@ class TrackingVolume : public Volume {
   ~TrackingVolume() override;
   TrackingVolume(const TrackingVolume&) = delete;
   TrackingVolume& operator=(const TrackingVolume&) = delete;
+  TrackingVolume(TrackingVolume&&) noexcept;
+  TrackingVolume& operator=(TrackingVolume&&) noexcept;
 
   /// Constructor for a container Volume
   /// - vacuum filled volume either as a for other tracking volumes
@@ -123,7 +128,7 @@ class TrackingVolume : public Volume {
   /// @param volbounds is the description of the volume boundaries
   /// @param volumeName is a string identifier
   TrackingVolume(const Transform3& transform,
-                 std::shared_ptr<const VolumeBounds> volbounds,
+                 std::shared_ptr<VolumeBounds> volbounds,
                  const std::string& volumeName = "undefined");
 
   /// Constructor for a full equipped Tracking Volume
@@ -138,8 +143,7 @@ class TrackingVolume : public Volume {
   /// @param denseVolumeVector  The contained dense volumes
   /// @param volumeName is a string identifier
   TrackingVolume(
-      const Transform3& transform,
-      std::shared_ptr<const VolumeBounds> volumeBounds,
+      const Transform3& transform, std::shared_ptr<VolumeBounds> volumeBounds,
       std::shared_ptr<const IVolumeMaterial> volumeMaterial,
       std::unique_ptr<const LayerArray> staticLayerArray = nullptr,
       std::shared_ptr<const TrackingVolumeArray> containedVolumeArray = nullptr,
@@ -149,10 +153,8 @@ class TrackingVolume : public Volume {
   /// Constructor from a regular volume
   /// @param volume is the volume to be converted
   /// @param volumeName is a string identifier
-  TrackingVolume(const Volume& volume,
-                 const std::string& volumeName = "undefined");
+  TrackingVolume(Volume& volume, const std::string& volumeName = "undefined");
 
-  // @TODO: This needs to be refactored to include Gen3 volumes
   /// Return the associated sub Volume, returns THIS if no subVolume exists
   /// @param gctx The current geometry context object, e.g. alignment
   /// @param position is the global position associated with that search
@@ -180,6 +182,10 @@ class TrackingVolume : public Volume {
       for (const auto& bs : m_boundarySurfaces) {
         visitor(&(bs->surfaceRepresentation()));
       }
+
+      for (const auto& portal : portals()) {
+        visitor(&portal.surface());
+      }
     }
 
     // Internal structure
@@ -213,6 +219,14 @@ class TrackingVolume : public Volume {
         volume->visitSurfaces(visitor, restrictToSensitives);
       }
     }
+
+    for (const auto& surface : surfaces()) {
+      visitor(&surface);
+    }
+
+    for (const auto& volume : volumes()) {
+      volume.visitSurfaces(visitor, restrictToSensitives);
+    }
   }
 
   /// @brief Visit all sensitive surfaces
@@ -256,11 +270,15 @@ class TrackingVolume : public Volume {
   /// Returns the VolumeName - for debug reason, might be depreciated later
   const std::string& volumeName() const;
 
+  /// Set the volume name to @p volumeName
+  /// @param volumeName is the new name of
+  void setVolumeName(const std::string& volumeName);
+
   /// Return the material of the volume
   const IVolumeMaterial* volumeMaterial() const;
 
   /// Return the material of the volume as shared pointer
-  const std::shared_ptr<const IVolumeMaterial>& volumeMaterialSharedPtr() const;
+  const std::shared_ptr<const IVolumeMaterial>& volumeMaterialPtr() const;
 
   /// Set the volume material description
   ///
@@ -297,6 +315,45 @@ class TrackingVolume : public Volume {
   /// @return the range of volumes
   MutableVolumeRange volumes();
 
+  using MutablePortalRange =
+      detail::TransformRange<detail::Dereference,
+                             std::vector<std::shared_ptr<Portal>>>;
+
+  using PortalRange =
+      detail::TransformRange<detail::ConstDereference,
+                             const std::vector<std::shared_ptr<Portal>>>;
+
+  /// Return all portals registered under this tracking volume
+  /// @return the range of portals
+  PortalRange portals() const;
+
+  /// Return mutable view of the registered portals under this tracking volume
+  /// @return the range of portals
+  MutablePortalRange portals();
+
+  /// Add a portal to this tracking volume
+  /// @param portal The portal to add
+  void addPortal(std::shared_ptr<Portal> portal);
+
+  using MutableSurfaceRange =
+      detail::TransformRange<detail::Dereference,
+                             std::vector<std::shared_ptr<Surface>>>;
+  using SurfaceRange =
+      detail::TransformRange<detail::ConstDereference,
+                             const std::vector<std::shared_ptr<Surface>>>;
+
+  /// Return all surfaces registered under this tracking volume
+  /// @return the range of surfaces
+  SurfaceRange surfaces() const;
+
+  /// Return mutable view of the registered surfaces under this tracking volume
+  /// @return the range of surfaces
+  MutableSurfaceRange surfaces();
+
+  /// Add a surface to this tracking volume
+  /// @param surface The surface to add
+  void addSurface(std::shared_ptr<Surface> surface);
+
   /// Add a child volume to this tracking volume
   /// @param volume The volume to add
   /// @note The @p volume will have its mother volume assigned to @p this.
@@ -429,6 +486,32 @@ class TrackingVolume : public Volume {
   ///  - positiveFaceXY
   GlueVolumesDescriptor& glueVolumesDescriptor();
 
+  /// Produces a 3D visualization of this tracking volume
+  /// @param helper The visualization helper describing the output format
+  /// @param gctx The geometry context
+  /// @param viewConfig The view configuration
+  /// @param portalViewConfig View configuration for portals
+  /// @param sensitiveViewConfig View configuration for sensitive surfaces
+  void visualize(IVisualization3D& helper, const GeometryContext& gctx,
+                 const ViewConfig& viewConfig,
+                 const ViewConfig& portalViewConfig,
+                 const ViewConfig& sensitiveViewConfig) const;
+
+  /// Register a navigation policy with this volume. The argument can not be
+  /// nullptr.
+  /// @param policy is the navigation policy to be registered
+  void setNavigationPolicy(std::unique_ptr<INavigationPolicy> policy);
+
+  /// Populate the navigation stream with navigation candidates from this
+  /// volume. Internally, this consults the registered navigation policy, where
+  /// the default is a noop.
+  /// @param args are the navigation arguments
+  /// @param stream is the navigation stream to be updated
+  /// @param logger is the logger
+  void initializeNavigationCandidates(const NavigationArguments& args,
+                                      AppendOnlyNavigationStream& stream,
+                                      const Logger& logger) const;
+
  private:
   void connectDenseBoundarySurfaces(
       MutableTrackingVolumeVector& confinedDenseVolumes);
@@ -452,7 +535,7 @@ class TrackingVolume : public Volume {
   /// static layers
   std::unique_ptr<const LayerArray> m_confinedLayers = nullptr;
 
-  /// Array of Volumes inside the Volume when actin as container
+  /// Array of Volumes inside the Volume when acting as container
   std::shared_ptr<const TrackingVolumeArray> m_confinedVolumes = nullptr;
 
   /// confined dense
@@ -490,6 +573,12 @@ class TrackingVolume : public Volume {
   std::string m_name;
 
   std::vector<std::unique_ptr<TrackingVolume>> m_volumes;
+  std::vector<std::shared_ptr<Portal>> m_portals;
+  std::vector<std::shared_ptr<Surface>> m_surfaces;
+
+  std::unique_ptr<INavigationPolicy> m_navigationPolicy;
+
+  NavigationDelegate m_navigationDelegate{};
 };
 
 }  // namespace Acts
diff --git a/Core/include/Acts/Geometry/TrackingVolumeArrayCreator.hpp b/Core/include/Acts/Geometry/TrackingVolumeArrayCreator.hpp
index 44ca5d78602..fe951f61dc0 100644
--- a/Core/include/Acts/Geometry/TrackingVolumeArrayCreator.hpp
+++ b/Core/include/Acts/Geometry/TrackingVolumeArrayCreator.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2016-2018 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
@@ -41,9 +41,6 @@ class TrackingVolumeArrayCreator : public ITrackingVolumeArrayCreator {
                                                   Logging::INFO))
       : m_logger(std::move(logger)) {}
 
-  /// Destructor
-  ~TrackingVolumeArrayCreator() override = default;
-
   /// create a tracking volume array
   ///
   /// @param [in] gctx the geometry context for this building
diff --git a/Core/include/Acts/Geometry/TrackingVolumeVisitorConcept.hpp b/Core/include/Acts/Geometry/TrackingVolumeVisitorConcept.hpp
index c79ed610de9..7ecaf7f3e7c 100644
--- a/Core/include/Acts/Geometry/TrackingVolumeVisitorConcept.hpp
+++ b/Core/include/Acts/Geometry/TrackingVolumeVisitorConcept.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2024 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
diff --git a/Core/include/Acts/Geometry/TrapezoidVolumeBounds.hpp b/Core/include/Acts/Geometry/TrapezoidVolumeBounds.hpp
index edfcd8da1c7..c34234287c8 100644
--- a/Core/include/Acts/Geometry/TrapezoidVolumeBounds.hpp
+++ b/Core/include/Acts/Geometry/TrapezoidVolumeBounds.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2016-2020 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
diff --git a/Core/include/Acts/Geometry/TrivialPortalLink.hpp b/Core/include/Acts/Geometry/TrivialPortalLink.hpp
new file mode 100644
index 00000000000..f68a7e326c6
--- /dev/null
+++ b/Core/include/Acts/Geometry/TrivialPortalLink.hpp
@@ -0,0 +1,69 @@
+// This file is part of the ACTS project.
+//
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
+//
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
+
+#pragma once
+
+#include "Acts/Definitions/Tolerance.hpp"
+#include "Acts/Geometry/PortalLinkBase.hpp"
+
+namespace Acts {
+
+class TrackingVolume;
+class GridPortalLink;
+
+/// Trivial portal link links to a single target volume on every point on a
+/// surface
+class TrivialPortalLink final : public PortalLinkBase {
+ public:
+  /// Construct a trivial portal link from a surface and a volume
+  /// @param surface is the surface
+  /// @param volume is the target
+  TrivialPortalLink(std::shared_ptr<RegularSurface> surface,
+                    TrackingVolume& volume)
+      : PortalLinkBase(std::move(surface)), m_volume{&volume} {}
+
+  /// Make a 1D grid portal link from this trivial portal link
+  /// The grid size is automatically determined from the surface bounds.
+  /// @param direction The binning direction
+  /// @return A grid
+  std::unique_ptr<GridPortalLink> makeGrid(BinningValue direction) const;
+
+  /// Print the portal link to a stream
+  /// @param os output stream
+  void toStream(std::ostream& os) const override;
+
+  /// Resolve the volume for a 2D position
+  /// @note Always returns the single target volume
+  /// @param gctx is the geometry context
+  /// @param position is the 2D position
+  /// @param tolerance is the tolerance
+  /// @return The target volume (can be null)
+  Result<const TrackingVolume*> resolveVolume(
+      const GeometryContext& gctx, const Vector2& position,
+      double tolerance = s_onSurfaceTolerance) const override;
+
+  /// Resolve the volume for a 3D position
+  /// @note Always returns the single target volume
+  /// @param gctx is the geometry context
+  /// @param position is the 2D position
+  /// @param tolerance is the tolerance
+  /// @return The target volume (can be null)
+  /// @note The position is assumed to be on the associated surface.
+  Result<const TrackingVolume*> resolveVolume(
+      const GeometryContext& gctx, const Vector3& position,
+      double tolerance = s_onSurfaceTolerance) const override;
+
+  /// Get the single volume that this trivial portal link is associated with
+  /// @return The target volume
+  const TrackingVolume& volume() const;
+
+ private:
+  TrackingVolume* m_volume;
+};
+
+}  // namespace Acts
diff --git a/Core/include/Acts/Geometry/Volume.hpp b/Core/include/Acts/Geometry/Volume.hpp
index 3df0b339fd9..da8932b1eab 100644
--- a/Core/include/Acts/Geometry/Volume.hpp
+++ b/Core/include/Acts/Geometry/Volume.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2016-2018 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
@@ -13,6 +13,7 @@
 #include "Acts/Geometry/GeometryObject.hpp"
 #include "Acts/Utilities/BinningType.hpp"
 #include "Acts/Utilities/BoundingBox.hpp"
+#include "Acts/Utilities/Logger.hpp"
 
 #include <iosfwd>
 #include <memory>
@@ -37,8 +38,7 @@ class Volume : public GeometryObject {
   ///
   /// @param transform is the transform to position the volume in 3D space
   /// @param volbounds is the volume boundary definitions
-  Volume(const Transform3& transform,
-         std::shared_ptr<const VolumeBounds> volbounds);
+  Volume(const Transform3& transform, std::shared_ptr<VolumeBounds> volbounds);
 
   /// Copy Constructor - with optional shift
   ///
@@ -65,21 +65,29 @@ class Volume : public GeometryObject {
   /// returns the center of the volume
   const Vector3& center() const;
 
-  /// Returns const reference to the volume bounds
+  /// Returns a const reference to the volume bounds
   const VolumeBounds& volumeBounds() const;
 
+  /// Returns a mutable reference to the volume bounds
+  VolumeBounds& volumeBounds();
+
   /// Returns shared pointer to the volume bounds
   std::shared_ptr<const VolumeBounds> volumeBoundsPtr() const;
 
+  /// Returns shared pointer to the volume bounds
+  std::shared_ptr<VolumeBounds> volumeBoundsPtr();
+
   /// Set volume bounds and update volume bounding boxes implicitly
   /// @param volbounds The volume bounds to be assigned
-  void assignVolumeBounds(std::shared_ptr<const VolumeBounds> volbounds);
+  void assignVolumeBounds(std::shared_ptr<VolumeBounds> volbounds);
 
   /// Set the volume bounds and optionally also update the volume transform
   /// @param volbounds The volume bounds to be assigned
   /// @param transform The transform to be assigned, can be optional
-  virtual void update(std::shared_ptr<const VolumeBounds> volbounds,
-                      std::optional<Transform3> transform = std::nullopt);
+  /// @param logger A logger object to log messages
+  virtual void update(std::shared_ptr<VolumeBounds> volbounds,
+                      std::optional<Transform3> transform = std::nullopt,
+                      const Logger& logger = Acts::getDummyLogger());
 
   /// Construct bounding box for this shape
   /// @param envelope Optional envelope to add / subtract from min/max
@@ -111,13 +119,21 @@ class Volume : public GeometryObject {
                           BinningValue bValue) const override;
 
   bool operator==(const Volume& other) const;
-  bool operator!=(const Volume& other) const;
+
+  /// Produces a 3D visualization of this volume
+  /// @param helper The visualization helper describing the output format
+  /// @param gctx The geometry context
+  /// @param viewConfig The view configuration
+  void visualize(IVisualization3D& helper, const GeometryContext& gctx,
+                 const ViewConfig& viewConfig) const;
 
  protected:
   Transform3 m_transform;
   Transform3 m_itransform;
   Vector3 m_center;
-  std::shared_ptr<const VolumeBounds> m_volumeBounds;
+
+ private:
+  std::shared_ptr<VolumeBounds> m_volumeBounds;
 };
 
 /**Overload of << operator for std::ostream for debug output*/
diff --git a/Core/include/Acts/Geometry/VolumeBounds.hpp b/Core/include/Acts/Geometry/VolumeBounds.hpp
index f2f4407cde5..28bcc029166 100644
--- a/Core/include/Acts/Geometry/VolumeBounds.hpp
+++ b/Core/include/Acts/Geometry/VolumeBounds.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2016-2018 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
@@ -17,6 +17,7 @@
 #include <cmath>
 #include <iostream>
 #include <memory>
+#include <numbers>
 #include <utility>
 #include <vector>
 
@@ -33,12 +34,14 @@ struct OrientedSurface {
 
 // Planar definitions to help construct the boundary surfaces
 static const Transform3 s_planeXY = Transform3::Identity();
-static const Transform3 s_planeYZ = AngleAxis3(0.5 * M_PI, Vector3::UnitY()) *
-                                    AngleAxis3(0.5 * M_PI, Vector3::UnitZ()) *
-                                    Transform3::Identity();
-static const Transform3 s_planeZX = AngleAxis3(-0.5 * M_PI, Vector3::UnitX()) *
-                                    AngleAxis3(-0.5 * M_PI, Vector3::UnitZ()) *
-                                    Transform3::Identity();
+static const Transform3 s_planeYZ =
+    AngleAxis3(std::numbers::pi / 2., Vector3::UnitY()) *
+    AngleAxis3(std::numbers::pi / 2., Vector3::UnitZ()) *
+    Transform3::Identity();
+static const Transform3 s_planeZX =
+    AngleAxis3(-std::numbers::pi / 2., Vector3::UnitX()) *
+    AngleAxis3(-std::numbers::pi / 2., Vector3::UnitZ()) *
+    Transform3::Identity();
 
 /// @class VolumeBounds
 ///
@@ -57,16 +60,19 @@ class VolumeBounds {
   // @enum BoundsType
   /// This is nested to the VolumeBounds, as also SurfaceBounds will have
   /// Bounds Type.
-  enum BoundsType : int {
-    eCone = 0,
-    eCuboid = 1,
-    eCutoutCylinder = 2,
-    eCylinder = 3,
-    eGenericCuboid = 4,
-    eTrapezoid = 5,
-    eOther = 6
+  enum class BoundsType {
+    eCone,
+    eCuboid,
+    eCutoutCylinder,
+    eCylinder,
+    eGenericCuboid,
+    eTrapezoid,
+    eOther,
+
   };
 
+  using enum BoundsType;
+
   /// Static member to get the name of the BoundsType
   static const std::vector<std::string> s_boundsTypeNames;
 
@@ -168,4 +174,6 @@ inline bool operator==(const VolumeBounds& lhs, const VolumeBounds& rhs) {
   return (lhs.type() == rhs.type()) && (lhs.values() == rhs.values());
 }
 
+std::ostream& operator<<(std::ostream& sl, const VolumeBounds::BoundsType& bt);
+
 }  // namespace Acts
diff --git a/Core/include/Acts/Geometry/detail/Layer.ipp b/Core/include/Acts/Geometry/detail/Layer.ipp
index 2c53bddae3a..fb76daf5773 100644
--- a/Core/include/Acts/Geometry/detail/Layer.ipp
+++ b/Core/include/Acts/Geometry/detail/Layer.ipp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2016-2018 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include <limits>
 #include <map>
diff --git a/Core/include/Acts/MagneticField/BFieldMapUtils.hpp b/Core/include/Acts/MagneticField/BFieldMapUtils.hpp
index 896b5b22344..09ac0035d9b 100644
--- a/Core/include/Acts/MagneticField/BFieldMapUtils.hpp
+++ b/Core/include/Acts/MagneticField/BFieldMapUtils.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2017-2018 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 #include "Acts/Definitions/Algebra.hpp"
diff --git a/Core/include/Acts/MagneticField/ConstantBField.hpp b/Core/include/Acts/MagneticField/ConstantBField.hpp
index a461242bfcc..7586cbcbace 100644
--- a/Core/include/Acts/MagneticField/ConstantBField.hpp
+++ b/Core/include/Acts/MagneticField/ConstantBField.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2016-2018 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 #include "Acts/Definitions/Algebra.hpp"
diff --git a/Core/include/Acts/MagneticField/InterpolatedBFieldMap.hpp b/Core/include/Acts/MagneticField/InterpolatedBFieldMap.hpp
index 09b975f44fe..d65f8113d9e 100644
--- a/Core/include/Acts/MagneticField/InterpolatedBFieldMap.hpp
+++ b/Core/include/Acts/MagneticField/InterpolatedBFieldMap.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2016-2018 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
diff --git a/Core/include/Acts/MagneticField/MagneticFieldContext.hpp b/Core/include/Acts/MagneticField/MagneticFieldContext.hpp
index 2b626754993..3d44f00a3ec 100644
--- a/Core/include/Acts/MagneticField/MagneticFieldContext.hpp
+++ b/Core/include/Acts/MagneticField/MagneticFieldContext.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2019 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
diff --git a/Core/include/Acts/MagneticField/MagneticFieldError.hpp b/Core/include/Acts/MagneticField/MagneticFieldError.hpp
index 019d27fc5b8..0149032ad69 100644
--- a/Core/include/Acts/MagneticField/MagneticFieldError.hpp
+++ b/Core/include/Acts/MagneticField/MagneticFieldError.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2021 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
diff --git a/Core/include/Acts/MagneticField/MagneticFieldProvider.hpp b/Core/include/Acts/MagneticField/MagneticFieldProvider.hpp
index cf3c5b994bc..068c2ed8e33 100644
--- a/Core/include/Acts/MagneticField/MagneticFieldProvider.hpp
+++ b/Core/include/Acts/MagneticField/MagneticFieldProvider.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2021 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
diff --git a/Core/include/Acts/MagneticField/NullBField.hpp b/Core/include/Acts/MagneticField/NullBField.hpp
index 9d0f72f9f41..d3c24ee59f3 100644
--- a/Core/include/Acts/MagneticField/NullBField.hpp
+++ b/Core/include/Acts/MagneticField/NullBField.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2016-2018 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 #include "Acts/Definitions/Algebra.hpp"
diff --git a/Core/include/Acts/MagneticField/SolenoidBField.hpp b/Core/include/Acts/MagneticField/SolenoidBField.hpp
index c97f3e96ff3..b2162203eec 100644
--- a/Core/include/Acts/MagneticField/SolenoidBField.hpp
+++ b/Core/include/Acts/MagneticField/SolenoidBField.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2017-2018 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
diff --git a/Core/include/Acts/Material/AccumulatedMaterialSlab.hpp b/Core/include/Acts/Material/AccumulatedMaterialSlab.hpp
index d726df1dd2e..5f0013bcc3b 100644
--- a/Core/include/Acts/Material/AccumulatedMaterialSlab.hpp
+++ b/Core/include/Acts/Material/AccumulatedMaterialSlab.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2018-2020 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
diff --git a/Core/include/Acts/Material/AccumulatedSurfaceMaterial.hpp b/Core/include/Acts/Material/AccumulatedSurfaceMaterial.hpp
index 1524176d3c4..7107410bfec 100644
--- a/Core/include/Acts/Material/AccumulatedSurfaceMaterial.hpp
+++ b/Core/include/Acts/Material/AccumulatedSurfaceMaterial.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2016-2020 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
diff --git a/Core/include/Acts/Material/AccumulatedVolumeMaterial.hpp b/Core/include/Acts/Material/AccumulatedVolumeMaterial.hpp
index a367d609078..3555a8fbabf 100644
--- a/Core/include/Acts/Material/AccumulatedVolumeMaterial.hpp
+++ b/Core/include/Acts/Material/AccumulatedVolumeMaterial.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2019-2020 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
diff --git a/Core/include/Acts/Material/BinnedSurfaceMaterial.hpp b/Core/include/Acts/Material/BinnedSurfaceMaterial.hpp
index c8df504b38b..97d3347c9e1 100644
--- a/Core/include/Acts/Material/BinnedSurfaceMaterial.hpp
+++ b/Core/include/Acts/Material/BinnedSurfaceMaterial.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2016-2020 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
diff --git a/Core/include/Acts/Material/BinnedSurfaceMaterialAccumulater.hpp b/Core/include/Acts/Material/BinnedSurfaceMaterialAccumulater.hpp
index 43257700eb9..f7f5c24bdae 100644
--- a/Core/include/Acts/Material/BinnedSurfaceMaterialAccumulater.hpp
+++ b/Core/include/Acts/Material/BinnedSurfaceMaterialAccumulater.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2024 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
diff --git a/Core/include/Acts/Material/GridSurfaceMaterial.hpp b/Core/include/Acts/Material/GridSurfaceMaterial.hpp
index c97dd9e93a1..6c2d6045ca2 100644
--- a/Core/include/Acts/Material/GridSurfaceMaterial.hpp
+++ b/Core/include/Acts/Material/GridSurfaceMaterial.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2024 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
diff --git a/Core/include/Acts/Material/HomogeneousSurfaceMaterial.hpp b/Core/include/Acts/Material/HomogeneousSurfaceMaterial.hpp
index 01a1e2702a0..1ea14e632ac 100644
--- a/Core/include/Acts/Material/HomogeneousSurfaceMaterial.hpp
+++ b/Core/include/Acts/Material/HomogeneousSurfaceMaterial.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2016-2020 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
@@ -78,7 +78,8 @@ class HomogeneousSurfaceMaterial : public ISurfaceMaterial {
   /// @copydoc ISurfaceMaterial::materialSlab(const Vector3&) const
   ///
   /// @note the input parameter is ignored
-  const MaterialSlab& materialSlab(const Vector3& gp) const final;
+  const MaterialSlab& materialSlab(const Vector3& gp = Vector3{0., 0.,
+                                                               0.}) const final;
 
   /// The inherited methods - for MaterialSlab access
   using ISurfaceMaterial::materialSlab;
diff --git a/Core/include/Acts/Material/HomogeneousVolumeMaterial.hpp b/Core/include/Acts/Material/HomogeneousVolumeMaterial.hpp
index 5309cb73ab5..91005dcae55 100644
--- a/Core/include/Acts/Material/HomogeneousVolumeMaterial.hpp
+++ b/Core/include/Acts/Material/HomogeneousVolumeMaterial.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2020 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
diff --git a/Core/include/Acts/Material/IMaterialDecorator.hpp b/Core/include/Acts/Material/IMaterialDecorator.hpp
index 3b6d390210b..6783dcea751 100644
--- a/Core/include/Acts/Material/IMaterialDecorator.hpp
+++ b/Core/include/Acts/Material/IMaterialDecorator.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2019-2020 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
diff --git a/Core/include/Acts/Material/ISurfaceMaterial.hpp b/Core/include/Acts/Material/ISurfaceMaterial.hpp
index d76254f2224..a379e18e715 100644
--- a/Core/include/Acts/Material/ISurfaceMaterial.hpp
+++ b/Core/include/Acts/Material/ISurfaceMaterial.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2016-2020 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
@@ -15,6 +15,7 @@
 #include "Acts/Material/MaterialSlab.hpp"
 
 #include <memory>
+#include <sstream>
 #include <vector>
 
 namespace Acts {
@@ -117,6 +118,15 @@ class ISurfaceMaterial {
   /// Output Method for std::ostream, to be overloaded by child classes
   virtual std::ostream& toStream(std::ostream& sl) const = 0;
 
+  /// @brief output into a string
+  ///
+  /// @return the string representation
+  std::string toString() const {
+    std::stringstream sstrm;
+    toStream(sstrm);
+    return sstrm.str();
+  }
+
  protected:
   double m_splitFactor{1.};  //!< the split factor in favour of oppositePre
   MappingType m_mappingType{
@@ -139,7 +149,7 @@ inline MaterialSlab ISurfaceMaterial::materialSlab(
   // The plain material properties associated to this bin
   MaterialSlab plainMatProp = materialSlab(lp);
   // Scale if you have material to scale
-  if (plainMatProp) {
+  if (plainMatProp.isValid()) {
     double scaleFactor = factor(pDir, mStage);
     if (scaleFactor == 0.) {
       return MaterialSlab();
@@ -154,7 +164,7 @@ inline MaterialSlab ISurfaceMaterial::materialSlab(
   // The plain material properties associated to this bin
   MaterialSlab plainMatProp = materialSlab(gp);
   // Scale if you have material to scale
-  if (plainMatProp) {
+  if (plainMatProp.isValid()) {
     double scaleFactor = factor(pDir, mStage);
     if (scaleFactor == 0.) {
       return MaterialSlab();
diff --git a/Core/include/Acts/Material/IVolumeMaterial.hpp b/Core/include/Acts/Material/IVolumeMaterial.hpp
index 5f1d18f50e6..334008d6f62 100644
--- a/Core/include/Acts/Material/IVolumeMaterial.hpp
+++ b/Core/include/Acts/Material/IVolumeMaterial.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2019-2020 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
diff --git a/Core/include/Acts/Material/Interactions.hpp b/Core/include/Acts/Material/Interactions.hpp
index 4ca87b1ca0c..07ccbd7541f 100644
--- a/Core/include/Acts/Material/Interactions.hpp
+++ b/Core/include/Acts/Material/Interactions.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2018-2020 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
diff --git a/Core/include/Acts/Material/InterpolatedMaterialMap.hpp b/Core/include/Acts/Material/InterpolatedMaterialMap.hpp
index f353efd60c5..eb792539871 100644
--- a/Core/include/Acts/Material/InterpolatedMaterialMap.hpp
+++ b/Core/include/Acts/Material/InterpolatedMaterialMap.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2019-2020 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
diff --git a/Core/include/Acts/Material/IntersectionMaterialAssigner.hpp b/Core/include/Acts/Material/IntersectionMaterialAssigner.hpp
index 408b1a54acd..036b3de982a 100644
--- a/Core/include/Acts/Material/IntersectionMaterialAssigner.hpp
+++ b/Core/include/Acts/Material/IntersectionMaterialAssigner.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2024 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
diff --git a/Core/include/Acts/Material/Material.hpp b/Core/include/Acts/Material/Material.hpp
index bccea094a90..ae42e08cf68 100644
--- a/Core/include/Acts/Material/Material.hpp
+++ b/Core/include/Acts/Material/Material.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2016-2020 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
@@ -74,7 +74,7 @@ class Material {
   /// Construct a vacuum representation.
   Material() = default;
   /// Construct from an encoded parameters vector.
-  Material(const ParametersVector& parameters);
+  explicit Material(const ParametersVector& parameters);
 
   Material(Material&& mat) = default;
   Material(const Material& mat) = default;
@@ -83,9 +83,9 @@ class Material {
   Material& operator=(const Material& mat) = default;
 
   /// Check if the material is valid, i.e. it is not vacuum.
-  constexpr operator bool() const { return 0.0f < m_ar; }
+  bool isValid() const { return 0.0f < m_ar; }
 
-  /// Return the radition length. Infinity in case of vacuum.
+  /// Return the radiation length. Infinity in case of vacuum.
   constexpr float X0() const { return m_x0; }
   /// Return the nuclear interaction length. Infinity in case of vacuum.
   constexpr float L0() const { return m_l0; }
@@ -117,9 +117,6 @@ class Material {
            (lhs.m_ar == rhs.m_ar) && (lhs.m_z == rhs.m_z) &&
            (lhs.m_molarRho == rhs.m_molarRho);
   }
-  friend constexpr bool operator!=(const Material& lhs, const Material& rhs) {
-    return !(lhs == rhs);
-  }
 };
 
 std::ostream& operator<<(std::ostream& os, const Material& material);
diff --git a/Core/include/Acts/Material/MaterialComposition.hpp b/Core/include/Acts/Material/MaterialComposition.hpp
index 1b11901e032..843736ebd58 100644
--- a/Core/include/Acts/Material/MaterialComposition.hpp
+++ b/Core/include/Acts/Material/MaterialComposition.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2018-2020 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
@@ -100,10 +100,10 @@ class MaterialComposition {
   /// Rescales the fractions so they all add up to unity within the accuracy.
   MaterialComposition(std::vector<ElementFraction> elements)
       : m_elements(std::move(elements)) {
-    std::sort(m_elements.begin(), m_elements.end());
+    std::ranges::sort(m_elements, std::less<ElementFraction>{});
     // compute the total weight first
     unsigned total = 0u;
-    for (auto element : m_elements) {
+    for (const auto& element : m_elements) {
       total += element.m_fraction;
     }
     // compute scale factor into the [0, 256) range
diff --git a/Core/include/Acts/Material/MaterialGridHelper.hpp b/Core/include/Acts/Material/MaterialGridHelper.hpp
index 299cadf24f7..0f68a86c3b3 100644
--- a/Core/include/Acts/Material/MaterialGridHelper.hpp
+++ b/Core/include/Acts/Material/MaterialGridHelper.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2020 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
diff --git a/Core/include/Acts/Material/MaterialInteraction.hpp b/Core/include/Acts/Material/MaterialInteraction.hpp
index b2e39004f88..e3b078d310a 100644
--- a/Core/include/Acts/Material/MaterialInteraction.hpp
+++ b/Core/include/Acts/Material/MaterialInteraction.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2021 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
diff --git a/Core/include/Acts/Material/MaterialInteractionAssignment.hpp b/Core/include/Acts/Material/MaterialInteractionAssignment.hpp
index edef6eb36ad..18cdc618e02 100644
--- a/Core/include/Acts/Material/MaterialInteractionAssignment.hpp
+++ b/Core/include/Acts/Material/MaterialInteractionAssignment.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2024 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
diff --git a/Core/include/Acts/Material/MaterialMapUtils.hpp b/Core/include/Acts/Material/MaterialMapUtils.hpp
index 5e3967caefe..8cacb23eb20 100644
--- a/Core/include/Acts/Material/MaterialMapUtils.hpp
+++ b/Core/include/Acts/Material/MaterialMapUtils.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2019 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
diff --git a/Core/include/Acts/Material/MaterialMapper.hpp b/Core/include/Acts/Material/MaterialMapper.hpp
index 2428b1385d4..6e2d02e6cd7 100644
--- a/Core/include/Acts/Material/MaterialMapper.hpp
+++ b/Core/include/Acts/Material/MaterialMapper.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2024 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
diff --git a/Core/include/Acts/Material/MaterialSlab.hpp b/Core/include/Acts/Material/MaterialSlab.hpp
index cfa531a9ff4..71c56c1a154 100644
--- a/Core/include/Acts/Material/MaterialSlab.hpp
+++ b/Core/include/Acts/Material/MaterialSlab.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2016-2020 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
@@ -45,7 +45,7 @@ class MaterialSlab {
   /// Construct vacuum without thickness.
   MaterialSlab() = default;
   /// Construct vacuum with thickness.
-  MaterialSlab(float thickness);
+  explicit MaterialSlab(float thickness);
   /// Construct from material description.
   ///
   /// @param material  is the material description
@@ -62,7 +62,7 @@ class MaterialSlab {
   void scaleThickness(float scale);
 
   /// Check if the material is valid, i.e. it is finite and not vacuum.
-  constexpr operator bool() const { return m_material && (0.0f < m_thickness); }
+  bool isValid() const { return m_material.isValid() && (0.0f < m_thickness); }
 
   /// Access the (average) material parameters.
   constexpr const Material& material() const { return m_material; }
@@ -85,10 +85,6 @@ class MaterialSlab {
     return (lhs.m_material == rhs.m_material) &&
            (lhs.m_thickness == rhs.m_thickness);
   }
-  friend constexpr bool operator!=(const MaterialSlab& lhs,
-                                   const MaterialSlab& rhs) {
-    return !(lhs == rhs);
-  }
 };
 
 std::ostream& operator<<(std::ostream& os, const MaterialSlab& materialSlab);
diff --git a/Core/include/Acts/Material/MaterialValidater.hpp b/Core/include/Acts/Material/MaterialValidater.hpp
index 53e7b194004..fcfff9b7d93 100644
--- a/Core/include/Acts/Material/MaterialValidater.hpp
+++ b/Core/include/Acts/Material/MaterialValidater.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2024 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
diff --git a/Core/include/Acts/Material/PropagatorMaterialAssigner.hpp b/Core/include/Acts/Material/PropagatorMaterialAssigner.hpp
index 6cb85d74e75..5c3c0fa0339 100644
--- a/Core/include/Acts/Material/PropagatorMaterialAssigner.hpp
+++ b/Core/include/Acts/Material/PropagatorMaterialAssigner.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2024 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
@@ -12,8 +12,7 @@
 #include "Acts/Geometry/GeometryContext.hpp"
 #include "Acts/MagneticField/MagneticFieldContext.hpp"
 #include "Acts/Material/interface/IAssignmentFinder.hpp"
-#include "Acts/Propagator/AbortList.hpp"
-#include "Acts/Propagator/ActionList.hpp"
+#include "Acts/Propagator/ActorList.hpp"
 #include "Acts/Propagator/Propagator.hpp"
 #include "Acts/Propagator/SurfaceCollector.hpp"
 #include "Acts/Surfaces/Surface.hpp"
@@ -62,9 +61,9 @@ struct InteractionVolumeCollector {
   /// @param [in,out] result is the mutable result object
   template <typename propagator_state_t, typename stepper_t,
             typename navigator_t>
-  void operator()(propagator_state_t& state, const stepper_t& stepper,
-                  const navigator_t& navigator, result_type& result,
-                  const Logger& /*logger*/) const {
+  void act(propagator_state_t& state, const stepper_t& stepper,
+           const navigator_t& navigator, result_type& result,
+           const Logger& /*logger*/) const {
     // Retrieve the current volume
     auto currentVolume = navigator.currentVolume(state.navigation);
 
@@ -131,11 +130,10 @@ class PropagatorMaterialAssigner final : public IAssignmentFinder {
     // Prepare Action list and abort list
     using MaterialSurfaceCollector =
         SurfaceCollector<MaterialSurfaceIdentifier>;
-    using ActionList =
-        ActionList<MaterialSurfaceCollector, InteractionVolumeCollector>;
-    using AbortList = AbortList<EndOfWorldReached>;
+    using ActorList = ActorList<MaterialSurfaceCollector,
+                                InteractionVolumeCollector, EndOfWorldReached>;
     using PropagatorOptions =
-        typename propagator_t::template Options<ActionList, AbortList>;
+        typename propagator_t::template Options<ActorList>;
 
     PropagatorOptions options(gctx, mctx);
 
diff --git a/Core/include/Acts/Material/ProtoSurfaceMaterial.hpp b/Core/include/Acts/Material/ProtoSurfaceMaterial.hpp
index 0eab5c89dff..58dee9d01c7 100644
--- a/Core/include/Acts/Material/ProtoSurfaceMaterial.hpp
+++ b/Core/include/Acts/Material/ProtoSurfaceMaterial.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2016-2020 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
diff --git a/Core/include/Acts/Material/ProtoVolumeMaterial.hpp b/Core/include/Acts/Material/ProtoVolumeMaterial.hpp
index fb0a02dfa8f..38206e8f6dc 100644
--- a/Core/include/Acts/Material/ProtoVolumeMaterial.hpp
+++ b/Core/include/Acts/Material/ProtoVolumeMaterial.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2016-2020 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
diff --git a/Core/include/Acts/Material/SurfaceMaterialMapper.hpp b/Core/include/Acts/Material/SurfaceMaterialMapper.hpp
index 59aeb2ae728..305d293542c 100644
--- a/Core/include/Acts/Material/SurfaceMaterialMapper.hpp
+++ b/Core/include/Acts/Material/SurfaceMaterialMapper.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2018-2020 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
diff --git a/Core/include/Acts/Material/VolumeMaterialMapper.hpp b/Core/include/Acts/Material/VolumeMaterialMapper.hpp
index 4354d68a60b..baf29d7b3d1 100644
--- a/Core/include/Acts/Material/VolumeMaterialMapper.hpp
+++ b/Core/include/Acts/Material/VolumeMaterialMapper.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2019-2020 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
diff --git a/Core/include/Acts/Material/detail/AverageMaterials.hpp b/Core/include/Acts/Material/detail/AverageMaterials.hpp
index 5fec5819dc5..02db95d4671 100644
--- a/Core/include/Acts/Material/detail/AverageMaterials.hpp
+++ b/Core/include/Acts/Material/detail/AverageMaterials.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2020 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
diff --git a/Core/include/Acts/Material/interface/IAssignmentFinder.hpp b/Core/include/Acts/Material/interface/IAssignmentFinder.hpp
index 75793afa60f..ff83041d688 100644
--- a/Core/include/Acts/Material/interface/IAssignmentFinder.hpp
+++ b/Core/include/Acts/Material/interface/IAssignmentFinder.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2024 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
diff --git a/Core/include/Acts/Material/interface/ISurfaceMaterialAccumulater.hpp b/Core/include/Acts/Material/interface/ISurfaceMaterialAccumulater.hpp
index f394948b6e3..ee1b4429238 100644
--- a/Core/include/Acts/Material/interface/ISurfaceMaterialAccumulater.hpp
+++ b/Core/include/Acts/Material/interface/ISurfaceMaterialAccumulater.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2024 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
diff --git a/Core/include/Acts/Navigation/DetectorNavigator.hpp b/Core/include/Acts/Navigation/DetectorNavigator.hpp
index 3b8d7a3fad3..8b9535513ba 100644
--- a/Core/include/Acts/Navigation/DetectorNavigator.hpp
+++ b/Core/include/Acts/Navigation/DetectorNavigator.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2023 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
@@ -22,6 +22,7 @@
 #include "Acts/Surfaces/Surface.hpp"
 #include "Acts/Utilities/Logger.hpp"
 
+#include <algorithm>
 #include <iomanip>
 #include <iterator>
 #include <sstream>
@@ -409,13 +410,9 @@ class DetectorNavigator {
 
     // Sort properly the surface candidates
     auto& nCandidates = nState.surfaceCandidates;
-    std::sort(nCandidates.begin(), nCandidates.end(),
-              [&](const auto& a, const auto& b) {
-                // The two path lengths
-                ActsScalar pathToA = a.objectIntersection.pathLength();
-                ActsScalar pathToB = b.objectIntersection.pathLength();
-                return pathToA < pathToB;
-              });
+    std::ranges::sort(nCandidates, {}, [](const auto& c) {
+      return c.objectIntersection.pathLength();
+    });
     // Set the surface candidate
     nState.surfaceCandidateIndex = 0;
   }
diff --git a/Core/include/Acts/Navigation/DetectorVolumeFinders.hpp b/Core/include/Acts/Navigation/DetectorVolumeFinders.hpp
index dd4f5ed818e..58f0b562b19 100644
--- a/Core/include/Acts/Navigation/DetectorVolumeFinders.hpp
+++ b/Core/include/Acts/Navigation/DetectorVolumeFinders.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2022-2023 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
diff --git a/Core/include/Acts/Navigation/INavigationPolicy.hpp b/Core/include/Acts/Navigation/INavigationPolicy.hpp
new file mode 100644
index 00000000000..de98f8d26c3
--- /dev/null
+++ b/Core/include/Acts/Navigation/INavigationPolicy.hpp
@@ -0,0 +1,75 @@
+// This file is part of the ACTS project.
+//
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
+//
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
+
+#pragma once
+
+#include "Acts/Navigation/NavigationDelegate.hpp"
+#include "Acts/Navigation/NavigationStream.hpp"
+#include "Acts/Utilities/DelegateChainBuilder.hpp"
+
+#include <type_traits>
+
+namespace Acts {
+
+class TrackingVolume;
+class INavigationPolicy;
+
+/// Concept for a navigation policy
+/// This exists so `updateState` can be a non-virtual method and we still have a
+/// way to enforce it exists.
+template <typename T>
+concept NavigationPolicyConcept = requires {
+  requires std::is_base_of_v<INavigationPolicy, T>;
+  // Has a conforming update method
+  requires requires(T policy, const NavigationArguments& args) {
+    policy.initializeCandidates(args,
+                                std::declval<AppendOnlyNavigationStream&>(),
+                                std::declval<const Logger&>());
+  };
+};
+
+/// Base class for all navigation policies. The policy needs to be *connected*
+/// to a delegate via a virtual method for it to become active. The update
+/// method is not part of the class interface. The conventional `updateState`
+/// method is only required for use with the navigation policy factory,
+/// otherwise `connect` is free to connect any function.
+class INavigationPolicy {
+ public:
+  /// Noop update function that is suitable as a default for default navigation
+  /// delegates.
+  static void noopInitializeCandidates(
+      const NavigationArguments& /*unused*/,
+      const AppendOnlyNavigationStream& /*unused*/, const Logger& /*unused*/) {
+    // This is a noop
+  }
+
+  /// Virtual destructor so policies can be held through this base class.
+  virtual ~INavigationPolicy() = default;
+
+  /// Connect a policy with a delegate (usually a member of a volume).
+  /// This method exists to allow a policy to ensure a non-virtual function is
+  /// registered with the delegate.
+  /// @param delegate The delegate to connect to
+  virtual void connect(NavigationDelegate& delegate) const = 0;
+
+ protected:
+  /// Internal helper function for derived classes that conform to the concept
+  /// and have a conventional `updateState` method. Mainly used to save some
+  /// boilerplate.
+  /// @tparam T The type of the navigation policy
+  /// @param delegate The delegate to connect to
+  template <NavigationPolicyConcept T>
+  void connectDefault(NavigationDelegate& delegate) const {
+    // This cannot be a concept because we use it in CRTP below
+    const auto* self = static_cast<const T*>(this);
+    DelegateChainBuilder{delegate}.add<&T::initializeCandidates>(self).store(
+        delegate);
+  }
+};
+
+}  // namespace Acts
diff --git a/Core/include/Acts/Navigation/InternalNavigation.hpp b/Core/include/Acts/Navigation/InternalNavigation.hpp
index 75f8ec87ea9..d979738cc9c 100644
--- a/Core/include/Acts/Navigation/InternalNavigation.hpp
+++ b/Core/include/Acts/Navigation/InternalNavigation.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2022 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
diff --git a/Core/include/Acts/Navigation/MultiLayerNavigation.hpp b/Core/include/Acts/Navigation/MultiLayerNavigation.hpp
index 15042881147..4434f24e7d4 100644
--- a/Core/include/Acts/Navigation/MultiLayerNavigation.hpp
+++ b/Core/include/Acts/Navigation/MultiLayerNavigation.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2022 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
@@ -14,8 +14,10 @@
 #include "Acts/Navigation/NavigationStateUpdaters.hpp"
 #include "Acts/Utilities/VectorHelpers.hpp"
 
+#include <algorithm>
 #include <array>
 #include <memory>
+#include <tuple>
 
 namespace Acts::Experimental {
 
@@ -105,16 +107,11 @@ class MultiLayerNavigation : public IInternalNavigation {
   void resolveDuplicates(const GeometryContext& gctx,
                          std::vector<const Acts::Surface*>& surfaces) const {
     // sorting the surfaces according to their radial distance
-    std::sort(surfaces.begin(), surfaces.end(),
-              [&gctx](const auto& surf1, const auto& surf2) {
-                if (surf1->center(gctx).x() != surf2->center(gctx).x()) {
-                  return surf1->center(gctx).x() < surf2->center(gctx).x();
-                }
-                if (surf1->center(gctx).y() != surf2->center(gctx).y()) {
-                  return surf1->center(gctx).y() < surf2->center(gctx).y();
-                }
-                return surf1->center(gctx).z() < surf2->center(gctx).z();
-              });
+    std::ranges::sort(surfaces, {}, [&gctx](const auto& s) {
+      assert(s != nullptr && "Uninitialized surface");
+      const auto& center = s->center(gctx);
+      return std::make_tuple(center.x(), center.y(), center.z());
+    });
 
     // Remove the duplicates
     surfaces.erase(std::unique(surfaces.begin(), surfaces.end()),
diff --git a/Core/include/Acts/Navigation/MultiNavigationPolicy.hpp b/Core/include/Acts/Navigation/MultiNavigationPolicy.hpp
new file mode 100644
index 00000000000..e66872fc39e
--- /dev/null
+++ b/Core/include/Acts/Navigation/MultiNavigationPolicy.hpp
@@ -0,0 +1,78 @@
+// This file is part of the ACTS project.
+//
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
+//
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
+
+#pragma once
+
+#include "Acts/Navigation/INavigationPolicy.hpp"
+
+namespace Acts {
+
+/// Base class for multi navigation policies
+class MultiNavigationPolicyBase : public INavigationPolicy {};
+
+/// Combined navigation policy that calls all contained other navigation
+/// policies. This class only works with policies complying with
+/// `NavigationPolicyConcept`, which means that they have a conventional
+/// `updateState` method.
+///
+/// Internally, this uses a delegate chain factory to produce an unrolled
+/// delegate chain.
+///
+/// @tparam Policies The navigation policies to be combined
+template <NavigationPolicyConcept... Policies>
+  requires(sizeof...(Policies) > 0)
+class MultiNavigationPolicy final : public MultiNavigationPolicyBase {
+ public:
+  /// Constructor from a set of child policies.
+  /// @param policies The child policies
+  explicit MultiNavigationPolicy(Policies&&... policies)
+      : m_policies{std::move(policies)...} {}
+
+  /// Implementation of the connection to a navigation delegate.
+  /// It uses the delegate chain factory to produce a delegate chain and stores
+  /// that chain in the owning navigation delegate.
+  /// @param delegate The navigation delegate to connect to
+  void connect(NavigationDelegate& delegate) const override {
+    auto factory = add(DelegateChainBuilder{delegate},
+                       std::index_sequence_for<Policies...>{});
+
+    factory.store(delegate);
+  }
+
+  /// Access the contained policies
+  /// @return The contained policies
+  const std::tuple<Policies...>& policies() const { return m_policies; }
+
+ private:
+  /// Internal helper to build the delegate chain
+  template <std::size_t... Is>
+  constexpr auto add(
+      auto factory,
+      std::integer_sequence<std::size_t, Is...> /*unused*/) const {
+    return add<Is...>(factory);
+  }
+
+  /// Internal helper to build the delegate chain
+  template <std::size_t I, std::size_t... Is>
+  constexpr auto add(auto factory) const {
+    using policy_type = std::tuple_element_t<I, decltype(m_policies)>;
+    auto* policy = &std::get<I>(m_policies);
+
+    auto added =
+        factory.template add<&policy_type::initializeCandidates>(policy);
+
+    if constexpr (sizeof...(Is) > 0) {
+      return add<Is...>(added);
+    } else {
+      return added;
+    }
+  }
+
+  std::tuple<Policies...> m_policies;
+};
+}  // namespace Acts
diff --git a/Core/include/Acts/Navigation/NavigationDelegate.hpp b/Core/include/Acts/Navigation/NavigationDelegate.hpp
new file mode 100644
index 00000000000..8e243818d30
--- /dev/null
+++ b/Core/include/Acts/Navigation/NavigationDelegate.hpp
@@ -0,0 +1,35 @@
+// This file is part of the ACTS project.
+//
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
+//
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
+
+#pragma once
+
+#include "Acts/Definitions/Algebra.hpp"
+#include "Acts/Navigation/NavigationStream.hpp"
+#include "Acts/Surfaces/BoundaryTolerance.hpp"
+#include "Acts/Utilities/Delegate.hpp"
+
+namespace Acts {
+
+class NavigationStream;
+class Logger;
+
+/// Struct that serves as the argument to the navigation delegate.
+/// It is not supposed to be used as an lvalue.
+struct NavigationArguments {
+  Vector3 position;
+  Vector3 direction;
+
+  BoundaryTolerance tolerance = BoundaryTolerance::None();
+};
+
+/// Central alias for the navigation delegate. This type is owning to support
+/// (type-erased) navigation delegate chains (i.e. multiple policies).
+using NavigationDelegate = OwningDelegate<void(
+    const NavigationArguments&, AppendOnlyNavigationStream&, const Logger&)>;
+
+}  // namespace Acts
diff --git a/Core/include/Acts/Navigation/NavigationDelegates.hpp b/Core/include/Acts/Navigation/NavigationDelegates.hpp
index b0d747de7c8..49894d9d9de 100644
--- a/Core/include/Acts/Navigation/NavigationDelegates.hpp
+++ b/Core/include/Acts/Navigation/NavigationDelegates.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2021 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
diff --git a/Core/include/Acts/Navigation/NavigationState.hpp b/Core/include/Acts/Navigation/NavigationState.hpp
index db3477b4fd5..6cfc8a17e46 100644
--- a/Core/include/Acts/Navigation/NavigationState.hpp
+++ b/Core/include/Acts/Navigation/NavigationState.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2021 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
diff --git a/Core/include/Acts/Navigation/NavigationStateFillers.hpp b/Core/include/Acts/Navigation/NavigationStateFillers.hpp
index 1eb70e0d361..74e6f3e7fb6 100644
--- a/Core/include/Acts/Navigation/NavigationStateFillers.hpp
+++ b/Core/include/Acts/Navigation/NavigationStateFillers.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2021 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
diff --git a/Core/include/Acts/Navigation/NavigationStateUpdaters.hpp b/Core/include/Acts/Navigation/NavigationStateUpdaters.hpp
index 3903d1e123c..df5e750db54 100644
--- a/Core/include/Acts/Navigation/NavigationStateUpdaters.hpp
+++ b/Core/include/Acts/Navigation/NavigationStateUpdaters.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2022 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
@@ -20,6 +20,7 @@
 #include "Acts/Utilities/IAxis.hpp"
 #include "Acts/Utilities/VectorHelpers.hpp"
 
+#include <algorithm>
 #include <array>
 #include <memory>
 
@@ -65,11 +66,9 @@ inline void intitializeCandidates(const GeometryContext& gctx,
     }
   }
 
-  std::sort(confirmedCandidates.begin(), confirmedCandidates.end(),
-            [&](const auto& a, const auto& b) {
-              return a.objectIntersection.pathLength() <
-                     b.objectIntersection.pathLength();
-            });
+  std::ranges::sort(confirmedCandidates, {}, [](const auto& c) {
+    return c.objectIntersection.pathLength();
+  });
 
   nState.surfaceCandidates = std::move(confirmedCandidates);
   nState.surfaceCandidateIndex = 0;
diff --git a/Core/include/Acts/Navigation/NavigationStream.hpp b/Core/include/Acts/Navigation/NavigationStream.hpp
new file mode 100644
index 00000000000..97e154214d7
--- /dev/null
+++ b/Core/include/Acts/Navigation/NavigationStream.hpp
@@ -0,0 +1,192 @@
+// This file is part of the ACTS project.
+//
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
+//
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
+
+#pragma once
+
+#include "Acts/Definitions/Algebra.hpp"
+#include "Acts/Geometry/GeometryContext.hpp"
+#include "Acts/Geometry/Portal.hpp"
+#include "Acts/Surfaces/BoundaryTolerance.hpp"
+#include "Acts/Utilities/Intersection.hpp"
+
+#include <span>
+#include <tuple>
+#include <vector>
+
+namespace Acts {
+
+// To be removed when the namespace Experimental is omitted
+namespace Experimental {
+class Portal;
+}
+
+class Surface;
+
+/// The NavigationStream is a container for the navigation candidates that
+/// are currentlu processed in a given context. The context could be local to a
+/// volume, or global to an entire track following.
+///
+/// The current candidates are stored in a vector of candidates, where an index
+/// is used to indicate the current active candidate.
+class NavigationStream {
+ public:
+  /// The query point for the navigation stream
+  ///
+  /// This holds the position and direction from which the navigation stream
+  /// should either be initialized or updated.
+  struct QueryPoint {
+    /// The position of the query point
+    Vector3 position = Vector3::Zero();
+    /// The direction of the query point
+    Vector3 direction = Vector3::Zero();
+  };
+
+  /// This is a candidate object of the navigation stream, it holds:
+  ///
+  /// - a Surface intersection
+  /// - a Portal : set if the surface represents a portal
+  /// - a BoundaryTolerance : the boundary tolerance used for the intersection
+  struct Candidate {
+    /// The intersection
+    ObjectIntersection<Surface> intersection =
+        ObjectIntersection<Surface>::invalid();
+    /// The portal
+    const Acts::Experimental::Portal* gen2Portal = nullptr;
+    const Portal* portal = nullptr;
+    /// The boundary tolerance
+    BoundaryTolerance bTolerance = BoundaryTolerance::None();
+    /// Convenience access to surface
+    const Surface& surface() const { return *intersection.object(); }
+    /// Cinvencience access to the path length
+    ActsScalar pathLength() const { return intersection.pathLength(); }
+
+    /// Order along the path length
+    ///
+    /// @param aCandidate is the first candidate
+    /// @param bCandidate is the second candidate
+    ///
+    /// @return true if aCandidate is closer to the origin
+    constexpr static bool pathLengthOrder(const Candidate& aCandidate,
+                                          const Candidate& bCandidate) {
+      return ObjectIntersection<Surface>::pathLengthOrder(
+          aCandidate.intersection, bCandidate.intersection);
+    }
+  };
+
+  /// Switch to next next candidate
+  ///
+  /// @return true if a next candidate is available
+  bool switchToNextCandidate() {
+    if (m_currentIndex < m_candidates.size()) {
+      ++m_currentIndex;
+      return true;
+    }
+    return false;
+  }
+
+  /// Const access the current candidate
+  const Candidate& currentCandidate() const {
+    return m_candidates.at(m_currentIndex);
+  }
+
+  /// Current Index
+  std::size_t currentIndex() const { return m_currentIndex; }
+
+  /// Non-cost access the candidate vector
+  std::vector<Candidate>& candidates() { return m_candidates; }
+
+  /// Const access the candidate vector
+  const std::vector<Candidate>& candidates() const { return m_candidates; }
+
+  /// Non-cost access the current candidate
+  ///
+  /// This will throw and out of bounds exception if the stream is not
+  /// valid anymore.
+  Candidate& currentCandidate() { return m_candidates.at(m_currentIndex); }
+
+  /// The number of active candidates
+  std::size_t remainingCandidates() const {
+    return (m_candidates.size() - m_currentIndex);
+  }
+
+  /// Fill one surface into the candidate vector
+  ///
+  /// @param surface the surface to be filled
+  /// @param bTolerance the boundary tolerance used for the intersection
+  void addSurfaceCandidate(const Surface& surface,
+                           const BoundaryTolerance& bTolerance);
+
+  /// Fill n surfaces into the candidate vector
+  ///
+  /// @param surfaces the surfaces that are filled in
+  /// @param bTolerance the boundary tolerance used for the intersection
+  void addSurfaceCandidates(std::span<const Surface*> surfaces,
+                            const BoundaryTolerance& bTolerance);
+
+  /// Fill one portal into the candidate vector
+  ///
+  void addPortalCandidate(const Experimental::Portal& portal);
+  /// @param portal the portals that are filled in
+
+  void addPortalCandidate(const Portal& portal);
+
+  /// Fill n portals into the candidate vector
+  ///
+  /// @param portals the portals that are filled in
+  void addPortalCandidates(std::span<const Experimental::Portal*> portals);
+
+  /// Initialize the stream from a query point
+  ///
+  /// @param gctx is the geometry context
+  /// @param queryPoint holds current position, direction, etc.
+  /// @param cTolerance is the candidate search tolerance
+  /// @param onSurfaceTolerance is the tolerance for on-surface intersections
+  ///
+  /// This method will first de-duplicate the candidates on basis of the surface
+  /// pointer to make sure that the multi-intersections are handled correctly.
+  /// This will allow intializeStream() to be called even as a re-initialization
+  /// and still work correctly with at one time valid candidates.
+  ///
+  /// @return true if the stream is active, false indicates that there are no valid candidates
+  bool initialize(const GeometryContext& gctx,
+                  const NavigationStream::QueryPoint& queryPoint,
+                  const BoundaryTolerance& cTolerance,
+                  ActsScalar onSurfaceTolerance = s_onSurfaceTolerance);
+
+  /// Convenience method to update a stream from a new query point,
+  /// this could be called from navigation delegates that do not require
+  /// a local state or from the navigator on the target stream
+  ///
+  /// @param gctx is the geometry context
+  /// @param queryPoint holds current position, direction, etc.
+  /// @param onSurfaceTolerance is the tolerance for on-surface intersections
+  ///
+  /// @return true if the stream is active, false indicate no valid candidates left
+  bool update(const GeometryContext& gctx,
+              const NavigationStream::QueryPoint& queryPoint,
+              ActsScalar onSurfaceTolerance = s_onSurfaceTolerance);
+
+ private:
+  /// The candidates of this navigation stream
+  std::vector<Candidate> m_candidates;
+
+  /// The currently active candidate
+  std::size_t m_currentIndex = 0u;
+};
+
+struct AppendOnlyNavigationStream {
+  explicit AppendOnlyNavigationStream(NavigationStream& stream);
+  void addSurfaceCandidate(const Surface& surface,
+                           const BoundaryTolerance& bTolerance);
+  void addPortalCandidate(const Portal& portal);
+
+ private:
+  NavigationStream* m_stream;
+};
+
+}  // namespace Acts
diff --git a/Core/include/Acts/Navigation/PortalNavigation.hpp b/Core/include/Acts/Navigation/PortalNavigation.hpp
index 4a10993d68e..638f2397760 100644
--- a/Core/include/Acts/Navigation/PortalNavigation.hpp
+++ b/Core/include/Acts/Navigation/PortalNavigation.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2022-2023 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
diff --git a/Core/include/Acts/Navigation/SurfaceArrayNavigationPolicy.hpp b/Core/include/Acts/Navigation/SurfaceArrayNavigationPolicy.hpp
new file mode 100644
index 00000000000..731122caff7
--- /dev/null
+++ b/Core/include/Acts/Navigation/SurfaceArrayNavigationPolicy.hpp
@@ -0,0 +1,84 @@
+// This file is part of the ACTS project.
+//
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
+//
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
+
+#include "Acts/Navigation/INavigationPolicy.hpp"
+
+#pragma once
+
+namespace Acts {
+
+class SurfaceArray;
+
+/// A navigation policy that internally uses the Gen1 @c SurfaceArray class
+class SurfaceArrayNavigationPolicy : public INavigationPolicy {
+ public:
+  /// Enum for configuring which type of surface array to produce. This affects
+  /// the projection that is used for creating the binning structure.
+  enum class LayerType { Cylinder, Disc, Plane };
+
+  /// Config struct to configure the surface array navigation
+  struct Config {
+    /// The type of the layer
+    LayerType layerType = LayerType::Cylinder;
+    /// The number of bins in the local directions. The interpretation depends
+    /// on the layer type.
+    std::pair<std::size_t, std::size_t> bins;
+  };
+
+  /// Main constructor, which internally creates the surface array acceleration
+  /// structure.
+  /// @note Expects that all relevant surfaces are registered with @p volume.
+  ///       Only selects sensitive surfaces for the surface array.
+  /// @param gctx The geometry context
+  /// @param volume The *layer volume* to construct the surface array from
+  /// @param logger A logging instance
+  /// @param config The configuration for the surface array
+  explicit SurfaceArrayNavigationPolicy(const GeometryContext& gctx,
+                                        const TrackingVolume& volume,
+                                        const Logger& logger, Config config);
+
+  /// Update the navigation state from the surface array
+  /// @param args The navigation arguments
+  /// @param stream The navigation stream to update
+  /// @param logger The logger
+  void initializeCandidates(const NavigationArguments& args,
+                            AppendOnlyNavigationStream& stream,
+                            const Logger& logger) const;
+
+  /// Connect this policy with a navigation delegate
+  /// @param delegate The navigation delegate to connect to
+  void connect(NavigationDelegate& delegate) const override;
+
+  /// Output stream operator for the contained layer type enum
+  /// @param os The output stream
+  /// @param layerType The layer type to print
+  friend std::ostream& operator<<(std::ostream& os,
+                                  const LayerType& layerType) {
+    switch (layerType) {
+      using enum LayerType;
+      case Cylinder:
+        os << "Cylinder";
+        break;
+      case Disc:
+        os << "Disc";
+        break;
+      case Plane:
+        os << "Plane";
+        break;
+    }
+    return os;
+  }
+
+ private:
+  std::unique_ptr<SurfaceArray> m_surfaceArray{};
+  const TrackingVolume& m_volume;
+};
+
+static_assert(NavigationPolicyConcept<SurfaceArrayNavigationPolicy>);
+
+}  // namespace Acts
diff --git a/Core/include/Acts/Navigation/TryAllNavigationPolicy.hpp b/Core/include/Acts/Navigation/TryAllNavigationPolicy.hpp
new file mode 100644
index 00000000000..677a1dbd6dc
--- /dev/null
+++ b/Core/include/Acts/Navigation/TryAllNavigationPolicy.hpp
@@ -0,0 +1,64 @@
+// This file is part of the ACTS project.
+//
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
+//
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
+
+#pragma once
+
+#include "Acts/Navigation/INavigationPolicy.hpp"
+#include "Acts/Navigation/NavigationStream.hpp"
+
+namespace Acts {
+
+class TrackingVolume;
+class GeometryContext;
+class Logger;
+
+/// Policy which adds **all** candidates of the configured type to the
+/// stream
+class TryAllNavigationPolicy final : public INavigationPolicy {
+ public:
+  struct Config {
+    bool portals = true;
+    bool sensitives = true;
+  };
+
+  /// Constructor from a volume
+  /// @param gctx is the geometry context
+  /// @param volume is the volume to navigate
+  /// @param logger is the logger
+  /// @param config The configuration for the policy
+  TryAllNavigationPolicy(const GeometryContext& gctx,
+                         const TrackingVolume& volume, const Logger& logger,
+                         const Config& config);
+
+  /// Constructor from a volume
+  /// @param gctx is the geometry context
+  /// @param volume is the volume to navigate
+  /// @param logger is the logger
+  TryAllNavigationPolicy(const GeometryContext& gctx,
+                         const TrackingVolume& volume, const Logger& logger);
+
+  /// Add all candidates to the stream
+  /// @param args are the navigation arguments
+  /// @param stream is the navigation stream to update
+  /// @param logger is the logger
+  void initializeCandidates(const NavigationArguments& args,
+                            AppendOnlyNavigationStream& stream,
+                            const Logger& logger) const;
+
+  /// Connect the policy to a navigation delegate
+  /// @param delegate is the navigation delegate
+  void connect(NavigationDelegate& delegate) const override;
+
+ private:
+  Config m_cfg;
+  const TrackingVolume* m_volume;
+};
+
+static_assert(NavigationPolicyConcept<TryAllNavigationPolicy>);
+
+}  // namespace Acts
diff --git a/Core/include/Acts/Propagator/AbortList.hpp b/Core/include/Acts/Propagator/AbortList.hpp
deleted file mode 100644
index d18b1b991a3..00000000000
--- a/Core/include/Acts/Propagator/AbortList.hpp
+++ /dev/null
@@ -1,115 +0,0 @@
-// This file is part of the Acts project.
-//
-// Copyright (C) 2016-2018 CERN for the benefit of the Acts project
-//
-// This Source Code Form is subject to the terms of the Mozilla Public
-// License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-#pragma once
-
-#include "Acts/Propagator/detail/abort_list_implementation.hpp"
-#include "Acts/Utilities/detail/Extendable.hpp"
-#include "Acts/Utilities/detail/MPL/has_duplicates.hpp"
-#include "Acts/Utilities/detail/MPL/type_collector.hpp"
-
-#include <boost/hana/type.hpp>
-#include <boost/hana/unpack.hpp>
-
-namespace hana = boost::hana;
-
-namespace Acts {
-
-/// @brief AbortList object to be used in the propagation
-///
-/// The abort list is a list of structs or classes that
-/// is called at each propagation step and can trigger the abort
-/// of the current propagation.
-///
-/// It can (optionally) depend on a result of an Actor from
-/// the actor list.
-template <typename... aborters_t>
-struct AbortList : public detail::Extendable<aborters_t...> {
- private:
-  static_assert(!detail::has_duplicates_v<aborters_t...>,
-                "same aborter type specified several times");
-
-  using detail::Extendable<aborters_t...>::tuple;
-
- public:
-  /// @cond
-  // This uses the type collector
-  using result_type = typename decltype(hana::unpack(
-      detail::type_collector_t<detail::action_type_extractor, aborters_t...>,
-      hana::template_<AbortList>))::type;
-  /// @endcond
-
-  using detail::Extendable<aborters_t...>::get;
-
-  /// Default constructor
-  AbortList() = default;
-
-  /// Default copy constructor
-  ///
-  /// @param aborters The source action list
-  AbortList(const AbortList<aborters_t...>& aborters) = default;
-
-  /// Default move constructor
-  ///
-  /// @param aborters The source action list
-  AbortList(AbortList<aborters_t...>&& aborters) = default;
-
-  /// Default move assignment operator
-  ///
-  /// @param aborters The source action list
-  AbortList<aborters_t...>& operator=(
-      const AbortList<aborters_t...>& aborters) = default;
-
-  /// Default move assignment operator
-  ///
-  /// @param aborters The source action list
-  AbortList<aborters_t...>& operator=(AbortList<aborters_t...>&& aborters) =
-      default;
-
-  /// Constructor from tuple
-  ///
-  /// @param aborters Source extensions tuple
-  AbortList(const std::tuple<aborters_t...>& aborters)
-      : detail::Extendable<aborters_t...>(aborters) {}
-
-  /// Constructor from tuple move
-  ///
-  /// @param aborters Source extensions tuple
-  AbortList(std::tuple<aborters_t...>&& aborters)
-      : detail::Extendable<aborters_t...>(std::move(aborters)) {}
-
-  /// Append new entries and return a new condition
-  template <typename... appendices_t>
-  AbortList<aborters_t..., appendices_t...> append(appendices_t... aps) const {
-    auto catTuple =
-        std::tuple_cat(tuple(), std::tuple<appendices_t...>(aps...));
-    return AbortList<aborters_t..., appendices_t...>(std::move(catTuple));
-  }
-
-  /// This is the call signature for the abort list, it broadcasts the call
-  /// to the tuple() members of the list
-  ///
-  /// @tparam propagator_state_t is the state type of the propagator
-  /// @tparam stepper_t Type of the stepper
-  /// @tparam navigator_t Type of the navigator
-  ///
-  /// @param [in,out] state is the state object from the propagator
-  /// @param [in] stepper Stepper used for the propagation
-  /// @param [in] navigator Navigator used for the propagation
-  /// @param [in] args are the arguments to be passed to the aborters
-  template <typename propagator_state_t, typename stepper_t,
-            typename navigator_t, typename... Args>
-  bool operator()(propagator_state_t& state, const stepper_t& stepper,
-                  const navigator_t& navigator, Args&&... args) const {
-    using impl = detail::abort_list_impl<aborters_t...>;
-    return impl::check(tuple(), state, stepper, navigator,
-                       std::forward<Args>(args)...);
-  }
-};
-
-}  // namespace Acts
diff --git a/Core/include/Acts/Propagator/ActionList.hpp b/Core/include/Acts/Propagator/ActionList.hpp
deleted file mode 100644
index 5ae6f85ff2e..00000000000
--- a/Core/include/Acts/Propagator/ActionList.hpp
+++ /dev/null
@@ -1,94 +0,0 @@
-// This file is part of the Acts project.
-//
-// Copyright (C) 2016-2018 CERN for the benefit of the Acts project
-//
-// This Source Code Form is subject to the terms of the Mozilla Public
-// License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-#pragma once
-
-#include "Acts/Propagator/detail/action_list_implementation.hpp"
-#include "Acts/Utilities/detail/Extendable.hpp"
-#include "Acts/Utilities/detail/MPL/all_of.hpp"
-#include "Acts/Utilities/detail/MPL/has_duplicates.hpp"
-#include "Acts/Utilities/detail/MPL/type_collector.hpp"
-
-#include <boost/hana/type.hpp>
-#include <boost/hana/unpack.hpp>
-
-namespace hana = boost::hana;
-
-namespace Acts {
-
-/// @brief ActionList implementation to be used with the propagator
-///
-/// This is the ActionList struct that is used in the propagator
-/// to define a list of different actors_t that are each
-/// executed during the stepping procedure
-template <typename... actors_t>
-struct ActionList : public detail::Extendable<actors_t...> {
- private:
-  static_assert(!detail::has_duplicates_v<actors_t...>,
-                "same action type specified several times");
-
-  using detail::Extendable<actors_t...>::tuple;
-
- public:
-  /// @cond
-  // This uses the type collector and unpacks using the `R` meta function
-  template <template <typename...> class R>
-  using result_type = typename decltype(hana::unpack(
-      detail::type_collector_t<detail::result_type_extractor, actors_t...>,
-      hana::template_<R>))::type;
-  /// @endcond
-
-  using detail::Extendable<actors_t...>::get;
-
-  /// Default constructor
-  ActionList() = default;
-
-  /// Default copy constructor
-  ///
-  /// @param actors The source action list
-  ActionList(const ActionList<actors_t...>& actors) = default;
-
-  /// Default move constructor
-  ///
-  /// @param actors The source action list
-  ActionList(ActionList<actors_t...>&& actors) = default;
-
-  /// Default move assignment operator
-  ///
-  /// @param actors The source action list
-  ActionList<actors_t...>& operator=(const ActionList<actors_t...>& actors) =
-      default;
-
-  /// Default move assignment operator
-  ///
-  /// @param actors The source action list
-  ActionList<actors_t...>& operator=(ActionList<actors_t...>&& actors) =
-      default;
-
-  /// Call operator that is that broadcasts the call to the tuple()
-  /// members of the list
-  ///
-  /// @tparam propagator_state_t is the state type of the propagator
-  /// @tparam stepper_t Type of the stepper used for the propagation
-  /// @tparam navigator_t Type of the navigator used for the propagation
-  ///
-  /// @param [in,out] state This is the propagator state object
-  /// @param [in] stepper The stepper in use
-  /// @param [in] navigator The navigator in use
-  /// @param [in] args The arguments to be passed to the actions
-  template <typename propagator_state_t, typename stepper_t,
-            typename navigator_t, typename... Args>
-  void operator()(propagator_state_t& state, const stepper_t& stepper,
-                  const navigator_t& navigator, Args&&... args) const {
-    using impl = detail::action_list_impl<actors_t...>;
-    impl::action(tuple(), state, stepper, navigator,
-                 std::forward<Args>(args)...);
-  }
-};
-
-}  // namespace Acts
diff --git a/Core/include/Acts/Propagator/ActorConcepts.hpp b/Core/include/Acts/Propagator/ActorConcepts.hpp
new file mode 100644
index 00000000000..aecbdba4ac6
--- /dev/null
+++ b/Core/include/Acts/Propagator/ActorConcepts.hpp
@@ -0,0 +1,92 @@
+// This file is part of the ACTS project.
+//
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
+//
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
+
+#pragma once
+
+#include <concepts>
+#include <type_traits>
+#include <utility>
+
+namespace Acts {
+
+template <typename actor_t>
+concept ActorHasResult = requires { typename actor_t::result_type; };
+
+template <typename actor_t>
+struct ActorHasResultStruct {
+  static constexpr bool value = ActorHasResult<actor_t>;
+};
+
+template <typename actor_t, typename propagator_state_t, typename stepper_t,
+          typename navigator_t, typename... Args>
+concept ActorHasActWithoutResult = requires(
+    const actor_t& a, propagator_state_t& state, const stepper_t& stepper,
+    const navigator_t& navigator, Args&&... args) {
+  {
+    a.act(state, stepper, navigator, std::move<Args>(args)...)
+  } -> std::same_as<void>;
+};
+
+template <typename actor_t, typename propagator_state_t, typename stepper_t,
+          typename navigator_t, typename... Args>
+concept ActorHasActWithResult =
+    ActorHasResult<actor_t> &&
+    requires(const actor_t& a, propagator_state_t& state,
+             const stepper_t& stepper, const navigator_t& navigator,
+             typename actor_t::result_type& result, Args&&... args) {
+      {
+        a.act(state, stepper, navigator, result, std::move<Args>(args)...)
+      } -> std::same_as<void>;
+    };
+
+template <typename actor_t, typename propagator_state_t, typename stepper_t,
+          typename navigator_t, typename... Args>
+concept ActorHasAct =
+    ActorHasActWithoutResult<actor_t, propagator_state_t, stepper_t,
+                             navigator_t, Args...> ||
+    ActorHasActWithResult<actor_t, propagator_state_t, stepper_t, navigator_t,
+                          Args...>;
+
+template <typename actor_t, typename propagator_state_t, typename stepper_t,
+          typename navigator_t, typename... Args>
+concept ActorHasAbortWithoutResult = requires(
+    const actor_t& a, propagator_state_t& state, const stepper_t& stepper,
+    const navigator_t& navigator, Args&&... args) {
+  {
+    a.checkAbort(state, stepper, navigator, std::move<Args>(args)...)
+  } -> std::same_as<bool>;
+};
+
+template <typename actor_t, typename propagator_state_t, typename stepper_t,
+          typename navigator_t, typename... Args>
+concept ActorHasAbortWithResult =
+    ActorHasResult<actor_t> &&
+    requires(const actor_t& a, propagator_state_t& state,
+             const stepper_t& stepper, const navigator_t& navigator,
+             typename actor_t::result_type& result, Args&&... args) {
+      {
+        a.checkAbort(state, stepper, navigator, result,
+                     std::move<Args>(args)...)
+      } -> std::same_as<bool>;
+    };
+
+template <typename actor_t, typename propagator_state_t, typename stepper_t,
+          typename navigator_t, typename... Args>
+concept ActorHasAbort =
+    ActorHasAbortWithoutResult<actor_t, propagator_state_t, stepper_t,
+                               navigator_t, Args...> ||
+    ActorHasAbortWithResult<actor_t, propagator_state_t, stepper_t, navigator_t,
+                            Args...>;
+
+template <typename actor_t, typename propagator_state_t, typename stepper_t,
+          typename navigator_t, typename... Args>
+concept Actor =
+    ActorHasAct<actor_t, propagator_state_t, stepper_t, navigator_t, Args...> ||
+    ActorHasAbort<actor_t, propagator_state_t, stepper_t, navigator_t, Args...>;
+
+}  // namespace Acts
diff --git a/Core/include/Acts/Propagator/ActorList.hpp b/Core/include/Acts/Propagator/ActorList.hpp
new file mode 100644
index 00000000000..89de8799a0d
--- /dev/null
+++ b/Core/include/Acts/Propagator/ActorList.hpp
@@ -0,0 +1,148 @@
+// This file is part of the ACTS project.
+//
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
+//
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
+
+#pragma once
+
+#include "Acts/Propagator/detail/actor_list_implementation.hpp"
+#include "Acts/Utilities/TypeList.hpp"
+
+namespace Acts {
+/// @brief Extract the result type of an actor
+template <typename T>
+struct ActorResultTypeExtractor {
+  using type = typename T::result_type;
+};
+
+/// @brief ActorList implementation to be used with the propagator
+///
+/// This is the ActorList struct that is used in the propagator
+/// to define a list of different actors_t that are each
+/// executed during the stepping procedure
+template <typename... actors_t>
+  requires((std::is_default_constructible_v<actors_t> && ...) &&
+           (std::is_copy_constructible_v<actors_t> && ...) &&
+           (std::is_move_constructible_v<actors_t> && ...) &&
+           ((Types::count<actors_t, TypeList<actors_t...>>::value == 1) && ...))
+struct ActorList {
+  /// @cond
+  // This uses the type collector and unpacks using the `R` meta function
+  // template <template <typename...> class R>
+  template <template <typename...> class R>
+  using result_type = typename Types::apply<
+      R, typename Types::map<ActorResultTypeExtractor,
+                             typename Types::filter<ActorHasResultStruct,
+                                                    actors_t...>::type>::type>::
+      type;
+  /// @endcond
+
+  /// Default constructor
+  ActorList() = default;
+
+  /// Default copy constructor
+  ///
+  /// @param actors The source action list
+  ActorList(const ActorList<actors_t...>& actors) = default;
+
+  /// Default move constructor
+  ///
+  /// @param actors The source action list
+  ActorList(ActorList<actors_t...>&& actors) = default;
+
+  /// Default move assignment operator
+  ///
+  /// @param actors The source action list
+  ActorList<actors_t...>& operator=(const ActorList<actors_t...>& actors) =
+      default;
+
+  /// Default move assignment operator
+  ///
+  /// @param actors The source action list
+  ActorList<actors_t...>& operator=(ActorList<actors_t...>&& actors) = default;
+
+  /// Constructor from tuple
+  ///
+  /// @param actors Source extensions tuple
+  ActorList(const std::tuple<actors_t...>& actors) : m_actors(actors) {}
+
+  /// Constructor from tuple move
+  ///
+  /// @param actors Source extensions tuple
+  ActorList(std::tuple<actors_t...>&& actors) : m_actors(std::move(actors)) {}
+
+  /// Const retrieval of an actor of a specific type
+  ///
+  /// @tparam actor_t Type of the Actor to be retrieved
+  template <typename actor_t>
+  const actor_t& get() const {
+    return std::get<actor_t>(m_actors);
+  }
+
+  /// Non-const retrieval of an actor of a specific type
+  ///
+  /// @tparam actor_t Type of the Actor to be retrieved
+  template <typename actor_t>
+  actor_t& get() {
+    return std::get<actor_t>(m_actors);
+  }
+
+  /// Append new entries and return a new condition
+  ///
+  /// @tparam appendices_t Types of appended entries to the tuple
+  ///
+  /// @param aps The actors to be appended to the new ActorList
+  ///
+  /// @return A new ActorList with the appended actors
+  template <typename... appendices_t>
+  ActorList<actors_t..., appendices_t...> append(appendices_t... aps) const {
+    auto catTuple =
+        std::tuple_cat(m_actors, std::tuple<appendices_t...>(aps...));
+    return ActorList<actors_t..., appendices_t...>(std::move(catTuple));
+  }
+
+  /// Act call which broadcasts the call to the tuple() members of the list
+  ///
+  /// @tparam propagator_state_t is the state type of the propagator
+  /// @tparam stepper_t Type of the stepper used for the propagation
+  /// @tparam navigator_t Type of the navigator used for the propagation
+  ///
+  /// @param [in,out] state This is the propagator state object
+  /// @param [in] stepper The stepper in use
+  /// @param [in] navigator The navigator in use
+  /// @param [in] args The arguments to be passed to the actions
+  template <typename propagator_state_t, typename stepper_t,
+            typename navigator_t, typename... Args>
+  void act(propagator_state_t& state, const stepper_t& stepper,
+           const navigator_t& navigator, Args&&... args) const {
+    using impl = detail::actor_list_impl<actors_t...>;
+    impl::act(m_actors, state, stepper, navigator, std::forward<Args>(args)...);
+  }
+
+  /// Check call which broadcasts the call to the tuple() members of the list
+  ///
+  /// @tparam propagator_state_t is the state type of the propagator
+  /// @tparam stepper_t Type of the stepper
+  /// @tparam navigator_t Type of the navigator
+  ///
+  /// @param [in,out] state is the state object from the propagator
+  /// @param [in] stepper Stepper used for the propagation
+  /// @param [in] navigator Navigator used for the propagation
+  /// @param [in] args are the arguments to be passed to the aborters
+  template <typename propagator_state_t, typename stepper_t,
+            typename navigator_t, typename... Args>
+  bool checkAbort(propagator_state_t& state, const stepper_t& stepper,
+                  const navigator_t& navigator, Args&&... args) const {
+    using impl = detail::actor_list_impl<actors_t...>;
+    return impl::checkAbort(m_actors, state, stepper, navigator,
+                            std::forward<Args>(args)...);
+  }
+
+ private:
+  std::tuple<actors_t...> m_actors;
+};
+
+}  // namespace Acts
diff --git a/Core/include/Acts/Propagator/AtlasStepper.hpp b/Core/include/Acts/Propagator/AtlasStepper.hpp
index f84d02cd543..f31aadbffab 100644
--- a/Core/include/Acts/Propagator/AtlasStepper.hpp
+++ b/Core/include/Acts/Propagator/AtlasStepper.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2016-2022 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
diff --git a/Core/include/Acts/Propagator/ConstrainedStep.hpp b/Core/include/Acts/Propagator/ConstrainedStep.hpp
index 4eb2517a17d..e957b001281 100644
--- a/Core/include/Acts/Propagator/ConstrainedStep.hpp
+++ b/Core/include/Acts/Propagator/ConstrainedStep.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2018-2022 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
@@ -156,7 +156,7 @@ class ConstrainedStep {
   }
 
  private:
-  inline static constexpr auto kNotSet = std::numeric_limits<Scalar>::max();
+  static constexpr auto kNotSet = std::numeric_limits<Scalar>::max();
 
   /// the step size tuple
   std::array<Scalar, 3> m_values = {kNotSet, kNotSet, kNotSet};
diff --git a/Core/include/Acts/Propagator/DirectNavigator.hpp b/Core/include/Acts/Propagator/DirectNavigator.hpp
index 6b2d7648a88..bd35c5cd4e8 100644
--- a/Core/include/Acts/Propagator/DirectNavigator.hpp
+++ b/Core/include/Acts/Propagator/DirectNavigator.hpp
@@ -1,13 +1,14 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2019-2024 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
+#include "Acts/Definitions/Direction.hpp"
 #include "Acts/Geometry/BoundarySurfaceT.hpp"
 #include "Acts/Geometry/Layer.hpp"
 #include "Acts/Geometry/TrackingGeometry.hpp"
@@ -17,6 +18,7 @@
 #include "Acts/Surfaces/BoundaryTolerance.hpp"
 #include "Acts/Surfaces/Surface.hpp"
 #include "Acts/Utilities/Intersection.hpp"
+#include "Acts/Utilities/Logger.hpp"
 
 #include <algorithm>
 #include <iterator>
@@ -69,7 +71,7 @@ class DirectNavigator {
     Options options;
 
     /// Index of the next surface to try
-    std::size_t surfaceIndex = 0;
+    int surfaceIndex = 0;
 
     /// Navigation state - external interface: the current surface
     const Surface* currentSurface = nullptr;
@@ -78,6 +80,35 @@ class DirectNavigator {
     bool targetReached = false;
     /// Navigation state - external interface: a break has been detected
     bool navigationBreak = false;
+
+    const Surface* navSurface() const {
+      return options.surfaces.at(surfaceIndex);
+    }
+
+    void nextSurface(Direction direction) {
+      if (direction == Direction::Forward) {
+        ++surfaceIndex;
+      } else {
+        --surfaceIndex;
+      }
+    }
+
+    bool endOfSurfaces() const {
+      return surfaceIndex < 0 ||
+             surfaceIndex >= static_cast<int>(options.surfaces.size());
+    }
+
+    int remainingSurfaces(Direction direction) const {
+      if (direction == Direction::Forward) {
+        return options.surfaces.size() - surfaceIndex;
+      }
+      return surfaceIndex + 1;
+    }
+
+    void resetSurfaceIndex(Direction direction) {
+      surfaceIndex =
+          direction == Direction::Forward ? 0 : options.surfaces.size() - 1;
+    }
   };
 
   explicit DirectNavigator(std::unique_ptr<const Logger> _logger =
@@ -140,17 +171,41 @@ class DirectNavigator {
   void initialize(propagator_state_t& state,
                   const stepper_t& /*stepper*/) const {
     ACTS_VERBOSE("Initialize. Surface sequence for navigation:");
-    for (auto surface : state.navigation.options.surfaces) {
+    for (const Surface* surface : state.navigation.options.surfaces) {
       ACTS_VERBOSE(surface->geometryId()
                    << " - " << surface->center(state.geoContext).transpose());
     }
 
     // We set the current surface to the start surface
     state.navigation.currentSurface = state.navigation.options.startSurface;
-    if (state.navigation.currentSurface) {
+    if (state.navigation.currentSurface != nullptr) {
       ACTS_VERBOSE("Current surface set to start surface "
                    << state.navigation.currentSurface->geometryId());
+    } else {
+      ACTS_VERBOSE("Current surface set to nullptr");
+    }
+
+    // Reset the surface index
+    state.navigation.resetSurfaceIndex(state.options.direction);
+    for (const Surface* surface : state.navigation.options.surfaces) {
+      // make sure we skip over the start surface
+      state.navigation.nextSurface(state.options.direction);
+      if (surface == state.navigation.currentSurface) {
+        break;
+      }
+    }
+    ACTS_VERBOSE("Start surface index set to "
+                 << state.navigation.surfaceIndex);
+    if (state.navigation.endOfSurfaces()) {
+      ACTS_DEBUG(
+          "Did not find the start surface in the sequence. Assuming it is not "
+          "part of the sequence. Trusting the correctness of the input "
+          "sequence. Resetting the surface index.");
+      state.navigation.resetSurfaceIndex(state.options.direction);
     }
+
+    state.navigation.navigationBreak = false;
+    state.navigation.targetReached = false;
   }
 
   /// @brief Navigator pre step call
@@ -162,21 +217,25 @@ class DirectNavigator {
   /// @param [in] stepper Stepper in use
   template <typename propagator_state_t, typename stepper_t>
   void preStep(propagator_state_t& state, const stepper_t& stepper) const {
+    if (state.navigation.navigationBreak) {
+      return;
+    }
+
     ACTS_VERBOSE("pre step");
 
     // Navigator target always resets the current surface
     state.navigation.currentSurface = nullptr;
 
     // Output the position in the sequence
-    ACTS_VERBOSE((state.navigation.options.surfaces.size() -
-                  state.navigation.surfaceIndex)
+    ACTS_VERBOSE(state.navigation.remainingSurfaces(state.options.direction)
                  << " out of " << state.navigation.options.surfaces.size()
                  << " surfaces remain to try.");
 
-    if (state.navigation.surfaceIndex >=
-        state.navigation.options.surfaces.size()) {
+    if (state.navigation.endOfSurfaces()) {
       // Set the navigation break
+      ACTS_VERBOSE("End of surfaces reached, navigation break.");
       state.navigation.navigationBreak = true;
+      stepper.releaseStepSize(state.stepping, ConstrainedStep::actor);
       // If no externally provided target is given, the target is reached
       if (state.navigation.options.targetSurface == nullptr) {
         state.navigation.targetReached = true;
@@ -188,8 +247,7 @@ class DirectNavigator {
 
     // Establish & update the surface status
     // TODO we do not know the intersection index - passing the closer one
-    const auto& surface =
-        *state.navigation.options.surfaces.at(state.navigation.surfaceIndex);
+    const auto& surface = *state.navigation.navSurface();
     const double farLimit = std::numeric_limits<double>::max();
     const auto index =
         chooseIntersection(
@@ -207,7 +265,7 @@ class DirectNavigator {
           "Surface not reachable anymore, switching to next one in "
           "sequence");
       // Move the sequence to the next surface
-      ++state.navigation.surfaceIndex;
+      state.navigation.nextSurface(state.options.direction);
     } else {
       ACTS_VERBOSE("Navigation stepSize set to "
                    << stepper.outputStepSize(state.stepping));
@@ -223,26 +281,27 @@ class DirectNavigator {
   /// @param [in] stepper Stepper in use
   template <typename propagator_state_t, typename stepper_t>
   void postStep(propagator_state_t& state, const stepper_t& stepper) const {
+    if (state.navigation.navigationBreak) {
+      return;
+    }
+
     ACTS_VERBOSE("post step");
 
     // Navigator post step always resets the current surface
     state.navigation.currentSurface = nullptr;
 
     // Output the position in the sequence
-    ACTS_VERBOSE((state.navigation.options.surfaces.size() -
-                  state.navigation.surfaceIndex)
+    ACTS_VERBOSE(state.navigation.remainingSurfaces(state.options.direction)
                  << " out of " << state.navigation.options.surfaces.size()
                  << " surfaces remain to try.");
 
-    if (state.navigation.surfaceIndex >=
-        state.navigation.options.surfaces.size()) {
+    if (state.navigation.endOfSurfaces()) {
       return;
     }
 
     // Establish the surface status
     // TODO we do not know the intersection index - passing the closer one
-    const auto& surface =
-        *state.navigation.options.surfaces.at(state.navigation.surfaceIndex);
+    const auto& surface = *state.navigation.navSurface();
     const double farLimit = std::numeric_limits<double>::max();
     const auto index =
         chooseIntersection(
@@ -257,14 +316,12 @@ class DirectNavigator {
         *m_logger);
     if (surfaceStatus == Intersection3D::Status::onSurface) {
       // Set the current surface
-      state.navigation.currentSurface =
-          state.navigation.options.surfaces.at(state.navigation.surfaceIndex);
+      state.navigation.currentSurface = state.navigation.navSurface();
       ACTS_VERBOSE("Current surface set to  "
                    << state.navigation.currentSurface->geometryId());
       // Move the sequence to the next surface
-      ++state.navigation.surfaceIndex;
-      if (state.navigation.surfaceIndex <
-          state.navigation.options.surfaces.size()) {
+      state.navigation.nextSurface(state.options.direction);
+      if (!state.navigation.endOfSurfaces()) {
         ACTS_VERBOSE("Next surface candidate is  "
                      << state.navigation.options.surfaces
                             .at(state.navigation.surfaceIndex)
diff --git a/Core/include/Acts/Propagator/EigenStepper.hpp b/Core/include/Acts/Propagator/EigenStepper.hpp
index 8f3a91a837c..af5e1b8fb13 100644
--- a/Core/include/Acts/Propagator/EigenStepper.hpp
+++ b/Core/include/Acts/Propagator/EigenStepper.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2016-2024 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
@@ -15,21 +15,19 @@
 #include "Acts/Definitions/Tolerance.hpp"
 #include "Acts/Definitions/Units.hpp"
 #include "Acts/EventData/TrackParameters.hpp"
+#include "Acts/EventData/detail/CorrectedTransformationFreeToBound.hpp"
+#include "Acts/Geometry/GeometryContext.hpp"
+#include "Acts/MagneticField/MagneticFieldContext.hpp"
 #include "Acts/MagneticField/MagneticFieldProvider.hpp"
 #include "Acts/Propagator/ConstrainedStep.hpp"
-#include "Acts/Propagator/DefaultExtension.hpp"
-#include "Acts/Propagator/DenseEnvironmentExtension.hpp"
-#include "Acts/Propagator/EigenStepperError.hpp"
+#include "Acts/Propagator/EigenStepperDefaultExtension.hpp"
 #include "Acts/Propagator/PropagatorTraits.hpp"
-#include "Acts/Propagator/StepperExtensionList.hpp"
 #include "Acts/Propagator/StepperOptions.hpp"
-#include "Acts/Propagator/detail/Auctioneer.hpp"
 #include "Acts/Propagator/detail/SteppingHelper.hpp"
 #include "Acts/Surfaces/Surface.hpp"
 #include "Acts/Utilities/Intersection.hpp"
 #include "Acts/Utilities/Result.hpp"
 
-#include <cmath>
 #include <functional>
 #include <limits>
 #include <type_traits>
@@ -48,8 +46,7 @@ namespace Acts {
 /// with s being the arc length of the track, q the charge of the particle,
 /// p the momentum magnitude and B the magnetic field
 ///
-template <typename extensionlist_t = StepperExtensionList<DefaultExtension>,
-          typename auctioneer_t = detail::VoidAuctioneer>
+template <typename extension_t = EigenStepperDefaultExtension>
 class EigenStepper {
  public:
   /// Jacobian, Covariance and State definitions
@@ -156,11 +153,8 @@ class EigenStepper {
     /// The geometry context
     std::reference_wrapper<const GeometryContext> geoContext;
 
-    /// List of algorithmic extensions
-    extensionlist_t extension;
-
-    /// Auctioneer for choosing the extension
-    auctioneer_t auctioneer;
+    /// Algorithmic extension
+    extension_t extension;
 
     /// @brief Storage of magnetic field and the sub steps during a RKN4 step
     struct {
diff --git a/Core/include/Acts/Propagator/EigenStepper.ipp b/Core/include/Acts/Propagator/EigenStepper.ipp
index eb693a9148a..84b305ae431 100644
--- a/Core/include/Acts/Propagator/EigenStepper.ipp
+++ b/Core/include/Acts/Propagator/EigenStepper.ipp
@@ -1,37 +1,37 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2019-2022 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include "Acts/EventData/TransformationHelpers.hpp"
 #include "Acts/Propagator/ConstrainedStep.hpp"
+#include "Acts/Propagator/EigenStepperError.hpp"
 #include "Acts/Propagator/detail/CovarianceEngine.hpp"
-#include "Acts/Utilities/QuickMath.hpp"
 
 #include <limits>
 
-template <typename E, typename A>
-Acts::EigenStepper<E, A>::EigenStepper(
+template <typename E>
+Acts::EigenStepper<E>::EigenStepper(
     std::shared_ptr<const MagneticFieldProvider> bField)
     : m_bField(std::move(bField)) {}
 
-template <typename E, typename A>
-auto Acts::EigenStepper<E, A>::makeState(
+template <typename E>
+auto Acts::EigenStepper<E>::makeState(
     std::reference_wrapper<const GeometryContext> gctx,
     std::reference_wrapper<const MagneticFieldContext> mctx,
     const BoundTrackParameters& par, double ssize) const -> State {
   return State{gctx, m_bField->makeCache(mctx), par, ssize};
 }
 
-template <typename E, typename A>
-void Acts::EigenStepper<E, A>::resetState(State& state,
-                                          const BoundVector& boundParams,
-                                          const BoundSquareMatrix& cov,
-                                          const Surface& surface,
-                                          const double stepSize) const {
+template <typename E>
+void Acts::EigenStepper<E>::resetState(State& state,
+                                       const BoundVector& boundParams,
+                                       const BoundSquareMatrix& cov,
+                                       const Surface& surface,
+                                       const double stepSize) const {
   FreeVector freeParams =
       transformBoundToFreeParameters(surface, state.geoContext, boundParams);
 
@@ -50,8 +50,8 @@ void Acts::EigenStepper<E, A>::resetState(State& state,
   state.derivative = FreeVector::Zero();
 }
 
-template <typename E, typename A>
-auto Acts::EigenStepper<E, A>::boundState(
+template <typename E>
+auto Acts::EigenStepper<E>::boundState(
     State& state, const Surface& surface, bool transportCov,
     const FreeToBoundCorrection& freeToBoundCorrection) const
     -> Result<BoundState> {
@@ -62,36 +62,32 @@ auto Acts::EigenStepper<E, A>::boundState(
       freeToBoundCorrection);
 }
 
-template <typename E, typename A>
+template <typename E>
 template <typename propagator_state_t, typename navigator_t>
-bool Acts::EigenStepper<E, A>::prepareCurvilinearState(
+bool Acts::EigenStepper<E>::prepareCurvilinearState(
     propagator_state_t& prop_state, const navigator_t& navigator) const {
   // test whether the accumulated path has still its initial value.
   if (prop_state.stepping.pathAccumulated == 0.) {
     // if no step was executed the path length derivates have not been
     // computed but are needed to compute the curvilinear covariance. The
     // derivates are given by k1 for a zero step width.
-    if (prop_state.stepping.extension.validExtensionForStep(prop_state, *this,
-                                                            navigator)) {
-      // First Runge-Kutta point (at current position)
-      auto& sd = prop_state.stepping.stepData;
-      auto pos = position(prop_state.stepping);
-      auto fieldRes = getField(prop_state.stepping, pos);
-      if (fieldRes.ok()) {
-        sd.B_first = *fieldRes;
-        if (prop_state.stepping.extension.k1(prop_state, *this, navigator,
-                                             sd.k1, sd.B_first, sd.kQoP)) {
-          // dr/ds :
-          prop_state.stepping.derivative.template head<3>() =
-              prop_state.stepping.pars.template segment<3>(eFreeDir0);
-          // d (dr/ds) / ds :
-          prop_state.stepping.derivative.template segment<3>(4) = sd.k1;
-          // to set dt/ds :
-          prop_state.stepping.extension.finalize(
-              prop_state, *this, navigator,
-              prop_state.stepping.pathAccumulated);
-          return true;
-        }
+    // First Runge-Kutta point (at current position)
+    auto& sd = prop_state.stepping.stepData;
+    auto pos = position(prop_state.stepping);
+    auto fieldRes = getField(prop_state.stepping, pos);
+    if (fieldRes.ok()) {
+      sd.B_first = *fieldRes;
+      if (prop_state.stepping.extension.template k<0>(
+              prop_state, *this, navigator, sd.k1, sd.B_first, sd.kQoP)) {
+        // dr/ds :
+        prop_state.stepping.derivative.template head<3>() =
+            prop_state.stepping.pars.template segment<3>(eFreeDir0);
+        // d (dr/ds) / ds :
+        prop_state.stepping.derivative.template segment<3>(4) = sd.k1;
+        // to set dt/ds :
+        prop_state.stepping.extension.finalize(
+            prop_state, *this, navigator, prop_state.stepping.pathAccumulated);
+        return true;
       }
     }
     return false;
@@ -99,8 +95,8 @@ bool Acts::EigenStepper<E, A>::prepareCurvilinearState(
   return true;
 }
 
-template <typename E, typename A>
-auto Acts::EigenStepper<E, A>::curvilinearState(
+template <typename E>
+auto Acts::EigenStepper<E>::curvilinearState(
     State& state, bool transportCov) const -> CurvilinearState {
   return detail::curvilinearState(
       state.cov, state.jacobian, state.jacTransport, state.derivative,
@@ -108,12 +104,11 @@ auto Acts::EigenStepper<E, A>::curvilinearState(
       state.covTransport && transportCov, state.pathAccumulated);
 }
 
-template <typename E, typename A>
-void Acts::EigenStepper<E, A>::update(State& state,
-                                      const FreeVector& freeParams,
-                                      const BoundVector& /*boundParams*/,
-                                      const Covariance& covariance,
-                                      const Surface& surface) const {
+template <typename E>
+void Acts::EigenStepper<E>::update(State& state, const FreeVector& freeParams,
+                                   const BoundVector& /*boundParams*/,
+                                   const Covariance& covariance,
+                                   const Surface& surface) const {
   state.pars = freeParams;
   state.cov = covariance;
   state.jacToGlobal = surface.boundToFreeJacobian(
@@ -121,26 +116,26 @@ void Acts::EigenStepper<E, A>::update(State& state,
       freeParams.template segment<3>(eFreeDir0));
 }
 
-template <typename E, typename A>
-void Acts::EigenStepper<E, A>::update(State& state, const Vector3& uposition,
-                                      const Vector3& udirection, double qOverP,
-                                      double time) const {
+template <typename E>
+void Acts::EigenStepper<E>::update(State& state, const Vector3& uposition,
+                                   const Vector3& udirection, double qOverP,
+                                   double time) const {
   state.pars.template segment<3>(eFreePos0) = uposition;
   state.pars.template segment<3>(eFreeDir0) = udirection;
   state.pars[eFreeTime] = time;
   state.pars[eFreeQOverP] = qOverP;
 }
 
-template <typename E, typename A>
-void Acts::EigenStepper<E, A>::transportCovarianceToCurvilinear(
+template <typename E>
+void Acts::EigenStepper<E>::transportCovarianceToCurvilinear(
     State& state) const {
   detail::transportCovarianceToCurvilinear(state.cov, state.jacobian,
                                            state.jacTransport, state.derivative,
                                            state.jacToGlobal, direction(state));
 }
 
-template <typename E, typename A>
-void Acts::EigenStepper<E, A>::transportCovarianceToBound(
+template <typename E>
+void Acts::EigenStepper<E>::transportCovarianceToBound(
     State& state, const Surface& surface,
     const FreeToBoundCorrection& freeToBoundCorrection) const {
   detail::transportCovarianceToBound(state.geoContext.get(), surface, state.cov,
@@ -149,9 +144,9 @@ void Acts::EigenStepper<E, A>::transportCovarianceToBound(
                                      state.pars, freeToBoundCorrection);
 }
 
-template <typename E, typename A>
+template <typename E>
 template <typename propagator_state_t, typename navigator_t>
-Acts::Result<double> Acts::EigenStepper<E, A>::step(
+Acts::Result<double> Acts::EigenStepper<E>::step(
     propagator_state_t& state, const navigator_t& navigator) const {
   // Runge-Kutta integrator state
   auto& sd = state.stepping.stepData;
@@ -169,10 +164,8 @@ Acts::Result<double> Acts::EigenStepper<E, A>::step(
     return fieldRes.error();
   }
   sd.B_first = *fieldRes;
-  if (!state.stepping.extension.validExtensionForStep(state, *this,
-                                                      navigator) ||
-      !state.stepping.extension.k1(state, *this, navigator, sd.k1, sd.B_first,
-                                   sd.kQoP)) {
+  if (!state.stepping.extension.template k<0>(state, *this, navigator, sd.k1,
+                                              sd.B_first, sd.kQoP)) {
     return 0.;
   }
 
@@ -183,17 +176,11 @@ Acts::Result<double> Acts::EigenStepper<E, A>::step(
     // This is given by the order of the Runge-Kutta method
     constexpr double exponent = 0.25;
 
-    // Whether to use fast power function if available
-    constexpr bool tryUseFastPow{false};
-
     double x = state.options.stepping.stepTolerance / errorEstimate_;
 
-    if constexpr (exponent == 0.25 && !tryUseFastPow) {
+    if constexpr (exponent == 0.25) {
       // This is 3x faster than std::pow
       x = std::sqrt(std::sqrt(x));
-    } else if constexpr (std::numeric_limits<double>::is_iec559 &&
-                         tryUseFastPow) {
-      x = fastPow(x, exponent);
     } else {
       x = std::pow(x, exponent);
     }
@@ -230,14 +217,16 @@ Acts::Result<double> Acts::EigenStepper<E, A>::step(
     }
     sd.B_middle = *field;
 
-    if (!state.stepping.extension.k2(state, *this, navigator, sd.k2,
-                                     sd.B_middle, sd.kQoP, half_h, sd.k1)) {
+    if (!state.stepping.extension.template k<1>(state, *this, navigator, sd.k2,
+                                                sd.B_middle, sd.kQoP, half_h,
+                                                sd.k1)) {
       return success(false);
     }
 
     // Third Runge-Kutta point
-    if (!state.stepping.extension.k3(state, *this, navigator, sd.k3,
-                                     sd.B_middle, sd.kQoP, half_h, sd.k2)) {
+    if (!state.stepping.extension.template k<2>(state, *this, navigator, sd.k3,
+                                                sd.B_middle, sd.kQoP, half_h,
+                                                sd.k2)) {
       return success(false);
     }
 
@@ -248,8 +237,8 @@ Acts::Result<double> Acts::EigenStepper<E, A>::step(
       return failure(field.error());
     }
     sd.B_last = *field;
-    if (!state.stepping.extension.k4(state, *this, navigator, sd.k4, sd.B_last,
-                                     sd.kQoP, h, sd.k3)) {
+    if (!state.stepping.extension.template k<3>(state, *this, navigator, sd.k4,
+                                                sd.B_last, sd.kQoP, h, sd.k3)) {
       return success(false);
     }
 
@@ -373,7 +362,7 @@ Acts::Result<double> Acts::EigenStepper<E, A>::step(
   return h;
 }
 
-template <typename E, typename A>
-void Acts::EigenStepper<E, A>::setIdentityJacobian(State& state) const {
+template <typename E>
+void Acts::EigenStepper<E>::setIdentityJacobian(State& state) const {
   state.jacobian = BoundMatrix::Identity();
 }
diff --git a/Core/include/Acts/Propagator/DefaultExtension.hpp b/Core/include/Acts/Propagator/EigenStepperDefaultExtension.hpp
similarity index 90%
rename from Core/include/Acts/Propagator/DefaultExtension.hpp
rename to Core/include/Acts/Propagator/EigenStepperDefaultExtension.hpp
index 1ae901f42eb..2810b11a2a2 100644
--- a/Core/include/Acts/Propagator/DefaultExtension.hpp
+++ b/Core/include/Acts/Propagator/EigenStepperDefaultExtension.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2018-2023 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
@@ -18,28 +18,15 @@ namespace Acts {
 
 /// @brief Default evaluater of the k_i's and elements of the transport matrix
 /// D of the RKN4 stepping. This is a pure implementation by textbook.
-struct DefaultExtension {
+struct EigenStepperDefaultExtension {
   using Scalar = ActsScalar;
   /// @brief Vector3 replacement for the custom scalar type
   using ThisVector3 = Eigen::Matrix<Scalar, 3, 1>;
 
-  /// @brief Control function if the step evaluation would be valid
-  ///
-  /// @tparam propagator_state_t Type of the state of the propagator
-  /// @tparam stepper_t Type of the stepper
-  /// @tparam navigator_t Type of the navigator
-  ///
-  /// @return Boolean flag if the step would be valid
-  template <typename propagator_state_t, typename stepper_t,
-            typename navigator_t>
-  int bid(const propagator_state_t& /*state*/, const stepper_t& /*stepper*/,
-          const navigator_t& /*navigator*/) const {
-    return 1;
-  }
-
   /// @brief Evaluater of the k_i's of the RKN4. For the case of i = 0 this
   /// step sets up qop, too.
   ///
+  /// @tparam i Index of the k_i, i = [0, 3]
   /// @tparam propagator_state_t Type of the state of the propagator
   /// @tparam stepper_t Type of the stepper
   /// @tparam navigator_t Type of the navigator
@@ -49,20 +36,21 @@ struct DefaultExtension {
   /// @param [out] knew Next k_i that is evaluated
   /// @param [in] bField B-Field at the evaluation position
   /// @param [out] kQoP k_i elements of the momenta
-  /// @param [in] i Index of the k_i, i = [0, 3]
   /// @param [in] h Step size (= 0. ^ 0.5 * StepSize ^ StepSize)
   /// @param [in] kprev Evaluated k_{i - 1}
   ///
   /// @return Boolean flag if the calculation is valid
-  template <typename propagator_state_t, typename stepper_t,
+  template <int i, typename propagator_state_t, typename stepper_t,
             typename navigator_t>
   bool k(const propagator_state_t& state, const stepper_t& stepper,
          const navigator_t& /*navigator*/, ThisVector3& knew,
-         const Vector3& bField, std::array<Scalar, 4>& kQoP, const int i = 0,
-         const double h = 0., const ThisVector3& kprev = ThisVector3::Zero()) {
+         const Vector3& bField, std::array<Scalar, 4>& kQoP,
+         const double h = 0., const ThisVector3& kprev = ThisVector3::Zero())
+    requires(i >= 0 && i <= 3)
+  {
     auto qop = stepper.qOverP(state.stepping);
     // First step does not rely on previous data
-    if (i == 0) {
+    if constexpr (i == 0) {
       knew = qop * stepper.direction(state.stepping).cross(bField);
       kQoP = {0., 0., 0., 0.};
     } else {
diff --git a/Core/include/Acts/Propagator/DenseEnvironmentExtension.hpp b/Core/include/Acts/Propagator/EigenStepperDenseExtension.hpp
similarity index 85%
rename from Core/include/Acts/Propagator/DenseEnvironmentExtension.hpp
rename to Core/include/Acts/Propagator/EigenStepperDenseExtension.hpp
index eed51e1e847..70dbb1cb820 100644
--- a/Core/include/Acts/Propagator/DenseEnvironmentExtension.hpp
+++ b/Core/include/Acts/Propagator/EigenStepperDenseExtension.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2018-2024 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
@@ -12,16 +12,12 @@
 #include "Acts/Utilities/detail/ReferenceWrapperAnyCompat.hpp"
 
 #include "Acts/Definitions/Algebra.hpp"
-#include "Acts/Definitions/PdgParticle.hpp"
-#include "Acts/Definitions/TrackParametrization.hpp"
 #include "Acts/Material/Interactions.hpp"
-#include "Acts/Propagator/AbortList.hpp"
-#include "Acts/Propagator/ActionList.hpp"
+#include "Acts/Material/Material.hpp"
+#include "Acts/Material/MaterialSlab.hpp"
+#include "Acts/Propagator/EigenStepperDefaultExtension.hpp"
 #include "Acts/Propagator/Propagator.hpp"
-#include "Acts/Utilities/VectorHelpers.hpp"
-
-#include <array>
-#include <cmath>
+#include "Acts/Utilities/MathHelpers.hpp"
 
 namespace Acts {
 
@@ -30,11 +26,14 @@ namespace Acts {
 /// ioninisation, bremsstrahlung, pair production and photonuclear interaction
 /// in the propagation and the jacobian. These effects will only occur if the
 /// propagation is in a TrackingVolume with attached material.
-struct DenseEnvironmentExtension {
+struct EigenStepperDenseExtension {
   using Scalar = ActsScalar;
   /// @brief Vector3 replacement for the custom scalar type
   using ThisVector3 = Eigen::Matrix<Scalar, 3, 1>;
 
+  /// Fallback extension
+  EigenStepperDefaultExtension defaultExtension;
+
   /// Momentum at a certain point
   Scalar currentMomentum = 0.;
   /// Particles momentum at k1
@@ -59,44 +58,11 @@ struct DenseEnvironmentExtension {
   /// Energy at each sub-step
   std::array<Scalar, 4> energy{};
 
-  /// @brief Control function if the step evaluation would be valid
-  ///
-  /// @tparam propagator_state_t Type of the state of the propagator
-  /// @tparam stepper_t Type of the stepper
-  /// @tparam navigator_t Type of the navigator
-  ///
-  /// @param [in] state State of the propagator
-  /// @param [in] stepper Stepper of the propagator
-  /// @param [in] navigator Navigator of the propagator
-  ///
-  /// @return Boolean flag if the step would be valid
-  template <typename propagator_state_t, typename stepper_t,
-            typename navigator_t>
-  int bid(const propagator_state_t& state, const stepper_t& stepper,
-          const navigator_t& navigator) const {
-    const auto& particleHypothesis = stepper.particleHypothesis(state.stepping);
-    float absQ = particleHypothesis.absoluteCharge();
-    float mass = particleHypothesis.mass();
-
-    // Check for valid particle properties
-    if (absQ == 0. || mass == 0. ||
-        stepper.absoluteMomentum(state.stepping) <
-            state.options.stepping.dense.momentumCutOff) {
-      return 0;
-    }
-
-    // Check existence of a volume with material
-    if (!navigator.currentVolumeMaterial(state.navigation)) {
-      return 0;
-    }
-
-    return 2;
-  }
-
   /// @brief Evaluater of the k_i's of the RKN4. For the case of i = 0 this
   /// step sets up member parameters, too.
   ///
-  /// @tparam stepper_state_t Type of the state of the propagator
+  /// @tparam i Index of the k_i, i = [0, 3]
+  /// @tparam propagator_state_t Type of the state of the propagator
   /// @tparam stepper_t Type of the stepper
   /// @tparam navigator_t Type of the navigator
   ///
@@ -106,30 +72,32 @@ struct DenseEnvironmentExtension {
   /// @param [out] knew Next k_i that is evaluated
   /// @param [out] kQoP k_i elements of the momenta
   /// @param [in] bField B-Field at the evaluation position
-  /// @param [in] i Index of the k_i, i = [0, 3]
   /// @param [in] h Step size (= 0. ^ 0.5 * StepSize ^ StepSize)
   /// @param [in] kprev Evaluated k_{i - 1}
   ///
   /// @return Boolean flag if the calculation is valid
-  template <typename propagator_state_t, typename stepper_t,
+  template <int i, typename propagator_state_t, typename stepper_t,
             typename navigator_t>
   bool k(const propagator_state_t& state, const stepper_t& stepper,
          const navigator_t& navigator, ThisVector3& knew, const Vector3& bField,
-         std::array<Scalar, 4>& kQoP, const int i = 0, const double h = 0.,
-         const ThisVector3& kprev = ThisVector3::Zero()) {
+         std::array<Scalar, 4>& kQoP, const double h = 0.,
+         const ThisVector3& kprev = ThisVector3::Zero())
+    requires(i >= 0 && i <= 3)
+  {
+    const auto* volumeMaterial =
+        navigator.currentVolumeMaterial(state.navigation);
+    if (volumeMaterial == nullptr) {
+      return defaultExtension.template k<i>(state, stepper, navigator, knew,
+                                            bField, kQoP, h, kprev);
+    }
+
     double q = stepper.charge(state.stepping);
     const auto& particleHypothesis = stepper.particleHypothesis(state.stepping);
     float mass = particleHypothesis.mass();
 
     // i = 0 is used for setup and evaluation of k
-    if (i == 0) {
-      // Set up container for energy loss
-      const auto* volumeMaterial =
-          navigator.currentVolumeMaterial(state.navigation);
-      if (volumeMaterial == nullptr) {
-        // This function is very hot, so we prefer to terminate here
-        std::terminate();
-      }
+    if constexpr (i == 0) {
+      // Set up for energy loss
       ThisVector3 position = stepper.position(state.stepping);
       material = volumeMaterial->material(position.template cast<double>());
       initialMomentum = stepper.absoluteMomentum(state.stepping);
@@ -141,7 +109,7 @@ struct DenseEnvironmentExtension {
       // Evaluate k for the time propagation
       Lambdappi[0] = -qop[0] * qop[0] * qop[0] * g * energy[0] / (q * q);
       //~ tKi[0] = std::hypot(1, mass / initialMomentum);
-      tKi[0] = std::hypot(1, mass * qop[0]);
+      tKi[0] = fastHypot(1, mass * qop[0]);
       kQoP[0] = Lambdappi[0];
     } else {
       // Update parameters and check for momentum condition
@@ -155,7 +123,7 @@ struct DenseEnvironmentExtension {
       // Evaluate k_i for the time propagation
       auto qopNew = qop[0] + h * Lambdappi[i - 1];
       Lambdappi[i] = -qopNew * qopNew * qopNew * g * energy[i] / (q * q);
-      tKi[i] = std::hypot(1, mass * qopNew);
+      tKi[i] = fastHypot(1, mass * qopNew);
       kQoP[i] = Lambdappi[i];
     }
     return true;
@@ -172,13 +140,20 @@ struct DenseEnvironmentExtension {
   ///
   /// @param [in] state State of the propagator
   /// @param [in] stepper Stepper of the propagator
+  /// @param [in] navigator Navigator of the propagator
   /// @param [in] h Step size
   ///
   /// @return Boolean flag if the calculation is valid
   template <typename propagator_state_t, typename stepper_t,
             typename navigator_t>
   bool finalize(propagator_state_t& state, const stepper_t& stepper,
-                const navigator_t& /*navigator*/, const double h) const {
+                const navigator_t& navigator, const double h) const {
+    const auto* volumeMaterial =
+        navigator.currentVolumeMaterial(state.navigation);
+    if (volumeMaterial == nullptr) {
+      return defaultExtension.finalize(state, stepper, navigator, h);
+    }
+
     const auto& particleHypothesis = stepper.particleHypothesis(state.stepping);
     float mass = particleHypothesis.mass();
 
@@ -193,14 +168,14 @@ struct DenseEnvironmentExtension {
     }
 
     // Add derivative dlambda/ds = Lambda''
-    state.stepping.derivative(7) = -std::hypot(mass, newMomentum) * g /
+    state.stepping.derivative(7) = -fastHypot(mass, newMomentum) * g /
                                    (newMomentum * newMomentum * newMomentum);
 
     // Update momentum
     state.stepping.pars[eFreeQOverP] =
         stepper.charge(state.stepping) / newMomentum;
     // Add derivative dt/ds = 1/(beta * c) = sqrt(m^2 * p^{-2} + c^{-2})
-    state.stepping.derivative(3) = std::hypot(1, mass / newMomentum);
+    state.stepping.derivative(3) = fastHypot(1, mass / newMomentum);
     // Update time
     state.stepping.pars[eFreeTime] +=
         (h / 6.) * (tKi[0] + 2. * (tKi[1] + tKi[2]) + tKi[3]);
@@ -231,6 +206,12 @@ struct DenseEnvironmentExtension {
   bool finalize(propagator_state_t& state, const stepper_t& stepper,
                 const navigator_t& navigator, const double h,
                 FreeMatrix& D) const {
+    const auto* volumeMaterial =
+        navigator.currentVolumeMaterial(state.navigation);
+    if (volumeMaterial == nullptr) {
+      return defaultExtension.finalize(state, stepper, navigator, h, D);
+    }
+
     return finalize(state, stepper, navigator, h) &&
            transportMatrix(state, stepper, h, D);
   }
@@ -352,7 +333,7 @@ struct DenseEnvironmentExtension {
     //~ (3. * g + qop[0] * dgdqop(energy[0], .mass,
     //~ absPdg, meanEnergyLoss));
 
-    double dtp1dl = qop[0] * mass * mass / std::hypot(1, qop[0] * mass);
+    double dtp1dl = qop[0] * mass * mass / fastHypot(1, qop[0] * mass);
     double qopNew = qop[0] + half_h * Lambdappi[0];
 
     //~ double dtpp2dl = -mass * mass * qopNew *
@@ -360,7 +341,7 @@ struct DenseEnvironmentExtension {
     //~ (3. * g * (1. + half_h * jdL[0]) +
     //~ qopNew * dgdqop(energy[1], mass, absPdgCode, meanEnergyLoss));
 
-    double dtp2dl = qopNew * mass * mass / std::hypot(1, qopNew * mass);
+    double dtp2dl = qopNew * mass * mass / fastHypot(1, qopNew * mass);
     qopNew = qop[0] + half_h * Lambdappi[1];
 
     //~ double dtpp3dl = -mass * mass * qopNew *
@@ -368,9 +349,9 @@ struct DenseEnvironmentExtension {
     //~ (3. * g * (1. + half_h * jdL[1]) +
     //~ qopNew * dgdqop(energy[2], mass, absPdg, meanEnergyLoss));
 
-    double dtp3dl = qopNew * mass * mass / std::hypot(1, qopNew * mass);
+    double dtp3dl = qopNew * mass * mass / fastHypot(1, qopNew * mass);
     qopNew = qop[0] + half_h * Lambdappi[2];
-    double dtp4dl = qopNew * mass * mass / std::hypot(1, qopNew * mass);
+    double dtp4dl = qopNew * mass * mass / fastHypot(1, qopNew * mass);
 
     //~ D(3, 7) = h * mass * mass * qop[0] /
     //~ std::hypot(1., mass * qop[0])
@@ -396,9 +377,9 @@ struct DenseEnvironmentExtension {
     PdgParticle absPdg = particleHypothesis.absolutePdg();
     float absQ = particleHypothesis.absoluteCharge();
 
-    energy[0] = std::hypot(initialMomentum, mass);
+    energy[0] = fastHypot(initialMomentum, mass);
     // use unit length as thickness to compute the energy loss per unit length
-    Acts::MaterialSlab slab(material, 1);
+    MaterialSlab slab(material, 1);
     // Use the same energy loss throughout the step.
     if (state.options.stepping.dense.meanEnergyLoss) {
       g = -computeEnergyLossMean(slab, absPdg, mass, static_cast<float>(qop[0]),
@@ -450,7 +431,7 @@ struct DenseEnvironmentExtension {
                         const stepper_t& stepper, const int i) {
     // Update parameters related to a changed momentum
     currentMomentum = initialMomentum + h * dPds[i - 1];
-    energy[i] = std::hypot(currentMomentum, mass);
+    energy[i] = fastHypot(currentMomentum, mass);
     dPds[i] = g * energy[i] / currentMomentum;
     qop[i] = stepper.charge(state.stepping) / currentMomentum;
     // Calculate term for later error propagation
diff --git a/Core/include/Acts/Propagator/EigenStepperError.hpp b/Core/include/Acts/Propagator/EigenStepperError.hpp
index ae04a1bcbe5..cc5af071146 100644
--- a/Core/include/Acts/Propagator/EigenStepperError.hpp
+++ b/Core/include/Acts/Propagator/EigenStepperError.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2019-2020 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
diff --git a/Core/include/Acts/Propagator/MaterialInteractor.hpp b/Core/include/Acts/Propagator/MaterialInteractor.hpp
index 171e5032ef2..9e3f59c4fb5 100644
--- a/Core/include/Acts/Propagator/MaterialInteractor.hpp
+++ b/Core/include/Acts/Propagator/MaterialInteractor.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2019 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
@@ -56,9 +56,9 @@ struct MaterialInteractor {
   /// @param logger a logger instance
   template <typename propagator_state_t, typename stepper_t,
             typename navigator_t>
-  void operator()(propagator_state_t& state, const stepper_t& stepper,
-                  const navigator_t& navigator, result_type& result,
-                  const Logger& logger) const {
+  void act(propagator_state_t& state, const stepper_t& stepper,
+           const navigator_t& navigator, result_type& result,
+           const Logger& logger) const {
     if (state.stage == PropagatorStage::postPropagation) {
       return;
     }
@@ -69,8 +69,7 @@ struct MaterialInteractor {
     }
 
     static_assert(
-        Acts::Concepts::NavigationCompatibilityConcept<propagator_state_t,
-                                                       navigator_t>,
+        Acts::NavigationCompatibleConcept<propagator_state_t, navigator_t>,
         "Navigation does not fulfill geometry compatibility concept");
 
     // Handle surface material
diff --git a/Core/include/Acts/Propagator/MultiEigenStepperLoop.hpp b/Core/include/Acts/Propagator/MultiEigenStepperLoop.hpp
index 5fe9d0c06d7..1bb4ab8f55a 100644
--- a/Core/include/Acts/Propagator/MultiEigenStepperLoop.hpp
+++ b/Core/include/Acts/Propagator/MultiEigenStepperLoop.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2021-2023 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
@@ -22,6 +22,7 @@
 #include "Acts/Propagator/ConstrainedStep.hpp"
 #include "Acts/Propagator/EigenStepper.hpp"
 #include "Acts/Propagator/EigenStepperError.hpp"
+#include "Acts/Propagator/MultiStepperError.hpp"
 #include "Acts/Propagator/Propagator.hpp"
 #include "Acts/Propagator/StepperOptions.hpp"
 #include "Acts/Propagator/detail/LoopStepperUtils.hpp"
@@ -40,186 +41,109 @@
 
 #include <boost/container/small_vector.hpp>
 
-#include "MultiStepperError.hpp"
-
 namespace Acts {
 
 using namespace Acts::UnitLiterals;
 
-/// @brief Reducer struct for the Loop MultiEigenStepper which reduces the
-/// multicomponent state to simply by summing the weighted values
-struct WeightedComponentReducerLoop {
-  template <typename component_range_t>
-  static Vector3 toVector3(const component_range_t& comps,
-                           const FreeIndices i) {
-    return std::accumulate(
-        comps.begin(), comps.end(), Vector3{Vector3::Zero()},
-        [i](const auto& sum, const auto& cmp) -> Vector3 {
-          return sum + cmp.weight * cmp.state.pars.template segment<3>(i);
-        });
-  }
-
-  template <typename stepper_state_t>
-  static Vector3 position(const stepper_state_t& s) {
-    return toVector3(s.components, eFreePos0);
-  }
-
-  template <typename stepper_state_t>
-  static Vector3 direction(const stepper_state_t& s) {
-    return toVector3(s.components, eFreeDir0).normalized();
-  }
-
-  // TODO: Maybe we can cache this value and only update it when the parameters
-  // change
-  template <typename stepper_state_t>
-  static ActsScalar qOverP(const stepper_state_t& s) {
-    return std::accumulate(
-        s.components.begin(), s.components.end(), ActsScalar{0.},
-        [](const auto& sum, const auto& cmp) -> ActsScalar {
-          return sum + cmp.weight * cmp.state.pars[eFreeQOverP];
-        });
-  }
-
-  template <typename stepper_state_t>
-  static ActsScalar absoluteMomentum(const stepper_state_t& s) {
-    return std::accumulate(
-        s.components.begin(), s.components.end(), ActsScalar{0.},
-        [&s](const auto& sum, const auto& cmp) -> ActsScalar {
-          return sum + cmp.weight * s.particleHypothesis.extractMomentum(
-                                        cmp.state.pars[eFreeQOverP]);
-        });
-  }
-
-  template <typename stepper_state_t>
-  static Vector3 momentum(const stepper_state_t& s) {
-    return std::accumulate(
-        s.components.begin(), s.components.end(), Vector3::Zero().eval(),
-        [&s](const auto& sum, const auto& cmp) -> Vector3 {
-          return sum + cmp.weight *
-                           s.particleHypothesis.extractMomentum(
-                               cmp.state.pars[eFreeQOverP]) *
-                           cmp.state.pars.template segment<3>(eFreeDir0);
-        });
-  }
-
-  template <typename stepper_state_t>
-  static ActsScalar charge(const stepper_state_t& s) {
-    return std::accumulate(
-        s.components.begin(), s.components.end(), ActsScalar{0.},
-        [&s](const auto& sum, const auto& cmp) -> ActsScalar {
-          return sum + cmp.weight * s.particleHypothesis.extractCharge(
-                                        cmp.state.pars[eFreeQOverP]);
-        });
-  }
-
-  template <typename stepper_state_t>
-  static ActsScalar time(const stepper_state_t& s) {
-    return std::accumulate(
-        s.components.begin(), s.components.end(), ActsScalar{0.},
-        [](const auto& sum, const auto& cmp) -> ActsScalar {
-          return sum + cmp.weight * cmp.state.pars[eFreeTime];
-        });
-  }
-
-  template <typename stepper_state_t>
-  static FreeVector pars(const stepper_state_t& s) {
-    return std::accumulate(s.components.begin(), s.components.end(),
-                           FreeVector{FreeVector::Zero()},
-                           [](const auto& sum, const auto& cmp) -> FreeVector {
-                             return sum + cmp.weight * cmp.state.pars;
-                           });
-  }
+namespace detail {
 
-  template <typename stepper_state_t>
-  static FreeVector cov(const stepper_state_t& s) {
-    return std::accumulate(s.components.begin(), s.components.end(),
-                           FreeMatrix{FreeMatrix::Zero()},
-                           [](const auto& sum, const auto& cmp) -> FreeMatrix {
-                             return sum + cmp.weight * cmp.state.cov;
-                           });
+struct MaxMomentumComponent {
+  template <typename component_range_t>
+  auto operator()(const component_range_t& cmps) const {
+    return std::max_element(cmps.begin(), cmps.end(),
+                            [&](const auto& a, const auto& b) {
+                              return std::abs(a.state.pars[eFreeQOverP]) >
+                                     std::abs(b.state.pars[eFreeQOverP]);
+                            });
   }
 };
 
-struct MaxMomentumReducerLoop {
+struct MaxWeightComponent {
   template <typename component_range_t>
-  static const auto& maxAbsoluteMomentumIt(const component_range_t& cmps) {
-    return *std::max_element(cmps.begin(), cmps.end(),
-                             [&](const auto& a, const auto& b) {
-                               return std::abs(a.state.pars[eFreeQOverP]) >
-                                      std::abs(b.state.pars[eFreeQOverP]);
-                             });
+  auto operator()(const component_range_t& cmps) {
+    return std::max_element(
+        cmps.begin(), cmps.end(),
+        [&](const auto& a, const auto& b) { return a.weight < b.weight; });
   }
+};
 
+template <typename component_chooser_t>
+struct SingleComponentReducer {
   template <typename stepper_state_t>
   static Vector3 position(const stepper_state_t& s) {
-    return maxAbsoluteMomentumIt(s.components)
-        .state.pars.template segment<3>(eFreePos0);
+    return component_chooser_t{}(s.components)
+        ->state.pars.template segment<3>(eFreePos0);
   }
 
   template <typename stepper_state_t>
   static Vector3 direction(const stepper_state_t& s) {
-    return maxAbsoluteMomentumIt(s.components)
-        .state.pars.template segment<3>(eFreeDir0);
+    return component_chooser_t{}(s.components)
+        ->state.pars.template segment<3>(eFreeDir0);
   }
 
   template <typename stepper_state_t>
   static ActsScalar qOverP(const stepper_state_t& s) {
-    const auto& cmp = maxAbsoluteMomentumIt(s.components);
-    return cmp.state.pars[eFreeQOverP];
+    const auto cmp = component_chooser_t{}(s.components);
+    return cmp->state.pars[eFreeQOverP];
   }
 
   template <typename stepper_state_t>
   static ActsScalar absoluteMomentum(const stepper_state_t& s) {
-    const auto& cmp = maxAbsoluteMomentumIt(s.components);
-    return std::abs(cmp.state.absCharge / cmp.state.pars[eFreeQOverP]);
+    const auto cmp = component_chooser_t{}(s.components);
+    return s.particleHypothesis.extractMomentum(cmp->state.pars[eFreeQOverP]);
   }
 
   template <typename stepper_state_t>
   static Vector3 momentum(const stepper_state_t& s) {
-    const auto& cmp = maxAbsoluteMomentumIt(s.components);
-    return std::abs(cmp.state.absCharge / cmp.state.pars[eFreeQOverP]) *
-           cmp.state.pars.template segment<3>(eFreeDir0);
+    const auto cmp = component_chooser_t{}(s.components);
+    return s.particleHypothesis.extractMomentum(cmp->state.pars[eFreeQOverP]) *
+           cmp->state.pars.template segment<3>(eFreeDir0);
   }
 
   template <typename stepper_state_t>
   static ActsScalar charge(const stepper_state_t& s) {
-    return maxAbsoluteMomentumIt(s.components).state.absCharge;
+    const auto cmp = component_chooser_t{}(s.components);
+    return s.particleHypothesis.extractCharge(cmp->state.pars[eFreeQOverP]);
   }
 
   template <typename stepper_state_t>
   static ActsScalar time(const stepper_state_t& s) {
-    return maxAbsoluteMomentumIt(s.components).state.pars[eFreeTime];
+    return component_chooser_t{}(s.components)->state.pars[eFreeTime];
   }
 
   template <typename stepper_state_t>
   static FreeVector pars(const stepper_state_t& s) {
-    return maxAbsoluteMomentumIt(s.components).state.pars;
+    return component_chooser_t{}(s.components)->state.pars;
   }
 
   template <typename stepper_state_t>
   static FreeVector cov(const stepper_state_t& s) {
-    return maxAbsoluteMomentumIt(s.components).state.cov;
+    return component_chooser_t{}(s.components)->state.cov;
   }
 };
 
+}  // namespace detail
+
+using MaxMomentumReducerLoop =
+    detail::SingleComponentReducer<detail::MaxMomentumComponent>;
+using MaxWeightReducerLoop =
+    detail::SingleComponentReducer<detail::MaxWeightComponent>;
+
 /// @brief Stepper based on the EigenStepper, but handles Multi-Component Tracks
 /// (e.g., for the GSF). Internally, this only manages a vector of
 /// EigenStepper::States. This simplifies implementation, but has several
 /// drawbacks:
-/// * There are certain redundancies between the global State and the component
-/// states
+/// * There are certain redundancies between the global State and the
+/// component states
 /// * The components do not share a single magnetic-field-cache
-/// @tparam extensionlist_t See EigenStepper for details
+/// @tparam extension_t See EigenStepper for details
 /// @tparam component_reducer_t How to map the multi-component state to a single
 /// component
-/// @tparam auctioneer_t See EigenStepper for details
 /// @tparam small_vector_size A size-hint how much memory should be allocated
 /// by the small vector
-template <typename extensionlist_t = StepperExtensionList<DefaultExtension>,
-          typename component_reducer_t = WeightedComponentReducerLoop,
-          typename auctioneer_t = detail::VoidAuctioneer>
-class MultiEigenStepperLoop
-    : public EigenStepper<extensionlist_t, auctioneer_t> {
+template <typename extension_t = EigenStepperDefaultExtension,
+          typename component_reducer_t = MaxWeightReducerLoop>
+class MultiEigenStepperLoop : public EigenStepper<extension_t> {
   /// Limits the number of steps after at least one component reached the
   /// surface
   std::size_t m_stepLimitAfterFirstComponentOnSurface = 50;
@@ -234,7 +158,7 @@ class MultiEigenStepperLoop
 
  public:
   /// @brief Typedef to the Single-Component Eigen Stepper
-  using SingleStepper = EigenStepper<extensionlist_t, auctioneer_t>;
+  using SingleStepper = EigenStepper<extension_t>;
 
   /// @brief Typedef to the State of the single component Stepper
   using SingleState = typename SingleStepper::State;
@@ -340,15 +264,14 @@ class MultiEigenStepperLoop
   MultiEigenStepperLoop(std::shared_ptr<const MagneticFieldProvider> bField,
                         std::unique_ptr<const Logger> logger =
                             getDefaultLogger("GSF", Logging::INFO))
-      : EigenStepper<extensionlist_t, auctioneer_t>(std::move(bField)),
+      : EigenStepper<extension_t>(std::move(bField)),
         m_logger(std::move(logger)) {}
 
   /// Constructor from a configuration and optionally provided Logger
   MultiEigenStepperLoop(const Config& config,
                         std::unique_ptr<const Logger> logger =
                             getDefaultLogger("GSF", Logging::INFO))
-      : EigenStepper<extensionlist_t, auctioneer_t>(config),
-        m_logger(std::move(logger)) {}
+      : EigenStepper<extension_t>(config), m_logger(std::move(logger)) {}
 
   /// Construct and initialize a state
   State makeState(std::reference_wrapper<const GeometryContext> gctx,
@@ -407,7 +330,6 @@ class MultiEigenStepperLoop
 
       // clang-format off
       auto& operator++() { ++it; return *this; }
-      auto operator!=(const Iterator& other) const { return it != other.it; }
       auto operator==(const Iterator& other) const { return it == other.it; }
       auto operator*() const { return ComponentProxy(*it, s); }
       // clang-format on
@@ -442,7 +364,6 @@ class MultiEigenStepperLoop
 
       // clang-format off
       auto& operator++() { ++it; return *this; }
-      auto operator!=(const ConstIterator& other) const { return it != other.it; }
       auto operator==(const ConstIterator& other) const { return it == other.it; }
       auto operator*() const { return ConstComponentProxy{*it}; }
       // clang-format on
diff --git a/Core/include/Acts/Propagator/MultiEigenStepperLoop.ipp b/Core/include/Acts/Propagator/MultiEigenStepperLoop.ipp
index f743d059a2f..fab3e3f0779 100644
--- a/Core/include/Acts/Propagator/MultiEigenStepperLoop.ipp
+++ b/Core/include/Acts/Propagator/MultiEigenStepperLoop.ipp
@@ -1,18 +1,18 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2023 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include "Acts/Propagator/MultiEigenStepperLoop.hpp"
 #include "Acts/Utilities/Logger.hpp"
 
 namespace Acts {
 
-template <typename E, typename R, typename A>
-auto MultiEigenStepperLoop<E, R, A>::boundState(
+template <typename E, typename R>
+auto MultiEigenStepperLoop<E, R>::boundState(
     State& state, const Surface& surface, bool transportCov,
     const FreeToBoundCorrection& freeToBoundCorrection) const
     -> Result<BoundState> {
@@ -62,8 +62,8 @@ auto MultiEigenStepperLoop<E, R, A>::boundState(
                     Jacobian::Zero(), accumulatedPathLength};
 }
 
-template <typename E, typename R, typename A>
-auto MultiEigenStepperLoop<E, R, A>::curvilinearState(
+template <typename E, typename R>
+auto MultiEigenStepperLoop<E, R>::curvilinearState(
     State& state, bool transportCov) const -> CurvilinearState {
   assert(!state.components.empty());
 
@@ -89,9 +89,9 @@ auto MultiEigenStepperLoop<E, R, A>::curvilinearState(
       Jacobian::Zero(), accumulatedPathLength};
 }
 
-template <typename E, typename R, typename A>
+template <typename E, typename R>
 template <typename propagator_state_t, typename navigator_t>
-Result<double> MultiEigenStepperLoop<E, R, A>::step(
+Result<double> MultiEigenStepperLoop<E, R>::step(
     propagator_state_t& state, const navigator_t& navigator) const {
   using Status = Acts::Intersection3D::Status;
 
diff --git a/Core/include/Acts/Propagator/MultiStepperAborters.hpp b/Core/include/Acts/Propagator/MultiStepperAborters.hpp
index d811f1bc2f8..0e28375df94 100644
--- a/Core/include/Acts/Propagator/MultiStepperAborters.hpp
+++ b/Core/include/Acts/Propagator/MultiStepperAborters.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2021 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
@@ -25,7 +25,7 @@ struct MultiStepperSurfaceReached : public SurfaceReached {
   double averageOnSurfaceTolerance = 0.2;
 
   MultiStepperSurfaceReached() = default;
-  MultiStepperSurfaceReached(double oLimit) : SurfaceReached(oLimit) {}
+  explicit MultiStepperSurfaceReached(double oLimit) : SurfaceReached(oLimit) {}
 
   /// boolean operator for abort condition without using the result
   ///
@@ -39,7 +39,7 @@ struct MultiStepperSurfaceReached : public SurfaceReached {
   /// @param logger a logger instance
   template <typename propagator_state_t, typename stepper_t,
             typename navigator_t>
-  bool operator()(propagator_state_t& state, const stepper_t& stepper,
+  bool checkAbort(propagator_state_t& state, const stepper_t& stepper,
                   const navigator_t& navigator, const Logger& logger) const {
     if (surface == nullptr) {
       ACTS_VERBOSE(
@@ -71,8 +71,8 @@ struct MultiStepperSurfaceReached : public SurfaceReached {
       }
 
       ACTS_VERBOSE(
-          "MultiStepperSurfaceReached aborter | "
-          "Target intersection not found. Maybe next time?");
+          "MultiStepperSurfaceReached aborter | Average distance to target: "
+          << sIntersection.pathLength());
     }
 
     bool reached = true;
@@ -82,8 +82,9 @@ struct MultiStepperSurfaceReached : public SurfaceReached {
       auto singleState = cmp.singleState(state);
       const auto& singleStepper = cmp.singleStepper(stepper);
 
-      if (!SurfaceReached::operator()(singleState, singleStepper, navigator,
+      if (!SurfaceReached::checkAbort(singleState, singleStepper, navigator,
                                       logger)) {
+        cmp.status() = Acts::Intersection3D::Status::reachable;
         reached = false;
       } else {
         cmp.status() = Acts::Intersection3D::Status::onSurface;
diff --git a/Core/include/Acts/Propagator/MultiStepperError.hpp b/Core/include/Acts/Propagator/MultiStepperError.hpp
index 77dae505f5f..ff068b14523 100644
--- a/Core/include/Acts/Propagator/MultiStepperError.hpp
+++ b/Core/include/Acts/Propagator/MultiStepperError.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2021 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
diff --git a/Core/include/Acts/Propagator/Navigator.hpp b/Core/include/Acts/Propagator/Navigator.hpp
index 7d9105d60df..637ea9310d9 100644
--- a/Core/include/Acts/Propagator/Navigator.hpp
+++ b/Core/include/Acts/Propagator/Navigator.hpp
@@ -1,21 +1,19 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2016-2024 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
 #include "Acts/Definitions/Algebra.hpp"
 #include "Acts/Definitions/Tolerance.hpp"
-#include "Acts/Definitions/Units.hpp"
 #include "Acts/Geometry/GeometryIdentifier.hpp"
 #include "Acts/Geometry/Layer.hpp"
 #include "Acts/Geometry/TrackingGeometry.hpp"
 #include "Acts/Geometry/TrackingVolume.hpp"
-#include "Acts/Propagator/ConstrainedStep.hpp"
 #include "Acts/Propagator/NavigatorOptions.hpp"
 #include "Acts/Surfaces/BoundaryTolerance.hpp"
 #include "Acts/Surfaces/Surface.hpp"
@@ -23,6 +21,7 @@
 #include "Acts/Utilities/Logger.hpp"
 #include "Acts/Utilities/StringHelpers.hpp"
 
+#include <algorithm>
 #include <sstream>
 #include <string>
 
@@ -59,9 +58,6 @@ struct NavigationOptions {
   double nearLimit = 0;
   /// The maximum distance for a surface to be considered
   double farLimit = std::numeric_limits<double>::max();
-
-  /// Force intersection with boundaries
-  bool forceIntersectBoundaries = false;
 };
 
 /// @brief Steers the propagation through the geometry by adjusting the step
@@ -120,6 +116,9 @@ class Navigator {
     explicit Options(const GeometryContext& gctx)
         : NavigatorPlainOptions(gctx) {}
 
+    /// The surface tolerance
+    double surfaceTolerance = s_onSurfaceTolerance;
+
     /// The near limit to resolve surfaces
     double nearLimit = s_onSurfaceTolerance;
 
@@ -189,10 +188,6 @@ class Navigator {
     const Layer* currentLayer = nullptr;
     /// Navigation state - external state: the current surface
     const Surface* currentSurface = nullptr;
-    /// Navigation state: the target volume
-    const TrackingVolume* targetVolume = nullptr;
-    /// Navigation state: the target layer
-    const Layer* targetLayer = nullptr;
     /// Navigation state: the target surface
     const Surface* targetSurface = nullptr;
 
@@ -202,8 +197,21 @@ class Navigator {
     bool navigationBreak = false;
     // The navigation stage (@todo: integrate break, target)
     Stage navigationStage = Stage::undefined;
-    /// Force intersection with boundaries
-    bool forceIntersectBoundaries = false;
+
+    void reset() {
+      navSurfaces.clear();
+      navSurfaceIndex = navSurfaces.size();
+      navLayers.clear();
+      navLayerIndex = navLayers.size();
+      navBoundaries.clear();
+      navBoundaryIndex = navBoundaries.size();
+
+      currentVolume = nullptr;
+      currentLayer = nullptr;
+      currentSurface = nullptr;
+
+      navigationStage = Stage::undefined;
+    }
   };
 
   /// Constructor with configuration object
@@ -216,8 +224,6 @@ class Navigator {
       : m_cfg{std::move(cfg)}, m_logger{std::move(_logger)} {}
 
   State makeState(const Options& options) const {
-    assert(options.startSurface != nullptr && "Start surface must be set");
-
     State state(options);
     state.startSurface = options.startSurface;
     state.targetSurface = options.targetSurface;
@@ -282,16 +288,6 @@ class Navigator {
       state.worldVolume = m_cfg.trackingGeometry->highestTrackingVolume();
     }
 
-    // We set the current surface to the start surface
-    // for eventual post-update action, e.g. material integration
-    // or collection when leaving a surface at the start of
-    // an extrapolation process
-    state.currentSurface = state.startSurface;
-    if (state.currentSurface != nullptr) {
-      ACTS_VERBOSE(volInfo(state) << "Current surface set to start surface "
-                                  << state.currentSurface->geometryId());
-    }
-
     // Fast Navigation initialization for start condition:
     // - short-cut through object association, saves navigation in the
     // - geometry and volume tree search for the lowest volume
@@ -300,15 +296,23 @@ class Navigator {
       ACTS_VERBOSE(
           volInfo(state)
           << "Fast start initialization through association from Surface.");
+
       // assign the current layer and volume by association
       state.startLayer = state.startSurface->associatedLayer();
+      state.currentLayer = state.startLayer;
+
       state.startVolume = state.startLayer->trackingVolume();
+      state.currentVolume = state.startVolume;
     } else if (state.startVolume != nullptr) {
       ACTS_VERBOSE(
           volInfo(state)
           << "Fast start initialization through association from Volume.");
+
+      state.currentVolume = state.startVolume;
+
       state.startLayer = state.startVolume->associatedLayer(
           state.options.geoContext, position);
+      state.currentLayer = state.startLayer;
     } else {
       ACTS_VERBOSE(volInfo(state)
                    << "Slow start initialization through search.");
@@ -316,33 +320,56 @@ class Navigator {
       ACTS_VERBOSE(volInfo(state)
                    << "Starting from position " << toString(position)
                    << " and direction " << toString(direction));
+
       state.startVolume = m_cfg.trackingGeometry->lowestTrackingVolume(
           state.options.geoContext, position);
-      state.startLayer = state.startVolume != nullptr
-                             ? state.startVolume->associatedLayer(
-                                   state.options.geoContext, position)
-                             : nullptr;
+      state.currentVolume = state.startVolume;
+
       if (state.startVolume != nullptr) {
+        state.startLayer = state.startVolume->associatedLayer(
+            state.options.geoContext, position);
+        state.currentLayer = state.startLayer;
         ACTS_VERBOSE(volInfo(state) << "Start volume resolved.");
+      } else {
+        ACTS_VERBOSE(volInfo(state)
+                     << "No start volume resolved. Nothing left to do.");
+        // set the navigation break
+        state.navigationBreak = true;
       }
     }
 
+    if (state.startVolume != nullptr) {
+      ACTS_VERBOSE(volInfo(state) << "Start volume resolved.");
+      assert(
+          state.startVolume->inside(position, state.options.surfaceTolerance) &&
+          "We did not end up inside the volume.");
+    }
+
+    if (state.startLayer != nullptr) {
+      ACTS_VERBOSE(volInfo(state) << "Start layer resolved "
+                                  << state.startLayer->geometryId());
+      // We provide the layer to the resolve surface method in this case
+      resolveSurfaces(state, position, direction);
+    }
+
     // Set the start volume as current volume
     state.currentVolume = state.startVolume;
     // Set the start layer as current layer
     state.currentLayer = state.startLayer;
 
-    if (state.startLayer != nullptr) {
-      ACTS_VERBOSE(volInfo(state) << "Start layer to be resolved.");
-      // We provide the layer to the resolve surface method in this case
-      bool startResolved = resolveSurfaces(state, position, direction);
-      if (!startResolved && state.startLayer == state.targetLayer) {
-        ACTS_VERBOSE(volInfo(state)
-                     << "Start is target layer and we have no surface "
-                        "candidates. Nothing left to do.");
-        // set the navigation break
-        state.navigationBreak = true;
-      }
+    // We set the current surface to the start surface for eventual post-update
+    // action, e.g. material integration or collection when leaving a surface at
+    // the start of an extrapolation process
+    state.currentSurface = state.startSurface;
+    if (state.currentSurface != nullptr) {
+      ACTS_VERBOSE(volInfo(state) << "Current surface set to start surface "
+                                  << state.currentSurface->geometryId());
+
+      assert(state.currentSurface->isOnSurface(
+                 state.options.geoContext, position, direction,
+                 BoundaryTolerance::Infinite(),
+                 state.options.surfaceTolerance) &&
+             "Stepper not on surface");
     }
   }
 
@@ -567,7 +594,6 @@ class Navigator {
     } else {
       ACTS_VERBOSE(volInfo(state)
                    << "Last surface on layer reached, and no layer.");
-      state.navigationBreak = (state.currentVolume == state.targetVolume);
     }
 
     // Do not return to the propagator
@@ -609,19 +635,8 @@ class Navigator {
       return true;
     }
 
-    // Screen output
-    if (logger().doPrint(Logging::VERBOSE)) {
-      std::ostringstream os;
-      os << "Last layer";
-      if (state.currentVolume == state.targetVolume) {
-        os << " (final volume) done, proceed to target.";
-      } else {
-        os << " done, target volume boundary.";
-      }
-      logger().log(Logging::VERBOSE, os.str());
-    }
-    // Set the navigation break if necessary
-    state.navigationBreak = (state.currentVolume == state.targetVolume);
+    ACTS_VERBOSE(volInfo(state) << "Last layer done, target volume boundary.");
+
     return false;
   }
 
@@ -659,14 +674,6 @@ class Navigator {
       return false;
     }
 
-    if (state.currentVolume == state.targetVolume) {
-      ACTS_VERBOSE(volInfo(state)
-                   << "In target volume: no need to resolve boundary, "
-                      "stopping navigation.");
-      state.navigationBreak = true;
-      return true;
-    }
-
     // Helper function to find boundaries
     auto findBoundaries = [&]() -> void {
       // The navigation options
@@ -675,7 +682,6 @@ class Navigator {
       navOpts.startObject = state.currentSurface;
       navOpts.nearLimit = state.options.nearLimit;
       navOpts.farLimit = state.options.farLimit;
-      navOpts.forceIntersectBoundaries = state.forceIntersectBoundaries;
 
       ACTS_VERBOSE(volInfo(state)
                    << "Try to find boundaries, we are at: "
@@ -684,10 +690,9 @@ class Navigator {
       // Evaluate the boundary surfaces
       state.navBoundaries = state.currentVolume->compatibleBoundaries(
           state.options.geoContext, position, direction, navOpts, logger());
-      std::sort(state.navBoundaries.begin(), state.navBoundaries.end(),
-                [](const auto& a, const auto& b) {
-                  return SurfaceIntersection::pathLengthOrder(a.first, b.first);
-                });
+      std::ranges::sort(state.navBoundaries, [](const auto& a, const auto& b) {
+        return SurfaceIntersection::pathLengthOrder(a.first, b.first);
+      });
 
       // Print boundary information
       if (logger().doPrint(Logging::VERBOSE)) {
@@ -713,18 +718,7 @@ class Navigator {
       return true;
     }
 
-    // We have to leave the volume somehow, so try again
-    state.navBoundaries.clear();
-    ACTS_VERBOSE(volInfo(state) << "Boundary navigation lost, re-targetting.");
-    state.forceIntersectBoundaries = true;
-    findBoundaries();
-    if (!state.navBoundaries.empty()) {
-      // Resetting intersection check for boundary surfaces
-      state.forceIntersectBoundaries = false;
-      return true;
-    }
-
-    // Tried our best, but couldn't do anything
+    // TODO
     return false;
   }
 
@@ -737,8 +731,14 @@ class Navigator {
                        const Vector3& direction) const {
     // get the layer and layer surface
     const Layer* currentLayer = state.currentLayer;
-    assert(currentLayer != nullptr && "Current layer is not set.");
+
+    if (currentLayer == nullptr) {
+      ACTS_VERBOSE(volInfo(state) << "No layer to resolve surfaces.");
+      return false;
+    }
+
     const Surface* layerSurface = &currentLayer->surfaceRepresentation();
+
     // Use navigation parameters and NavigationOptions
     NavigationOptions<Surface> navOpts;
     navOpts.resolveSensitive = m_cfg.resolveSensitive;
@@ -759,14 +759,14 @@ class Navigator {
         navOpts.externalSurfaces.push_back(itSurface->second);
       }
     }
+
     navOpts.nearLimit = state.options.nearLimit;
     navOpts.farLimit = state.options.farLimit;
 
     // get the surfaces
     state.navSurfaces = currentLayer->compatibleSurfaces(
         state.options.geoContext, position, direction, navOpts);
-    std::sort(state.navSurfaces.begin(), state.navSurfaces.end(),
-              SurfaceIntersection::pathLengthOrder);
+    std::ranges::sort(state.navSurfaces, SurfaceIntersection::pathLengthOrder);
 
     // Print surface information
     if (logger().doPrint(Logging::VERBOSE)) {
@@ -818,10 +818,9 @@ class Navigator {
     // Request the compatible layers
     state.navLayers = state.currentVolume->compatibleLayers(
         state.options.geoContext, position, direction, navOpts);
-    std::sort(state.navLayers.begin(), state.navLayers.end(),
-              [](const auto& a, const auto& b) {
-                return SurfaceIntersection::pathLengthOrder(a.first, b.first);
-              });
+    std::ranges::sort(state.navLayers, [](const auto& a, const auto& b) {
+      return SurfaceIntersection::pathLengthOrder(a.first, b.first);
+    });
 
     // Print layer information
     if (logger().doPrint(Logging::VERBOSE)) {
diff --git a/Core/include/Acts/Propagator/NavigatorOptions.hpp b/Core/include/Acts/Propagator/NavigatorOptions.hpp
index 816efb13f41..ca2472a9dc8 100644
--- a/Core/include/Acts/Propagator/NavigatorOptions.hpp
+++ b/Core/include/Acts/Propagator/NavigatorOptions.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2024 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
diff --git a/Core/include/Acts/Propagator/Propagator.hpp b/Core/include/Acts/Propagator/Propagator.hpp
index 576a221bc43..6a38e5d2a8f 100644
--- a/Core/include/Acts/Propagator/Propagator.hpp
+++ b/Core/include/Acts/Propagator/Propagator.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2016-2024 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
@@ -20,8 +20,7 @@
 #include "Acts/EventData/TrackParametersConcept.hpp"
 #include "Acts/Geometry/GeometryContext.hpp"
 #include "Acts/MagneticField/MagneticFieldContext.hpp"
-#include "Acts/Propagator/AbortList.hpp"
-#include "Acts/Propagator/ActionList.hpp"
+#include "Acts/Propagator/ActorList.hpp"
 #include "Acts/Propagator/PropagatorOptions.hpp"
 #include "Acts/Propagator/PropagatorResult.hpp"
 #include "Acts/Propagator/PropagatorState.hpp"
@@ -106,18 +105,16 @@ class Propagator final
   /// Re-define bound track parameters dependent on the stepper
   using StepperBoundTrackParameters =
       detail::stepper_bound_parameters_type_t<stepper_t>;
-  static_assert(
-      Concepts::BoundTrackParametersConcept<StepperBoundTrackParameters>,
-      "Stepper bound track parameters do not fulfill bound "
-      "parameters concept.");
+  static_assert(BoundTrackParametersConcept<StepperBoundTrackParameters>,
+                "Stepper bound track parameters do not fulfill bound "
+                "parameters concept.");
 
   /// Re-define curvilinear track parameters dependent on the stepper
   using StepperCurvilinearTrackParameters =
       detail::stepper_curvilinear_parameters_type_t<stepper_t>;
-  static_assert(
-      Concepts::BoundTrackParametersConcept<StepperCurvilinearTrackParameters>,
-      "Stepper bound track parameters do not fulfill bound "
-      "parameters concept.");
+  static_assert(BoundTrackParametersConcept<StepperCurvilinearTrackParameters>,
+                "Stepper bound track parameters do not fulfill bound "
+                "parameters concept.");
 
   using Jacobian = BoundMatrix;
   using BoundState = std::tuple<StepperBoundTrackParameters, Jacobian, double>;
@@ -150,10 +147,9 @@ class Propagator final
 
   using NavigatorOptions = typename navigator_t::Options;
 
-  template <typename action_list_t = ActionList<>,
-            typename aborter_list_t = AbortList<>>
-  using Options = PropagatorOptions<StepperOptions, NavigatorOptions,
-                                    action_list_t, aborter_list_t>;
+  template <typename actor_list_t = ActorList<>>
+  using Options =
+      PropagatorOptions<StepperOptions, NavigatorOptions, actor_list_t>;
 
   /// Constructor from implementation object
   ///
@@ -171,13 +167,13 @@ class Propagator final
   /// @brief Helper struct determining the state's type
   ///
   /// @tparam propagator_options_t Propagator options type
-  /// @tparam action_list_t List of propagation action types
+  /// @tparam actor_list_t List of propagation action types
   ///
   /// This helper struct provides type definitions to extract the correct
   /// propagation state type from a given TrackParameter type and an
-  /// ActionList.
+  /// ActorList.
   ///
-  template <typename propagator_options_t, typename action_list_t>
+  template <typename propagator_options_t, typename actor_list_t>
   struct state_type_helper {
     /// @brief Propagation state type for an arbitrary list of additional
     ///        propagation states
@@ -188,19 +184,19 @@ class Propagator final
     using this_state_type = State<propagator_options_t, args...>;
 
     /// @brief Propagation result type derived from a given action list
-    using type = typename action_list_t::template result_type<this_state_type>;
+    using type = typename actor_list_t::template result_type<this_state_type>;
   };
 
   /// @brief Helper struct determining the result's type
   ///
   /// @tparam parameters_t Type of final track parameters
-  /// @tparam action_list_t List of propagation action types
+  /// @tparam actor_list_t List of propagation action types
   ///
   /// This helper struct provides type definitions to extract the correct
   /// propagation result type from a given TrackParameter type and an
-  /// ActionList.
+  /// ActorList.
   ///
-  template <typename parameters_t, typename action_list_t>
+  template <typename parameters_t, typename actor_list_t>
   struct result_type_helper {
     /// @brief Propagation result type for an arbitrary list of additional
     ///        propagation results
@@ -211,28 +207,28 @@ class Propagator final
     using this_result_type = PropagatorResult<parameters_t, args...>;
 
     /// @brief Propagation result type derived from a given action list
-    using type = typename action_list_t::template result_type<this_result_type>;
+    using type = typename actor_list_t::template result_type<this_result_type>;
   };
 
  public:
   /// @brief Short-hand type definition for propagation state derived from
   ///        an action list
   ///
-  /// @tparam action_list_t List of propagation action types
+  /// @tparam actor_list_t List of propagation action types
   ///
-  template <typename propagator_options_t, typename action_list_t>
-  using action_list_t_state_t =
-      typename state_type_helper<propagator_options_t, action_list_t>::type;
+  template <typename propagator_options_t, typename actor_list_t>
+  using actor_list_t_state_t =
+      typename state_type_helper<propagator_options_t, actor_list_t>::type;
 
   /// @brief Short-hand type definition for propagation result derived from
   ///        an action list
   ///
   /// @tparam parameters_t Type of the final track parameters
-  /// @tparam action_list_t List of propagation action types
+  /// @tparam actor_list_t List of propagation action types
   ///
-  template <typename parameters_t, typename action_list_t>
-  using action_list_t_result_t =
-      typename result_type_helper<parameters_t, action_list_t>::type;
+  template <typename parameters_t, typename actor_list_t>
+  using actor_list_t_result_t =
+      typename result_type_helper<parameters_t, actor_list_t>::type;
 
   /// @brief Propagate track parameters
   ///
@@ -254,9 +250,8 @@ class Propagator final
   ///
   template <typename parameters_t, typename propagator_options_t,
             typename path_aborter_t = PathLimitReached>
-  Result<
-      action_list_t_result_t<StepperCurvilinearTrackParameters,
-                             typename propagator_options_t::action_list_type>>
+  Result<actor_list_t_result_t<StepperCurvilinearTrackParameters,
+                               typename propagator_options_t::actor_list_type>>
   propagate(const parameters_t& start, const propagator_options_t& options,
             bool makeCurvilinear = true) const;
 
@@ -281,9 +276,8 @@ class Propagator final
   template <typename parameters_t, typename propagator_options_t,
             typename target_aborter_t = SurfaceReached,
             typename path_aborter_t = PathLimitReached>
-  Result<
-      action_list_t_result_t<StepperBoundTrackParameters,
-                             typename propagator_options_t::action_list_type>>
+  Result<actor_list_t_result_t<StepperBoundTrackParameters,
+                               typename propagator_options_t::actor_list_type>>
   propagate(const parameters_t& start, const Surface& target,
             const propagator_options_t& options) const;
 
@@ -365,9 +359,8 @@ class Propagator final
   ///
   /// @return Propagation result
   template <typename propagator_state_t, typename propagator_options_t>
-  Result<
-      action_list_t_result_t<StepperCurvilinearTrackParameters,
-                             typename propagator_options_t::action_list_type>>
+  Result<actor_list_t_result_t<StepperCurvilinearTrackParameters,
+                               typename propagator_options_t::actor_list_type>>
   makeResult(propagator_state_t state, Result<void> result,
              const propagator_options_t& options, bool makeCurvilinear) const;
 
@@ -388,9 +381,8 @@ class Propagator final
   ///
   /// @return Propagation result
   template <typename propagator_state_t, typename propagator_options_t>
-  Result<
-      action_list_t_result_t<StepperBoundTrackParameters,
-                             typename propagator_options_t::action_list_type>>
+  Result<actor_list_t_result_t<StepperBoundTrackParameters,
+                               typename propagator_options_t::actor_list_type>>
   makeResult(propagator_state_t state, Result<void> result,
              const Surface& target, const propagator_options_t& options) const;
 
diff --git a/Core/include/Acts/Propagator/Propagator.ipp b/Core/include/Acts/Propagator/Propagator.ipp
index 04ba25da36b..d88ecfca5db 100644
--- a/Core/include/Acts/Propagator/Propagator.ipp
+++ b/Core/include/Acts/Propagator/Propagator.ipp
@@ -1,13 +1,13 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2019-2024 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include "Acts/EventData/TrackParametersConcept.hpp"
-#include "Acts/Propagator/ActionList.hpp"
+#include "Acts/Propagator/ActorList.hpp"
 #include "Acts/Propagator/ConstrainedStep.hpp"
 #include "Acts/Propagator/Navigator.hpp"
 #include "Acts/Propagator/PropagatorError.hpp"
@@ -16,25 +16,36 @@
 #include "Acts/Surfaces/BoundaryTolerance.hpp"
 #include "Acts/Utilities/Intersection.hpp"
 
-#include <type_traits>
+#include <concepts>
+
+namespace Acts::detail {
+template <typename Stepper, typename StateType, typename N>
+concept propagator_stepper_compatible_with =
+    requires(const Stepper& s, StateType& st, const N& n) {
+      { s.step(st, n) } -> std::same_as<Acts::Result<double>>;
+    };
+}  // namespace Acts::detail
 
 template <typename S, typename N>
 template <typename propagator_state_t>
 auto Acts::Propagator<S, N>::propagate(propagator_state_t& state) const
     -> Result<void> {
-  // Pre-stepping call to the navigator and action list
+  // Pre-stepping call to the navigator and actor list
   ACTS_VERBOSE("Entering propagation.");
 
   state.stage = PropagatorStage::prePropagation;
 
-  // Pre-Stepping call to the action list
-  state.options.actionList(state, m_stepper, m_navigator, logger());
+  // Pre-Stepping call to the actor list
+  state.options.actorList.act(state, m_stepper, m_navigator, logger());
+  // assume negative outcome, only set to true later if we actually have
+  // a positive outcome.
 
   // start at true, if we don't begin the stepping loop we're fine.
   bool terminatedNormally = true;
 
   // Pre-Stepping: abort condition check
-  if (state.options.abortList(state, m_stepper, m_navigator, logger())) {
+  if (state.options.actorList.checkAbort(state, m_stepper, m_navigator,
+                                         logger())) {
     ACTS_VERBOSE("Propagation terminated without going into stepping loop.");
   } else {
     // Stepping loop
@@ -126,9 +137,10 @@ auto Acts::Propagator<S, N>::propagate(propagator_state_t& state) const
           }
         }
 
-        state.options.actionList(state, m_stepper, m_navigator, logger());
+        state.options.actorList.act(state, m_stepper, m_navigator, logger());
 
-        if (state.options.abortList(state, m_stepper, m_navigator, logger())) {
+        if (state.options.actorList.checkAbort(state, m_stepper, m_navigator,
+                                               logger())) {
           terminatedNormally = true;
           break;
         }
@@ -174,8 +186,9 @@ auto Acts::Propagator<S, N>::propagate(propagator_state_t& state) const
         // navigator post step call - action list - aborter list
         state.stage = PropagatorStage::postStep;
         m_navigator.postStep(state, m_stepper);
-        state.options.actionList(state, m_stepper, m_navigator, logger());
-        if (state.options.abortList(state, m_stepper, m_navigator, logger())) {
+        state.options.actorList.act(state, m_stepper, m_navigator, logger());
+        if (state.options.actorList.checkAbort(state, m_stepper, m_navigator,
+                                               logger())) {
           terminatedNormally = true;
           break;
         }
@@ -195,9 +208,9 @@ auto Acts::Propagator<S, N>::propagate(propagator_state_t& state) const
     return PropagatorError::StepCountLimitReached;
   }
 
-  // Post-stepping call to the action list
+  // Post-stepping call to the actor list
   ACTS_VERBOSE("Stepping loop done.");
-  state.options.actionList(state, m_stepper, m_navigator, logger());
+  state.options.actorList.act(state, m_stepper, m_navigator, logger());
 
   // return progress flag here, decide on SUCCESS later
   return Result<void>::success();
@@ -209,12 +222,11 @@ template <typename parameters_t, typename propagator_options_t,
 auto Acts::Propagator<S, N>::propagate(const parameters_t& start,
                                        const propagator_options_t& options,
                                        bool makeCurvilinear) const
-    -> Result<action_list_t_result_t<
-        StepperCurvilinearTrackParameters,
-        typename propagator_options_t::action_list_type>> {
-  static_assert(
-      std::is_copy_constructible<StepperCurvilinearTrackParameters>::value,
-      "return track parameter type must be copy-constructible");
+    -> Result<
+        actor_list_t_result_t<StepperCurvilinearTrackParameters,
+                              typename propagator_options_t::actor_list_type>> {
+  static_assert(std::copy_constructible<StepperCurvilinearTrackParameters>,
+                "return track parameter type must be copy-constructible");
 
   auto state = makeState(start, options);
 
@@ -231,10 +243,10 @@ template <typename parameters_t, typename propagator_options_t,
 auto Acts::Propagator<S, N>::propagate(
     const parameters_t& start, const Surface& target,
     const propagator_options_t& options) const
-    -> Result<action_list_t_result_t<
-        StepperBoundTrackParameters,
-        typename propagator_options_t::action_list_type>> {
-  static_assert(Concepts::BoundTrackParametersConcept<parameters_t>,
+    -> Result<
+        actor_list_t_result_t<StepperBoundTrackParameters,
+                              typename propagator_options_t::actor_list_type>> {
+  static_assert(BoundTrackParametersConcept<parameters_t>,
                 "Parameters do not fulfill bound parameters concept.");
 
   auto state = makeState<parameters_t, propagator_options_t, target_aborter_t,
@@ -251,29 +263,29 @@ template <typename parameters_t, typename propagator_options_t,
           typename path_aborter_t>
 auto Acts::Propagator<S, N>::makeState(
     const parameters_t& start, const propagator_options_t& options) const {
-  static_assert(Concepts::BoundTrackParametersConcept<parameters_t>,
+  static_assert(BoundTrackParametersConcept<parameters_t>,
                 "Parameters do not fulfill bound parameters concept.");
 
   // Type of track parameters produced by the propagation
   using ReturnParameterType = StepperCurvilinearTrackParameters;
 
-  static_assert(std::is_copy_constructible<ReturnParameterType>::value,
+  static_assert(std::copy_constructible<ReturnParameterType>,
                 "return track parameter type must be copy-constructible");
 
   // Expand the abort list with a path aborter
   path_aborter_t pathAborter;
   pathAborter.internalLimit = options.pathLimit;
 
-  auto abortList = options.abortList.append(pathAborter);
+  auto actorList = options.actorList.append(pathAborter);
 
   // The expanded options (including path limit)
-  auto eOptions = options.extend(abortList);
+  auto eOptions = options.extend(actorList);
   eOptions.navigation.startSurface = &start.referenceSurface();
   eOptions.navigation.targetSurface = nullptr;
   using OptionsType = decltype(eOptions);
   using StateType =
-      action_list_t_state_t<OptionsType,
-                            typename propagator_options_t::action_list_type>;
+      actor_list_t_state_t<OptionsType,
+                           typename propagator_options_t::actor_list_type>;
   // Initialize the internal propagator state
   StateType state{
       eOptions,
@@ -282,8 +294,7 @@ auto Acts::Propagator<S, N>::makeState(
       m_navigator.makeState(eOptions.navigation)};
 
   static_assert(
-      Concepts::has_method<const S, Result<double>, Concepts::Stepper::step_t,
-                           StateType&, const N&>,
+      detail::propagator_stepper_compatible_with<S, StateType, N>,
       "Step method of the Stepper is not compatible with the propagator "
       "state");
 
@@ -298,7 +309,7 @@ template <typename parameters_t, typename propagator_options_t,
 auto Acts::Propagator<S, N>::makeState(
     const parameters_t& start, const Surface& target,
     const propagator_options_t& options) const {
-  static_assert(Concepts::BoundTrackParametersConcept<parameters_t>,
+  static_assert(BoundTrackParametersConcept<parameters_t>,
                 "Parameters do not fulfill bound parameters concept.");
 
   // Type of provided options
@@ -306,18 +317,18 @@ auto Acts::Propagator<S, N>::makeState(
   targetAborter.surface = &target;
   path_aborter_t pathAborter;
   pathAborter.internalLimit = options.pathLimit;
-  auto abortList = options.abortList.append(targetAborter, pathAborter);
+  auto actorList = options.actorList.append(targetAborter, pathAborter);
 
   // Create the extended options and declare their type
-  auto eOptions = options.extend(abortList);
+  auto eOptions = options.extend(actorList);
   eOptions.navigation.startSurface = &start.referenceSurface();
   eOptions.navigation.targetSurface = &target;
   using OptionsType = decltype(eOptions);
 
   // Initialize the internal propagator state
   using StateType =
-      action_list_t_state_t<OptionsType,
-                            typename propagator_options_t::action_list_type>;
+      actor_list_t_state_t<OptionsType,
+                           typename propagator_options_t::actor_list_type>;
   StateType state{
       eOptions,
       m_stepper.makeState(eOptions.geoContext, eOptions.magFieldContext, start,
@@ -325,8 +336,7 @@ auto Acts::Propagator<S, N>::makeState(
       m_navigator.makeState(eOptions.navigation)};
 
   static_assert(
-      Concepts::has_method<const S, Result<double>, Concepts::Stepper::step_t,
-                           StateType&, const N&>,
+      detail::propagator_stepper_compatible_with<S, StateType, N>,
       "Step method of the Stepper is not compatible with the propagator "
       "state");
 
@@ -341,19 +351,19 @@ auto Acts::Propagator<S, N>::makeResult(propagator_state_t state,
                                         Result<void> propagationResult,
                                         const propagator_options_t& /*options*/,
                                         bool makeCurvilinear) const
-    -> Result<action_list_t_result_t<
-        StepperCurvilinearTrackParameters,
-        typename propagator_options_t::action_list_type>> {
+    -> Result<
+        actor_list_t_result_t<StepperCurvilinearTrackParameters,
+                              typename propagator_options_t::actor_list_type>> {
   // Type of track parameters produced by the propagation
   using ReturnParameterType = StepperCurvilinearTrackParameters;
 
-  static_assert(std::is_copy_constructible<ReturnParameterType>::value,
+  static_assert(std::copy_constructible<ReturnParameterType>,
                 "return track parameter type must be copy-constructible");
 
-  // Type of the full propagation result, including output from actions
+  // Type of the full propagation result, including output from actors
   using ResultType =
-      action_list_t_result_t<ReturnParameterType,
-                             typename propagator_options_t::action_list_type>;
+      actor_list_t_result_t<ReturnParameterType,
+                            typename propagator_options_t::actor_list_type>;
 
   if (!propagationResult.ok()) {
     return propagationResult.error();
@@ -386,19 +396,19 @@ template <typename propagator_state_t, typename propagator_options_t>
 auto Acts::Propagator<S, N>::makeResult(
     propagator_state_t state, Result<void> propagationResult,
     const Surface& target, const propagator_options_t& /*options*/) const
-    -> Result<action_list_t_result_t<
-        StepperBoundTrackParameters,
-        typename propagator_options_t::action_list_type>> {
+    -> Result<
+        actor_list_t_result_t<StepperBoundTrackParameters,
+                              typename propagator_options_t::actor_list_type>> {
   // Type of track parameters produced at the end of the propagation
   using ReturnParameterType = StepperBoundTrackParameters;
 
-  static_assert(std::is_copy_constructible<ReturnParameterType>::value,
+  static_assert(std::copy_constructible<ReturnParameterType>,
                 "return track parameter type must be copy-constructible");
 
-  // Type of the full propagation result, including output from actions
+  // Type of the full propagation result, including output from actors
   using ResultType =
-      action_list_t_result_t<ReturnParameterType,
-                             typename propagator_options_t::action_list_type>;
+      actor_list_t_result_t<ReturnParameterType,
+                            typename propagator_options_t::actor_list_type>;
 
   if (!propagationResult.ok()) {
     return propagationResult.error();
@@ -434,7 +444,7 @@ void Acts::Propagator<S, N>::initialize(propagator_state_t& state) const {
 
   // Apply the loop protection - it resets the internal path limit
   detail::setupLoopProtection(
-      state, m_stepper, state.options.abortList.template get<path_aborter_t>(),
+      state, m_stepper, state.options.actorList.template get<path_aborter_t>(),
       false, logger());
 }
 
@@ -453,8 +463,8 @@ Acts::Result<Acts::BoundTrackParameters>
 Acts::detail::BasePropagatorHelper<derived_t>::propagateToSurface(
     const BoundTrackParameters& start, const Surface& target,
     const Options& options) const {
-  using ResultType = Result<typename derived_t::template action_list_t_result_t<
-      BoundTrackParameters, ActionList<>>>;
+  using ResultType = Result<typename derived_t::template actor_list_t_result_t<
+      BoundTrackParameters, ActorList<>>>;
   using DerivedOptions = typename derived_t::template Options<>;
 
   DerivedOptions derivedOptions(options);
diff --git a/Core/include/Acts/Propagator/PropagatorError.hpp b/Core/include/Acts/Propagator/PropagatorError.hpp
index 099377f507b..34bd9df0f90 100644
--- a/Core/include/Acts/Propagator/PropagatorError.hpp
+++ b/Core/include/Acts/Propagator/PropagatorError.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2019-2020 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
diff --git a/Core/include/Acts/Propagator/PropagatorOptions.hpp b/Core/include/Acts/Propagator/PropagatorOptions.hpp
index ff684f3c943..0c8d95ad646 100644
--- a/Core/include/Acts/Propagator/PropagatorOptions.hpp
+++ b/Core/include/Acts/Propagator/PropagatorOptions.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2024 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
@@ -12,8 +12,7 @@
 #include "Acts/Definitions/Tolerance.hpp"
 #include "Acts/Geometry/GeometryContext.hpp"
 #include "Acts/MagneticField/MagneticFieldContext.hpp"
-#include "Acts/Propagator/AbortList.hpp"
-#include "Acts/Propagator/ActionList.hpp"
+#include "Acts/Propagator/ActorList.hpp"
 #include "Acts/Propagator/NavigatorOptions.hpp"
 #include "Acts/Propagator/StepperOptions.hpp"
 
@@ -34,13 +33,22 @@ struct PurePropagatorPlainOptions {
   /// Absolute maximum path length
   double pathLimit = std::numeric_limits<double>::max();
 
-  /// Required tolerance to reach surface
-  double surfaceTolerance = s_onSurfaceTolerance;
-
   /// Loop protection step, it adapts the pathLimit
   bool loopProtection = true;
   /// Allowed loop fraction, 1 is a full loop
   double loopFraction = 0.5;
+
+  /// Required tolerance to reach surface
+  double surfaceTolerance = s_onSurfaceTolerance;
+
+  /// Constrain the propagation to selected volumes
+  /// @note ignored if empty
+  /// @note requires `VolumeConstraintAborter` aborter
+  std::vector<std::uint32_t> constrainToVolumeIds;
+  /// Additional volumes to be considered as end of world
+  /// @note ignored if empty
+  /// @note requires `VolumeConstraintAborter` aborter
+  std::vector<std::uint32_t> endOfWorldVolumeIds;
 };
 
 }  // namespace detail
@@ -67,20 +75,15 @@ struct PropagatorPlainOptions : public detail::PurePropagatorPlainOptions {
 
 /// @brief Options for propagate() call
 ///
-/// @tparam action_list_t List of action types called after each
+/// @tparam actor_list_t List of action types called after each
 ///    propagation step with the current propagation and stepper state
 ///
-/// @tparam aborter_list_t List of abort conditions tested after each
-///    propagation step using the current propagation and stepper state
-///
 template <typename stepper_options_t, typename navigator_options_t,
-          typename action_list_t = ActionList<>,
-          typename aborter_list_t = AbortList<>>
+          typename actor_list_t = ActorList<>>
 struct PropagatorOptions : public detail::PurePropagatorPlainOptions {
   using stepper_options_type = stepper_options_t;
   using navigator_options_type = navigator_options_t;
-  using action_list_type = action_list_t;
-  using aborter_list_type = aborter_list_t;
+  using actor_list_type = actor_list_t;
 
   /// PropagatorOptions with context
   PropagatorOptions(const GeometryContext& gctx,
@@ -105,17 +108,17 @@ struct PropagatorOptions : public detail::PurePropagatorPlainOptions {
     return pOptions;
   }
 
-  /// @brief Expand the Options with extended aborters
+  /// @brief Expand the options with extended actors
   ///
-  /// @tparam extended_aborter_list_t Type of the new aborter list
+  /// @tparam extended_actor_list_t Type of the new actor list
   ///
-  /// @param aborters The new aborter list to be used (internally)
-  template <typename extended_aborter_list_t>
-  PropagatorOptions<stepper_options_t, navigator_options_t, action_list_t,
-                    extended_aborter_list_t>
-  extend(extended_aborter_list_t aborters) const {
-    PropagatorOptions<stepper_options_t, navigator_options_t, action_list_t,
-                      extended_aborter_list_t>
+  /// @param extendedActorList The new actor list to be used (internally)
+  template <typename extended_actor_list_t>
+  PropagatorOptions<stepper_options_t, navigator_options_t,
+                    extended_actor_list_t>
+  extend(extended_actor_list_t extendedActorList) const {
+    PropagatorOptions<stepper_options_t, navigator_options_t,
+                      extended_actor_list_t>
         eoptions(geoContext, magFieldContext);
 
     // Copy the base options
@@ -127,8 +130,7 @@ struct PropagatorOptions : public detail::PurePropagatorPlainOptions {
     eoptions.navigation = navigation;
 
     // Action / Abort list
-    eoptions.actionList = actionList;
-    eoptions.abortList = aborters;
+    eoptions.actorList = extendedActorList;
 
     // And return the options
     return eoptions;
@@ -158,10 +160,7 @@ struct PropagatorOptions : public detail::PurePropagatorPlainOptions {
   navigator_options_t navigation;
 
   /// List of actions
-  action_list_t actionList;
-
-  /// List of abort conditions
-  aborter_list_t abortList;
+  actor_list_t actorList;
 };
 
 }  // namespace Acts
diff --git a/Core/include/Acts/Propagator/PropagatorResult.hpp b/Core/include/Acts/Propagator/PropagatorResult.hpp
index 3c4998d7291..232211b8495 100644
--- a/Core/include/Acts/Propagator/PropagatorResult.hpp
+++ b/Core/include/Acts/Propagator/PropagatorResult.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2024 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
diff --git a/Core/include/Acts/Propagator/PropagatorState.hpp b/Core/include/Acts/Propagator/PropagatorState.hpp
index 4f499e46eee..4a623640207 100644
--- a/Core/include/Acts/Propagator/PropagatorState.hpp
+++ b/Core/include/Acts/Propagator/PropagatorState.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2024 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
diff --git a/Core/include/Acts/Propagator/PropagatorTraits.hpp b/Core/include/Acts/Propagator/PropagatorTraits.hpp
index 047e21386b8..2bd1567fdb2 100644
--- a/Core/include/Acts/Propagator/PropagatorTraits.hpp
+++ b/Core/include/Acts/Propagator/PropagatorTraits.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2023 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
diff --git a/Core/include/Acts/Propagator/RiddersPropagator.hpp b/Core/include/Acts/Propagator/RiddersPropagator.hpp
index 9f265f153ae..32df1e09387 100644
--- a/Core/include/Acts/Propagator/RiddersPropagator.hpp
+++ b/Core/include/Acts/Propagator/RiddersPropagator.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2017-2019 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
@@ -36,20 +36,20 @@ class RiddersPropagator {
   using Covariance = BoundSquareMatrix;
 
   ///
-  /// @note The result_type_helper struct and the action_list_t_result_t are
+  /// @note The result_type_helper struct and the actor_list_t_result_t are
   /// here to allow a look'n'feel of this class like the Propagator itself
   ///
 
   /// @brief Helper struct determining the result's type
   ///
   /// @tparam parameters_t Type of final track parameters
-  /// @tparam action_list_t    List of propagation action types
+  /// @tparam actor_list_t    List of propagation action types
   ///
   /// This helper struct provides type definitions to extract the correct
   /// propagation result type from a given TrackParameter type and an
-  /// ActionList.
+  /// ActorList.
   ///
-  template <typename parameters_t, typename action_list_t>
+  template <typename parameters_t, typename actor_list_t>
   struct result_type_helper {
     /// @brief Propagation result type for an arbitrary list of additional
     ///        propagation results
@@ -60,18 +60,18 @@ class RiddersPropagator {
     using this_result_type = PropagatorResult<parameters_t, args...>;
 
     /// @brief Propagation result type derived from a given action list
-    using type = typename action_list_t::template result_type<this_result_type>;
+    using type = typename actor_list_t::template result_type<this_result_type>;
   };
 
   /// @brief Short-hand type definition for propagation result derived from
   ///        an action list
   ///
   /// @tparam parameters_t Type of the final track parameters
-  /// @tparam action_list_t List of propagation action types
+  /// @tparam actor_list_t List of propagation action types
   ///
-  template <typename parameters_t, typename action_list_t>
-  using action_list_t_result_t =
-      typename result_type_helper<parameters_t, action_list_t>::type;
+  template <typename parameters_t, typename actor_list_t>
+  using actor_list_t_result_t =
+      typename result_type_helper<parameters_t, actor_list_t>::type;
 
  public:
   struct Config {
@@ -81,10 +81,8 @@ class RiddersPropagator {
     std::vector<double> deviationsDisc = {-3e-5, -1e-5, 1e-5, 3e-5};
   };
 
-  template <typename action_list_t = ActionList<>,
-            typename aborter_list_t = AbortList<>>
-  using Options =
-      typename propagator_t::template Options<action_list_t, aborter_list_t>;
+  template <typename actor_list_t = ActorList<>>
+  using Options = typename propagator_t::template Options<actor_list_t>;
 
   /// @brief Constructor using a propagator
   ///
@@ -117,9 +115,8 @@ class RiddersPropagator {
   ///
   /// @return Result of the propagation
   template <typename parameters_t, typename propagator_options_t>
-  Result<
-      action_list_t_result_t<CurvilinearTrackParameters,
-                             typename propagator_options_t::action_list_type>>
+  Result<actor_list_t_result_t<CurvilinearTrackParameters,
+                               typename propagator_options_t::actor_list_type>>
   propagate(const parameters_t& start,
             const propagator_options_t& options) const;
 
@@ -136,8 +133,8 @@ class RiddersPropagator {
   /// @note If the target surface is a disc, the resulting covariance may be
   /// inconsistent. In this case a zero matrix is returned.
   template <typename parameters_t, typename propagator_options_t>
-  Result<action_list_t_result_t<
-      BoundTrackParameters, typename propagator_options_t::action_list_type>>
+  Result<actor_list_t_result_t<BoundTrackParameters,
+                               typename propagator_options_t::actor_list_type>>
   propagate(const parameters_t& start, const Surface& target,
             const propagator_options_t& options) const;
 
diff --git a/Core/include/Acts/Propagator/RiddersPropagator.ipp b/Core/include/Acts/Propagator/RiddersPropagator.ipp
index cc8e1114d93..1b1764a13d7 100644
--- a/Core/include/Acts/Propagator/RiddersPropagator.ipp
+++ b/Core/include/Acts/Propagator/RiddersPropagator.ipp
@@ -1,23 +1,25 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2017-2023 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include "Acts/Definitions/TrackParametrization.hpp"
 
+#include <numbers>
+
 template <typename propagator_t>
 template <typename parameters_t, typename propagator_options_t>
 auto Acts::RiddersPropagator<propagator_t>::propagate(
     const parameters_t& start, const propagator_options_t& options) const
-    -> Result<action_list_t_result_t<
-        CurvilinearTrackParameters,
-        typename propagator_options_t::action_list_type>> {
+    -> Result<
+        actor_list_t_result_t<CurvilinearTrackParameters,
+                              typename propagator_options_t::actor_list_type>> {
   using ThisResult = Result<
-      action_list_t_result_t<CurvilinearTrackParameters,
-                             typename propagator_options_t::action_list_type>>;
+      actor_list_t_result_t<CurvilinearTrackParameters,
+                            typename propagator_options_t::actor_list_type>>;
 
   // Remove the covariance from our start parameters in order to skip jacobian
   // transport for the nominal propagation
@@ -55,11 +57,10 @@ template <typename parameters_t, typename propagator_options_t>
 auto Acts::RiddersPropagator<propagator_t>::propagate(
     const parameters_t& start, const Surface& target,
     const propagator_options_t& options) const
-    -> Result<action_list_t_result_t<
-        BoundTrackParameters,
-        typename propagator_options_t::action_list_type>> {
-  using ThisResult = Result<action_list_t_result_t<
-      BoundTrackParameters, typename propagator_options_t::action_list_type>>;
+    -> Result<actor_list_t_result_t<
+        BoundTrackParameters, typename propagator_options_t::actor_list_type>> {
+  using ThisResult = Result<actor_list_t_result_t<
+      BoundTrackParameters, typename propagator_options_t::actor_list_type>>;
 
   // Remove the covariance from our start parameters in order to skip jacobian
   // transport for the nominal propagation
@@ -151,8 +152,8 @@ bool Acts::RiddersPropagator<propagator_t>::inconsistentDerivativesOnDisc(
     for (unsigned int j = 0; j < derivatives.size(); j++) {
       // If there is at least one with a similar angle then it seems to work
       // properly
-      if (i != j &&
-          std::abs(derivatives[i](1) - derivatives[j](1)) < 0.5 * M_PI) {
+      if (i != j && std::abs(derivatives[i](1) - derivatives[j](1)) <
+                        std::numbers::pi / 2.) {
         jumpedAngle = false;
         break;
       }
@@ -180,8 +181,8 @@ Acts::RiddersPropagator<propagator_t>::wiggleParameter(
     // Treatment for theta
     if (param == eBoundTheta) {
       const double current_theta = start.template get<eBoundTheta>();
-      if (current_theta + h > M_PI) {
-        h = M_PI - current_theta;
+      if (current_theta + h > std::numbers::pi) {
+        h = std::numbers::pi - current_theta;
       }
       if (current_theta + h < 0) {
         h = -current_theta;
@@ -203,10 +204,14 @@ Acts::RiddersPropagator<propagator_t>::wiggleParameter(
     if (param == eBoundPhi) {
       double phi0 = nominal(Acts::eBoundPhi);
       double phi1 = r.endParameters->parameters()(Acts::eBoundPhi);
-      if (std::abs(phi1 + 2. * M_PI - phi0) < std::abs(phi1 - phi0)) {
-        derivatives.back()[Acts::eBoundPhi] = (phi1 + 2. * M_PI - phi0) / h;
-      } else if (std::abs(phi1 - 2. * M_PI - phi0) < std::abs(phi1 - phi0)) {
-        derivatives.back()[Acts::eBoundPhi] = (phi1 - 2. * M_PI - phi0) / h;
+      if (std::abs(phi1 + 2. * std::numbers::pi - phi0) <
+          std::abs(phi1 - phi0)) {
+        derivatives.back()[Acts::eBoundPhi] =
+            (phi1 + 2. * std::numbers::pi - phi0) / h;
+      } else if (std::abs(phi1 - 2. * std::numbers::pi - phi0) <
+                 std::abs(phi1 - phi0)) {
+        derivatives.back()[Acts::eBoundPhi] =
+            (phi1 - 2. * std::numbers::pi - phi0) / h;
       }
     }
   }
diff --git a/Core/include/Acts/Propagator/StandardAborters.hpp b/Core/include/Acts/Propagator/StandardAborters.hpp
index 84ac3a427cf..706b0ce0697 100644
--- a/Core/include/Acts/Propagator/StandardAborters.hpp
+++ b/Core/include/Acts/Propagator/StandardAborters.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2017-2023 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
@@ -41,7 +41,7 @@ struct PathLimitReached {
   /// @param logger a logger instance
   template <typename propagator_state_t, typename stepper_t,
             typename navigator_t>
-  bool operator()(propagator_state_t& state, const stepper_t& stepper,
+  bool checkAbort(propagator_state_t& state, const stepper_t& stepper,
                   const navigator_t& navigator, const Logger& logger) const {
     (void)navigator;
 
@@ -77,7 +77,7 @@ struct SurfaceReached {
   double nearLimit = -100 * UnitConstants::um;
 
   SurfaceReached() = default;
-  SurfaceReached(double nLimit) : nearLimit(nLimit) {}
+  explicit SurfaceReached(double nLimit) : nearLimit(nLimit) {}
 
   /// boolean operator for abort condition without using the result
   ///
@@ -91,7 +91,7 @@ struct SurfaceReached {
   /// @param logger a logger instance
   template <typename propagator_state_t, typename stepper_t,
             typename navigator_t>
-  bool operator()(propagator_state_t& state, const stepper_t& stepper,
+  bool checkAbort(propagator_state_t& state, const stepper_t& stepper,
                   const navigator_t& navigator, const Logger& logger) const {
     if (surface == nullptr) {
       ACTS_VERBOSE("SurfaceReached aborter | Target surface not set.");
@@ -161,11 +161,9 @@ struct ForcedSurfaceReached : SurfaceReached {
       : SurfaceReached(std::numeric_limits<double>::lowest()) {}
 };
 
-/// This is the condition that the end of World has been reached
+/// This is the condition that the end of world has been reached
 /// it then triggers an propagation abort
 struct EndOfWorldReached {
-  EndOfWorldReached() = default;
-
   /// boolean operator for abort condition without using the result
   ///
   /// @tparam propagator_state_t Type of the propagator state
@@ -175,7 +173,7 @@ struct EndOfWorldReached {
   /// @param [in] navigator The navigator object
   template <typename propagator_state_t, typename stepper_t,
             typename navigator_t>
-  bool operator()(propagator_state_t& state, const stepper_t& /*stepper*/,
+  bool checkAbort(propagator_state_t& state, const stepper_t& /*stepper*/,
                   const navigator_t& navigator,
                   const Logger& /*logger*/) const {
     bool endOfWorld = navigator.endOfWorldReached(state.navigation);
@@ -183,11 +181,65 @@ struct EndOfWorldReached {
   }
 };
 
+/// This is the condition that the end of world has been reached
+/// it then triggers a propagation abort
+struct VolumeConstraintAborter {
+  /// boolean operator for abort condition without using the result
+  ///
+  /// @tparam propagator_state_t Type of the propagator state
+  /// @tparam navigator_t Type of the navigator
+  ///
+  /// @param [in,out] state The propagation state object
+  /// @param [in] navigator The navigator object
+  /// @param logger a logger instance
+  template <typename propagator_state_t, typename stepper_t,
+            typename navigator_t>
+  bool checkAbort(propagator_state_t& state, const stepper_t& /*stepper*/,
+                  const navigator_t& navigator, const Logger& logger) const {
+    const auto& constrainToVolumeIds = state.options.constrainToVolumeIds;
+    const auto& endOfWorldVolumeIds = state.options.endOfWorldVolumeIds;
+
+    if (constrainToVolumeIds.empty() && endOfWorldVolumeIds.empty()) {
+      return false;
+    }
+    const auto* currentVolume = navigator.currentVolume(state.navigation);
+
+    // We need a volume to check its ID
+    if (currentVolume == nullptr) {
+      return false;
+    }
+
+    const auto currentVolumeId =
+        static_cast<std::uint32_t>(currentVolume->geometryId().volume());
+
+    if (!constrainToVolumeIds.empty() &&
+        std::find(constrainToVolumeIds.begin(), constrainToVolumeIds.end(),
+                  currentVolumeId) == constrainToVolumeIds.end()) {
+      ACTS_VERBOSE(
+          "VolumeConstraintAborter aborter | Abort with volume constrain "
+          << currentVolumeId);
+      return true;
+    }
+
+    if (!endOfWorldVolumeIds.empty() &&
+        std::find(endOfWorldVolumeIds.begin(), endOfWorldVolumeIds.end(),
+                  currentVolumeId) != endOfWorldVolumeIds.end()) {
+      ACTS_VERBOSE(
+          "VolumeConstraintAborter aborter | Abort with additional end of "
+          "world volume "
+          << currentVolumeId);
+      return true;
+    }
+
+    return false;
+  }
+};
+
 /// Aborter that checks if the propagation has reached any surface
 struct AnySurfaceReached {
   template <typename propagator_state_t, typename stepper_t,
             typename navigator_t>
-  bool operator()(propagator_state_t& state, const stepper_t& stepper,
+  bool checkAbort(propagator_state_t& state, const stepper_t& stepper,
                   const navigator_t& navigator, const Logger& logger) const {
     (void)stepper;
     (void)logger;
diff --git a/Core/include/Acts/Propagator/StepperConcept.hpp b/Core/include/Acts/Propagator/StepperConcept.hpp
index b2b7a3fea11..d869b90b301 100644
--- a/Core/include/Acts/Propagator/StepperConcept.hpp
+++ b/Core/include/Acts/Propagator/StepperConcept.hpp
@@ -1,223 +1,133 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2019-2020 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
 #include "Acts/Definitions/Algebra.hpp"
+#include "Acts/Definitions/TrackParametrization.hpp"
 #include "Acts/EventData/TrackParameters.hpp"
 #include "Acts/EventData/detail/CorrectedTransformationFreeToBound.hpp"
 #include "Acts/Propagator/ConstrainedStep.hpp"
 #include "Acts/Surfaces/BoundaryTolerance.hpp"
 #include "Acts/Surfaces/Surface.hpp"
+#include "Acts/Utilities/Concepts.hpp"
 #include "Acts/Utilities/Intersection.hpp"
 #include "Acts/Utilities/Logger.hpp"
-#include "Acts/Utilities/TypeTraits.hpp"
 
 namespace Acts {
-class Surface;
-
-namespace Concepts::Stepper {
-
-template <typename T>
-using state_t = typename T::State;
-
-template <typename T>
-using jacobian_t = typename T::Jacobian;
-template <typename T>
-using covariance_t = typename T::Covariance;
-template <typename T>
-using bound_state_t = typename T::BoundState;
-template <typename T>
-using curvilinear_state_t = typename T::CurvilinearState;
-
-METHOD_TRAIT(reset_state_t, resetState);
-METHOD_TRAIT(get_field_t, getField);
-METHOD_TRAIT(position_t, position);
-METHOD_TRAIT(direction_t, direction);
-METHOD_TRAIT(qop_t, qOverP);
-METHOD_TRAIT(absolute_momentum_t, absoluteMomentum);
-METHOD_TRAIT(momentum_t, momentum);
-METHOD_TRAIT(charge_t, charge);
-METHOD_TRAIT(time_t, time);
-METHOD_TRAIT(bound_state_method_t, boundState);
-METHOD_TRAIT(curvilinear_state_method_t, curvilinearState);
-METHOD_TRAIT(update_t, update);
-METHOD_TRAIT(covariance_transport_bound_t, transportCovarianceToBound);
-METHOD_TRAIT(covariance_transport_curvilinear_t,
-             transportCovarianceToCurvilinear);
-METHOD_TRAIT(step_t, step);
-METHOD_TRAIT(update_surface_status_t, updateSurfaceStatus);
-METHOD_TRAIT(update_step_size_t, updateStepSize);
-METHOD_TRAIT(get_step_size_t, getStepSize);
-METHOD_TRAIT(release_step_size_t, releaseStepSize);
-METHOD_TRAIT(output_step_size_t, outputStepSize);
-
-template <typename T>
-using cov_transport_t = decltype(std::declval<T>().covTransport);
-template <typename T>
-using cov_t = decltype(std::declval<T>().cov);
-template <typename T>
-using path_accumulated_t = decltype(std::declval<T>().pathAccumulated);
-template <typename T>
-using step_size_t = decltype(std::declval<T>().stepSize);
-
-// clang-format off
-    template <typename S>
-    constexpr bool StepperStateConcept
-      = require<has_member<S, cov_transport_t, bool>,
-                has_member<S, cov_t, BoundSquareMatrix>,
-                has_member<S, path_accumulated_t, double>//,
-//                 has_member<S, step_size_t, ConstrainedStep>
-               >;
-// clang-format on
-
-// clang-format off
-template <typename S>
-constexpr bool MultiStepperStateConcept= require<
-  has_member<S, cov_transport_t, bool>,
-  has_member<S, path_accumulated_t, double>
->;
-// clang-format on
-
-// clang-format off
-    template <typename S, typename state = typename S::State>
-      struct CommonStepperConcept {
-        constexpr static bool state_exists = exists<state_t, S>;
-        static_assert(state_exists, "State type not found");
-        constexpr static bool jacobian_exists = exists<jacobian_t, S>;
-        static_assert(jacobian_exists, "Jacobian type not found");
-        constexpr static bool covariance_exists = exists<covariance_t, S>;
-        static_assert(covariance_exists, "Covariance type not found");
-        constexpr static bool bound_state_exists = exists<bound_state_t, S>;
-        static_assert(bound_state_exists, "BoundState type not found");
-        constexpr static bool curvilinear_state_exists = exists<curvilinear_state_t, S>;
-        static_assert(curvilinear_state_exists, "CurvilinearState type not found");
-        constexpr static bool reset_state_exists = has_method<const S, void, reset_state_t, state&, const BoundVector&, const BoundSquareMatrix&, const Surface&, const double>;
-        static_assert(reset_state_exists, "resetState method not found");
-        constexpr static bool position_exists = has_method<const S, Vector3, position_t, const state&>;
-        static_assert(position_exists, "position method not found");
-        constexpr static bool direction_exists = has_method<const S, Vector3, direction_t, const state&>;
-        static_assert(direction_exists, "direction method not found");
-        constexpr static bool qop_exists = has_method<const S, double, qop_t, const state&>;
-        static_assert(qop_exists, "qOverP method not found");
-        constexpr static bool absolute_momentum_exists = has_method<const S, double, absolute_momentum_t, const state&>;
-        static_assert(absolute_momentum_exists, "absoluteMomentum method not found");
-        constexpr static bool momentum_exists = has_method<const S, Vector3, momentum_t, const state&>;
-        static_assert(momentum_exists, "momentum method not found");
-        constexpr static bool charge_exists = has_method<const S, double, charge_t, const state&>;
-        static_assert(charge_exists, "charge method not found");
-        constexpr static bool time_exists = has_method<const S, double, time_t, const state&>;
-        static_assert(time_exists, "time method not found");
-        constexpr static bool bound_state_method_exists= has_method<const S, Result<typename S::BoundState>, bound_state_method_t, state&, const Surface&, bool, const FreeToBoundCorrection&>;
-        static_assert(bound_state_method_exists, "boundState method not found");
-        constexpr static bool curvilinear_state_method_exists = has_method<const S, typename S::CurvilinearState, curvilinear_state_method_t, state&, bool>;
-        static_assert(curvilinear_state_method_exists, "curvilinearState method not found");
-        constexpr static bool covariance_transport_exists = require<has_method<const S, void, covariance_transport_curvilinear_t, state&>,
-                                                                    has_method<const S, void, covariance_transport_bound_t, state&, const Surface&, const FreeToBoundCorrection&>>;
-        static_assert(covariance_transport_exists, "covarianceTransport method not found");
-        constexpr static bool update_surface_exists = has_method<const S, Intersection3D::Status, update_surface_status_t, state&, const Surface&, std::uint8_t, Direction, const BoundaryTolerance&, ActsScalar, const Logger&>;
-        static_assert(update_surface_exists, "updateSurfaceStatus method not found");
-        constexpr static bool update_step_size_exists = has_method<const S, void, update_step_size_t, state&, double, ConstrainedStep::Type, bool>;
-        static_assert(update_step_size_exists, "updateStepSize method not found");
-        constexpr static bool get_step_size_exists = has_method<const S, double, get_step_size_t, const state &, ConstrainedStep::Type>;
-        static_assert(get_step_size_exists, "getStepSize method not found");
-        constexpr static bool release_step_size_exists = has_method<const S, void, release_step_size_t, state&, ConstrainedStep::Type>;
-        static_assert(release_step_size_exists, "releaseStepSize method not found");
-        constexpr static bool output_step_size_exists = has_method<const S, std::string, output_step_size_t, const state&>;
-        static_assert(output_step_size_exists, "outputStepSize method not found");
-
-        constexpr static bool value = require<state_exists,
-                                              jacobian_exists,
-                                              covariance_exists,
-                                              bound_state_exists,
-                                              curvilinear_state_exists,
-                                              position_exists,
-                                              direction_exists,
-                                              qop_exists,
-                                              absolute_momentum_exists,
-                                              momentum_exists,
-                                              charge_exists,
-                                              time_exists,
-                                              bound_state_method_exists,
-                                              curvilinear_state_method_exists,
-                                              covariance_transport_exists,
-                                              update_surface_exists,
-                                              update_step_size_exists,
-                                              release_step_size_exists,
-                                              output_step_size_exists>;
-
+namespace Concepts {
+
+/// @brief Concept that is satisfied by both single- and multi-steppers.
+template <typename Stepper, typename State = typename Stepper::State>
+concept CommonStepper = requires {
+  typename Stepper::State;
+  typename Stepper::Jacobian;
+  typename Stepper::Covariance;
+  typename Stepper::BoundState;
+  typename Stepper::CurvilinearState;
+
+  requires requires(const Stepper& s, State& t) {
+    { s.transportCovarianceToCurvilinear(t) } -> std::same_as<void>;
+
+    requires requires(const BoundVector& bv, const BoundSquareMatrix& bm,
+                      const Surface& sf, const double d) {
+      { s.resetState(t, bv, bm, sf, d) } -> std::same_as<void>;
+    };
+
+    requires requires(const Surface& sf, bool b,
+                      const FreeToBoundCorrection& corr) {
+      {
+        s.boundState(t, sf, b, corr)
+      } -> std::same_as<Result<typename Stepper::BoundState>>;
+      { s.transportCovarianceToBound(t, sf, corr) } -> std::same_as<void>;
+    };
+
+    requires requires(bool b) {
+      {
+        s.curvilinearState(t, b)
+      } -> std::same_as<typename Stepper::CurvilinearState>;
+    };
+
+    requires requires(const Surface& sf, std::uint8_t ui, Direction d,
+                      const BoundaryTolerance& bt, ActsScalar sc,
+                      const Logger& l) {
+      { s.updateSurfaceStatus(t, sf, ui, d, bt, sc, l) };
+    };
+
+    requires requires(const ConstrainedStep::Type st) {
+      { s.releaseStepSize(t, st) } -> std::same_as<void>;
+
+      requires requires(double d, bool b) {
+        { s.updateStepSize(t, d, st, b) } -> std::same_as<void>;
+      };
+    };
+  };
+
+  requires requires(const Stepper& s, const State& t) {
+    { s.position(t) } -> std::same_as<Vector3>;
+    { s.direction(t) } -> std::same_as<Vector3>;
+    { s.qOverP(t) } -> std::same_as<double>;
+    { s.absoluteMomentum(t) } -> std::same_as<double>;
+    { s.momentum(t) } -> std::same_as<Vector3>;
+    { s.charge(t) } -> std::same_as<double>;
+    { s.time(t) } -> std::same_as<double>;
+    { s.outputStepSize(t) } -> std::same_as<std::string>;
+
+    requires requires(const ConstrainedStep::Type st) {
+      { s.getStepSize(t, st) } -> std::same_as<double>;
+    };
+  };
+};
+
+/// @brief Concept that is satisfied by single-steppers.
+template <typename Stepper, typename State = typename Stepper::State>
+concept SingleStepper =
+    CommonStepper<Stepper, State> && requires(const Stepper& s, State& t) {
+      requires requires(const FreeVector& fv, const BoundVector& bv,
+                        const BoundSquareMatrix& bm, const Surface& sf) {
+        { s.update(t, fv, bv, bm, sf) } -> std::same_as<void>;
       };
-// clang-format on
-
-// clang-format off
-    // NOTE This static_asserts in here must be commented out, since it would break the compilation for the MultiStepper
-    template <typename S, typename state = typename S::State>
-      struct SingleStepperConcept {
-        constexpr static bool common_stepper_concept_fullfilled = CommonStepperConcept<S, state>::value;
-        static_assert(common_stepper_concept_fullfilled, "Stepper does not fulfill common stepper concept");
-        constexpr static bool update_method_exists = require<has_method<const S, void, update_t, state&, const FreeVector&, const BoundVector&, const BoundSquareMatrix&, const Surface&>, has_method<const S, void, update_t, state&, const Vector3&, const Vector3&, double, double>>;
-        // static_assert(update_method_exists, "update method not found");
-        constexpr static bool get_field_exists = has_method<const S, Result<Vector3>, get_field_t, state&, const Vector3&>;
-        // static_assert(get_field_exists, "getField method not found");
-
-        constexpr static bool value = require<common_stepper_concept_fullfilled,
-                                              update_method_exists,
-                                              get_field_exists>;
+
+      requires requires(const Vector3& v1, const Vector3& v2, double d1,
+                        double d2) {
+        { s.update(t, v1, v2, d1, d2) } -> std::same_as<void>;
+        { s.getField(t, v1) } -> std::same_as<Result<Vector3>>;
       };
-// clang-format on
-
-// clang-format off
-    template <typename S, typename state = typename S::State>
-      struct MultiStepperConcept {
-        constexpr static bool common_stepper_concept_fullfilled = CommonStepperConcept<S, state>::value;
-        static_assert(common_stepper_concept_fullfilled, "Common stepper concept not fulfilled");
-
-        // TODO for now we do not check if the ComponentProxy does fulfill a concept
-        template <typename T> using component_proxy_t = typename T::ComponentProxy;
-        constexpr static bool component_proxy_exists = exists<component_proxy_t, S>;
-        // static_assert(component_proxy_exists, "!component_proxy_exists");
-
-        // TODO for now we do not check if the ConstComponentProxy does fulfill a concept
-        template <typename T> using const_component_proxy_t = typename T::ConstComponentProxy;
-        constexpr static bool const_component_proxy_exists = exists<const_component_proxy_t, S>;
-        // static_assert(const_component_proxy_exists, "!const_component_proxy_exists");
-
-        METHOD_TRAIT(number_components_t, numberComponents);
-        constexpr static bool number_components_exists = has_method<const S, std::size_t, number_components_t, const state&>;
-        // static_assert(number_components_exists, "!num_components_exists");
-
-        // TODO We cannot check addComponents since it is a template member function
-
-        METHOD_TRAIT(clear_components_t, clearComponents);
-        constexpr static bool clear_components_exists = has_method<const S, void, clear_components_t, state&>;
-        // static_assert(clear_components_exists, "!clear_components_exists");
-
-        METHOD_TRAIT(remove_missed_components_t, removeMissedComponents);
-        constexpr static bool remove_missed_components_exists = has_method<const S, void, remove_missed_components_t, state&>;
-        // static_assert(remove_missed_components_exists, "!remove_missed_components_exists");
-
-        constexpr static bool value = require<common_stepper_concept_fullfilled,
-                                              component_proxy_exists,
-                                              const_component_proxy_exists,
-                                              number_components_exists,
-                                              clear_components_exists,
-                                              remove_missed_components_exists>;
-        };
-// clang-format on
-
-}  // namespace Concepts::Stepper
-
-template <typename stepper, typename state = typename stepper::State>
-constexpr bool StepperConcept =
-    Acts::Concepts ::Stepper::SingleStepperConcept<stepper, state>::value ||
-    Acts::Concepts ::Stepper::MultiStepperConcept<stepper, state>::value;
-template <typename stepper>
-constexpr bool StepperStateConcept =
-    Acts::Concepts ::Stepper::StepperStateConcept<stepper> ||
-    Acts::Concepts ::Stepper::MultiStepperStateConcept<stepper>;
+    };
+
+/// @brief Concept that is satisfied by multi-steppers.
+template <typename Stepper, typename State = typename Stepper::State>
+concept MultiStepper = CommonStepper<Stepper, State> && requires {
+  // TODO for now we do not check if the ComponentProxy does fulfill a concept
+  typename Stepper::ComponentProxy;
+
+  // TODO for now we do not check if the ConstComponentProxy does fulfill a
+  // concept
+  typename Stepper::ConstComponentProxy;
+
+  requires requires(const Stepper& s, State& t) {
+    { s.numberComponents(t) } -> std::same_as<std::size_t>;
+    { s.clearComponents(t) } -> std::same_as<void>;
+    { s.removeMissedComponents(t) } -> std::same_as<void>;
+  };
+};
+}  // namespace Concepts
+
+/// @brief Concept that is satisfied by steppers.
+template <typename _Stepper, typename State = typename _Stepper::State>
+concept StepperConcept = Concepts::SingleStepper<_Stepper, State> ||
+                         Concepts::MultiStepper<_Stepper, State>;
+
+/// @brief Concept that is satisfied by stepper states.
+template <typename State>
+concept StepperStateConcept = requires(const State& t) {
+  { t.covTransport } -> Concepts::decayed_same_as<const bool&>;
+  { t.pathAccumulated } -> Concepts::decayed_same_as<const double&>;
+};
+
 }  // namespace Acts
diff --git a/Core/include/Acts/Propagator/StepperExtensionList.hpp b/Core/include/Acts/Propagator/StepperExtensionList.hpp
deleted file mode 100644
index 3454030dd5c..00000000000
--- a/Core/include/Acts/Propagator/StepperExtensionList.hpp
+++ /dev/null
@@ -1,232 +0,0 @@
-// This file is part of the Acts project.
-//
-// Copyright (C) 2021 CERN for the benefit of the Acts project
-//
-// This Source Code Form is subject to the terms of the Mozilla Public
-// License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-#pragma once
-
-#include "Acts/Definitions/Algebra.hpp"
-#include "Acts/Definitions/TrackParametrization.hpp"
-#include "Acts/Propagator/detail/Auctioneer.hpp"
-#include "Acts/Utilities/detail/Extendable.hpp"
-#include "Acts/Utilities/detail/MPL/all_of.hpp"
-#include "Acts/Utilities/detail/MPL/has_duplicates.hpp"
-
-#include <array>
-
-namespace Acts {
-
-/// @brief Container of extensions used in the stepper of the propagation. This
-/// struct allows a broadcast of function calls for each element in the list.
-/// The broadcasts occur for a certain function at each step in a specific
-/// order.
-/// The first function is an evaluater if an extension is or how many extensions
-/// are applicable for an upcoming step.
-/// The next functions called are the evaluations of the k_1 - k_4 or the RKN4
-/// integration.
-/// The last function call in a step is the finalize() method. This method is an
-/// overloaded function (optionally propagates the covariance).
-/// Each method has the possibility to break the evaluation of a given step if
-/// an extension reports that something went wrong (e.g. a particle lost too
-/// much momentum during the step)
-/// @tparam extensions Types of the extensions
-template <typename... extensions>
-struct StepperExtensionList : private detail::Extendable<extensions...> {
- private:
-  // Checkout for duplicates in the extensions
-  static_assert(!detail::has_duplicates_v<extensions...>,
-                "same extension type specified several times");
-
-  static constexpr unsigned int nExtensions = sizeof...(extensions);
-
-  static_assert(nExtensions != 0, "no extension type specified");
-
-  // Access to all extensions
-  using detail::Extendable<extensions...>::tuple;
-
-  // Vector of valid extensions for a step
-  std::array<bool, nExtensions> validExtensions{};
-
- public:
-  // Access to an extension
-  using detail::Extendable<extensions...>::get;
-
-  /// @brief Evaluation function to set valid extensions for an upcoming
-  /// integration step
-  ///
-  /// @tparam propagator_state_t Type of the state of the propagator
-  /// @tparam stepper_t Type of the stepper
-  /// @tparam navigtor_t Type of the navigator
-  ///
-  /// @param [in] state State of the propagator
-  /// @param [in] stepper Stepper of the propagation
-  /// @param [in] navigator Navigator of the propagation
-  template <typename propagator_state_t, typename stepper_t,
-            typename navigtor_t>
-  bool validExtensionForStep(const propagator_state_t& state,
-                             const stepper_t& stepper,
-                             const navigtor_t& navigator) {
-    const auto bids = std::apply(
-        [&](const auto&... ext) {
-          return std::array<int, nExtensions>{
-              ext.bid(state, stepper, navigator)...};
-        },
-        tuple());
-
-    validExtensions = state.stepping.auctioneer(std::move(bids));
-
-    return (std::find(validExtensions.begin(), validExtensions.end(), true) !=
-            validExtensions.end());
-  }
-
-  /// @brief This functions broadcasts the call for evaluating a generic k. It
-  /// collects all arguments and extensions, test their validity for the
-  /// evaluation and passes them forward for evaluation and returns a boolean as
-  /// indicator if the evaluation is valid.
-  template <typename propagator_state_t, typename stepper_t,
-            typename navigator_t>
-  bool k(const propagator_state_t& state, const stepper_t& stepper,
-         const navigator_t& navigator, Vector3& knew, const Vector3& bField,
-         std::array<double, 4>& kQoP, const int i, const double h = 0.,
-         const Vector3& kprev = Vector3::Zero()) {
-    // TODO replace with integer-templated lambda with C++20
-    auto impl = [&, i, h](auto intType, auto& implRef) {
-      constexpr int N = decltype(intType)::value;
-
-      if constexpr (N == 0) {
-        return true;
-      } else {
-        // If element is invalid: continue
-        if (!std::get<N - 1>(validExtensions)) {
-          return implRef(std::integral_constant<int, N - 1>{}, implRef);
-        }
-        // Continue as long as evaluations are 'true'
-        if (std::get<N - 1>(this->tuple())
-                .template k(state, stepper, navigator, knew, bField, kQoP, i, h,
-                            kprev)) {
-          return implRef(std::integral_constant<int, N - 1>{}, implRef);
-        } else {
-          // Break at false
-          return false;
-        }
-      }
-    };
-
-    return impl(std::integral_constant<int, nExtensions>{}, impl);
-  }
-
-  /// @brief This functions broadcasts the call for evaluating k1. It collects
-  /// all arguments and extensions, test their validity for the evaluation and
-  /// passes them forward for evaluation and returns a boolean as indicator if
-  /// the evaluation is valid.
-  template <typename propagator_state_t, typename stepper_t,
-            typename navigator_t>
-  bool k1(const propagator_state_t& state, const stepper_t& stepper,
-          const navigator_t& navigator, Vector3& knew, const Vector3& bField,
-          std::array<double, 4>& kQoP) {
-    return k(state, stepper, navigator, knew, bField, kQoP, 0);
-  }
-
-  /// @brief This functions broadcasts the call for evaluating k2. It collects
-  /// all arguments and extensions and passes them forward for evaluation and
-  /// returns a boolean as indicator if the evaluation is valid.
-  template <typename propagator_state_t, typename stepper_t,
-            typename navigator_t>
-  bool k2(const propagator_state_t& state, const stepper_t& stepper,
-          const navigator_t& navigator, Vector3& knew, const Vector3& bField,
-          std::array<double, 4>& kQoP, const double h, const Vector3& kprev) {
-    return k(state, stepper, navigator, knew, bField, kQoP, 1, h, kprev);
-  }
-
-  /// @brief This functions broadcasts the call for evaluating k3. It collects
-  /// all arguments and extensions and passes them forward for evaluation and
-  /// returns a boolean as indicator if the evaluation is valid.
-  template <typename propagator_state_t, typename stepper_t,
-            typename navigator_t>
-  bool k3(const propagator_state_t& state, const stepper_t& stepper,
-          const navigator_t& navigator, Vector3& knew, const Vector3& bField,
-          std::array<double, 4>& kQoP, const double h, const Vector3& kprev) {
-    return k(state, stepper, navigator, knew, bField, kQoP, 2, h, kprev);
-  }
-
-  /// @brief This functions broadcasts the call for evaluating k4. It collects
-  /// all arguments and extensions and passes them forward for evaluation and
-  /// returns a boolean as indicator if the evaluation is valid.
-  template <typename propagator_state_t, typename stepper_t,
-            typename navigator_t>
-  bool k4(const propagator_state_t& state, const stepper_t& stepper,
-          const navigator_t& navigator, Vector3& knew, const Vector3& bField,
-          std::array<double, 4>& kQoP, const double h, const Vector3& kprev) {
-    return k(state, stepper, navigator, knew, bField, kQoP, 3, h, kprev);
-  }
-
-  /// @brief This functions broadcasts the call of the method finalize(). It
-  /// collects all extensions and arguments and passes them forward for
-  /// evaluation and returns a boolean.
-  template <typename propagator_state_t, typename stepper_t,
-            typename navigator_t>
-  bool finalize(propagator_state_t& state, const stepper_t& stepper,
-                const navigator_t& navigator, const double h, FreeMatrix& D) {
-    // TODO replace with integer-templated lambda with C++20
-    auto impl = [&, h](auto intType, auto& implRef) {
-      constexpr int N = decltype(intType)::value;
-
-      if constexpr (N == 0) {
-        return true;
-      } else {
-        // If element is invalid: continue
-        if (!std::get<N - 1>(validExtensions)) {
-          return implRef(std::integral_constant<int, N - 1>{}, implRef);
-        }
-        // Continue as long as evaluations are 'true'
-        if (std::get<N - 1>(this->tuple())
-                .finalize(state, stepper, navigator, h, D)) {
-          return implRef(std::integral_constant<int, N - 1>{}, implRef);
-        } else {
-          // Break at false
-          return false;
-        }
-      }
-    };
-
-    return impl(std::integral_constant<int, nExtensions>{}, impl);
-  }
-
-  /// @brief This functions broadcasts the call of the method finalize(). It
-  /// collects all extensions and arguments and passes them forward for
-  /// evaluation and returns a boolean.
-  template <typename propagator_state_t, typename stepper_t,
-            typename navigator_t>
-  bool finalize(propagator_state_t& state, const stepper_t& stepper,
-                const navigator_t& navigator, const double h) {
-    // TODO replace with integer-templated lambda with C++20
-    auto impl = [&, h](auto intType, auto& implRef) {
-      constexpr int N = decltype(intType)::value;
-
-      if constexpr (N == 0) {
-        return true;
-      } else {
-        // If element is invalid: continue
-        if (!std::get<N - 1>(validExtensions)) {
-          return implRef(std::integral_constant<int, N - 1>{}, implRef);
-        }
-
-        // Continue as long as evaluations are 'true'
-        if (std::get<N - 1>(this->tuple())
-                .finalize(state, stepper, navigator, h)) {
-          return implRef(std::integral_constant<int, N - 1>{}, implRef);
-        } else {
-          // Break at false
-          return false;
-        }
-      }
-    };
-
-    return impl(std::integral_constant<int, nExtensions>{}, impl);
-  }
-};
-
-}  // namespace Acts
diff --git a/Core/include/Acts/Propagator/StepperOptions.hpp b/Core/include/Acts/Propagator/StepperOptions.hpp
index 0d4bbc9346e..8d81d6c3a2b 100644
--- a/Core/include/Acts/Propagator/StepperOptions.hpp
+++ b/Core/include/Acts/Propagator/StepperOptions.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2024 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
diff --git a/Core/include/Acts/Propagator/StraightLineStepper.hpp b/Core/include/Acts/Propagator/StraightLineStepper.hpp
index 1e6879676d2..8ba0d72fe81 100644
--- a/Core/include/Acts/Propagator/StraightLineStepper.hpp
+++ b/Core/include/Acts/Propagator/StraightLineStepper.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2016-2020 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
@@ -28,6 +28,7 @@
 #include "Acts/Surfaces/Surface.hpp"
 #include "Acts/Utilities/Intersection.hpp"
 #include "Acts/Utilities/Logger.hpp"
+#include "Acts/Utilities/MathHelpers.hpp"
 #include "Acts/Utilities/Result.hpp"
 
 #include <algorithm>
@@ -336,8 +337,8 @@ class StraightLineStepper {
           direction(prop_state.stepping);
       // dt / ds
       prop_state.stepping.derivative(eFreeTime) =
-          std::hypot(1., prop_state.stepping.particleHypothesis.mass() /
-                             absoluteMomentum(prop_state.stepping));
+          fastHypot(1., prop_state.stepping.particleHypothesis.mass() /
+                            absoluteMomentum(prop_state.stepping));
       // d (dr/ds) / ds : == 0
       prop_state.stepping.derivative.template segment<3>(4) =
           Acts::Vector3::Zero().transpose();
@@ -424,7 +425,7 @@ class StraightLineStepper {
     const auto m = state.stepping.particleHypothesis.mass();
     const auto p = absoluteMomentum(state.stepping);
     // time propagates along distance as 1/b = sqrt(1 + m²/p²)
-    const auto dtds = std::hypot(1., m / p);
+    const auto dtds = fastHypot(1., m / p);
     // Update the track parameters according to the equations of motion
     Vector3 dir = direction(state.stepping);
     state.stepping.pars.template segment<3>(eFreePos0) += h * dir;
diff --git a/Core/include/Acts/Propagator/SurfaceCollector.hpp b/Core/include/Acts/Propagator/SurfaceCollector.hpp
index 4f996019233..9d5afa9b226 100644
--- a/Core/include/Acts/Propagator/SurfaceCollector.hpp
+++ b/Core/include/Acts/Propagator/SurfaceCollector.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2016-2018 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
@@ -92,9 +92,9 @@ struct SurfaceCollector {
   /// @param logger a logger instance
   template <typename propagator_state_t, typename stepper_t,
             typename navigator_t>
-  void operator()(propagator_state_t& state, const stepper_t& stepper,
-                  const navigator_t& navigator, result_type& result,
-                  const Logger& logger) const {
+  void act(propagator_state_t& state, const stepper_t& stepper,
+           const navigator_t& navigator, result_type& result,
+           const Logger& logger) const {
     if (state.stage == PropagatorStage::postPropagation) {
       return;
     }
diff --git a/Core/include/Acts/Propagator/SympyStepper.hpp b/Core/include/Acts/Propagator/SympyStepper.hpp
index b981d39aa95..1e771a53ba7 100644
--- a/Core/include/Acts/Propagator/SympyStepper.hpp
+++ b/Core/include/Acts/Propagator/SympyStepper.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2024 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
diff --git a/Core/include/Acts/Propagator/SympyStepper.ipp b/Core/include/Acts/Propagator/SympyStepper.ipp
index 42714f4cdbb..30e91427026 100644
--- a/Core/include/Acts/Propagator/SympyStepper.ipp
+++ b/Core/include/Acts/Propagator/SympyStepper.ipp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2024 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include "Acts/Propagator/EigenStepperError.hpp"
 
diff --git a/Core/include/Acts/Propagator/TryAllNavigator.hpp b/Core/include/Acts/Propagator/TryAllNavigator.hpp
index f50e9e14b6a..693f46f605c 100644
--- a/Core/include/Acts/Propagator/TryAllNavigator.hpp
+++ b/Core/include/Acts/Propagator/TryAllNavigator.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2023-2024 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
@@ -101,8 +101,6 @@ class TryAllNavigatorBase {
       : m_cfg(std::move(cfg)), m_logger{std::move(_logger)} {}
 
   State makeState(const Options& options) const {
-    assert(options.startSurface != nullptr && "Start surface must be set");
-
     State state(options);
     state.startSurface = options.startSurface;
     state.targetSurface = options.targetSurface;
@@ -359,8 +357,8 @@ class TryAllNavigator : public TryAllNavigatorBase {
       }
     }
 
-    std::sort(intersectionCandidates.begin(), intersectionCandidates.end(),
-              detail::IntersectionCandidate::forwardOrder);
+    std::ranges::sort(intersectionCandidates,
+                      detail::IntersectionCandidate::forwardOrder);
 
     ACTS_VERBOSE(volInfo(state) << "found " << intersectionCandidates.size()
                                 << " intersections");
@@ -595,8 +593,6 @@ class TryAllOverstepNavigator : public TryAllNavigatorBase {
       : TryAllNavigatorBase(std::move(cfg), std::move(logger)) {}
 
   State makeState(const Options& options) const {
-    assert(options.startSurface != nullptr && "Start surface must be set");
-
     State state(options);
     state.startSurface = options.startSurface;
     state.targetSurface = options.targetSurface;
@@ -774,9 +770,8 @@ class TryAllOverstepNavigator : public TryAllNavigatorBase {
         }
       }
 
-      std::sort(state.navigation.activeCandidates.begin(),
-                state.navigation.activeCandidates.end(),
-                detail::IntersectionCandidate::forwardOrder);
+      std::ranges::sort(state.navigation.activeCandidates,
+                        detail::IntersectionCandidate::forwardOrder);
 
       state.navigation.activeCandidateIndex = 0;
 
diff --git a/Core/include/Acts/Propagator/VoidNavigator.hpp b/Core/include/Acts/Propagator/VoidNavigator.hpp
index ac4e7d9263b..f3074717f3e 100644
--- a/Core/include/Acts/Propagator/VoidNavigator.hpp
+++ b/Core/include/Acts/Propagator/VoidNavigator.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2018-2024 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
diff --git a/Core/include/Acts/Propagator/VolumeCollector.hpp b/Core/include/Acts/Propagator/VolumeCollector.hpp
index de503b8d58d..5163b71bab7 100644
--- a/Core/include/Acts/Propagator/VolumeCollector.hpp
+++ b/Core/include/Acts/Propagator/VolumeCollector.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2016-2018 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
@@ -91,9 +91,9 @@ struct VolumeCollector {
   /// @param logger the logger object
   template <typename propagator_state_t, typename stepper_t,
             typename navigator_t>
-  void operator()(propagator_state_t& state, const stepper_t& stepper,
-                  const navigator_t& navigator, result_type& result,
-                  const Logger& logger) const {
+  void act(propagator_state_t& state, const stepper_t& stepper,
+           const navigator_t& navigator, result_type& result,
+           const Logger& logger) const {
     auto currentVolume = navigator.currentVolume(state.navigation);
 
     // The current volume has been assigned by the navigator
diff --git a/Core/include/Acts/Propagator/detail/Auctioneer.hpp b/Core/include/Acts/Propagator/detail/Auctioneer.hpp
deleted file mode 100644
index e086526d327..00000000000
--- a/Core/include/Acts/Propagator/detail/Auctioneer.hpp
+++ /dev/null
@@ -1,108 +0,0 @@
-// This file is part of the Acts project.
-//
-// Copyright (C) 2016-2018 CERN for the benefit of the Acts project
-//
-// This Source Code Form is subject to the terms of the Mozilla Public
-// License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-#pragma once
-
-#include <algorithm>
-#include <array>
-
-namespace Acts::detail {
-/// The StepperExtensionList allows to add an arbitrary number of step
-/// evaluation algorithms for the RKN4 evaluation. These can be categorised in
-/// two general types:
-/// a) Step evaluation that should not be evaluated along with other
-/// extensions, or at least would overwrite partial results. This means that
-/// in the best case unnecessary/redundant calculation would be performed, in
-/// the worst case the evaluation would go wrong.
-/// b) The step evaluation remains untouched and only further calculations are
-/// performed (like additional features or data gathering) that can be treated
-/// as independent of the basic step evaluation in type a). These types can be
-/// added but do not require special treatment in order to not ruin the step
-/// evaluation.
-/// The concept of the auctioneers aims in the first place to judge which
-/// extension of category a) is the one to go. Although every extension can
-/// judge if it is valid based on the data given from the state of stepper,
-/// multiple extensions from type a) could fulfill their dependencies. Since
-/// an extension does not know about other extensions, the decision for the
-/// best extension for the step can only be estimated on a global scope. This
-/// is the job of the auctioneers.
-///
-/// TODO: An anticipation of an optimal concept of the input (and maybe also
-/// the output) of the call operator of an auctioneer cannot be performed at
-/// the current stage. At the current stage, a real bid-system would be pure
-/// guessing.
-
-/// @brief Auctioneer that takes all extensions as valid that make a valid bid
-struct VoidAuctioneer {
-  /// @brief Default constructor
-  VoidAuctioneer() = default;
-
-  /// @brief Call operator that returns the list of valid candidates as valids
-  ///
-  /// @param [in] vCandidates Candidates that are treated as valid extensions
-  /// @return The to vCandidates identical list of valid extensions
-  template <long unsigned int N>
-  std::array<bool, N> operator()(std::array<int, N> vCandidates) const {
-    std::array<bool, N> valids{};
-
-    for (unsigned int i = 0; i < vCandidates.size(); i++) {
-      valids[i] = (vCandidates[i] > 0) ? true : false;
-    }
-    return valids;
-  }
-};
-
-/// @brief Auctioneer that states only the first one that makes a valid bid
-struct FirstValidAuctioneer {
-  /// @brief Default constructor
-  FirstValidAuctioneer() = default;
-
-  /// @brief Call operator that states the first valid extension as the only
-  /// valid extension
-  ///
-  /// @param [in] vCandidates Candidates for a valid extension
-  /// @return List with at most one valid extension
-  template <long unsigned int N>
-  std::array<bool, N> operator()(std::array<int, N> vCandidates) const {
-    std::array<bool, N> valids = {};
-
-    for (unsigned int i = 0; i < vCandidates.size(); i++) {
-      if (vCandidates[i] > 0) {
-        valids[i] = true;
-        return valids;
-      }
-    }
-    return valids;
-  }
-};
-
-/// @brief Auctioneer that makes only the highest bidding extension valid. If
-/// multiple elements have the same int, the first one with this value is
-/// picked.
-struct HighestValidAuctioneer {
-  /// @brief Default constructor
-  HighestValidAuctioneer() = default;
-
-  /// @brief Call operator that states the highest bidding extension as the
-  /// only
-  /// valid extension
-  ///
-  /// @param [in] vCandidates Candidates for a valid extension
-  /// @return List with at most one valid extension
-  template <long unsigned int N>
-  std::array<bool, N> operator()(std::array<int, N> vCandidates) const {
-    std::array<bool, N> valids = {};
-
-    auto highscore = std::max_element(vCandidates.begin(), vCandidates.end());
-    valids.at(std::distance(vCandidates.begin(), highscore)) = true;
-
-    return valids;
-  }
-};
-
-}  // namespace Acts::detail
diff --git a/Core/include/Acts/Propagator/detail/CovarianceEngine.hpp b/Core/include/Acts/Propagator/detail/CovarianceEngine.hpp
index 1509402a04b..9af7086f063 100644
--- a/Core/include/Acts/Propagator/detail/CovarianceEngine.hpp
+++ b/Core/include/Acts/Propagator/detail/CovarianceEngine.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2019-2020 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
diff --git a/Core/include/Acts/Propagator/detail/JacobianEngine.hpp b/Core/include/Acts/Propagator/detail/JacobianEngine.hpp
index f44f6ea0a98..a5dae1cf5ea 100644
--- a/Core/include/Acts/Propagator/detail/JacobianEngine.hpp
+++ b/Core/include/Acts/Propagator/detail/JacobianEngine.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2021 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
diff --git a/Core/include/Acts/Propagator/detail/LoopProtection.hpp b/Core/include/Acts/Propagator/detail/LoopProtection.hpp
index 1dd334a59a4..62c7e363423 100644
--- a/Core/include/Acts/Propagator/detail/LoopProtection.hpp
+++ b/Core/include/Acts/Propagator/detail/LoopProtection.hpp
@@ -1,16 +1,18 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2018 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
 #include "Acts/Definitions/Algebra.hpp"
 #include "Acts/Utilities/Logger.hpp"
 
+#include <numbers>
+
 namespace Acts::detail {
 
 /// Estimate the loop protection limit
@@ -46,7 +48,8 @@ void setupLoopProtection(propagator_state_t& state, const stepper_t& stepper,
   // Transverse component at start is taken for the loop protection
   const double p = stepper.absoluteMomentum(state.stepping);
   // Calculate the full helix path
-  const double helixPath = state.options.direction * 2 * M_PI * p / B;
+  const double helixPath =
+      state.options.direction * 2 * std::numbers::pi * p / B;
   // And set it as the loop limit if it overwrites the internal limit
   const double loopLimit = state.options.loopFraction * helixPath;
   const double previousLimit = pathAborter.internalLimit;
diff --git a/Core/include/Acts/Propagator/detail/LoopStepperUtils.hpp b/Core/include/Acts/Propagator/detail/LoopStepperUtils.hpp
index 55925db5e0b..199bc5d0113 100644
--- a/Core/include/Acts/Propagator/detail/LoopStepperUtils.hpp
+++ b/Core/include/Acts/Propagator/detail/LoopStepperUtils.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2023 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
diff --git a/Core/include/Acts/Propagator/detail/NavigationHelpers.hpp b/Core/include/Acts/Propagator/detail/NavigationHelpers.hpp
index eed67d053eb..16e8c089e4f 100644
--- a/Core/include/Acts/Propagator/detail/NavigationHelpers.hpp
+++ b/Core/include/Acts/Propagator/detail/NavigationHelpers.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2023-2024 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
diff --git a/Core/include/Acts/Propagator/detail/ParameterTraits.hpp b/Core/include/Acts/Propagator/detail/ParameterTraits.hpp
index 33cfaa681f0..5bf9c5bde8e 100644
--- a/Core/include/Acts/Propagator/detail/ParameterTraits.hpp
+++ b/Core/include/Acts/Propagator/detail/ParameterTraits.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2023 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
diff --git a/Core/include/Acts/Propagator/detail/PointwiseMaterialInteraction.hpp b/Core/include/Acts/Propagator/detail/PointwiseMaterialInteraction.hpp
index e3c32247b64..8cf1d6b25f9 100644
--- a/Core/include/Acts/Propagator/detail/PointwiseMaterialInteraction.hpp
+++ b/Core/include/Acts/Propagator/detail/PointwiseMaterialInteraction.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2019 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
@@ -17,6 +17,7 @@
 #include "Acts/Material/ISurfaceMaterial.hpp"
 #include "Acts/Material/MaterialSlab.hpp"
 #include "Acts/Surfaces/Surface.hpp"
+#include "Acts/Utilities/MathHelpers.hpp"
 
 #include <algorithm>
 #include <cmath>
@@ -50,7 +51,7 @@ struct PointwiseMaterialInteraction {
   const Direction navDir;
 
   /// The effective, passed material properties including the path correction.
-  MaterialSlab slab;
+  MaterialSlab slab = MaterialSlab(0.);
   /// The path correction factor due to non-zero incidence on the surface.
   double pathCorrection = 0.;
   /// Expected phi variance due to the interactions.
@@ -89,6 +90,7 @@ struct PointwiseMaterialInteraction {
         navDir(state.options.direction) {}
 
   /// @brief This function evaluates the material properties to interact with
+  /// This updates the slab and then returns, if the resulting slab is valid
   ///
   /// @tparam propagator_state_t Type of the propagator state
   /// @tparam navigator_t Type of the navigator
@@ -119,8 +121,8 @@ struct PointwiseMaterialInteraction {
     pathCorrection = surface->pathCorrection(state.geoContext, pos, dir);
     slab.scaleThickness(pathCorrection);
 
-    // Get the surface material & properties from them
-    return slab;
+    // Check if the evaluated material is valid
+    return slab.isValid();
   }
 
   /// @brief This function evaluate the material effects
@@ -145,7 +147,7 @@ struct PointwiseMaterialInteraction {
     const auto& particleHypothesis = stepper.particleHypothesis(state.stepping);
     // in forward(backward) propagation, energy decreases(increases) and
     // variances increase(decrease)
-    const auto nextE = std::hypot(mass, momentum) - Eloss * navDir;
+    const auto nextE = fastHypot(mass, momentum) - Eloss * navDir;
     // put particle at rest if energy loss is too large
     nextP = (mass < nextE) ? std::sqrt(nextE * nextE - mass * mass) : 0;
     // minimum momentum below which we will not push particles via material
diff --git a/Core/include/Acts/Propagator/detail/SteppingHelper.hpp b/Core/include/Acts/Propagator/detail/SteppingHelper.hpp
index c9cd876b1f4..8bc4027286b 100644
--- a/Core/include/Acts/Propagator/detail/SteppingHelper.hpp
+++ b/Core/include/Acts/Propagator/detail/SteppingHelper.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2019 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
diff --git a/Core/include/Acts/Propagator/detail/SteppingLogger.hpp b/Core/include/Acts/Propagator/detail/SteppingLogger.hpp
index 42e909f4788..ffdfcb84500 100644
--- a/Core/include/Acts/Propagator/detail/SteppingLogger.hpp
+++ b/Core/include/Acts/Propagator/detail/SteppingLogger.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2016-2018 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
@@ -68,9 +68,9 @@ struct SteppingLogger {
   /// @param [in,out] result is the mutable result object
   template <typename propagator_state_t, typename stepper_t,
             typename navigator_t>
-  void operator()(propagator_state_t& state, const stepper_t& stepper,
-                  const navigator_t& navigator, result_type& result,
-                  const Logger& /*logger*/) const {
+  void act(propagator_state_t& state, const stepper_t& stepper,
+           const navigator_t& navigator, result_type& result,
+           const Logger& /*logger*/) const {
     // Don't log if you have reached the target or are sterile
     if (sterile || state.stage == PropagatorStage::postPropagation) {
       return;
diff --git a/Core/include/Acts/Propagator/detail/SympyCovarianceEngine.hpp b/Core/include/Acts/Propagator/detail/SympyCovarianceEngine.hpp
index 78a1732120a..3d06a683c61 100644
--- a/Core/include/Acts/Propagator/detail/SympyCovarianceEngine.hpp
+++ b/Core/include/Acts/Propagator/detail/SympyCovarianceEngine.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2024 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
diff --git a/Core/include/Acts/Propagator/detail/SympyJacobianEngine.hpp b/Core/include/Acts/Propagator/detail/SympyJacobianEngine.hpp
index 19f62751a5d..dadc63f0f76 100644
--- a/Core/include/Acts/Propagator/detail/SympyJacobianEngine.hpp
+++ b/Core/include/Acts/Propagator/detail/SympyJacobianEngine.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2024 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
diff --git a/Core/include/Acts/Propagator/detail/VolumeMaterialInteraction.hpp b/Core/include/Acts/Propagator/detail/VolumeMaterialInteraction.hpp
index 8fd72f38aa8..9b4cf634e45 100644
--- a/Core/include/Acts/Propagator/detail/VolumeMaterialInteraction.hpp
+++ b/Core/include/Acts/Propagator/detail/VolumeMaterialInteraction.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2019-2020 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
@@ -119,7 +119,7 @@ struct VolumeMaterialInteraction {
     } else {
       slab = MaterialSlab();
     }
-    return slab;
+    return slab.isValid();
   }
 };
 
diff --git a/Core/include/Acts/Propagator/detail/abort_list_implementation.hpp b/Core/include/Acts/Propagator/detail/abort_list_implementation.hpp
deleted file mode 100644
index 5c4a7d5b959..00000000000
--- a/Core/include/Acts/Propagator/detail/abort_list_implementation.hpp
+++ /dev/null
@@ -1,108 +0,0 @@
-// This file is part of the Acts project.
-//
-// Copyright (C) 2018 CERN for the benefit of the Acts project
-//
-// This Source Code Form is subject to the terms of the Mozilla Public
-// License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-#pragma once
-
-#include "Acts/Utilities/detail/MPL/type_collector.hpp"
-
-#include <utility>
-
-namespace Acts::detail {
-
-namespace {
-
-/// This is the caller used if the aborter uses the result and that result type
-/// exists
-template <bool has_result = true>
-struct abort_checker {
-  template <typename aborter_t, typename propagator_state_t, typename stepper_t,
-            typename navigator_t, typename... Args>
-  static bool check(const aborter_t& aborter, propagator_state_t& state,
-                    const stepper_t& stepper, const navigator_t& navigator,
-                    Args&&... args) {
-    using action_type = action_type_t<aborter_t>;
-    using result_type = result_type_t<action_type>;
-
-    return aborter(state, stepper, navigator, state.template get<result_type>(),
-                   std::forward<Args>(args)...);
-  }
-};
-
-/// This is the caller used if the aborter only uses the cache it has no access
-/// to the result
-template <>
-struct abort_checker<false> {
-  template <typename aborter_t, typename propagator_state_t, typename stepper_t,
-            typename navigator_t, typename... Args>
-  static bool check(const aborter_t& aborter, propagator_state_t& state,
-                    const stepper_t& stepper, const navigator_t& navigator,
-                    Args&&... args) {
-    return aborter(state, stepper, navigator, std::forward<Args>(args)...);
-  }
-};
-}  // end of anonymous namespace
-
-template <typename... conditions>
-struct abort_list_impl;
-
-/// This is the check call on the a list of conditions it calls the apparent
-/// condition and broadcasts the call to the remaining ones
-template <typename first, typename... others>
-struct abort_list_impl<first, others...> {
-  template <typename T, typename propagator_state_t, typename stepper_t,
-            typename navigator_t, typename... Args>
-  static bool check(const T& aborters_tuple, propagator_state_t& state,
-                    const stepper_t& stepper, const navigator_t& navigator,
-                    Args&&... args) {
-    // get the right helper for calling the abort condition
-    constexpr bool has_result = has_action_type_v<first>;
-
-    // get the cache abort condition
-    const auto& this_aborter = std::get<first>(aborters_tuple);
-    // - check abort conditions recursively
-    // - make use of short-circuit evaluation
-    // -> skip remaining conditions if this abort condition evaluates to true
-
-    bool abort = abort_checker<has_result>::check(this_aborter, state, stepper,
-                                                  navigator, args...) ||
-                 abort_list_impl<others...>::check(aborters_tuple, state,
-                                                   stepper, navigator, args...);
-
-    return abort;
-  }
-};
-
-/// This is the check call on the a last of all conditions
-template <typename last>
-struct abort_list_impl<last> {
-  template <typename T, typename propagator_state_t, typename stepper_t,
-            typename navigator_t, typename... Args>
-  static bool check(const T& aborters_tuple, propagator_state_t& state,
-                    const stepper_t& stepper, const navigator_t& navigator,
-                    Args&&... args) {
-    // get the right helper for calling the abort condition
-    constexpr bool has_result = has_action_type_v<last>;
-    const auto& this_aborter = std::get<last>(aborters_tuple);
-    return abort_checker<has_result>::check(
-        this_aborter, state, stepper, navigator, std::forward<Args>(args)...);
-  }
-};
-
-/// This is the empty call list - never abort
-template <>
-struct abort_list_impl<> {
-  template <typename T, typename propagator_state_t, typename stepper_t,
-            typename navigator_t, typename... Args>
-  static bool check(const T& /*aborter_tuple*/, propagator_state_t& /*state*/,
-                    const stepper_t& /*stepper*/,
-                    const navigator_t& /*navigator*/, Args&&... /*args*/) {
-    return false;
-  }
-};
-
-}  // namespace Acts::detail
diff --git a/Core/include/Acts/Propagator/detail/action_list_implementation.hpp b/Core/include/Acts/Propagator/detail/action_list_implementation.hpp
deleted file mode 100644
index c58a62191cf..00000000000
--- a/Core/include/Acts/Propagator/detail/action_list_implementation.hpp
+++ /dev/null
@@ -1,96 +0,0 @@
-// This file is part of the Acts project.
-//
-// Copyright (C) 2018 CERN for the benefit of the Acts project
-//
-// This Source Code Form is subject to the terms of the Mozilla Public
-// License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-#pragma once
-
-#include "Acts/Utilities/detail/MPL/type_collector.hpp"
-
-#include <utility>
-
-namespace Acts::detail {
-
-namespace {
-
-/// The action caller struct, it's called with the the right result object,
-/// which is taken out from the result tuple
-template <bool has_result = true>
-struct action_caller {
-  template <typename actor_t, typename propagator_state_t, typename stepper_t,
-            typename navigator_t, typename... Args>
-  static void action(const actor_t& act, propagator_state_t& state,
-                     const stepper_t& stepper, const navigator_t& navigator,
-                     Args&&... args) {
-    act(state, stepper, navigator,
-        state.template get<detail::result_type_t<actor_t>>(),
-        std::forward<Args>(args)...);
-  }
-};
-
-/// The action caller struct, without result object
-template <>
-struct action_caller<false> {
-  template <typename actor_t, typename propagator_state_t, typename stepper_t,
-            typename navigator_t, typename... Args>
-  static void action(const actor_t& act, propagator_state_t& state,
-                     const stepper_t& stepper, const navigator_t& navigator,
-                     Args&&... args) {
-    act(state, stepper, navigator, std::forward<Args>(args)...);
-  }
-};
-}  // end of anonymous namespace
-
-/// The dummy list call implementation
-template <typename... actors>
-struct action_list_impl;
-
-/// The action list call implementation
-/// - it calls 'action' on the current entry of the tuple
-/// - then broadcasts the action call to the remaining tuple
-template <typename first, typename... others>
-struct action_list_impl<first, others...> {
-  template <typename T, typename propagator_state_t, typename stepper_t,
-            typename navigator_t, typename... Args>
-  static void action(const T& actors_tuple, propagator_state_t& state,
-                     const stepper_t& stepper, const navigator_t& navigator,
-                     Args&&... args) {
-    constexpr bool has_result = has_result_type_v<first>;
-    const auto& this_actor = std::get<first>(actors_tuple);
-    action_caller<has_result>::action(this_actor, state, stepper, navigator,
-                                      args...);
-    action_list_impl<others...>::action(actors_tuple, state, stepper, navigator,
-                                        args...);
-  }
-};
-
-/// The action list call implementation
-/// - it calls 'action' on the last entry of the tuple
-template <typename last>
-struct action_list_impl<last> {
-  template <typename T, typename propagator_state_t, typename stepper_t,
-            typename navigator_t, typename... Args>
-  static void action(const T& actors_tuple, propagator_state_t& state,
-                     const stepper_t& stepper, const navigator_t& navigator,
-                     Args&&... args) {
-    constexpr bool has_result = has_result_type_v<last>;
-    const auto& this_actor = std::get<last>(actors_tuple);
-    action_caller<has_result>::action(this_actor, state, stepper, navigator,
-                                      std::forward<Args>(args)...);
-  }
-};
-
-/// The empty action list call implementation
-template <>
-struct action_list_impl<> {
-  template <typename T, typename propagator_state_t, typename stepper_t,
-            typename navigator_t, typename... Args>
-  static void action(const T& /*actors_tuple*/, propagator_state_t& /*state*/,
-                     const stepper_t& /*stepper*/,
-                     const navigator_t& /*navigator*/, Args&&... /*args*/) {}
-};
-
-}  // namespace Acts::detail
diff --git a/Core/include/Acts/Propagator/detail/actor_list_implementation.hpp b/Core/include/Acts/Propagator/detail/actor_list_implementation.hpp
new file mode 100644
index 00000000000..e10e22d2fc9
--- /dev/null
+++ b/Core/include/Acts/Propagator/detail/actor_list_implementation.hpp
@@ -0,0 +1,103 @@
+// This file is part of the ACTS project.
+//
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
+//
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
+
+#pragma once
+
+#include "Acts/Propagator/ActorConcepts.hpp"
+
+#include <tuple>
+#include <utility>
+
+namespace Acts::detail {
+
+namespace {
+
+struct actor_caller {
+  template <typename actor_t, typename propagator_state_t, typename stepper_t,
+            typename navigator_t, typename... Args>
+  static void act(const actor_t& actor, propagator_state_t& state,
+                  const stepper_t& stepper, const navigator_t& navigator,
+                  Args&&... args)
+    requires(
+        Actor<actor_t, propagator_state_t, stepper_t, navigator_t, Args...>)
+  {
+    if constexpr (ActorHasActWithoutResult<actor_t, propagator_state_t,
+                                           stepper_t, navigator_t, Args...>) {
+      actor.act(state, stepper, navigator, std::forward<Args>(args)...);
+      return;
+    }
+
+    if constexpr (ActorHasActWithResult<actor_t, propagator_state_t, stepper_t,
+                                        navigator_t, Args...>) {
+      actor.act(state, stepper, navigator,
+                state.template get<typename actor_t::result_type>(),
+                std::forward<Args>(args)...);
+      return;
+    }
+  }
+
+  template <typename actor_t, typename propagator_state_t, typename stepper_t,
+            typename navigator_t, typename... Args>
+  static bool checkAbort(const actor_t& actor, propagator_state_t& state,
+                         const stepper_t& stepper, const navigator_t& navigator,
+                         Args&&... args)
+    requires(
+        Actor<actor_t, propagator_state_t, stepper_t, navigator_t, Args...>)
+  {
+    if constexpr (ActorHasAbortWithoutResult<actor_t, propagator_state_t,
+                                             stepper_t, navigator_t, Args...>) {
+      return actor.checkAbort(state, stepper, navigator,
+                              std::forward<Args>(args)...);
+    }
+
+    if constexpr (ActorHasAbortWithResult<actor_t, propagator_state_t,
+                                          stepper_t, navigator_t, Args...>) {
+      return actor.checkAbort(
+          state, stepper, navigator,
+          state.template get<typename actor_t::result_type>(),
+          std::forward<Args>(args)...);
+    }
+
+    return false;
+  }
+};
+
+}  // namespace
+
+template <typename... actors_t>
+struct actor_list_impl {
+  template <typename propagator_state_t, typename stepper_t,
+            typename navigator_t, typename... Args>
+  static void act(const std::tuple<actors_t...>& actor_tuple,
+                  propagator_state_t& state, const stepper_t& stepper,
+                  const navigator_t& navigator, Args&&... args) {
+    std::apply(
+        [&](const actors_t&... actor) {
+          (actor_caller::act(actor, state, stepper, navigator,
+                             std::forward<Args>(args)...),
+           ...);
+        },
+        actor_tuple);
+  }
+
+  template <typename propagator_state_t, typename stepper_t,
+            typename navigator_t, typename... Args>
+  static bool checkAbort(const std::tuple<actors_t...>& actor_tuple,
+                         propagator_state_t& state, const stepper_t& stepper,
+                         const navigator_t& navigator, Args&&... args) {
+    return std::apply(
+        [&](const actors_t&... actor) {
+          return (actor_caller::checkAbort(actor, state, stepper, navigator,
+                                           std::forward<Args>(args)...) ||
+                  ...);
+        },
+        actor_tuple);
+  }
+};
+
+}  // namespace Acts::detail
diff --git a/Core/include/Acts/Seeding/BinnedGroup.hpp b/Core/include/Acts/Seeding/BinnedGroup.hpp
index 8a44e634e8f..56f0729fe40 100644
--- a/Core/include/Acts/Seeding/BinnedGroup.hpp
+++ b/Core/include/Acts/Seeding/BinnedGroup.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2024 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
diff --git a/Core/include/Acts/Seeding/BinnedGroup.ipp b/Core/include/Acts/Seeding/BinnedGroup.ipp
index 8bc2ac10648..01012631c4f 100644
--- a/Core/include/Acts/Seeding/BinnedGroup.ipp
+++ b/Core/include/Acts/Seeding/BinnedGroup.ipp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2024 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 namespace Acts {
 
diff --git a/Core/include/Acts/Seeding/BinnedGroupIterator.hpp b/Core/include/Acts/Seeding/BinnedGroupIterator.hpp
index bdd23d442ff..d4599680d32 100644
--- a/Core/include/Acts/Seeding/BinnedGroupIterator.hpp
+++ b/Core/include/Acts/Seeding/BinnedGroupIterator.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2024 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
@@ -83,10 +83,6 @@ class BinnedGroupIterator {
   /// @param [in] other The BinnedGroupIterator we are comparing against this one
   /// @return The result of the comparison
   bool operator==(const BinnedGroupIterator<grid_t>& other) const;
-  /// @brief (In-)Equality operator
-  /// @param [in] other The BinnedGroupIterator we are comparing against this one
-  /// @return The result of the comparison
-  bool operator!=(const BinnedGroupIterator<grid_t>& other) const;
 
   /// @brief Increment the iterator by one (pre)
   /// @return The incremented iterator
diff --git a/Core/include/Acts/Seeding/BinnedGroupIterator.ipp b/Core/include/Acts/Seeding/BinnedGroupIterator.ipp
index c41444b1014..70cd691f5db 100644
--- a/Core/include/Acts/Seeding/BinnedGroupIterator.ipp
+++ b/Core/include/Acts/Seeding/BinnedGroupIterator.ipp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2024 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 // Binned SP Group Iterator
 
@@ -30,12 +30,6 @@ bool Acts::BinnedGroupIterator<grid_t>::operator==(
   return m_group.ptr == other.m_group.ptr && m_gridItr == other.m_gridItr;
 }
 
-template <typename grid_t>
-bool Acts::BinnedGroupIterator<grid_t>::operator!=(
-    const Acts::BinnedGroupIterator<grid_t>& other) const {
-  return !(*this == other);
-}
-
 template <typename grid_t>
 Acts::BinnedGroupIterator<grid_t>&
 Acts::BinnedGroupIterator<grid_t>::operator++() {
diff --git a/Core/include/Acts/Seeding/CandidatesForMiddleSp.hpp b/Core/include/Acts/Seeding/CandidatesForMiddleSp.hpp
index 9affac3af92..a559566120f 100644
--- a/Core/include/Acts/Seeding/CandidatesForMiddleSp.hpp
+++ b/Core/include/Acts/Seeding/CandidatesForMiddleSp.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2018-2022 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
diff --git a/Core/include/Acts/Seeding/CandidatesForMiddleSp.ipp b/Core/include/Acts/Seeding/CandidatesForMiddleSp.ipp
index 7fbaa006a59..fa8bff07631 100644
--- a/Core/include/Acts/Seeding/CandidatesForMiddleSp.ipp
+++ b/Core/include/Acts/Seeding/CandidatesForMiddleSp.ipp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2022 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 namespace Acts {
 
diff --git a/Core/include/Acts/Seeding/EstimateTrackParamsFromSeed.hpp b/Core/include/Acts/Seeding/EstimateTrackParamsFromSeed.hpp
index bd18d811672..f4f56946c84 100644
--- a/Core/include/Acts/Seeding/EstimateTrackParamsFromSeed.hpp
+++ b/Core/include/Acts/Seeding/EstimateTrackParamsFromSeed.hpp
@@ -1,126 +1,27 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2021 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
 #include "Acts/Definitions/TrackParametrization.hpp"
 #include "Acts/Definitions/Units.hpp"
 #include "Acts/Geometry/GeometryContext.hpp"
-#include "Acts/Seeding/Seed.hpp"
 #include "Acts/Surfaces/Surface.hpp"
 #include "Acts/Utilities/Logger.hpp"
+#include "Acts/Utilities/MathHelpers.hpp"
 
 #include <array>
 #include <cmath>
 #include <iostream>
 #include <iterator>
 #include <optional>
-#include <vector>
 
 namespace Acts {
-/// @todo:
-/// 1) Implement the simple Line and Circle fit based on Taubin Circle fit
-/// 2) Implement the simple Line and Parabola fit (from HPS reconstruction by
-/// Robert Johnson)
-
-/// Estimate the track parameters on the xy plane from at least three space
-/// points. It assumes the trajectory projection on the xy plane is a circle,
-/// i.e. the magnetic field is along global z-axis.
-///
-/// The method is based on V. Karimaki NIM A305 (1991) 187-191:
-/// https://doi.org/10.1016/0168-9002(91)90533-V
-/// - no weights are used in Karimaki's fit; d0 is the distance of the point of
-/// closest approach to the origin, 1/R is the curvature, phi is the angle of
-/// the direction propagation (counter clockwise as positive) at the point of
-/// cloest approach.
-///
-/// @tparam spacepoint_iterator_t The type of space point iterator
-///
-/// @param spBegin is the begin iterator for the space points
-/// @param spEnd is the end iterator for the space points
-/// @param logger A logger instance
-///
-/// @return optional bound track parameters with the estimated d0, phi and 1/R
-/// stored with the indices, eBoundLoc0, eBoundPhi and eBoundQOverP,
-/// respectively. The bound parameters with other indices are set to zero.
-template <typename spacepoint_iterator_t>
-std::optional<BoundVector> estimateTrackParamsFromSeed(
-    spacepoint_iterator_t spBegin, spacepoint_iterator_t spEnd,
-    const Logger& logger = getDummyLogger()) {
-  // Check the number of provided space points
-  std::size_t numSP = std::distance(spBegin, spEnd);
-  if (numSP < 3) {
-    ACTS_ERROR("At least three space points are required.");
-    return std::nullopt;
-  }
-
-  ActsScalar x2m = 0., xm = 0.;
-  ActsScalar xym = 0.;
-  ActsScalar y2m = 0., ym = 0.;
-  ActsScalar r2m = 0., r4m = 0.;
-  ActsScalar xr2m = 0., yr2m = 0.;
-
-  for (spacepoint_iterator_t it = spBegin; it != spEnd; it++) {
-    if (*it == nullptr) {
-      ACTS_ERROR("Empty space point found. This should not happen.");
-      return std::nullopt;
-    }
-    const auto& sp = *it;
-
-    ActsScalar x = sp->x();
-    ActsScalar y = sp->y();
-    ActsScalar r2 = x * x + y * y;
-    x2m += x * x;
-    xm += x;
-    xym += x * y;
-    y2m += y * y;
-    ym += y;
-    r2m += r2;
-    r4m += r2 * r2;
-    xr2m += x * r2;
-    yr2m += y * r2;
-    numSP++;
-  }
-  x2m = x2m / numSP;
-  xm = xm / numSP;
-  xym = xym / numSP;
-  y2m = y2m / numSP;
-  ym = ym / numSP;
-  r2m = r2m / numSP;
-  r4m = r4m / numSP;
-  xr2m = xr2m / numSP;
-  yr2m = yr2m / numSP;
-
-  ActsScalar Cxx = x2m - xm * xm;
-  ActsScalar Cxy = xym - xm * ym;
-  ActsScalar Cyy = y2m - ym * ym;
-  ActsScalar Cxr2 = xr2m - xm * r2m;
-  ActsScalar Cyr2 = yr2m - ym * r2m;
-  ActsScalar Cr2r2 = r4m - r2m * r2m;
-
-  ActsScalar q1 = Cr2r2 * Cxy - Cxr2 * Cyr2;
-  ActsScalar q2 = Cr2r2 * (Cxx - Cyy) - Cxr2 * Cxr2 + Cyr2 * Cyr2;
-
-  ActsScalar phi = 0.5 * std::atan(2 * q1 / q2);
-  ActsScalar k = (std::sin(phi) * Cxr2 - std::cos(phi) * Cyr2) * (1. / Cr2r2);
-  ActsScalar delta = -k * r2m + std::sin(phi) * xm - std::cos(phi) * ym;
-
-  ActsScalar rho = (2 * k) / (std::sqrt(1 - 4 * delta * k));
-  ActsScalar d0 = (2 * delta) / (1 + std::sqrt(1 - 4 * delta * k));
-
-  // Initialize the bound parameters vector
-  BoundVector params = BoundVector::Zero();
-  params[eBoundLoc0] = d0;
-  params[eBoundPhi] = phi;
-  params[eBoundQOverP] = rho;
-
-  return params;
-}
 
 /// Estimate the full track parameters from three space points
 ///
@@ -241,12 +142,11 @@ std::optional<BoundVector> estimateTrackParamsFromSeed(
   int sign = ia > 0 ? -1 : 1;
   const ActsScalar R = circleCenter.norm();
   ActsScalar invTanTheta =
-      local2.z() /
-      (2.f * R * std::asin(std::hypot(local2.x(), local2.y()) / (2.f * R)));
+      local2.z() / (2.f * R * std::asin(local2.head<2>().norm() / (2.f * R)));
   // The momentum direction in the new frame (the center of the circle has the
   // coordinate (-1.*A/(2*B), 1./(2*B)))
   ActsScalar A = -circleCenter(0) / circleCenter(1);
-  Vector3 transDirection(1., A, std::hypot(1, A) * invTanTheta);
+  Vector3 transDirection(1., A, fastHypot(1, A) * invTanTheta);
   // Transform it back to the original frame
   Vector3 direction = rotation * transDirection.normalized();
 
@@ -276,7 +176,7 @@ std::optional<BoundVector> estimateTrackParamsFromSeed(
   // momentum on the transverse plane of the new frame)
   ActsScalar qOverPt = sign * (UnitConstants::m) / (0.3 * bFieldInTesla * R);
   // The estimated q/p in [GeV/c]^-1
-  params[eBoundQOverP] = qOverPt / std::hypot(1., invTanTheta);
+  params[eBoundQOverP] = qOverPt / fastHypot(1., invTanTheta);
 
   if (params.hasNaN()) {
     ACTS_ERROR(
@@ -288,4 +188,41 @@ std::optional<BoundVector> estimateTrackParamsFromSeed(
   return params;
 }
 
+/// Configuration for the estimation of the covariance matrix of the track
+/// parameters with `estimateTrackParamCovariance`.
+struct EstimateTrackParamCovarianceConfig {
+  /// The initial sigmas for the track parameters
+  BoundVector initialSigmas = {1. * UnitConstants::mm,
+                               1. * UnitConstants::mm,
+                               1. * UnitConstants::degree,
+                               1. * UnitConstants::degree,
+                               1. * UnitConstants::e / UnitConstants::GeV,
+                               1. * UnitConstants::ns};
+
+  /// The initial relative uncertainty of the q/pt
+  double initialSigmaPtRel = 0.1;
+
+  /// The inflation factors for the variances of the track parameters
+  BoundVector initialVarInflation = {1., 1., 1., 1., 1., 1.};
+  /// The inflation factor for time uncertainty if the time parameter was not
+  /// estimated
+  double noTimeVarInflation = 100.;
+};
+
+/// Estimate the covariance matrix of the given track parameters based on the
+/// provided configuration. The assumption is that we can model the uncertainty
+/// of the track parameters as a diagonal matrix with the provided initial
+/// sigmas. The inflation factors are used to inflate the initial variances
+/// based on the provided configuration. The uncertainty of q/p is estimated
+/// based on the relative uncertainty of the q/pt and the theta uncertainty.
+///
+/// @param config is the configuration for the estimation
+/// @param params is the track parameters
+/// @param hasTime is true if the track parameters have time
+///
+/// @return the covariance matrix of the track parameters
+BoundMatrix estimateTrackParamCovariance(
+    const EstimateTrackParamCovarianceConfig& config, const BoundVector& params,
+    bool hasTime);
+
 }  // namespace Acts
diff --git a/Core/include/Acts/Seeding/GbtsBase.hpp b/Core/include/Acts/Seeding/GbtsBase.hpp
index dd8e1103311..3c8a7eed8cb 100644
--- a/Core/include/Acts/Seeding/GbtsBase.hpp
+++ b/Core/include/Acts/Seeding/GbtsBase.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2021 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
diff --git a/Core/include/Acts/Seeding/GbtsDataStorage.hpp b/Core/include/Acts/Seeding/GbtsDataStorage.hpp
index 11debd64d7f..c28b0cc2413 100644
--- a/Core/include/Acts/Seeding/GbtsDataStorage.hpp
+++ b/Core/include/Acts/Seeding/GbtsDataStorage.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2021 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
@@ -14,6 +14,7 @@
 
 #include <algorithm>
 #include <map>
+#include <numbers>
 #include <vector>
 
 namespace Acts {
@@ -105,8 +106,8 @@ class GbtsEtaBin {
   }
 
   void sortByPhi() {
-    std::sort(m_vn.begin(), m_vn.end(),
-              typename Acts::GbtsNode<space_point_t>::CompareByPhi());
+    std::ranges::sort(m_vn,
+                      typename Acts::GbtsNode<space_point_t>::CompareByPhi());
   }
 
   bool empty() const { return m_vn.empty(); }
@@ -117,12 +118,12 @@ class GbtsEtaBin {
       // float phi = pN->m_sp.phi();
       // float phi = (std::atan(pN->m_sp.x() / pN->m_sp.y()));
       float phi = pN->m_spGbts.phi();
-      if (phi <= M_PI - dphi) {
+      if (phi <= std::numbers::pi_v<float> - dphi) {
         continue;
       }
 
-      m_vPhiNodes.push_back(
-          std::pair<float, unsigned int>(phi - 2 * M_PI, nIdx));
+      m_vPhiNodes.push_back(std::pair<float, unsigned int>(
+          phi - static_cast<float>(2. * std::numbers::pi), nIdx));
     }
 
     for (unsigned int nIdx = 0; nIdx < m_vn.size(); nIdx++) {
@@ -134,11 +135,11 @@ class GbtsEtaBin {
     for (unsigned int nIdx = 0; nIdx < m_vn.size(); nIdx++) {
       GbtsNode<space_point_t> *pN = m_vn.at(nIdx);
       float phi = pN->m_spGbts.phi();
-      if (phi >= -M_PI + dphi) {
+      if (phi >= -std::numbers::pi_v<float> + dphi) {
         break;
       }
-      m_vPhiNodes.push_back(
-          std::pair<float, unsigned int>(phi + 2 * M_PI, nIdx));
+      m_vPhiNodes.push_back(std::pair<float, unsigned int>(
+          phi + static_cast<float>(2. * std::numbers::pi), nIdx));
     }
   }
 
diff --git a/Core/include/Acts/Seeding/GbtsGeometry.hpp b/Core/include/Acts/Seeding/GbtsGeometry.hpp
index 1d284822d38..54931b200b8 100644
--- a/Core/include/Acts/Seeding/GbtsGeometry.hpp
+++ b/Core/include/Acts/Seeding/GbtsGeometry.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2021 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
diff --git a/Core/include/Acts/Seeding/GbtsTrackingFilter.hpp b/Core/include/Acts/Seeding/GbtsTrackingFilter.hpp
index 7ce93170b9a..c2111482947 100644
--- a/Core/include/Acts/Seeding/GbtsTrackingFilter.hpp
+++ b/Core/include/Acts/Seeding/GbtsTrackingFilter.hpp
@@ -1,15 +1,16 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2021 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
 // TODO: update to C++17 style
 #include "Acts/Seeding/GbtsDataStorage.hpp"  //includes geo which has trigindetsilayer, may move this to trigbase
+#include "Acts/Utilities/Logger.hpp"
 
 #include <algorithm>
 #include <cmath>
@@ -112,8 +113,11 @@ template <typename external_spacepoint_t>
 class GbtsTrackingFilter {
  public:
   GbtsTrackingFilter(const std::vector<Acts::TrigInDetSiLayer>& g,
-                     std::vector<Acts::GbtsEdge<external_spacepoint_t>>& sb)
-      : m_geo(g), m_segStore(sb) {}
+                     std::vector<Acts::GbtsEdge<external_spacepoint_t>>& sb,
+                     std::unique_ptr<const Acts::Logger> logger =
+                         Acts::getDefaultLogger("Filter",
+                                                Acts::Logging::Level::INFO))
+      : m_geo(g), m_segStore(sb), m_logger(std::move(logger)) {}
 
   void followTrack(Acts::GbtsEdge<external_spacepoint_t>* pS,
                    GbtsEdgeState<external_spacepoint_t>& output) {
@@ -138,8 +142,8 @@ class GbtsTrackingFilter {
     if (m_stateVec.empty()) {
       return;
     }
-    std::sort(m_stateVec.begin(), m_stateVec.end(),
-              typename GbtsEdgeState<external_spacepoint_t>::Compare());
+    std::ranges::sort(m_stateVec,
+                      typename GbtsEdgeState<external_spacepoint_t>::Compare());
 
     GbtsEdgeState<external_spacepoint_t>* best = (*m_stateVec.begin());
 
@@ -233,11 +237,15 @@ class GbtsTrackingFilter {
     const float add_hit = 14.0;
 
     if (ts.m_Cx[2][2] < 0.0 || ts.m_Cx[1][1] < 0.0 || ts.m_Cx[0][0] < 0.0) {
-      std::cout << "Negative cov_x" << std::endl;
+      ACTS_WARNING("Negative covariance detected in X components: "
+                   << "cov[2][2]=" << ts.m_Cx[2][2] << " cov[1][1]="
+                   << ts.m_Cx[1][1] << " cov[0][0]=" << ts.m_Cx[0][0]);
     }
 
     if (ts.m_Cy[1][1] < 0.0 || ts.m_Cy[0][0] < 0.0) {
-      std::cout << "Negative cov_y" << std::endl;
+      ACTS_WARNING("Negative covariance detected in Y components: "
+                   << "cov[1][1]=" << ts.m_Cy[1][1]
+                   << " cov[0][0]=" << ts.m_Cy[0][0]);
     }
 
     // add ms.
@@ -380,4 +388,7 @@ class GbtsTrackingFilter {
   GbtsEdgeState<external_spacepoint_t> m_stateStore[MAX_EDGE_STATE];
 
   int m_globalStateCounter{0};
+
+  const Acts::Logger& logger() const { return *m_logger; }
+  std::unique_ptr<const Acts::Logger> m_logger{nullptr};
 };
diff --git a/Core/include/Acts/Seeding/HoughTransformUtils.hpp b/Core/include/Acts/Seeding/HoughTransformUtils.hpp
index 6b6872a74be..4fcece48034 100644
--- a/Core/include/Acts/Seeding/HoughTransformUtils.hpp
+++ b/Core/include/Acts/Seeding/HoughTransformUtils.hpp
@@ -1,26 +1,27 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2022 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 /// This file implements the tools for a hough transform.
 
 #pragma once
 #include "Acts/Utilities/Delegate.hpp"
+#include "Acts/Utilities/Grid.hpp"
 #include "Acts/Utilities/Logger.hpp"
 #include "Acts/Utilities/Result.hpp"
 
+#include <algorithm>
 #include <array>
 #include <map>
 #include <optional>
 #include <set>
+#include <span>
 #include <unordered_set>
 
-#include "HoughVectors.hpp"
-
 namespace Acts::HoughTransformUtils {
 
 /// this type is responsible for encoding the parameters of our hough space
@@ -109,23 +110,33 @@ class HoughCell {
   YieldType nLayers() const { return m_nLayers; }
   /// @brief access the number of unique hits compatible with this cell
   YieldType nHits() const { return m_nHits; }
-  /// @brief access the set of layers compatible with this cell
-  const std::unordered_set<unsigned>& layers() const { return m_layers; }
-  /// @brief access the set of unique hits compatible with this cell
-  const std::unordered_set<identifier_t>& hits() const { return m_hits; }
+  /// @brief access the span of layers compatible with this cell
+  std::span<const unsigned, std::dynamic_extent> getLayers() const;
+  // /// @brief access the pan of unique hits compatible with this cell
+  std::span<const identifier_t, std::dynamic_extent> getHits() const;
+
   /// @brief reset this cell, removing any existing content.
   void reset();
 
  private:
-  /// data members
-
-  YieldType m_nLayers =
-      0;                  // (weighted) number of layers with hits on this cell
-  YieldType m_nHits = 0;  // (weighted) number of unique hits on this cell
-  std::unordered_set<unsigned> m_layers =
-      {};  // set of layers with hits on this cell
-  std::unordered_set<identifier_t> m_hits =
-      {};  // set of unique hits on this cell
+  /// (weighted) number of layers with hits on this cell
+  YieldType m_nLayers{0};
+  /// (weighted) number of unique hits on this cell
+  YieldType m_nHits{0};
+
+  /// index for the hits -- keeps track of vector's size
+  std::size_t m_iHit{0};
+  /// index for the layers -- keeps track of vector's size
+  std::size_t m_iLayer{0};
+
+  /// a batch to resize the vector of the hits or the layers
+  std::size_t m_assignBatch{20};
+
+  /// vector of layers with hits on this cell
+  std::vector<unsigned> m_layers{std::vector<unsigned>(m_assignBatch)};
+
+  /// vector of hits on this cell
+  std::vector<identifier_t> m_hits{std::vector<identifier_t>(m_assignBatch)};
 };
 
 /// @brief Configuration - number of bins in each axis.
@@ -145,7 +156,10 @@ template <class identifier_t>
 class HoughPlane {
  public:
   /// @brief hough histogram representation as a 2D-indexable vector of hough cells
-  using HoughHist = MultiIndexedVector2D<HoughCell<identifier_t>>;
+  using Axis =
+      Acts::Axis<Acts::AxisType::Equidistant, Acts::AxisBoundaryType::Bound>;
+  using HoughHist = Grid<HoughCell<identifier_t>, Axis, Axis>;
+  using Index = typename HoughHist::index_t;
 
   /// @brief instantiate the (empty) hough plane
   /// @param cfg: configuration
@@ -179,9 +193,9 @@ class HoughPlane {
   /// @param xBin: bin index in the first coordinate
   /// @param yBin: bin index in the second coordinate
   /// @return the set of layer indices that have hits for this cell
-  const std::unordered_set<unsigned>& layers(std::size_t xBin,
-                                             std::size_t yBin) const {
-    return m_houghHist(xBin, yBin).layers();
+  std::unordered_set<unsigned> layers(std::size_t xBin,
+                                      std::size_t yBin) const {
+    return m_houghHist.atLocalBins({xBin, yBin}).layers();
   }
 
   /// @brief get the (weighted) number of layers  with hits in one cell of the histogram
@@ -189,23 +203,32 @@ class HoughPlane {
   /// @param yBin: bin index in the second coordinate
   /// @return the (weighed) number of layers that have hits for this cell
   YieldType nLayers(std::size_t xBin, std::size_t yBin) const {
-    return m_houghHist(xBin, yBin).nLayers();
+    return m_houghHist.atLocalBins({xBin, yBin}).nLayers();
   }
 
   /// @brief get the identifiers of all hits in one cell of the histogram
   /// @param xBin: bin index in the first coordinate
   /// @param yBin: bin index in the second coordinate
   /// @return the set of identifiers of the hits for this cell
-  const std::unordered_set<identifier_t>& hitIds(std::size_t xBin,
-                                                 std::size_t yBin) const {
-    return m_houghHist(xBin, yBin).hits();
+  std::unordered_set<identifier_t> hitIds(std::size_t xBin,
+                                          std::size_t yBin) const {
+    const auto hits_span = m_houghHist.atLocalBins({xBin, yBin}).getHits();
+
+    return std::unordered_set<identifier_t>(hits_span.begin(), hits_span.end());
   }
-  /// @brief get the (weighted) number of hits in one cell of the histogram
+  /// @brief access the (weighted) number of hits in one cell of the histogram from bin's coordinates
   /// @param xBin: bin index in the first coordinate
   /// @param yBin: bin index in the second coordinate
   /// @return the (weighted) number of hits for this cell
   YieldType nHits(std::size_t xBin, std::size_t yBin) const {
-    return m_houghHist(xBin, yBin).nHits();
+    return m_houghHist.atLocalBins({xBin, yBin}).nHits();
+  }
+
+  /// @brief access the (weighted) number of hits in one cell of the histogram from globalBin index
+  /// @param globalBin: global bin index
+  /// @return the (weighted) number of hits for this cell
+  YieldType nHits(std::size_t globalBin) const {
+    return m_houghHist.at(globalBin).nHits();
   }
 
   /// @brief get the number of bins on the first coordinate
@@ -220,10 +243,20 @@ class HoughPlane {
   /// @brief get the list of cells with non-zero content.
   /// Useful for peak-finders in sparse data
   /// to avoid looping over all cells
-  const std::set<std::pair<std::size_t, std::size_t>>& getNonEmptyBins() const {
+  const std::unordered_set<std::size_t>& getNonEmptyBins() const {
     return m_touchedBins;
   }
 
+  /// @brief get the coordinates of the bin given the global bin index
+  Index axisBins(std::size_t globalBin) const {
+    return m_houghHist.localBinsFromGlobalBin(globalBin);
+  }
+
+  /// @brief get the globalBin index given the coordinates of the bin
+  std::size_t globalBin(Index indexBin) const {
+    return m_houghHist.globalBinFromLocalBins(indexBin);
+  }
+
   /// @brief get the bin indices of the cell containing the largest number
   /// of (weighted) hits across the entire histogram
   std::pair<std::size_t, std::size_t> locMaxHits() const {
@@ -253,12 +286,19 @@ class HoughPlane {
 
   YieldType m_maxHits = 0.0f;    // track the maximum number of hits seen
   YieldType m_maxLayers = 0.0f;  // track the maximum number of layers seen
-  std::pair<std::size_t, std::size_t> m_maxLocHits = {
-      0, 0};  // track the location of the maximum in hits
-  std::pair<std::size_t, std::size_t> m_maxLocLayers = {
-      0, 0};  // track the location of the maximum in layers
-  std::set<std::pair<std::size_t, std::size_t>> m_touchedBins =
-      {};                  // track the bins with non-trivial content
+
+  /// track the location of the maximum in hits
+  std::pair<std::size_t, std::size_t> m_maxLocHits = {0, 0};
+  /// track the location of the maximum in layers
+  std::pair<std::size_t, std::size_t> m_maxLocLayers = {0, 0};
+
+  std::size_t m_assignBatch{20};
+
+  /// track the bins with non-trivial content
+  std::unordered_set<std::size_t> m_touchedBins{};
+
+  std::size_t m_iBin = 0;
+
   HoughPlaneConfig m_cfg;  // the configuration object
   HoughHist m_houghHist;   // the histogram data object
 };
@@ -350,15 +390,15 @@ class IslandsAroundMax {
   /// @brief method to incrementally grow an island by adding adjacent cells
   /// Performs a breadth-first search for neighbours above threshold and adds
   /// them to candidate. Stops when no suitable neighbours are left.
+  /// @param houghPlane: The current hough Plane we are looking for maxima
   /// @param inMaximum: List of cells found in the island. Incrementally populated by calls to the method
-  /// @param toExplore: List of neighbour cell candidates left to explore. Method will not do anything once this is empty
+  /// @param toExplore: List of the global Bin indices of neighbour cell candidates left to explore. Method will not do anything once this is empty
   /// @param threshold: the threshold to apply to check if a cell should be added to an island
   /// @param yieldMap: A map of the hit content of above-threshold cells. Used cells will be set to empty content to avoid re-use by subsequent calls
-  void extendMaximum(
-      std::vector<std::pair<std::size_t, std::size_t>>& inMaximum,
-      std::vector<std::pair<std::size_t, std::size_t>>& toExplore,
-      YieldType threshold,
-      std::map<std::pair<std::size_t, std::size_t>, YieldType>& yieldMap);
+  void extendMaximum(const HoughPlane<identifier_t>& houghPlane,
+                     std::vector<std::array<std::size_t, 2>>& inMaximum,
+                     std::vector<std::size_t>& toExplore, YieldType threshold,
+                     std::unordered_map<std::size_t, YieldType>& yieldMap);
 
   IslandsAroundMaxConfig m_cfg;  // configuration data object
 
diff --git a/Core/include/Acts/Seeding/HoughTransformUtils.ipp b/Core/include/Acts/Seeding/HoughTransformUtils.ipp
index a8f2dea2341..99cbfcb5a05 100644
--- a/Core/include/Acts/Seeding/HoughTransformUtils.ipp
+++ b/Core/include/Acts/Seeding/HoughTransformUtils.ipp
@@ -1,12 +1,13 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2023 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include <algorithm>
+#include <tuple>
 
 template <class identifier_t>
 template <class PointType>
@@ -38,56 +39,88 @@ void Acts::HoughTransformUtils::HoughPlane<identifier_t>::fill(
   }
 }
 
+template <class identifier_t>
+std::span<const identifier_t, std::dynamic_extent>
+Acts::HoughTransformUtils::HoughCell<identifier_t>::getHits() const {
+  std::span<const identifier_t, std::dynamic_extent> hits(m_hits.begin(),
+                                                          m_iHit);
+  return hits;
+}
+
+template <class identifier_t>
+std::span<const unsigned, std::dynamic_extent>
+Acts::HoughTransformUtils::HoughCell<identifier_t>::getLayers() const {
+  std::span<const unsigned, std::dynamic_extent> layers(m_layers.begin(),
+                                                        m_iLayer);
+
+  return layers;
+}
+
 template <class identifier_t>
 void Acts::HoughTransformUtils::HoughCell<identifier_t>::fill(
     const identifier_t& identifier, unsigned layer, YieldType weight) {
   // add the hit to the list of hits in the cell
-  if (m_hits.insert(identifier).second) {
-    // if new, increment the weighted hit counter
-    m_nHits += weight;
+
+  if (m_iHit != 0 && m_hits[m_iHit - 1] == identifier) {
+    return;
   }
-  // and to the same for layer counts
-  if (m_layers.insert(layer).second) {
-    m_nLayers += weight;
+
+  if (m_iHit == m_hits.size()) {
+    m_hits.resize(m_hits.size() + m_assignBatch);
   }
+
+  if (m_iLayer == m_layers.size()) {
+    m_layers.resize(m_layers.size() + m_assignBatch);
+  }
+
+  m_hits[m_iHit] = identifier;
+  m_layers[m_iLayer] = layer;
+
+  m_iHit += 1;
+  m_iLayer += 1;
+
+  m_nHits += weight;
+  m_nLayers += weight;
 }
+
 template <class identifier_t>
 void Acts::HoughTransformUtils::HoughCell<identifier_t>::reset() {
-  // avoid expensive clear calls on empty cells
-  if (m_nLayers > 0) {
-    m_layers.clear();
-  }
-  if (m_nHits > 0) {
-    m_hits.clear();
-  }
   m_nHits = 0;
   m_nLayers = 0;
+
+  m_iLayer = 0;
+  m_iHit = 0;
 }
 
 template <class identifier_t>
 Acts::HoughTransformUtils::HoughPlane<identifier_t>::HoughPlane(
     const HoughPlaneConfig& cfg)
-    : m_cfg(cfg) {
+    : m_cfg(cfg),
+      m_houghHist(Axis(0, m_cfg.nBinsX, m_cfg.nBinsX),
+                  Axis(0, m_cfg.nBinsY, m_cfg.nBinsY)) {
   // instantiate our histogram.
-  m_houghHist = HoughHist(m_cfg.nBinsX, m_cfg.nBinsY);
+  // m_houghHist = HoughHist(Axis(0, m_cfg.nBinsX, m_cfg.nBinsX), Axis(0,
+  // m_cfg.nBinsY, m_cfg.nBinsY));
 }
 template <class identifier_t>
 void Acts::HoughTransformUtils::HoughPlane<identifier_t>::fillBin(
     std::size_t binX, std::size_t binY, const identifier_t& identifier,
     unsigned layer, double w) {
   // mark that this bin was filled with non trivial content
-  m_touchedBins.insert({binX, binY});
+
+  m_touchedBins.insert(globalBin({binX, binY}));
+
   // add content to the cell
-  m_houghHist(binX, binY).fill(identifier, layer, w);
+  m_houghHist.atLocalBins({binX, binY}).fill(identifier, layer, w);
   // and update our cached maxima
-  YieldType nLayers = m_houghHist(binX, binY).nLayers();
-  YieldType nHits = m_houghHist(binX, binY).nHits();
-  if (nLayers > m_maxLayers) {
-    m_maxLayers = nLayers;
+  YieldType layers = nLayers(binX, binY);
+  YieldType hits = nHits(binX, binY);
+  if (layers > m_maxLayers) {
+    m_maxLayers = layers;
     m_maxLocLayers = {binX, binY};
   }
-  if (nHits > m_maxHits) {
-    m_maxHits = nHits;
+  if (hits > m_maxHits) {
+    m_maxHits = hits;
     m_maxLocHits = {binX, binY};
   }
 }
@@ -96,13 +129,14 @@ template <class identifier_t>
 void Acts::HoughTransformUtils::HoughPlane<identifier_t>::reset() {
   // reset all bins that were previously filled
   // avoid calling this on empty cells to save time
-  for (auto bin : m_touchedBins) {
-    m_houghHist(bin).reset();
+  for (auto bin : getNonEmptyBins()) {
+    m_houghHist.at(bin).reset();
   }
   // don't forget to reset our cached maxima
   m_maxHits = 0.;
   m_maxLayers = 0.;
   // and reset the list of nontrivial bins
+  m_iBin = 0;
   m_touchedBins.clear();
 }
 
@@ -120,12 +154,15 @@ Acts::HoughTransformUtils::PeakFinders::LayerGuidedCombinatoric<
   std::vector<PeakFinders::LayerGuidedCombinatoric<identifier_t>::Maximum>
       maxima;
   // loop over the non empty bins
-  for (auto [x, y] : plane.getNonEmptyBins()) {
+  for (auto nbin : plane.getNonEmptyBins()) {
     // and look for the ones that represent a maximum
-    if (passThreshold(plane, x, y)) {
+
+    std::array<std::size_t, 2> xy = plane.axisBins(nbin);
+
+    if (passThreshold(plane, xy[0], xy[1])) {
       // write out a maximum
       Maximum max;
-      max.hitIdentifiers = plane.hitIds(x, y);
+      max.hitIdentifiers = plane.hitIds(xy[0], xy[1]);
       maxima.push_back(max);
     }
   }
@@ -207,33 +244,34 @@ Acts::HoughTransformUtils::PeakFinders::IslandsAroundMax<
   // and obtain the fraction of the max that is our cutoff for island formation
   YieldType min = std::max(m_cfg.threshold, m_cfg.fractionCutoff * max);
   // book a list for the candidates and the maxima
-  std::vector<std::pair<std::size_t, std::size_t>> candidates;
+  const std::unordered_set<std::size_t>& nonEmptyBins{plane.getNonEmptyBins()};
+  std::vector<std::size_t> candidates;
+  candidates.reserve(nonEmptyBins.size());
   std::vector<Maximum> maxima;
+  maxima.reserve(nonEmptyBins.size());
   // keep track of the yields in each non empty cell
-  std::map<std::pair<std::size_t, std::size_t>, YieldType> yieldMap;
+  std::unordered_map<std::size_t, YieldType> yieldMap;
 
   // now loop over all non empty bins
-  for (auto [x, y] : plane.getNonEmptyBins()) {
-    // we only consider cells above threshold from now on.
-    // each is a potential candidate to seed or join an island
-    // We also add each to our yield map
-    if (plane.nHits(x, y) > min) {
-      candidates.push_back({x, y});
-      yieldMap[{x, y}] = plane.nHits(x, y);
+  for (const std::size_t nbin : nonEmptyBins) {
+    //  we only consider cells above threshold from now on.
+    //  each is a potential candidate to seed or join an island
+    //  We also add each to our yield map
+
+    if (plane.nHits(nbin) > min) {
+      candidates.push_back(nbin);
+      yieldMap[nbin] = plane.nHits(nbin);
     }
   }
   // sort the candidate cells descending in content
-  std::sort(candidates.begin(), candidates.end(),
-            [&plane](const std::pair<std::size_t, std::size_t>& bin1,
-                     const std::pair<std::size_t, std::size_t>& bin2) {
-              return (plane.nHits(bin1.first, bin1.second) >
-                      plane.nHits(bin2.first, bin2.second));
-            });
+  std::ranges::sort(candidates, std::greater{}, [&yieldMap](std::size_t c) {
+    return std::make_tuple(yieldMap[c], c);
+  });
 
   // now we build islands from the candidate cells, starting with the most
   // populated one
-  std::vector<std::pair<std::size_t, std::size_t>> toExplore;
-  std::vector<std::pair<std::size_t, std::size_t>> solution;
+  std::vector<std::size_t> toExplore;
+  std::vector<std::array<std::size_t, 2>> solution;
 
   // loop over candidate cells
   for (auto& cand : candidates) {
@@ -242,11 +280,13 @@ Acts::HoughTransformUtils::PeakFinders::IslandsAroundMax<
     if (yieldMap[cand] < min) {
       continue;
     }
+    // CALL AXIS BINS HERE
+    std::array<std::size_t, 2> xy = plane.axisBins(cand);
     // translate to parameter space for overlap veto
     CoordType xCand =
-        binCenter(ranges.xMin, ranges.xMax, plane.nBinsX(), cand.first);
+        binCenter(ranges.xMin, ranges.xMax, plane.nBinsX(), xy[0]);
     CoordType yCand =
-        binCenter(ranges.yMin, ranges.yMax, plane.nBinsY(), cand.second);
+        binCenter(ranges.yMin, ranges.yMax, plane.nBinsY(), xy[1]);
     // check if we are too close to a previously found maximum
     bool goodSpacing = true;
     for (auto& found : maxima) {
@@ -267,7 +307,7 @@ Acts::HoughTransformUtils::PeakFinders::IslandsAroundMax<
     toExplore.push_back(cand);
     // and incrementally add neighbours, filling the solution vector
     while (!toExplore.empty()) {
-      extendMaximum(solution, toExplore, min, yieldMap);
+      extendMaximum(plane, solution, toExplore, min, yieldMap);
     }
     // nothing found? Next candidate!
     if (solution.empty()) {
@@ -286,8 +326,9 @@ Acts::HoughTransformUtils::PeakFinders::IslandsAroundMax<
     // Also collect all hit identifiers in the island and the maximum
     // extent (within the count threshold!) of the island
     for (auto& [xBin, yBin] : solution) {
-      const auto& hidIds = plane.hitIds(xBin, yBin);
-      maximum.hitIdentifiers.insert(hidIds.cbegin(), hidIds.cend());
+      auto hidIds = plane.hitIds(xBin, yBin);
+      maximum.hitIdentifiers.insert(std::make_move_iterator(hidIds.begin()),
+                                    std::make_move_iterator(hidIds.end()));
       CoordType xHit =
           binCenter(ranges.xMin, ranges.xMax, plane.nBinsX(), xBin);
       CoordType yHit =
@@ -323,32 +364,38 @@ Acts::HoughTransformUtils::PeakFinders::IslandsAroundMax<
 template <class identifier_t>
 void Acts::HoughTransformUtils::PeakFinders::IslandsAroundMax<identifier_t>::
     extendMaximum(
-        std::vector<std::pair<std::size_t, std::size_t>>& inMaximum,
-        std::vector<std::pair<std::size_t, std::size_t>>& toExplore,
-        YieldType threshold,
-        std::map<std::pair<std::size_t, std::size_t>, YieldType>& yieldMap) {
+        const Acts::HoughTransformUtils::HoughPlane<identifier_t>& houghPlane,
+        std::vector<std::array<std::size_t, 2>>& inMaximum,
+        std::vector<std::size_t>& toExplore, YieldType threshold,
+        std::unordered_map<std::size_t, YieldType>& yieldMap) {
   // in this call, we explore the last element of the toExplore list.
   // Fetch it and pop it from the vector.
-  auto nextCand = toExplore.back();
+
+  const std::size_t candidate = toExplore.back();
+  YieldType& yield{yieldMap[candidate]};
   toExplore.pop_back();
   // check if we are above threshold. Don't add this cell to the island if not
-  if (yieldMap[nextCand] < threshold) {
+  if (yield < threshold) {
     return;
   }
   // This candidate is above threshold and should go on the island!
-
+  auto nextCand = houghPlane.axisBins(candidate);
   // add it to the cell list for the island
   inMaximum.push_back(nextCand);
   // and "veto" the hit for further use via the yield map
-  yieldMap[nextCand] = -1.0f;
+  yieldMap[candidate] = -1.0f;
 
   // now we have to collect the non empty neighbours of this cell and check them
   // as well
   for (auto step : m_stepDirections) {
-    auto newCand = std::make_pair(nextCand.first + step.first,
-                                  nextCand.second + step.second);
-    // no need for bounds-checking, as the map structure will default to "empty"
-    // yields for OOB
+    std::array<unsigned long, 2> newCandxy = {nextCand[0] + step.first,
+                                              nextCand[1] + step.second};
+    // check if we are moving out of the bounds
+    if (newCandxy[0] >= houghPlane.nBinsX() ||
+        newCandxy[1] >= houghPlane.nBinsY()) {
+      continue;
+    }
+    std::size_t newCand = houghPlane.globalBin({newCandxy[0], newCandxy[1]});
 
     // if the cell is above threshold, add it to our list of neighbours to
     // explore
diff --git a/Core/include/Acts/Seeding/HoughVectors.hpp b/Core/include/Acts/Seeding/HoughVectors.hpp
deleted file mode 100644
index 0e0c12eb47e..00000000000
--- a/Core/include/Acts/Seeding/HoughVectors.hpp
+++ /dev/null
@@ -1,162 +0,0 @@
-// This file is part of the Acts project.
-//
-// Copyright (C) 2021 CERN for the benefit of the Acts project
-//
-// This Source Code Form is subject to the terms of the Mozilla Public
-// License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-#pragma once
-
-#include "Acts/Utilities/Logger.hpp"
-
-#include <sstream>
-#include <stdexcept>
-#include <vector>
-
-template <typename T>
-class MultiIndexedVector2D {
- private:
-  std::size_t m_d1, m_d2;
-  std::vector<T> m_data;
-
-  /// Private access to the logging instance
-  const Acts::Logger& logger() const { return *m_logger; }
-
-  /// the logging instance
-  std::unique_ptr<const Acts::Logger> m_logger;
-
- public:
-  MultiIndexedVector2D() : m_d1(0), m_d2(0) {
-    m_logger = Acts::getDefaultLogger("HoughVectors", Acts::Logging::ERROR);
-  }
-
-  MultiIndexedVector2D(std::size_t d1, std::size_t d2, T const& t = T())
-      : m_d1(d1), m_d2(d2), m_data(d1 * d2, t) {
-    m_logger = Acts::getDefaultLogger("HoughVectors", Acts::Logging::ERROR);
-  }
-
-  std::size_t size(int dim) const {
-    if (dim == 0) {
-      return m_d1;
-    }
-    if (dim == 1) {
-      return m_d2;
-    } else {
-      ACTS_ERROR("MultiIndexedVector2D: Argument to size() must be 0 or 1");
-      return 0;
-    }
-  }
-
-  void resize(std::size_t x1, std::size_t x2, T const& t = T()) {
-    m_d1 = x1;
-    m_d2 = x2;
-    m_data.resize(x1 * x2, t);
-  }
-
-  T& operator()(std::size_t i, std::size_t j) {
-    if (i >= m_d1 || j >= m_d2) {
-      std::stringstream s;
-      s << "MultiIndexedVector2D out of bounds: request (" << i << "," << j
-        << ") size (" << m_d1 << "," << m_d2 << ")";
-      ACTS_ERROR(s.str());
-    }
-    return m_data[i * m_d2 + j];
-  }
-  inline T& operator()(std::pair<std::size_t, std::size_t> indices) {
-    return operator()(indices.first, indices.second);
-  }
-
-  T const& operator()(std::size_t i, std::size_t j) const {
-    if (i >= m_d1 || j >= m_d2) {
-      std::stringstream s;
-      s << "MultiIndexedVector2D out of bounds: request (" << i << "," << j
-        << ") size (" << m_d1 << "," << m_d2 << ")";
-      ACTS_ERROR(s.str());
-    }
-    return m_data[i * m_d2 + j];
-  }
-  inline T const& operator()(
-      std::pair<std::size_t, std::size_t> indices) const {
-    return operator()(indices.first, indices.second);
-  }
-
-  T* operator[](std::size_t i) {
-    if (i >= m_d1) {
-      std::stringstream s;
-      s << "MultiIndexedVector2D out of bounds: request " << i << " size ("
-        << m_d1 << "," << m_d2 << ")";
-      ACTS_ERROR(s.str());
-    }
-    return m_data.data() + (i * m_d2);
-  }
-
-  const T* operator[](std::size_t i) const {
-    if (i >= m_d1) {
-      std::stringstream s;
-      s << "MultiIndexedVector2D out of bounds: request " << i << " size ("
-        << m_d1 << "," << m_d2 << ")";
-      ACTS_ERROR(s.str());
-    }
-    return m_data.data() + (i * m_d2);
-  }
-
-  void reset(const T& t) { m_data.assign(m_data.size(), t); }
-
-  T* data() { return m_data.data(); }
-
-  const T* data() const { return m_data.data(); }
-};
-
-template <typename T>
-class MultiIndexedVector3D {
- private:
-  std::size_t m_d1, m_d2, m_d3;
-  std::vector<T> m_data;
-  /// Private access to the logging instance
-  const Acts::Logger& logger() const { return *m_logger; }
-
-  /// the logging instance
-  std::unique_ptr<const Acts::Logger> m_logger;
-
- public:
-  MultiIndexedVector3D() : m_d1(0), m_d2(0), m_d3(0) {
-    m_logger = Acts::getDefaultLogger("HoughVectors", Acts::Logging::ERROR);
-  }
-
-  MultiIndexedVector3D(std::size_t d1, std::size_t d2, std::size_t d3,
-                       T const& t = T())
-      : m_d1(d1), m_d2(d2), m_d3(d3), m_data(d1 * d2 * d3, t) {
-    m_logger = Acts::getDefaultLogger("HoughVectors", Acts::Logging::ERROR);
-  }
-
-  T& operator()(std::size_t i, std::size_t j, std::size_t k) {
-    if (i >= m_d1 || j >= m_d2 || k >= m_d3) {
-      std::stringstream s;
-      s << "MultiIndexedVector3D out of bounds: request (" << i << "," << j
-        << "," << k << ") size (" << m_d1 << "," << m_d2 << "," << m_d3 << ")";
-      ACTS_ERROR(s.str());
-    }
-    return m_data[i * m_d2 * m_d3 + j * m_d3 + k];
-  }
-
-  T const& operator()(std::size_t i, std::size_t j, std::size_t k) const {
-    if (i >= m_d1 || j >= m_d2 || k >= m_d3) {
-      std::stringstream s;
-      s << "MultiIndexedVector3D out of bounds: request (" << i << "," << j
-        << "," << k << ") size (" << m_d1 << "," << m_d2 << "," << m_d3 << ")";
-      ACTS_ERROR(s.str());
-    }
-    return m_data[i * m_d2 * m_d3 + j * m_d3 + k];
-  }
-
-  void resize(std::size_t x1, std::size_t x2, std::size_t x3,
-              T const& t = T()) {
-    m_d1 = x1;
-    m_d2 = x2;
-    m_d3 = x3;
-    m_data.resize(x1 * x2 * x3, t);
-  }
-
-  T* data() { return m_data.data(); }
-};
diff --git a/Core/include/Acts/Seeding/IExperimentCuts.hpp b/Core/include/Acts/Seeding/IExperimentCuts.hpp
index 4618dbcf584..b1c10a144dd 100644
--- a/Core/include/Acts/Seeding/IExperimentCuts.hpp
+++ b/Core/include/Acts/Seeding/IExperimentCuts.hpp
@@ -1,15 +1,14 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2018 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
 #include "Acts/Seeding/CandidatesForMiddleSp.hpp"
-#include "Acts/Seeding/InternalSeed.hpp"
 
 #include <limits>
 #include <memory>
@@ -29,27 +28,25 @@ class IExperimentCuts {
   /// @param middle middle space point of the current seed
   /// @param top top space point of the current seed
   /// @return seed weight to be added to the seed's weight
-  virtual float seedWeight(const InternalSpacePoint<SpacePoint>& bottom,
-                           const InternalSpacePoint<SpacePoint>& middle,
-                           const InternalSpacePoint<SpacePoint>& top) const = 0;
+  virtual float seedWeight(const SpacePoint& bottom, const SpacePoint& middle,
+                           const SpacePoint& top) const = 0;
   /// @param weight the current seed weight
   /// @param bottom bottom space point of the current seed
   /// @param middle middle space point of the current seed
   /// @param top top space point of the current seed
   /// @return true if the seed should be kept, false if the seed should be
   /// discarded
-  virtual bool singleSeedCut(
-      float weight, const InternalSpacePoint<SpacePoint>& bottom,
-      const InternalSpacePoint<SpacePoint>& middle,
-      const InternalSpacePoint<SpacePoint>& top) const = 0;
+  virtual bool singleSeedCut(float weight, const SpacePoint& bottom,
+                             const SpacePoint& middle,
+                             const SpacePoint& top) const = 0;
 
   /// @param seedCandidates contains collection of seed candidates created for one middle
   /// space point in a std::tuple format
   /// @return vector of seed candidates that pass the cut
-  virtual std::vector<typename CandidatesForMiddleSp<
-      const InternalSpacePoint<SpacePoint>>::value_type>
-  cutPerMiddleSP(std::vector<typename CandidatesForMiddleSp<
-                     const InternalSpacePoint<SpacePoint>>::value_type>
-                     seedCandidates) const = 0;
+  virtual std::vector<
+      typename CandidatesForMiddleSp<const SpacePoint>::value_type>
+  cutPerMiddleSP(
+      std::vector<typename CandidatesForMiddleSp<const SpacePoint>::value_type>
+          seedCandidates) const = 0;
 };
 }  // namespace Acts
diff --git a/Core/include/Acts/Seeding/InternalSeed.hpp b/Core/include/Acts/Seeding/InternalSeed.hpp
deleted file mode 100644
index a5552f9f71b..00000000000
--- a/Core/include/Acts/Seeding/InternalSeed.hpp
+++ /dev/null
@@ -1,65 +0,0 @@
-// This file is part of the Acts project.
-//
-// Copyright (C) 2018 CERN for the benefit of the Acts project
-//
-// This Source Code Form is subject to the terms of the Mozilla Public
-// License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-#pragma once
-
-#include "Acts/Seeding/InternalSpacePoint.hpp"
-#include "Acts/Seeding/Seed.hpp"
-
-#include <memory>
-
-namespace Acts {
-template <typename SpacePoint>
-class InternalSeed {
-  /////////////////////////////////////////////////////////////////////////////////
-  // Public methods:
-  /////////////////////////////////////////////////////////////////////////////////
-
- public:
-  InternalSeed(InternalSpacePoint<SpacePoint>& s0,
-               InternalSpacePoint<SpacePoint>& s1,
-               InternalSpacePoint<SpacePoint>& s2, float z,
-               bool qualitySeed = false);
-  InternalSeed& operator=(const InternalSeed& seed);
-
-  const std::array<InternalSpacePoint<SpacePoint>*, 3> sp;
-  float z() const { return m_z; }
-  bool qualitySeed() const { return m_qualitySeed; }
-
- protected:
-  float m_z;
-  bool m_qualitySeed;
-};
-
-/// @cond
-
-/////////////////////////////////////////////////////////////////////////////////
-// Inline methods
-/////////////////////////////////////////////////////////////////////////////////
-
-template <typename SpacePoint>
-inline InternalSeed<SpacePoint>& InternalSeed<SpacePoint>::operator=(
-    const InternalSeed<SpacePoint>& seed) {
-  m_z = seed.m_z;
-  sp = seed.sp;
-  m_qualitySeed = seed.m_qualitySeed;
-  return (*this);
-}
-
-template <typename SpacePoint>
-inline InternalSeed<SpacePoint>::InternalSeed(
-    InternalSpacePoint<SpacePoint>& s0, InternalSpacePoint<SpacePoint>& s1,
-    InternalSpacePoint<SpacePoint>& s2, float z, bool qualitySeed)
-    : sp({&s0, &s1, &s2}) {
-  m_z = z;
-  m_qualitySeed = qualitySeed;
-}
-
-/// @endcond
-
-}  // namespace Acts
diff --git a/Core/include/Acts/Seeding/InternalSpacePoint.hpp b/Core/include/Acts/Seeding/InternalSpacePoint.hpp
deleted file mode 100644
index 6609123bf29..00000000000
--- a/Core/include/Acts/Seeding/InternalSpacePoint.hpp
+++ /dev/null
@@ -1,91 +0,0 @@
-// This file is part of the Acts project.
-//
-// Copyright (C) 2023 CERN for the benefit of the Acts project
-//
-// This Source Code Form is subject to the terms of the Mozilla Public
-// License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-#pragma once
-
-#include "Acts/Definitions/Algebra.hpp"
-
-#include <cmath>
-#include <functional>
-#include <optional>
-
-namespace Acts {
-
-template <typename SpacePoint>
-class InternalSpacePoint {
-  /////////////////////////////////////////////////////////////////////////////////
-  // Public methods:
-  /////////////////////////////////////////////////////////////////////////////////
-
- public:
-  InternalSpacePoint() = delete;
-  InternalSpacePoint(std::size_t index, const SpacePoint& sp,
-                     const Acts::Vector3& globalPos,
-                     const Acts::Vector2& offsetXY,
-                     const Acts::Vector2& variance,
-                     std::optional<float> globalTime);
-
-  InternalSpacePoint(const InternalSpacePoint<SpacePoint>& sp);
-  ~InternalSpacePoint() = default;
-
-  InternalSpacePoint<SpacePoint>& operator=(
-      const InternalSpacePoint<SpacePoint>&) = delete;
-
-  std::size_t index() const { return m_index; }
-  float x() const { return m_x; }
-  float y() const { return m_y; }
-  float z() const { return m_z; }
-  std::optional<float> t() const { return m_t; }
-  float radius() const { return m_r; }
-  float phi() const { return m_phi; }
-  float varianceR() const { return m_varianceR; }
-  float varianceZ() const { return m_varianceZ; }
-  const SpacePoint& sp() const { return m_sp; }
-
- protected:
-  std::size_t m_index;
-  float m_x;                 // x-coordinate in beam system coordinates
-  float m_y;                 // y-coordinate in beam system coordinates
-  float m_z;                 // z-coordinate in beam system coordinetes
-  float m_r;                 // radius       in beam system coordinates
-  float m_phi;               //
-  float m_varianceR;         //
-  float m_varianceZ;         //
-  std::optional<float> m_t;  // time
-  std::reference_wrapper<const SpacePoint> m_sp;  // external space point
-};
-
-/////////////////////////////////////////////////////////////////////////////////
-// Inline methods
-/////////////////////////////////////////////////////////////////////////////////
-
-template <typename SpacePoint>
-inline InternalSpacePoint<SpacePoint>::InternalSpacePoint(
-    std::size_t index, const SpacePoint& sp, const Acts::Vector3& globalPos,
-    const Acts::Vector2& offsetXY, const Acts::Vector2& variance,
-    std::optional<float> globalTime)
-    : m_index(index),
-      m_x(globalPos.x() - offsetXY.x()),
-      m_y(globalPos.y() - offsetXY.y()),
-      m_z(globalPos.z()),
-      m_r(std::hypot(m_x, m_y)),
-      m_phi(std::atan2(m_y, m_x)),
-      m_varianceR(variance.x()),
-      m_varianceZ(variance.y()),
-      m_t(globalTime),
-      m_sp(sp) {}
-
-/////////////////////////////////////////////////////////////////////////////////
-// Copy constructor
-/////////////////////////////////////////////////////////////////////////////////
-
-template <typename SpacePoint>
-inline InternalSpacePoint<SpacePoint>::InternalSpacePoint(
-    const InternalSpacePoint<SpacePoint>& sp) = default;
-
-}  // namespace Acts
diff --git a/Core/include/Acts/Seeding/Neighbour.hpp b/Core/include/Acts/Seeding/Neighbour.hpp
index 82da5a36d31..f6fd772fc28 100644
--- a/Core/include/Acts/Seeding/Neighbour.hpp
+++ b/Core/include/Acts/Seeding/Neighbour.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2024 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
diff --git a/Core/include/Acts/Seeding/PathSeeder.hpp b/Core/include/Acts/Seeding/PathSeeder.hpp
new file mode 100644
index 00000000000..d4475c022df
--- /dev/null
+++ b/Core/include/Acts/Seeding/PathSeeder.hpp
@@ -0,0 +1,191 @@
+// This file is part of the ACTS project.
+//
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
+//
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
+
+#pragma once
+
+#include "Acts/EventData/SourceLink.hpp"
+#include "Acts/EventData/TrackParameters.hpp"
+#include "Acts/Seeding/detail/UtilityFunctions.hpp"
+#include "Acts/Surfaces/Surface.hpp"
+#include "Acts/Utilities/Delegate.hpp"
+#include "Acts/Utilities/GridIterator.hpp"
+
+namespace Acts {
+
+/// @brief Seeding algorigthm that extracts
+/// the IP parameters and sorts the source links
+/// into possible track candidates
+///
+/// The algorithm to convert the given source links
+/// into seeds -- pairs of IP parameters and the corresponding
+/// source links -- as follows: First the source links
+/// are sorted into a user-defined grid. Then, iteration over the source links
+/// is performed. If a source link is attached to a surface that is
+/// in the reference tracking layer, as defined by the user, the IP parameters
+/// are estimated and the tracking layers are intersected to construct the
+/// core of the "Path". The source links in the subsequent layers are then
+/// added to the seed if they lie within the path width of the core.
+/// Both the list of source links and the IP parameters are stored in the seed
+/// struct.
+///
+/// @tparam axis_t Type of the axis to bin
+/// the source links
+///
+/// @note The algorithm is designed to be used in the
+/// context of a telescope-style geometry. The surfaces
+/// are assumed to be planar.
+///
+/// @note Handling of the rotated surfaces has to happen
+/// in the user-defined delegate functions.
+class PathSeeder {
+ public:
+  using PathSeed =
+      std::pair<CurvilinearTrackParameters, std::vector<SourceLink>>;
+
+  /// @brief Delegate to estimate the IP parameters
+  /// and the momentum direction at the reference tracking layer
+  ///
+  /// @arg Geometry context to use
+  /// @arg Pivot source link
+  ///
+  /// @return Pair of the track parameters at the IP and
+  /// the reference tracking layer
+  using TrackEstimator = Delegate<
+      std::pair<CurvilinearTrackParameters, CurvilinearTrackParameters>(
+          const GeometryContext&, const SourceLink&)>;
+
+  /// @brief Delegate to find the intersections for the given pivot
+  /// source link
+  ///
+  /// @arg The geometry context to use
+  /// @arg Track parameters at the reference tracking layer
+  ///
+  /// @return Vector of pairs of the geometry identifier
+  /// and the local intersection point
+  using IntersectionLookup =
+      Delegate<std::vector<std::pair<GeometryIdentifier, Vector2>>(
+          const GeometryContext&, const CurvilinearTrackParameters&)>;
+
+  /// @brief Delegate to provide the path width around
+  /// the intersection point to pull the source links
+  /// from the grid
+  ///
+  /// @arg The geometry context to use
+  /// @arg The geometry identifier to use if the
+  /// path width is varied across different tracking layers
+  ///
+  /// @return The path width in the bin0 and bin1 direction
+  /// defined with respect to the surface normal
+  using PathWidthLookup = Delegate<std::pair<ActsScalar, ActsScalar>(
+      const GeometryContext&, const GeometryIdentifier&)>;
+
+  /// @brief The nested configuration struct
+  struct Config {
+    /// Parameters estimator
+    TrackEstimator trackEstimator;
+    /// Intersection finder
+    IntersectionLookup intersectionFinder;
+    /// Path width provider
+    PathWidthLookup pathWidthProvider;
+    /// Reference layer IDs
+    std::vector<GeometryIdentifier> refLayerIds;
+  };
+
+  /// @brief Constructor
+  PathSeeder(const Config& config) : m_cfg(config) {};
+
+  /// @brief Destructor
+  ~PathSeeder() = default;
+
+  /// @brief Extract the IP parameters and
+  /// sort the source links into the seeds
+  ///
+  /// @param gctx The geometry context
+  /// @param sourceLinkGridLookup The lookup table for the source links
+  /// @param seedCollection The collection of seeds to fill
+  ///
+  /// @return The vector of seeds
+  template <Acts::detail::SourceLinkGrid grid_t, typename container_t>
+  void findSeeds(const GeometryContext& gctx,
+                 const std::unordered_map<GeometryIdentifier, grid_t>&
+                     sourceLinkGridLookup,
+                 container_t& seedCollection) const {
+    // Create the seeds
+    for (auto& refGeoId : m_cfg.refLayerIds) {
+      auto refGrid = sourceLinkGridLookup.at(refGeoId);
+
+      for (auto it = refGrid.begin(); it != refGrid.end(); it++) {
+        std::vector<SourceLink> pivotSourceLinks = *it;
+
+        for (const auto& pivot : pivotSourceLinks) {
+          // Get the IP parameters
+          auto [ipParameters, refLayerParameters] =
+              m_cfg.trackEstimator(gctx, pivot);
+
+          // Intersect with the surfaces
+          std::vector<std::pair<GeometryIdentifier, Vector2>> intersections =
+              m_cfg.intersectionFinder(gctx, refLayerParameters);
+
+          // Continue if no intersections
+          if (intersections.empty()) {
+            continue;
+          }
+
+          // Iterate over the intersections
+          // and get the source links
+          // in the subsequent layers
+          std::vector<SourceLink> seedSourceLinks;
+          for (auto& [geoId, refPoint] : intersections) {
+            // Get the path width
+            auto [pathWidth0, pathWidth1] =
+                m_cfg.pathWidthProvider(gctx, geoId);
+
+            // Get the bounds of the path
+            ActsScalar top0 = refPoint[0] + pathWidth0;
+            ActsScalar bot0 = refPoint[0] - pathWidth0;
+            ActsScalar top1 = refPoint[1] + pathWidth1;
+            ActsScalar bot1 = refPoint[1] - pathWidth1;
+
+            // Get the lookup table for the source links
+            auto grid = sourceLinkGridLookup.at(geoId);
+
+            // Get the range of bins to search for source links
+            auto botLeftBin = grid.localBinsFromPosition(Vector2(bot0, bot1));
+            auto topRightBin = grid.localBinsFromPosition(Vector2(top0, top1));
+
+            // Get the source links from the lookup table
+            // by iterating over the bin ranges
+            auto currentBin = botLeftBin;
+            while (currentBin.at(1) <= topRightBin.at(1)) {
+              while (currentBin.at(0) <= topRightBin.at(0)) {
+                auto sourceLinksToAdd = grid.atLocalBins(currentBin);
+
+                seedSourceLinks.insert(seedSourceLinks.end(),
+                                       sourceLinksToAdd.begin(),
+                                       sourceLinksToAdd.end());
+
+                currentBin.at(0)++;
+              }
+              currentBin.at(1)++;
+              currentBin.at(0) = botLeftBin.at(0);
+            }
+          }
+          PathSeed seed = {ipParameters, seedSourceLinks};
+
+          // Add the seed to the collection
+          Acts::detail::pushBackOrInsertAtEnd(seedCollection, seed);
+        }
+      }
+    }
+  }
+
+ private:
+  Config m_cfg;
+};
+
+}  // namespace Acts
diff --git a/Core/include/Acts/Seeding/Seed.hpp b/Core/include/Acts/Seeding/Seed.hpp
deleted file mode 100644
index 46be4589a20..00000000000
--- a/Core/include/Acts/Seeding/Seed.hpp
+++ /dev/null
@@ -1,54 +0,0 @@
-// This file is part of the Acts project.
-//
-// Copyright (C) 2018 CERN for the benefit of the Acts project
-//
-// This Source Code Form is subject to the terms of the Mozilla Public
-// License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-#pragma once
-
-#include <limits>
-#include <vector>
-
-#include <boost/container/small_vector.hpp>
-
-namespace Acts {
-template <typename SpacePoint>
-class Seed {
-  /////////////////////////////////////////////////////////////////////////////////
-  // Public methods:
-  /////////////////////////////////////////////////////////////////////////////////
-
- public:
-  Seed(const SpacePoint& b, const SpacePoint& m, const SpacePoint& u,
-       float vertex,
-       float seedQuality = -std::numeric_limits<float>::infinity());
-  Seed(const Seed&) = default;
-  Seed& operator=(const Seed&) = default;
-
-  const auto& sp() const { return m_spacepoints; }
-  double z() const { return m_zvertex; }
-  float seedQuality() const { return m_seedQuality; }
-
- private:
-  boost::container::small_vector<const SpacePoint*, 3> m_spacepoints;
-  float m_zvertex;
-  float m_seedQuality;
-};
-
-///////////////////////////////////////////////////////////////////////////////
-// Constructors
-///////////////////////////////////////////////////////////////////////////////
-
-template <typename SpacePoint>
-Seed<SpacePoint>::Seed(const SpacePoint& b, const SpacePoint& m,
-                       const SpacePoint& u, float vertex, float seedQuality) {
-  m_zvertex = vertex;
-  m_spacepoints.push_back(&b);
-  m_spacepoints.push_back(&m);
-  m_spacepoints.push_back(&u);
-  m_seedQuality = seedQuality;
-}
-
-}  // namespace Acts
diff --git a/Core/include/Acts/Seeding/SeedConfirmationRangeConfig.hpp b/Core/include/Acts/Seeding/SeedConfirmationRangeConfig.hpp
index e901fcfa0e4..79a353a373a 100644
--- a/Core/include/Acts/Seeding/SeedConfirmationRangeConfig.hpp
+++ b/Core/include/Acts/Seeding/SeedConfirmationRangeConfig.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2022 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
diff --git a/Core/include/Acts/Seeding/SeedFilter.hpp b/Core/include/Acts/Seeding/SeedFilter.hpp
index 95a7b81aa0e..d6e1479a9cd 100644
--- a/Core/include/Acts/Seeding/SeedFilter.hpp
+++ b/Core/include/Acts/Seeding/SeedFilter.hpp
@@ -1,19 +1,19 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2023 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
-#include "Acts/EventData/SpacePointData.hpp"
+#include "Acts/EventData/Seed.hpp"
+#include "Acts/EventData/SpacePointMutableData.hpp"
 #include "Acts/Seeding/CandidatesForMiddleSp.hpp"
 #include "Acts/Seeding/IExperimentCuts.hpp"
-#include "Acts/Seeding/InternalSeed.hpp"
-#include "Acts/Seeding/Seed.hpp"
 #include "Acts/Seeding/SeedFilterConfig.hpp"
+#include "Acts/Utilities/Logger.hpp"
 
 #include <memory>
 #include <mutex>
@@ -38,15 +38,22 @@ struct SeedFilterState {
 template <typename external_spacepoint_t>
 class SeedFilter final {
  public:
-  SeedFilter(SeedFilterConfig config,
+  SeedFilter(const SeedFilterConfig& config,
              IExperimentCuts<external_spacepoint_t>* expCuts = nullptr);
+  SeedFilter(const SeedFilterConfig& config,
+             std::unique_ptr<const Acts::Logger> logger,
+             IExperimentCuts<external_spacepoint_t>* expCuts = nullptr);
+  SeedFilter(const SeedFilter<external_spacepoint_t>&) = delete;
+  SeedFilter& operator=(const SeedFilter<external_spacepoint_t>&) = delete;
+  SeedFilter(SeedFilter<external_spacepoint_t>&&) noexcept = default;
+  SeedFilter& operator=(SeedFilter<external_spacepoint_t>&&) noexcept = default;
 
   SeedFilter() = delete;
   ~SeedFilter() = default;
 
-  /// Create InternalSeeds for the all seeds with the same bottom and middle
+  /// Create Seeds for the all seeds with the same bottom and middle
   /// space point and discard all others.
-  /// @param spacePointData Auxiliary variables used by the seeding
+  /// @param mutableData Container for mutable variables used in the seeding
   /// @param bottomSP fixed bottom space point
   /// @param middleSP fixed middle space point
   /// @param topSpVec vector containing all space points that may be compatible
@@ -56,41 +63,38 @@ class SeedFilter final {
   /// @param seedFilterState holds quantities used in seed filter
   /// @param candidates_collector container for the seed candidates
   void filterSeeds_2SpFixed(
-      Acts::SpacePointData& spacePointData,
-      const InternalSpacePoint<external_spacepoint_t>& bottomSP,
-      const InternalSpacePoint<external_spacepoint_t>& middleSP,
-      const std::vector<const InternalSpacePoint<external_spacepoint_t>*>&
-          topSpVec,
+      const Acts::SpacePointMutableData& mutableData,
+      const external_spacepoint_t& bottomSP,
+      const external_spacepoint_t& middleSP,
+      const std::vector<const external_spacepoint_t*>& topSpVec,
       const std::vector<float>& invHelixDiameterVec,
       const std::vector<float>& impactParametersVec,
       SeedFilterState& seedFilterState,
-      CandidatesForMiddleSp<const InternalSpacePoint<external_spacepoint_t>>&
-          candidates_collector) const;
+      CandidatesForMiddleSp<const external_spacepoint_t>& candidates_collector)
+      const;
 
   /// Filter seeds once all seeds for one middle space point have been created
-  /// @param spacePointData Auxiliary variables used by the seeding
+  /// @param mutableData Container for mutable variables used in the seeding
   /// @param candidates_collector collection of seed candidates
   /// @param outputCollection Output container for the seeds
   /// for all seeds with the same middle space point
   template <typename collection_t>
   void filterSeeds_1SpFixed(
-      Acts::SpacePointData& spacePointData,
-      CandidatesForMiddleSp<const InternalSpacePoint<external_spacepoint_t>>&
-          candidates_collector,
+      Acts::SpacePointMutableData& mutableData,
+      CandidatesForMiddleSp<const external_spacepoint_t>& candidates_collector,
       collection_t& outputCollection) const;
 
   /// Filter seeds once all seeds for one middle space point have been created
-  /// @param spacePointData Auxiliary variables used by the seeding
+  /// @param mutableData Container for mutable variables used in the seeding
   /// @param candidates collection of seed candidates
   /// @param numQualitySeeds number of high quality seeds in seed confirmation
   /// @param outputCollection Output container for the seeds
   /// for all seeds with the same middle space point
   template <typename collection_t>
   void filterSeeds_1SpFixed(
-      Acts::SpacePointData& spacePointData,
+      Acts::SpacePointMutableData& mutableData,
       std::vector<typename CandidatesForMiddleSp<
-          const InternalSpacePoint<external_spacepoint_t>>::value_type>&
-          candidates,
+          const external_spacepoint_t>::value_type>& candidates,
       const std::size_t numQualitySeeds, collection_t& outputCollection) const;
 
   const SeedFilterConfig getSeedFilterConfig() const { return m_cfg; }
@@ -99,7 +103,11 @@ class SeedFilter final {
   }
 
  private:
+  const Logger& logger() const { return *m_logger; }
+
   const SeedFilterConfig m_cfg;
+  std::unique_ptr<const Acts::Logger> m_logger =
+      Acts::getDefaultLogger("Filter", Logging::Level::INFO);
   const IExperimentCuts<external_spacepoint_t>* m_experimentCuts;
 };
 }  // namespace Acts
diff --git a/Core/include/Acts/Seeding/SeedFilter.ipp b/Core/include/Acts/Seeding/SeedFilter.ipp
index 71d2a6250ce..66498916a7e 100644
--- a/Core/include/Acts/Seeding/SeedFilter.ipp
+++ b/Core/include/Acts/Seeding/SeedFilter.ipp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2023 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include "Acts/Seeding/detail/UtilityFunctions.hpp"
 
@@ -16,7 +16,7 @@ namespace Acts {
 // constructor
 template <typename external_spacepoint_t>
 SeedFilter<external_spacepoint_t>::SeedFilter(
-    SeedFilterConfig config,
+    const SeedFilterConfig& config,
     IExperimentCuts<external_spacepoint_t>* expCuts /* = 0*/)
     : m_cfg(config), m_experimentCuts(expCuts) {
   if (!config.isInInternalUnits) {
@@ -24,21 +24,32 @@ SeedFilter<external_spacepoint_t>::SeedFilter(
         "SeedFilterConfig not in ACTS internal units in SeedFilter");
   }
 }
+
+template <typename external_spacepoint_t>
+SeedFilter<external_spacepoint_t>::SeedFilter(
+    const SeedFilterConfig& config, std::unique_ptr<const Acts::Logger> logger,
+    IExperimentCuts<external_spacepoint_t>* expCuts /* = 0*/)
+    : m_cfg(config), m_logger(std::move(logger)), m_experimentCuts(expCuts) {
+  if (!config.isInInternalUnits) {
+    throw std::runtime_error(
+        "SeedFilterConfig not in ACTS internal units in SeedFilter");
+  }
+}
+
 // function to filter seeds based on all seeds with same bottom- and
 // middle-spacepoint.
 // return vector must contain weight of each seed
 template <typename external_spacepoint_t>
 void SeedFilter<external_spacepoint_t>::filterSeeds_2SpFixed(
-    Acts::SpacePointData& spacePointData,
-    const InternalSpacePoint<external_spacepoint_t>& bottomSP,
-    const InternalSpacePoint<external_spacepoint_t>& middleSP,
-    const std::vector<const InternalSpacePoint<external_spacepoint_t>*>&
-        topSpVec,
+    const Acts::SpacePointMutableData& mutableData,
+    const external_spacepoint_t& bottomSP,
+    const external_spacepoint_t& middleSP,
+    const std::vector<const external_spacepoint_t*>& topSpVec,
     const std::vector<float>& invHelixDiameterVec,
     const std::vector<float>& impactParametersVec,
     SeedFilterState& seedFilterState,
-    CandidatesForMiddleSp<const InternalSpacePoint<external_spacepoint_t>>&
-        candidates_collector) const {
+    CandidatesForMiddleSp<const external_spacepoint_t>& candidates_collector)
+    const {
   // seed confirmation
   SeedConfirmationRangeConfig seedConfRange;
   if (m_cfg.seedConfirmation) {
@@ -69,11 +80,10 @@ void SeedFilter<external_spacepoint_t>::filterSeeds_2SpFixed(
 
   if (topSpVec.size() > 2) {
     // sort indexes based on comparing values in invHelixDiameterVec
-    std::sort(
-        topSPIndexVec.begin(), topSPIndexVec.end(),
-        [&invHelixDiameterVec](const std::size_t i1, const std::size_t i2) {
-          return invHelixDiameterVec[i1] < invHelixDiameterVec[i2];
-        });
+    std::ranges::sort(topSPIndexVec, {},
+                      [&invHelixDiameterVec](const std::size_t t) {
+                        return invHelixDiameterVec[t];
+                      });
   }
 
   // vector containing the radius of all compatible seeds
@@ -91,10 +101,9 @@ void SeedFilter<external_spacepoint_t>::filterSeeds_2SpFixed(
     float lowerLimitCurv = invHelixDiameter - m_cfg.deltaInvHelixDiameter;
     float upperLimitCurv = invHelixDiameter + m_cfg.deltaInvHelixDiameter;
     // use deltaR instead of top radius
-    float currentTopR =
-        m_cfg.useDeltaRorTopRadius
-            ? spacePointData.deltaR(topSpVec[topSPIndex]->index())
-            : topSpVec[topSPIndex]->radius();
+    float currentTopR = m_cfg.useDeltaRorTopRadius
+                            ? mutableData.deltaR(topSpVec[topSPIndex]->index())
+                            : topSpVec[topSPIndex]->radius();
     float impact = impactParametersVec[topSPIndex];
 
     float weight = -(impact * m_cfg.impactWeightFactor);
@@ -109,7 +118,7 @@ void SeedFilter<external_spacepoint_t>::filterSeeds_2SpFixed(
 
       float otherTopR =
           m_cfg.useDeltaRorTopRadius
-              ? spacePointData.deltaR(topSpVec[compatibleTopSPIndex]->index())
+              ? mutableData.deltaR(topSpVec[compatibleTopSPIndex]->index())
               : topSpVec[compatibleTopSPIndex]->radius();
 
       // curvature difference within limits?
@@ -190,9 +199,9 @@ void SeedFilter<external_spacepoint_t>::filterSeeds_2SpFixed(
 
       // skip a bad quality seed if any of its constituents has a weight larger
       // than the seed weight
-      if (weight < spacePointData.quality(bottomSP.index()) &&
-          weight < spacePointData.quality(middleSP.index()) &&
-          weight < spacePointData.quality(topSpVec[topSPIndex]->index())) {
+      if (weight < mutableData.quality(bottomSP.index()) &&
+          weight < mutableData.quality(middleSP.index()) &&
+          weight < mutableData.quality(topSpVec[topSPIndex]->index())) {
         continue;
       }
 
@@ -237,26 +246,24 @@ void SeedFilter<external_spacepoint_t>::filterSeeds_2SpFixed(
 template <typename external_spacepoint_t>
 template <typename collection_t>
 void SeedFilter<external_spacepoint_t>::filterSeeds_1SpFixed(
-    Acts::SpacePointData& spacePointData,
-    CandidatesForMiddleSp<const InternalSpacePoint<external_spacepoint_t>>&
-        candidates_collector,
+    Acts::SpacePointMutableData& mutableData,
+    CandidatesForMiddleSp<const external_spacepoint_t>& candidates_collector,
     collection_t& outputCollection) const {
   // retrieve all candidates
   // this collection is already sorted
   // higher weights first
   std::size_t numQualitySeeds = candidates_collector.nHighQualityCandidates();
   auto extended_collection = candidates_collector.storage();
-  filterSeeds_1SpFixed(spacePointData, extended_collection, numQualitySeeds,
+  filterSeeds_1SpFixed(mutableData, extended_collection, numQualitySeeds,
                        outputCollection);
 }
 
 template <typename external_spacepoint_t>
 template <typename collection_t>
 void SeedFilter<external_spacepoint_t>::filterSeeds_1SpFixed(
-    Acts::SpacePointData& spacePointData,
+    Acts::SpacePointMutableData& mutableData,
     std::vector<typename CandidatesForMiddleSp<
-        const InternalSpacePoint<external_spacepoint_t>>::value_type>&
-        candidates,
+        const external_spacepoint_t>::value_type>& candidates,
     const std::size_t numQualitySeeds, collection_t& outputCollection) const {
   if (m_experimentCuts != nullptr) {
     candidates = m_experimentCuts->cutPerMiddleSP(std::move(candidates));
@@ -284,25 +291,30 @@ void SeedFilter<external_spacepoint_t>::filterSeeds_1SpFixed(
       if (numQualitySeeds > 0 && !qualitySeed) {
         continue;
       }
-      if (bestSeedQuality < spacePointData.quality(bottom->index()) &&
-          bestSeedQuality < spacePointData.quality(medium->index()) &&
-          bestSeedQuality < spacePointData.quality(top->index())) {
+      if (bestSeedQuality < mutableData.quality(bottom->index()) &&
+          bestSeedQuality < mutableData.quality(medium->index()) &&
+          bestSeedQuality < mutableData.quality(top->index())) {
         continue;
       }
     }
 
     // set quality of seed components
-    spacePointData.setQuality(bottom->index(), bestSeedQuality);
-    spacePointData.setQuality(medium->index(), bestSeedQuality);
-    spacePointData.setQuality(top->index(), bestSeedQuality);
-
-    Acts::detail::pushBackOrInsertAtEnd(
-        outputCollection,
-        Seed<external_spacepoint_t>{bottom->sp(), medium->sp(), top->sp(),
-                                    zOrigin, bestSeedQuality});
-
+    mutableData.setQuality(bottom->index(), bestSeedQuality);
+    mutableData.setQuality(medium->index(), bestSeedQuality);
+    mutableData.setQuality(top->index(), bestSeedQuality);
+
+    Acts::Seed<external_spacepoint_t> seed{*bottom, *medium, *top};
+    seed.setVertexZ(zOrigin);
+    seed.setQuality(bestSeedQuality);
+
+    ACTS_VERBOSE("Adding seed: [b=" << bottom->index() << ", m="
+                                    << medium->index() << ", t=" << top->index()
+                                    << "], quality=" << bestSeedQuality
+                                    << ", vertexZ=" << zOrigin);
+    Acts::detail::pushBackOrInsertAtEnd(outputCollection, std::move(seed));
     ++numTotalSeeds;
   }
+  ACTS_VERBOSE("Identified " << numTotalSeeds << " seeds");
 }
 
 }  // namespace Acts
diff --git a/Core/include/Acts/Seeding/SeedFilterConfig.hpp b/Core/include/Acts/Seeding/SeedFilterConfig.hpp
index 879ad372652..38bcdc3d470 100644
--- a/Core/include/Acts/Seeding/SeedFilterConfig.hpp
+++ b/Core/include/Acts/Seeding/SeedFilterConfig.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2020 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
diff --git a/Core/include/Acts/Seeding/SeedFinder.hpp b/Core/include/Acts/Seeding/SeedFinder.hpp
index da9d8104679..35a101015a5 100644
--- a/Core/include/Acts/Seeding/SeedFinder.hpp
+++ b/Core/include/Acts/Seeding/SeedFinder.hpp
@@ -1,29 +1,31 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2024 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
 #include "Acts/Definitions/Units.hpp"
-#include "Acts/EventData/SpacePointData.hpp"
+#include "Acts/EventData/SpacePointMutableData.hpp"
 #include "Acts/Geometry/Extent.hpp"
 #include "Acts/Seeding/CandidatesForMiddleSp.hpp"
-#include "Acts/Seeding/InternalSeed.hpp"
-#include "Acts/Seeding/InternalSpacePoint.hpp"
 #include "Acts/Seeding/Neighbour.hpp"
 #include "Acts/Seeding/SeedFilter.hpp"
 #include "Acts/Seeding/SeedFinderConfig.hpp"
 #include "Acts/Seeding/SeedFinderUtils.hpp"
+#include "Acts/Seeding/SpacePointGrid.hpp"
+#include "Acts/Seeding/detail/UtilityFunctions.hpp"
+#include "Acts/Utilities/Logger.hpp"
 
 #include <array>
 #include <limits>
 #include <list>
 #include <map>
 #include <memory>
+#include <ranges>
 #include <set>
 #include <string>
 #include <utility>
@@ -31,6 +33,17 @@
 
 namespace Acts {
 
+template <typename Coll>
+concept GridBinCollection =
+    std::ranges::random_access_range<Coll> &&
+    std::same_as<typename Coll::value_type, std::size_t>;
+
+template <typename collection_t, typename external_t, std::size_t N = 3ul>
+concept CollectionStoresSeedsTo =
+    requires(collection_t coll, Acts::Seed<external_t, N> seed) {
+      Acts::detail::pushBackOrInsertAtEnd(coll, seed);
+    };
+
 enum class SpacePointCandidateType : short { eBottom, eTop };
 
 enum class DetectorMeasurementInfo : short { eDefault, eDetailed };
@@ -45,38 +58,44 @@ class SeedFinder {
  public:
   struct SeedingState {
     // bottom space point
-    std::vector<InternalSpacePoint<external_spacepoint_t>*> compatBottomSP;
-    std::vector<InternalSpacePoint<external_spacepoint_t>*> compatTopSP;
+    std::vector<const external_spacepoint_t*> compatBottomSP{};
+    std::vector<const external_spacepoint_t*> compatTopSP{};
     // contains parameters required to calculate circle with linear equation
     // ...for bottom-middle
-    std::vector<LinCircle> linCircleBottom;
+    std::vector<LinCircle> linCircleBottom{};
     // ...for middle-top
-    std::vector<LinCircle> linCircleTop;
+    std::vector<LinCircle> linCircleTop{};
 
     // create vectors here to avoid reallocation in each loop
-    std::vector<const InternalSpacePoint<external_spacepoint_t>*> topSpVec;
-    std::vector<float> curvatures;
-    std::vector<float> impactParameters;
+    std::vector<const external_spacepoint_t*> topSpVec{};
+    std::vector<float> curvatures{};
+    std::vector<float> impactParameters{};
 
     // managing seed candidates for SpM
-    CandidatesForMiddleSp<const InternalSpacePoint<external_spacepoint_t>>
-        candidates_collector;
+    CandidatesForMiddleSp<const external_spacepoint_t> candidates_collector{};
 
     // managing doublet candidates
     boost::container::small_vector<Acts::Neighbour<grid_t>,
                                    Acts::detail::ipow(3, grid_t::DIM)>
-        bottomNeighbours;
+        bottomNeighbours{};
     boost::container::small_vector<Acts::Neighbour<grid_t>,
                                    Acts::detail::ipow(3, grid_t::DIM)>
-        topNeighbours;
+        topNeighbours{};
 
-    // Adding space point info
-    Acts::SpacePointData spacePointData;
+    // Mutable variables for Space points used in the seeding
+    Acts::SpacePointMutableData spacePointMutableData{};
   };
 
   /// The only constructor. Requires a config object.
   /// @param config the configuration for the SeedFinder
-  SeedFinder(const Acts::SeedFinderConfig<external_spacepoint_t>& config);
+  /// @param logger the ACTS logger
+  SeedFinder(const Acts::SeedFinderConfig<external_spacepoint_t>& config,
+             std::unique_ptr<const Acts::Logger> logger =
+                 getDefaultLogger("Finder", Logging::Level::INFO));
+  SeedFinder(SeedFinder<external_spacepoint_t, grid_t, platform_t>&&) noexcept =
+      default;
+  SeedFinder& operator=(SeedFinder<external_spacepoint_t, grid_t,
+                                   platform_t>&&) noexcept = default;
   ~SeedFinder() = default;
   /**    @name Disallow default instantiation, copy, assignment */
   //@{
@@ -84,7 +103,7 @@ class SeedFinder {
   SeedFinder(const SeedFinder<external_spacepoint_t, grid_t, platform_t>&) =
       delete;
   SeedFinder<external_spacepoint_t, grid_t, platform_t>& operator=(
-      const SeedFinder<external_spacepoint_t, grid_t, platform_t>&) = default;
+      const SeedFinder<external_spacepoint_t, grid_t, platform_t>&) = delete;
   //@}
 
   /// Create all seeds from the space points in the three iterators.
@@ -99,7 +118,9 @@ class SeedFinder {
   /// @param rMiddleSPRange range object containing the minimum and maximum r for middle SP for a certain z bin.
   /// @note Ranges must return pointers.
   /// @note Ranges must be separate objects for each parallel call.
-  template <typename container_t, typename sp_range_t>
+  template <typename container_t, Acts::GridBinCollection sp_range_t>
+    requires Acts::CollectionStoresSeedsTo<container_t, external_spacepoint_t,
+                                           3ul>
   void createSeedsForGroup(const Acts::SeedFinderOptions& options,
                            SeedingState& state, const grid_t& grid,
                            container_t& outputCollection,
@@ -109,11 +130,21 @@ class SeedFinder {
                            const Acts::Range1D<float>& rMiddleSPRange) const;
 
  private:
+  /// Given a middle space point candidate, get the proper radius validity range
+  /// In case the radius range changes according to the z-bin we need to
+  /// retrieve the proper range. We can do this computation only once, since
+  /// all the middle space point candidates belong to the same z-bin
+  /// @param spM space point candidate to be used as middle SP in a seed
+  /// @param rMiddleSPRange range object containing the minimum and maximum r for middle SP for a certain z bin.
+  std::pair<float, float> retrieveRadiusRangeForMiddle(
+      const external_spacepoint_t& spM,
+      const Acts::Range1D<float>& rMiddleSPRange) const;
+
   /// Iterates over dublets and tests the compatibility between them by applying
   /// a series of cuts that can be tested with only two SPs
-  /// @param spacePointData object containing the spacepoint data
   /// @param options frequently changing configuration (like beam position)
   /// @param grid spacepoint grid
+  /// @param mutableData Container for mutable variables used in the seeding
   /// @param otherSPsNeighbours inner or outer space points to be used in the dublet
   /// @param mediumSP space point candidate to be used as middle SP in a seed
   /// @param linCircleVec vector containing inner or outer SP parameters after reference frame transformation to the u-v space
@@ -126,32 +157,33 @@ class SeedFinder {
   /// @param sinPhiM ratio between middle SP y position and radius
   template <Acts::SpacePointCandidateType candidateType, typename out_range_t>
   void getCompatibleDoublets(
-      Acts::SpacePointData& spacePointData,
       const Acts::SeedFinderOptions& options, const grid_t& grid,
-      boost::container::small_vector<Acts::Neighbour<grid_t>,
+      Acts::SpacePointMutableData& mutableData,
+      boost::container::small_vector<Neighbour<grid_t>,
                                      Acts::detail::ipow(3, grid_t::DIM)>&
           otherSPsNeighbours,
-      const InternalSpacePoint<external_spacepoint_t>& mediumSP,
+      const external_spacepoint_t& mediumSP,
       std::vector<LinCircle>& linCircleVec, out_range_t& outVec,
       const float deltaRMinSP, const float deltaRMaxSP, const float uIP,
       const float uIP2, const float cosPhiM, const float sinPhiM) const;
 
   /// Iterates over the seed candidates tests the compatibility between three
   /// SPs and calls for the seed confirmation
-  /// @param spacePointData object containing the spacepoint data
   /// @param SpM space point candidate to be used as middle SP in a seed
   /// @param options frequently changing configuration (like beam position)
   /// @param seedFilterState State object that holds memory used in SeedFilter
   /// @param state State object that holds memory used
   template <Acts::DetectorMeasurementInfo detailedMeasurement>
-  void filterCandidates(Acts::SpacePointData& spacePointData,
-                        const InternalSpacePoint<external_spacepoint_t>& SpM,
+  void filterCandidates(const external_spacepoint_t& SpM,
                         const Acts::SeedFinderOptions& options,
                         SeedFilterState& seedFilterState,
                         SeedingState& state) const;
 
  private:
+  const Logger& logger() const { return *m_logger; }
+
   Acts::SeedFinderConfig<external_spacepoint_t> m_config;
+  std::unique_ptr<const Acts::Logger> m_logger{nullptr};
 };
 
 }  // namespace Acts
diff --git a/Core/include/Acts/Seeding/SeedFinder.ipp b/Core/include/Acts/Seeding/SeedFinder.ipp
index ba36b260909..e6ccb9f589f 100644
--- a/Core/include/Acts/Seeding/SeedFinder.ipp
+++ b/Core/include/Acts/Seeding/SeedFinder.ipp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2024 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include <algorithm>
 #include <cmath>
@@ -15,8 +15,9 @@ namespace Acts {
 
 template <typename external_spacepoint_t, typename grid_t, typename platform_t>
 SeedFinder<external_spacepoint_t, grid_t, platform_t>::SeedFinder(
-    const Acts::SeedFinderConfig<external_spacepoint_t>& config)
-    : m_config(config) {
+    const Acts::SeedFinderConfig<external_spacepoint_t>& config,
+    std::unique_ptr<const Acts::Logger> logger)
+    : m_config(config), m_logger(std::move(logger)) {
   if (!config.isInInternalUnits) {
     throw std::runtime_error(
         "SeedFinderConfig not in ACTS internal units in SeedFinder");
@@ -36,7 +37,9 @@ SeedFinder<external_spacepoint_t, grid_t, platform_t>::SeedFinder(
 }
 
 template <typename external_spacepoint_t, typename grid_t, typename platform_t>
-template <typename container_t, typename sp_range_t>
+template <typename container_t, Acts::GridBinCollection sp_range_t>
+  requires Acts::CollectionStoresSeedsTo<container_t, external_spacepoint_t,
+                                         3ul>
 void SeedFinder<external_spacepoint_t, grid_t, platform_t>::createSeedsForGroup(
     const Acts::SeedFinderOptions& options, SeedingState& state,
     const grid_t& grid, container_t& outputCollection,
@@ -63,9 +66,10 @@ void SeedFinder<external_spacepoint_t, grid_t, platform_t>::createSeedsForGroup(
   }
 
   // Get the middle space point candidates
-  const auto& middleSPs = grid.at(middleSPsIdx);
+  const std::vector<const external_spacepoint_t*>& middleSPs =
+      grid.at(middleSPsIdx);
   // Return if somehow there are no middle sp candidates
-  if (middleSPs.size() == 0) {
+  if (middleSPs.empty()) {
     return;
   }
 
@@ -103,40 +107,26 @@ void SeedFinder<external_spacepoint_t, grid_t, platform_t>::createSeedsForGroup(
     return;
   }
 
-  for (const auto& spM : middleSPs) {
-    float rM = spM->radius();
+  // we compute this here since all middle space point candidates belong to the
+  // same z-bin
+  auto [minRadiusRangeForMiddle, maxRadiusRangeForMiddle] =
+      retrieveRadiusRangeForMiddle(*middleSPs.front(), rMiddleSPRange);
+  ACTS_VERBOSE("Current global bin: " << middleSPsIdx << ", z value of "
+                                      << middleSPs.front()->z());
+  ACTS_VERBOSE("Validity range (radius) for the middle space point is ["
+               << minRadiusRangeForMiddle << ", " << maxRadiusRangeForMiddle
+               << "]");
+
+  for (const external_spacepoint_t* spM : middleSPs) {
+    const float rM = spM->radius();
 
     // check if spM is outside our radial region of interest
-    if (m_config.useVariableMiddleSPRange) {
-      if (rM < rMiddleSPRange.min()) {
-        continue;
-      }
-      if (rM > rMiddleSPRange.max()) {
-        // break because SPs are sorted in r
-        break;
-      }
-    } else if (!m_config.rRangeMiddleSP.empty()) {
-      /// get zBin position of the middle SP
-      auto pVal = std::lower_bound(m_config.zBinEdges.begin(),
-                                   m_config.zBinEdges.end(), spM->z());
-      int zBin = std::distance(m_config.zBinEdges.begin(), pVal);
-      /// protects against zM at the limit of zBinEdges
-      zBin == 0 ? zBin : --zBin;
-      if (rM < m_config.rRangeMiddleSP[zBin][0]) {
-        continue;
-      }
-      if (rM > m_config.rRangeMiddleSP[zBin][1]) {
-        // break because SPs are sorted in r
-        break;
-      }
-    } else {
-      if (rM < m_config.rMinMiddle) {
-        continue;
-      }
-      if (rM > m_config.rMaxMiddle) {
-        // break because SPs are sorted in r
-        break;
-      }
+    if (rM < minRadiusRangeForMiddle) {
+      continue;
+    }
+    if (rM > maxRadiusRangeForMiddle) {
+      // break because SPs are sorted in r
+      break;
     }
 
     const float zM = spM->z();
@@ -147,12 +137,13 @@ void SeedFinder<external_spacepoint_t, grid_t, platform_t>::createSeedsForGroup(
 
     // Iterate over middle-top dublets
     getCompatibleDoublets<Acts::SpacePointCandidateType::eTop>(
-        state.spacePointData, options, grid, state.topNeighbours, *spM.get(),
+        options, grid, state.spacePointMutableData, state.topNeighbours, *spM,
         state.linCircleTop, state.compatTopSP, m_config.deltaRMinTopSP,
         m_config.deltaRMaxTopSP, uIP, uIP2, cosPhiM, sinPhiM);
 
     // no top SP found -> try next spM
     if (state.compatTopSP.empty()) {
+      ACTS_VERBOSE("No compatible Tops, moving to next middle candidate");
       continue;
     }
 
@@ -174,32 +165,43 @@ void SeedFinder<external_spacepoint_t, grid_t, platform_t>::createSeedsForGroup(
       seedFilterState.rMaxSeedConf = seedConfRange.rMaxSeedConf;
       // continue if number of top SPs is smaller than minimum
       if (state.compatTopSP.size() < seedFilterState.nTopSeedConf) {
+        ACTS_VERBOSE(
+            "Number of top SPs is "
+            << state.compatTopSP.size()
+            << " and is smaller than minimum, moving to next middle candidate");
         continue;
       }
     }
 
     // Iterate over middle-bottom dublets
     getCompatibleDoublets<Acts::SpacePointCandidateType::eBottom>(
-        state.spacePointData, options, grid, state.bottomNeighbours, *spM.get(),
-        state.linCircleBottom, state.compatBottomSP, m_config.deltaRMinBottomSP,
-        m_config.deltaRMaxBottomSP, uIP, uIP2, cosPhiM, sinPhiM);
+        options, grid, state.spacePointMutableData, state.bottomNeighbours,
+        *spM, state.linCircleBottom, state.compatBottomSP,
+        m_config.deltaRMinBottomSP, m_config.deltaRMaxBottomSP, uIP, uIP2,
+        cosPhiM, sinPhiM);
 
     // no bottom SP found -> try next spM
     if (state.compatBottomSP.empty()) {
+      ACTS_VERBOSE("No compatible Bottoms, moving to next middle candidate");
       continue;
     }
 
+    ACTS_VERBOSE("Candidates: " << state.compatBottomSP.size()
+                                << " bottoms and " << state.compatTopSP.size()
+                                << " tops for middle candidate indexed "
+                                << spM->index());
     // filter candidates
     if (m_config.useDetailedDoubleMeasurementInfo) {
       filterCandidates<Acts::DetectorMeasurementInfo::eDetailed>(
-          state.spacePointData, *spM.get(), options, seedFilterState, state);
+          *spM, options, seedFilterState, state);
     } else {
       filterCandidates<Acts::DetectorMeasurementInfo::eDefault>(
-          state.spacePointData, *spM.get(), options, seedFilterState, state);
+          *spM, options, seedFilterState, state);
     }
 
-    m_config.seedFilter->filterSeeds_1SpFixed(
-        state.spacePointData, state.candidates_collector, outputCollection);
+    m_config.seedFilter->filterSeeds_1SpFixed(state.spacePointMutableData,
+                                              state.candidates_collector,
+                                              outputCollection);
 
   }  // loop on mediums
 }
@@ -208,15 +210,15 @@ template <typename external_spacepoint_t, typename grid_t, typename platform_t>
 template <Acts::SpacePointCandidateType candidateType, typename out_range_t>
 inline void
 SeedFinder<external_spacepoint_t, grid_t, platform_t>::getCompatibleDoublets(
-    Acts::SpacePointData& spacePointData,
     const Acts::SeedFinderOptions& options, const grid_t& grid,
-    boost::container::small_vector<Acts::Neighbour<grid_t>,
+    Acts::SpacePointMutableData& mutableData,
+    boost::container::small_vector<Neighbour<grid_t>,
                                    Acts::detail::ipow(3, grid_t::DIM)>&
         otherSPsNeighbours,
-    const InternalSpacePoint<external_spacepoint_t>& mediumSP,
-    std::vector<LinCircle>& linCircleVec, out_range_t& outVec,
-    const float deltaRMinSP, const float deltaRMaxSP, const float uIP,
-    const float uIP2, const float cosPhiM, const float sinPhiM) const {
+    const external_spacepoint_t& mediumSP, std::vector<LinCircle>& linCircleVec,
+    out_range_t& outVec, const float deltaRMinSP, const float deltaRMaxSP,
+    const float uIP, const float uIP2, const float cosPhiM,
+    const float sinPhiM) const {
   float impactMax = m_config.impactMax;
 
   constexpr bool isBottomCandidate =
@@ -255,8 +257,9 @@ SeedFinder<external_spacepoint_t, grid_t, platform_t>::getCompatibleDoublets(
   float deltaZ = 0.;
 
   for (auto& otherSPCol : otherSPsNeighbours) {
-    const auto& otherSPs = grid.at(otherSPCol.index);
-    if (otherSPs.size() == 0) {
+    const std::vector<const external_spacepoint_t*>& otherSPs =
+        grid.at(otherSPCol.index);
+    if (otherSPs.empty()) {
       continue;
     }
 
@@ -267,8 +270,8 @@ SeedFinder<external_spacepoint_t, grid_t, platform_t>::getCompatibleDoublets(
     // find the first SP inside the radius region of interest and update
     // the iterator so we don't need to look at the other SPs again
     for (; min_itr != otherSPs.end(); ++min_itr) {
-      const auto& otherSP = *min_itr;
-      if constexpr (isBottomCandidate) {
+      const external_spacepoint_t* otherSP = *min_itr;
+      if constexpr (candidateType == Acts::SpacePointCandidateType::eBottom) {
         // if r-distance is too big, try next SP in bin
         if ((rM - otherSP->radius()) <= deltaRMaxSP) {
           break;
@@ -286,7 +289,7 @@ SeedFinder<external_spacepoint_t, grid_t, platform_t>::getCompatibleDoublets(
     otherSPCol.itr = min_itr;
 
     for (; min_itr != otherSPs.end(); ++min_itr) {
-      const auto& otherSP = *min_itr;
+      const external_spacepoint_t* otherSP = *min_itr;
 
       if constexpr (isBottomCandidate) {
         deltaR = (rM - otherSP->radius());
@@ -362,9 +365,10 @@ SeedFinder<external_spacepoint_t, grid_t, platform_t>::getCompatibleDoublets(
         // fill output vectors
         linCircleVec.emplace_back(cotTheta, iDeltaR, Er, uT, vT, xNewFrame,
                                   yNewFrame);
-        spacePointData.setDeltaR(otherSP->index(),
-                                 std::sqrt(deltaR2 + (deltaZ * deltaZ)));
-        outVec.push_back(otherSP.get());
+
+        mutableData.setDeltaR(otherSP->index(),
+                              std::sqrt(deltaR2 + (deltaZ * deltaZ)));
+        outVec.push_back(otherSP);
         continue;
       }
 
@@ -381,8 +385,15 @@ SeedFinder<external_spacepoint_t, grid_t, platform_t>::getCompatibleDoublets(
       const float uT = xNewFrame * iDeltaR2;
       const float vT = yNewFrame * iDeltaR2;
 
-      // interactionPointCut == true we apply this cut first cuts before
-      // coordinate transformation to avoid unnecessary calculations
+      // We check the interaction point by evaluating the minimal distance
+      // between the origin and the straight line connecting the two points in
+      // the doublets. Using a geometric similarity, the Im is given by
+      // yNewFrame * rM / deltaR <= m_config.impactMax
+      // However, we make here an approximation of the impact parameter
+      // which is valid under the assumption yNewFrame / xNewFrame is small
+      // The correct computation would be:
+      // yNewFrame * yNewFrame * rM * rM <= m_config.impactMax *
+      // m_config.impactMax * deltaR2
       if (std::abs(rM * yNewFrame) <= impactMax * xNewFrame) {
         // check if duplet cotTheta is within the region of interest
         // cotTheta is defined as (deltaZ / deltaR) but instead we multiply
@@ -411,9 +422,9 @@ SeedFinder<external_spacepoint_t, grid_t, platform_t>::getCompatibleDoublets(
         // fill output vectors
         linCircleVec.emplace_back(cotTheta, iDeltaR, Er, uT, vT, xNewFrame,
                                   yNewFrame);
-        spacePointData.setDeltaR(otherSP->index(),
-                                 std::sqrt(deltaR2 + (deltaZ * deltaZ)));
-        outVec.emplace_back(otherSP.get());
+        mutableData.setDeltaR(otherSP->index(),
+                              std::sqrt(deltaR2 + (deltaZ * deltaZ)));
+        outVec.emplace_back(otherSP);
         continue;
       }
 
@@ -460,9 +471,10 @@ SeedFinder<external_spacepoint_t, grid_t, platform_t>::getCompatibleDoublets(
       // fill output vectors
       linCircleVec.emplace_back(cotTheta, iDeltaR, Er, uT, vT, xNewFrame,
                                 yNewFrame);
-      spacePointData.setDeltaR(otherSP->index(),
-                               std::sqrt(deltaR2 + (deltaZ * deltaZ)));
-      outVec.emplace_back(otherSP.get());
+
+      mutableData.setDeltaR(otherSP->index(),
+                            std::sqrt(deltaR2 + (deltaZ * deltaZ)));
+      outVec.emplace_back(otherSP);
     }
   }
 }
@@ -471,15 +483,13 @@ template <typename external_spacepoint_t, typename grid_t, typename platform_t>
 template <Acts::DetectorMeasurementInfo detailedMeasurement>
 inline void
 SeedFinder<external_spacepoint_t, grid_t, platform_t>::filterCandidates(
-    Acts::SpacePointData& spacePointData,
-    const InternalSpacePoint<external_spacepoint_t>& spM,
-    const Acts::SeedFinderOptions& options, SeedFilterState& seedFilterState,
-    SeedingState& state) const {
-  float rM = spM.radius();
-  float cosPhiM = spM.x() / rM;
-  float sinPhiM = spM.y() / rM;
-  float varianceRM = spM.varianceR();
-  float varianceZM = spM.varianceZ();
+    const external_spacepoint_t& spM, const Acts::SeedFinderOptions& options,
+    SeedFilterState& seedFilterState, SeedingState& state) const {
+  const float rM = spM.radius();
+  const float cosPhiM = spM.x() / rM;
+  const float sinPhiM = spM.y() / rM;
+  const float varianceRM = spM.varianceR();
+  const float varianceZM = spM.varianceZ();
 
   std::size_t numTopSP = state.compatTopSP.size();
 
@@ -496,17 +506,13 @@ SeedFinder<external_spacepoint_t, grid_t, platform_t>::filterCandidates(
 
   if constexpr (detailedMeasurement ==
                 Acts::DetectorMeasurementInfo::eDefault) {
-    std::sort(sorted_bottoms.begin(), sorted_bottoms.end(),
-              [&state](const std::size_t a, const std::size_t b) -> bool {
-                return state.linCircleBottom[a].cotTheta <
-                       state.linCircleBottom[b].cotTheta;
-              });
-
-    std::sort(sorted_tops.begin(), sorted_tops.end(),
-              [&state](const std::size_t a, const std::size_t b) -> bool {
-                return state.linCircleTop[a].cotTheta <
-                       state.linCircleTop[b].cotTheta;
-              });
+    std::ranges::sort(sorted_bottoms, {}, [&state](const std::size_t s) {
+      return state.linCircleBottom[s].cotTheta;
+    });
+
+    std::ranges::sort(sorted_tops, {}, [&state](const std::size_t s) {
+      return state.linCircleTop[s].cotTheta;
+    });
   }
 
   // Reserve enough space, in case current capacity is too little
@@ -615,8 +621,7 @@ SeedFinder<external_spacepoint_t, grid_t, platform_t>::filterCandidates(
             rotationTermsUVtoXY[0] * A0 + rotationTermsUVtoXY[1],
             zPositionMiddle};
 
-        if (!xyzCoordinateCheck(spacePointData, m_config, spM, positionMiddle,
-                                rMTransf)) {
+        if (!xyzCoordinateCheck(m_config, spM, positionMiddle, rMTransf)) {
           continue;
         }
 
@@ -631,8 +636,7 @@ SeedFinder<external_spacepoint_t, grid_t, platform_t>::filterCandidates(
 
         auto spB = state.compatBottomSP[b];
         double rBTransf[3];
-        if (!xyzCoordinateCheck(spacePointData, m_config, *spB, positionBottom,
-                                rBTransf)) {
+        if (!xyzCoordinateCheck(m_config, *spB, positionBottom, rBTransf)) {
           continue;
         }
 
@@ -646,8 +650,7 @@ SeedFinder<external_spacepoint_t, grid_t, platform_t>::filterCandidates(
 
         auto spT = state.compatTopSP[t];
         double rTTransf[3];
-        if (!xyzCoordinateCheck(spacePointData, m_config, *spT, positionTop,
-                                rTTransf)) {
+        if (!xyzCoordinateCheck(m_config, *spT, positionTop, rTTransf)) {
           continue;
         }
 
@@ -824,10 +827,31 @@ SeedFinder<external_spacepoint_t, grid_t, platform_t>::filterCandidates(
     seedFilterState.zOrigin = spM.z() - rM * lb.cotTheta;
 
     m_config.seedFilter->filterSeeds_2SpFixed(
-        state.spacePointData, *state.compatBottomSP[b], spM, state.topSpVec,
-        state.curvatures, state.impactParameters, seedFilterState,
-        state.candidates_collector);
+        state.spacePointMutableData, *state.compatBottomSP[b], spM,
+        state.topSpVec, state.curvatures, state.impactParameters,
+        seedFilterState, state.candidates_collector);
   }  // loop on bottoms
 }
 
+template <typename external_spacepoint_t, typename grid_t, typename platform_t>
+std::pair<float, float> SeedFinder<external_spacepoint_t, grid_t, platform_t>::
+    retrieveRadiusRangeForMiddle(
+        const external_spacepoint_t& spM,
+        const Acts::Range1D<float>& rMiddleSPRange) const {
+  if (m_config.useVariableMiddleSPRange) {
+    return std::make_pair(rMiddleSPRange.min(), rMiddleSPRange.max());
+  }
+  if (!m_config.rRangeMiddleSP.empty()) {
+    /// get zBin position of the middle SP
+    auto pVal = std::lower_bound(m_config.zBinEdges.begin(),
+                                 m_config.zBinEdges.end(), spM.z());
+    int zBin = std::distance(m_config.zBinEdges.begin(), pVal);
+    /// protects against zM at the limit of zBinEdges
+    zBin == 0 ? zBin : --zBin;
+    return std::make_pair(m_config.rRangeMiddleSP[zBin][0],
+                          m_config.rRangeMiddleSP[zBin][1]);
+  }
+  return std::make_pair(m_config.rMinMiddle, m_config.rMaxMiddle);
+}
+
 }  // namespace Acts
diff --git a/Core/include/Acts/Seeding/SeedFinderConfig.hpp b/Core/include/Acts/Seeding/SeedFinderConfig.hpp
index f9d254594f7..93dacaeafd8 100644
--- a/Core/include/Acts/Seeding/SeedFinderConfig.hpp
+++ b/Core/include/Acts/Seeding/SeedFinderConfig.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2018-2020 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
@@ -15,6 +15,7 @@
 
 #include <limits>
 #include <memory>
+#include <numbers>
 #include <vector>
 
 namespace Acts {
@@ -33,8 +34,8 @@ struct SeedFinderConfig {
   /// Geometry Settings + Detector ROI
   /// (r, z, phi) range for limiting location of all measurements and grid
   /// creation
-  float phiMin = -M_PI;
-  float phiMax = M_PI;
+  float phiMin = -std::numbers::pi_v<float>;
+  float phiMax = std::numbers::pi_v<float>;
   float zMin = -2800 * Acts::UnitConstants::mm;
   float zMax = 2800 * Acts::UnitConstants::mm;
   float rMax = 600 * Acts::UnitConstants::mm;
@@ -176,20 +177,7 @@ struct SeedFinderConfig {
   /// measurement from strips on back-to-back modules.
   /// Enables setting of the following delegates.
   bool useDetailedDoubleMeasurementInfo = false;
-  /// Returns half of the length of the top strip.
-  Delegate<float(const SpacePoint&)> getTopHalfStripLength;
-  /// Returns half of the length of the bottom strip.
-  Delegate<float(const SpacePoint&)> getBottomHalfStripLength;
-  /// Returns direction of the top strip.
-  Delegate<Acts::Vector3(const SpacePoint&)> getTopStripDirection;
-  /// Returns direction of the bottom strip.
-  Delegate<Acts::Vector3(const SpacePoint&)> getBottomStripDirection;
-  /// Returns distance between the centers of the two strips.
-  Delegate<Acts::Vector3(const SpacePoint&)> getStripCenterDistance;
-  /// Returns position of the center of the top strip.
-  Delegate<Acts::Vector3(const SpacePoint&)> getTopStripCenterPosition;
-  /// Delegate for specifying experiment specific cuts on space points
-  /// before filling the grid. Currently accepts three parameters
+
   Delegate<bool(const SpacePoint&)> spacePointSelector{
       DelegateFuncTag<voidSpacePointSelector>{}};
 
diff --git a/Core/include/Acts/Seeding/SeedFinderGbts.hpp b/Core/include/Acts/Seeding/SeedFinderGbts.hpp
index fd416ac6dee..a7ca8f55268 100644
--- a/Core/include/Acts/Seeding/SeedFinderGbts.hpp
+++ b/Core/include/Acts/Seeding/SeedFinderGbts.hpp
@@ -1,22 +1,21 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2021 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
 // TODO: update to C++17 style
 
+#include "Acts/EventData/Seed.hpp"
 #include "Acts/EventData/SpacePointData.hpp"
-#include "Acts/Seeding/InternalSeed.hpp"
-#include "Acts/Seeding/InternalSpacePoint.hpp"
 #include "Acts/Seeding/SeedFinderConfig.hpp"
 #include "Acts/Seeding/SeedFinderGbtsConfig.hpp"
 #include "Acts/TrackFinding/RoiDescriptor.hpp"
-#include "Acts/Utilities/KDTree.hpp"
+#include "Acts/Utilities/Logger.hpp"
 
 #include <array>
 #include <iostream>
@@ -47,14 +46,15 @@ class SeedFinderGbts {
   static constexpr std::size_t NDims = 3;
 
   using seed_t = Seed<external_spacepoint_t>;
-  //   using internal_sp_t = InternalSpacePoint<external_spacepoint_t>;
-  //   using tree_t = KDTree<NDims, internal_sp_t *, ActsScalar, std::array, 4>;
 
   // constructors
   SeedFinderGbts(const SeedFinderGbtsConfig<external_spacepoint_t> &config,
-                 const GbtsGeometry<external_spacepoint_t> &gbtsgeo);
+                 const GbtsGeometry<external_spacepoint_t> &gbtsgeo,
+                 std::unique_ptr<const Acts::Logger> logger =
+                     Acts::getDefaultLogger("Finder",
+                                            Acts::Logging::Level::INFO));
 
-  ~SeedFinderGbts();  //!!! is it dangerous not to use default? got def in ipp
+  ~SeedFinderGbts() = default;
   SeedFinderGbts() = default;
   SeedFinderGbts(const SeedFinderGbts<external_spacepoint_t> &) = delete;
   SeedFinderGbts<external_spacepoint_t> &operator=(
@@ -86,10 +86,14 @@ class SeedFinderGbts {
       const Acts::GbtsGeometry<external_spacepoint_t> &gbtsgeo);
 
   // needs to be member of class so can accessed by all member functions
-  GbtsDataStorage<external_spacepoint_t> *m_storage;
+  std::unique_ptr<GbtsDataStorage<external_spacepoint_t>> m_storage{nullptr};
 
   // for create seeds:
   std::vector<TrigInDetTriplet<external_spacepoint_t>> m_triplets;
+
+  const Acts::Logger &logger() const { return *m_logger; }
+  std::unique_ptr<const Acts::Logger> m_logger =
+      Acts::getDefaultLogger("Finder", Acts::Logging::Level::INFO);
 };
 
 }  // namespace Acts
diff --git a/Core/include/Acts/Seeding/SeedFinderGbts.ipp b/Core/include/Acts/Seeding/SeedFinderGbts.ipp
index 92cc7cd1963..ed2fe157acf 100644
--- a/Core/include/Acts/Seeding/SeedFinderGbts.ipp
+++ b/Core/include/Acts/Seeding/SeedFinderGbts.ipp
@@ -1,15 +1,14 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2021 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 // SeedFinderGbts.ipp
 // TODO: update to C++17 style
 
-#include "Acts/Definitions/Algebra.hpp"  //for M_PI
 #include "Acts/Geometry/Extent.hpp"
 #include "Acts/Seeding/SeedFilter.hpp"
 #include "Acts/Seeding/SeedFinder.hpp"
@@ -17,11 +16,13 @@
 #include "Acts/Seeding/SeedFinderUtils.hpp"
 #include "Acts/Utilities/BinningType.hpp"
 
+#include <algorithm>
 #include <cmath>
 #include <fstream>
 #include <functional>
 #include <iostream>
 #include <list>
+#include <numbers>
 #include <numeric>
 #include <type_traits>
 #include <vector>
@@ -33,22 +34,18 @@ namespace Acts {
 template <typename external_spacepoint_t>
 SeedFinderGbts<external_spacepoint_t>::SeedFinderGbts(
     const SeedFinderGbtsConfig<external_spacepoint_t>& config,
-    const GbtsGeometry<external_spacepoint_t>& gbtsGeo)
-    : m_config(config) {
-  m_storage = new GbtsDataStorage(gbtsGeo);
-}
-
-template <typename external_spacepoint_t>
-SeedFinderGbts<external_spacepoint_t>::~SeedFinderGbts() {
-  delete m_storage;
-
-  m_storage = nullptr;
-}
+    const GbtsGeometry<external_spacepoint_t>& gbtsGeo,
+    std::unique_ptr<const Acts::Logger> logger)
+    : m_config(config),
+      m_storage(
+          std::make_unique<GbtsDataStorage<external_spacepoint_t>>(gbtsGeo)),
+      m_logger(std::move(logger)) {}
 
 // define loadspace points function
 template <typename external_spacepoint_t>
 void SeedFinderGbts<external_spacepoint_t>::loadSpacePoints(
     const std::vector<GbtsSP<external_spacepoint_t>>& gbtsSPvect) {
+  ACTS_VERBOSE("Loading space points");
   for (const auto& gbtssp : gbtsSPvect) {
     bool is_Pixel = gbtssp.isPixel();
     if (!is_Pixel) {
@@ -57,7 +54,7 @@ void SeedFinderGbts<external_spacepoint_t>::loadSpacePoints(
     m_storage->addSpacePoint(gbtssp, (m_config.m_useClusterWidth > 0));
   }
 
-  m_config.m_phiSliceWidth = 2 * M_PI / m_config.m_nMaxPhiSlice;
+  m_config.m_phiSliceWidth = 2 * std::numbers::pi / m_config.m_nMaxPhiSlice;
 
   m_storage->sortByPhi();
 
@@ -69,6 +66,7 @@ void SeedFinderGbts<external_spacepoint_t>::runGbts_TrackFinder(
     std::vector<GbtsTrigTracklet<external_spacepoint_t>>& vTracks,
     const Acts::RoiDescriptor& roi,
     const Acts::GbtsGeometry<external_spacepoint_t>& gbtsGeo) {
+  ACTS_VERBOSE("Running GBTS Track Finder");
   const float min_z0 = roi.zedMinus();
   const float max_z0 = roi.zedPlus();
   const float cut_zMinU = min_z0 + m_config.maxOuterRadius * roi.dzdrMinus();
@@ -158,7 +156,7 @@ void SeedFinderGbts<external_spacepoint_t>::runGbts_TrackFinder(
                     .m_phiSliceWidth;  // the default sliding window along phi
 
             if (m_config.m_useEtaBinning) {
-              deltaPhi = 0.001f + m_maxCurv * std::fabs(rb2 - rb1);
+              deltaPhi = 0.001f + m_maxCurv * std::abs(rb2 - rb1);
             }
 
             unsigned int first_it = 0;
@@ -218,7 +216,7 @@ void SeedFinderGbts<external_spacepoint_t>::runGbts_TrackFinder(
 
                 float dz = z2 - z1;
                 float tau = dz / dr;
-                float ftau = std::fabs(tau);
+                float ftau = std::abs(tau);
                 if (ftau > 36.0) {
                   continue;
                 }
@@ -287,17 +285,18 @@ void SeedFinderGbts<external_spacepoint_t>::runGbts_TrackFinder(
                     float tau2 = edgeStorage.at(n2_in_idx).m_p[0];
                     float tau_ratio = tau2 * uat_1 - 1.0f;
 
-                    if (std::fabs(tau_ratio) >
-                        m_config.cut_tau_ratio_max) {  // bad
-                                                       // match
+                    // bad match
+                    if (std::abs(tau_ratio) > m_config.cut_tau_ratio_max) {
                       continue;
                     }
-                    isGood = true;  // good match found
+
+                    // good match found
+                    isGood = true;
                     break;
                   }
                 }
                 if (!isGood) {
-                  continue;  // no moatch found, skip creating [n1 <- n2] edge
+                  continue;  // no match found, skip creating [n1 <- n2] edge
                 }
 
                 float curv = D * std::sqrt(L2);  // signed curvature
@@ -326,6 +325,7 @@ void SeedFinderGbts<external_spacepoint_t>::runGbts_TrackFinder(
   m_storage->getConnectingNodes(vNodes);
 
   if (vNodes.empty()) {
+    ACTS_VERBOSE("No nodes");
     return;
   }
 
@@ -352,8 +352,8 @@ void SeedFinderGbts<external_spacepoint_t>::runGbts_TrackFinder(
       out_sort[outIdx].first = pS->m_p[0];
     }
 
-    std::sort(in_sort.begin(), in_sort.end());
-    std::sort(out_sort.begin(), out_sort.end());
+    std::ranges::sort(in_sort);
+    std::ranges::sort(out_sort);
 
     unsigned int last_out = 0;
 
@@ -390,10 +390,10 @@ void SeedFinderGbts<external_spacepoint_t>::runGbts_TrackFinder(
 
         float dPhi = pNS->m_p[3] - Phi1;
 
-        if (dPhi < -M_PI) {
-          dPhi += 2 * M_PI;
-        } else if (dPhi > M_PI) {
-          dPhi -= 2 * M_PI;
+        if (dPhi < -std::numbers::pi_v<float>) {
+          dPhi += static_cast<float>(2 * std::numbers::pi);
+        } else if (dPhi > std::numbers::pi_v<float>) {
+          dPhi -= static_cast<float>(2 * std::numbers::pi);
         }
 
         if (dPhi < -m_config.cut_dphi_max || dPhi > m_config.cut_dphi_max) {
@@ -495,8 +495,8 @@ void SeedFinderGbts<external_spacepoint_t>::runGbts_TrackFinder(
 
   m_triplets.clear();
 
-  std::sort(vSeeds.begin(), vSeeds.end(),
-            typename Acts::GbtsEdge<external_spacepoint_t>::CompareLevel());
+  std::ranges::sort(
+      vSeeds, typename Acts::GbtsEdge<external_spacepoint_t>::CompareLevel());
 
   if (vSeeds.empty()) {
     return;
@@ -504,8 +504,9 @@ void SeedFinderGbts<external_spacepoint_t>::runGbts_TrackFinder(
 
   // backtracking
 
-  GbtsTrackingFilter<external_spacepoint_t> tFilter(m_config.m_layerGeometry,
-                                                    edgeStorage);
+  GbtsTrackingFilter<external_spacepoint_t> tFilter(
+      m_config.m_layerGeometry, edgeStorage,
+      logger().cloneWithSuffix("GbtsFilter"));
 
   for (auto pS : vSeeds) {
     if (pS->m_level == -1) {
@@ -649,6 +650,7 @@ void SeedFinderGbts<external_spacepoint_t>::createSeeds(
     const Acts::RoiDescriptor& roi,
     const Acts::GbtsGeometry<external_spacepoint_t>& gbtsGeo,
     output_container_t& out_cont) {
+  ACTS_VERBOSE("Creating seeds");
   std::vector<GbtsTrigTracklet<external_spacepoint_t>>
       vTracks;  // make empty vector
 
@@ -700,7 +702,9 @@ void SeedFinderGbts<external_spacepoint_t>::createSeeds(
     float Vertex = 0;
     float Quality = triplet.Q();
     // make a new seed, add to vector of seeds
-    out_cont.emplace_back(*S1, *S2, *S3, Vertex, Quality);
+    out_cont.emplace_back(*S1, *S2, *S3);
+    out_cont.back().setVertexZ(Vertex);
+    out_cont.back().setQuality(Quality);
   }
 }
 
diff --git a/Core/include/Acts/Seeding/SeedFinderGbtsConfig.hpp b/Core/include/Acts/Seeding/SeedFinderGbtsConfig.hpp
index c724ad1d395..c1f0962a3ac 100644
--- a/Core/include/Acts/Seeding/SeedFinderGbtsConfig.hpp
+++ b/Core/include/Acts/Seeding/SeedFinderGbtsConfig.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2021 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
diff --git a/Core/include/Acts/Seeding/SeedFinderOrthogonal.hpp b/Core/include/Acts/Seeding/SeedFinderOrthogonal.hpp
index 70f895366ec..a4129fad556 100644
--- a/Core/include/Acts/Seeding/SeedFinderOrthogonal.hpp
+++ b/Core/include/Acts/Seeding/SeedFinderOrthogonal.hpp
@@ -1,20 +1,19 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2023 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
-#include "Acts/EventData/SpacePointData.hpp"
-#include "Acts/Seeding/InternalSeed.hpp"
-#include "Acts/Seeding/InternalSpacePoint.hpp"
+#include "Acts/EventData/SpacePointMutableData.hpp"
 #include "Acts/Seeding/SeedFilter.hpp"
 #include "Acts/Seeding/SeedFinderConfig.hpp"
 #include "Acts/Seeding/SeedFinderOrthogonalConfig.hpp"
 #include "Acts/Utilities/KDTree.hpp"
+#include "Acts/Utilities/Logger.hpp"
 
 #include <array>
 #include <iostream>
@@ -42,27 +41,25 @@ class SeedFinderOrthogonal {
    */
   using seed_t = Seed<external_spacepoint_t>;
 
-  /**
-   * @brief The spacepoint type used by this seeder internally.
-   */
-  using internal_sp_t = InternalSpacePoint<external_spacepoint_t>;
-
   /**
    * @brief The k-d tree type used by this seeder internally, which is
    * three-dimensional, contains internal spacepoint pointers, uses the Acts
    * scalar type for coordinates, stores its coordinates in std::arrays, and
    * has leaf size 4.
    */
-  using tree_t = KDTree<NDims, internal_sp_t *, ActsScalar, std::array, 4>;
+  using tree_t =
+      KDTree<NDims, const external_spacepoint_t *, ActsScalar, std::array, 4>;
 
   /**
    * @brief Construct a new orthogonal seed finder.
    *
    * @param config The configuration parameters for this seed finder.
+   * @param logger The ACTS logger.
    */
   SeedFinderOrthogonal(
-      const Acts::SeedFinderOrthogonalConfig<external_spacepoint_t> &config);
-
+      const Acts::SeedFinderOrthogonalConfig<external_spacepoint_t> &config,
+      std::unique_ptr<const Acts::Logger> logger =
+          Acts::getDefaultLogger("Finder", Logging::Level::INFO));
   /**
    * @brief Destroy the orthogonal seed finder object.
    */
@@ -72,7 +69,11 @@ class SeedFinderOrthogonal {
   SeedFinderOrthogonal(const SeedFinderOrthogonal<external_spacepoint_t> &) =
       delete;
   SeedFinderOrthogonal<external_spacepoint_t> &operator=(
-      const SeedFinderOrthogonal<external_spacepoint_t> &) = default;
+      const SeedFinderOrthogonal<external_spacepoint_t> &) = delete;
+  SeedFinderOrthogonal(
+      SeedFinderOrthogonal<external_spacepoint_t> &&) noexcept = default;
+  SeedFinderOrthogonal<external_spacepoint_t> &operator=(
+      SeedFinderOrthogonal<external_spacepoint_t> &&) noexcept = default;
 
   /**
    * @brief Perform seed finding, appending seeds to a container.
@@ -100,15 +101,12 @@ class SeedFinderOrthogonal {
    * @param options frequently changing configuration (like beam position)
    * @param spacePoints The input spacepoints from which to create seeds.
    * @param out_cont The output container to write seeds to.
-   * @param extract_coordinates User-defined function for extracting global position and
    * covariance of the external space point
    */
-  template <typename input_container_t, typename output_container_t,
-            typename callable_t>
+  template <typename input_container_t, typename output_container_t>
   void createSeeds(const Acts::SeedFinderOptions &options,
                    const input_container_t &spacePoints,
-                   output_container_t &out_cont,
-                   callable_t &&extract_coordinates) const;
+                   output_container_t &out_cont) const;
 
   /**
    * @brief Perform seed finding, returning a new container of seeds.
@@ -121,15 +119,13 @@ class SeedFinderOrthogonal {
    * @tparam input_container_t The type of the input spacepoint container.
    * @param options frequently changing configuration (like beam position)
    * @param spacePoints The input spacepoints from which to create seeds.
-   * @param extract_coordinates User-defined function for extracting global position and
    * covariance of the external space point
    *
    * @return A vector of seeds.
    */
-  template <typename input_container_t, typename callable_t>
+  template <typename input_container_t>
   std::vector<seed_t> createSeeds(const Acts::SeedFinderOptions &options,
-                                  const input_container_t &spacePoints,
-                                  callable_t &&extract_coordinates) const;
+                                  const input_container_t &spacePoints) const;
 
  private:
   /**
@@ -152,7 +148,7 @@ class SeedFinderOrthogonal {
    * @return An N-dimensional axis-aligned search range.
    */
   typename tree_t::range_t validTupleOrthoRangeLH(
-      const internal_sp_t &low) const;
+      const external_spacepoint_t &low) const;
 
   /**
    * @brief Return the AABB rearch range for a given spacepoint, searching
@@ -169,7 +165,7 @@ class SeedFinderOrthogonal {
    * @return An N-dimensional axis-aligned search range.
    */
   typename tree_t::range_t validTupleOrthoRangeHL(
-      const internal_sp_t &high) const;
+      const external_spacepoint_t &high) const;
 
   /**
    * @brief Check whether two spacepoints form a valid tuple.
@@ -189,8 +185,10 @@ class SeedFinderOrthogonal {
    *
    * @return True if the two points form a valid pair, false otherwise.
    */
-  bool validTuple(const SeedFinderOptions &options, const internal_sp_t &low,
-                  const internal_sp_t &high, bool isMiddleInverted) const;
+  bool validTuple(const SeedFinderOptions &options,
+                  const external_spacepoint_t &low,
+                  const external_spacepoint_t &high,
+                  bool isMiddleInverted) const;
 
   /**
    * @brief Create a k-d tree from a set of spacepoints.
@@ -199,51 +197,64 @@ class SeedFinderOrthogonal {
    *
    * @return A k-d tree containing the given spacepoints.
    */
-  tree_t createTree(const std::vector<internal_sp_t *> &spacePoints) const;
+  tree_t createTree(
+      const std::vector<const external_spacepoint_t *> &spacePoints) const;
 
   /**
    * @brief Filter potential candidate pairs, and output seeds into an
    * iterator.
    *
    * @param options frequently changing configuration (like beam position)
+   * @param mutableData Container for mutable variables used in the seeding
    * @param middle The (singular) middle spacepoint.
    * @param bottom The (vector of) candidate bottom spacepoints.
    * @param top The (vector of) candidate top spacepoints.
    * @param seedFilterState  holds quantities used in seed filter
    * @param candidates_collector The container to write the resulting
    * seed candidates to.
-   * @param spacePointData Auxiliary variables used by the seeding
    */
   void filterCandidates(
-      const SeedFinderOptions &options, internal_sp_t &middle,
-      std::vector<internal_sp_t *> &bottom, std::vector<internal_sp_t *> &top,
+      const SeedFinderOptions &options,
+      Acts::SpacePointMutableData &mutableData,
+      const external_spacepoint_t &middle,
+      const std::vector<const external_spacepoint_t *> &bottom,
+      const std::vector<const external_spacepoint_t *> &top,
       SeedFilterState seedFilterState,
-      CandidatesForMiddleSp<const InternalSpacePoint<external_spacepoint_t>>
-          &candidates_collector,
-      Acts::SpacePointData &spacePointData) const;
+      CandidatesForMiddleSp<const external_spacepoint_t> &candidates_collector)
+      const;
 
   /**
    * @brief Search for seeds starting from a given middle space point.
    *
    * @param options frequently changing configuration (like beam position)
+   * @param mutableData Container for mutable variables used in the seeding
    * @tparam NDims Number of dimensions for our spatial embedding (probably 3).
    * @tparam output_container_t Type of the output container.
    *
    * @param tree The k-d tree to use for searching.
    * @param out_cont The container write output seeds to.
    * @param middle_p The middle spacepoint to find seeds for.
-   * @param spacePointData Aux data for the spacepoints
    */
   template <typename output_container_t>
-  void processFromMiddleSP(const SeedFinderOptions &options, const tree_t &tree,
-                           output_container_t &out_cont,
-                           const typename tree_t::pair_t &middle_p,
-                           Acts::SpacePointData &spacePointData) const;
+  void processFromMiddleSP(const SeedFinderOptions &options,
+                           Acts::SpacePointMutableData &mutableData,
+                           const tree_t &tree, output_container_t &out_cont,
+                           const typename tree_t::pair_t &middle_p) const;
 
   /**
    * @brief The configuration for the seeding algorithm.
    */
   Acts::SeedFinderOrthogonalConfig<external_spacepoint_t> m_config;
+
+  /**
+   * @brief Get the logger.
+   */
+  const Logger &logger() const { return *m_logger; }
+
+  /**
+   * @brief The logger
+   */
+  std::unique_ptr<const Acts::Logger> m_logger{getDummyLogger().clone()};
 };
 }  // namespace Acts
 
diff --git a/Core/include/Acts/Seeding/SeedFinderOrthogonal.ipp b/Core/include/Acts/Seeding/SeedFinderOrthogonal.ipp
index 31757e3e72a..a725d68e92d 100644
--- a/Core/include/Acts/Seeding/SeedFinderOrthogonal.ipp
+++ b/Core/include/Acts/Seeding/SeedFinderOrthogonal.ipp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2023 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include "Acts/Geometry/Extent.hpp"
 #include "Acts/Seeding/SeedFilter.hpp"
@@ -13,6 +13,7 @@
 #include "Acts/Seeding/SeedFinderUtils.hpp"
 #include "Acts/Utilities/BinningType.hpp"
 
+#include <algorithm>
 #include <cmath>
 #include <functional>
 #include <numeric>
@@ -21,7 +22,7 @@
 namespace Acts {
 template <typename external_spacepoint_t>
 auto SeedFinderOrthogonal<external_spacepoint_t>::validTupleOrthoRangeLH(
-    const internal_sp_t &low) const -> typename tree_t::range_t {
+    const external_spacepoint_t &low) const -> typename tree_t::range_t {
   float colMin = m_config.collisionRegionMin;
   float colMax = m_config.collisionRegionMax;
   float pL = low.phi();
@@ -94,7 +95,7 @@ auto SeedFinderOrthogonal<external_spacepoint_t>::validTupleOrthoRangeLH(
 
 template <typename external_spacepoint_t>
 auto SeedFinderOrthogonal<external_spacepoint_t>::validTupleOrthoRangeHL(
-    const internal_sp_t &high) const -> typename tree_t::range_t {
+    const external_spacepoint_t &high) const -> typename tree_t::range_t {
   float pM = high.phi();
   float rM = high.radius();
   float zM = high.z();
@@ -157,8 +158,8 @@ auto SeedFinderOrthogonal<external_spacepoint_t>::validTupleOrthoRangeHL(
 
 template <typename external_spacepoint_t>
 bool SeedFinderOrthogonal<external_spacepoint_t>::validTuple(
-    const SeedFinderOptions &options, const internal_sp_t &low,
-    const internal_sp_t &high, bool isMiddleInverted) const {
+    const SeedFinderOptions &options, const external_spacepoint_t &low,
+    const external_spacepoint_t &high, bool isMiddleInverted) const {
   float rL = low.radius();
   float rH = high.radius();
 
@@ -225,7 +226,7 @@ bool SeedFinderOrthogonal<external_spacepoint_t>::validTuple(
    * Cut: Ensure that the forward angle (z / r) lies within reasonable bounds,
    * which is to say the absolute value must be smaller than the max cot(θ).
    */
-  if (std::fabs(cotTheta) > m_config.cotThetaMax) {
+  if (std::abs(cotTheta) > m_config.cotThetaMax) {
     return false;
   }
 
@@ -243,8 +244,9 @@ bool SeedFinderOrthogonal<external_spacepoint_t>::validTuple(
 
 template <typename external_spacepoint_t>
 SeedFinderOrthogonal<external_spacepoint_t>::SeedFinderOrthogonal(
-    const SeedFinderOrthogonalConfig<external_spacepoint_t> &config)
-    : m_config(config) {
+    const SeedFinderOrthogonalConfig<external_spacepoint_t> &config,
+    std::unique_ptr<const Acts::Logger> logger)
+    : m_config(config), m_logger(std::move(logger)) {
   if (!config.isInInternalUnits) {
     throw std::runtime_error(
         "SeedFinderOrthogonalConfig not in ACTS internal units in "
@@ -254,12 +256,13 @@ SeedFinderOrthogonal<external_spacepoint_t>::SeedFinderOrthogonal(
 
 template <typename external_spacepoint_t>
 void SeedFinderOrthogonal<external_spacepoint_t>::filterCandidates(
-    const SeedFinderOptions &options, internal_sp_t &middle,
-    std::vector<internal_sp_t *> &bottom, std::vector<internal_sp_t *> &top,
+    const SeedFinderOptions &options, Acts::SpacePointMutableData &mutableData,
+    const external_spacepoint_t &middle,
+    const std::vector<const external_spacepoint_t *> &bottom,
+    const std::vector<const external_spacepoint_t *> &top,
     SeedFilterState seedFilterState,
-    CandidatesForMiddleSp<const InternalSpacePoint<external_spacepoint_t>>
-        &candidates_collector,
-    Acts::SpacePointData &spacePointData) const {
+    CandidatesForMiddleSp<const external_spacepoint_t> &candidates_collector)
+    const {
   float rM = middle.radius();
   float zM = middle.z();
   float varianceRM = middle.varianceR();
@@ -286,7 +289,7 @@ void SeedFinderOrthogonal<external_spacepoint_t>::filterCandidates(
     }
   }
 
-  std::vector<const internal_sp_t *> top_valid;
+  std::vector<const external_spacepoint_t *> top_valid;
   std::vector<float> curvatures;
   std::vector<float> impactParameters;
 
@@ -297,8 +300,8 @@ void SeedFinderOrthogonal<external_spacepoint_t>::filterCandidates(
   std::vector<LinCircle> linCircleTop;
 
   // transform coordinates
-  transformCoordinates(spacePointData, bottom, middle, true, linCircleBottom);
-  transformCoordinates(spacePointData, top, middle, false, linCircleTop);
+  transformCoordinates(mutableData, bottom, middle, true, linCircleBottom);
+  transformCoordinates(mutableData, top, middle, false, linCircleTop);
 
   // sort: make index vector
   std::vector<std::size_t> sorted_bottoms(linCircleBottom.size());
@@ -311,16 +314,14 @@ void SeedFinderOrthogonal<external_spacepoint_t>::filterCandidates(
     sorted_tops[i] = i;
   }
 
-  std::sort(
-      sorted_bottoms.begin(), sorted_bottoms.end(),
-      [&linCircleBottom](const std::size_t a, const std::size_t b) -> bool {
-        return linCircleBottom[a].cotTheta < linCircleBottom[b].cotTheta;
-      });
+  std::ranges::sort(sorted_bottoms, {},
+                    [&linCircleBottom](const std::size_t s) {
+                      return linCircleBottom[s].cotTheta;
+                    });
 
-  std::sort(sorted_tops.begin(), sorted_tops.end(),
-            [&linCircleTop](const std::size_t a, const std::size_t b) -> bool {
-              return linCircleTop[a].cotTheta < linCircleTop[b].cotTheta;
-            });
+  std::ranges::sort(sorted_tops, {}, [&linCircleTop](const std::size_t s) {
+    return linCircleTop[s].cotTheta;
+  });
 
   std::vector<float> tanMT;
   tanMT.reserve(top.size());
@@ -473,7 +474,7 @@ void SeedFinderOrthogonal<external_spacepoint_t>::filterCandidates(
     seedFilterState.zOrigin = zM - rM * lb.cotTheta;
 
     m_config.seedFilter->filterSeeds_2SpFixed(
-        spacePointData, *bottom[b], middle, top_valid, curvatures,
+        mutableData, *bottom[b], middle, top_valid, curvatures,
         impactParameters, seedFilterState, candidates_collector);
 
   }  // loop on bottoms
@@ -482,11 +483,11 @@ void SeedFinderOrthogonal<external_spacepoint_t>::filterCandidates(
 template <typename external_spacepoint_t>
 template <typename output_container_t>
 void SeedFinderOrthogonal<external_spacepoint_t>::processFromMiddleSP(
-    const SeedFinderOptions &options, const tree_t &tree,
-    output_container_t &out_cont, const typename tree_t::pair_t &middle_p,
-    Acts::SpacePointData &spacePointData) const {
+    const SeedFinderOptions &options, Acts::SpacePointMutableData &mutableData,
+    const tree_t &tree, output_container_t &out_cont,
+    const typename tree_t::pair_t &middle_p) const {
   using range_t = typename tree_t::range_t;
-  internal_sp_t &middle = *middle_p.second;
+  const external_spacepoint_t &middle = *middle_p.second;
 
   /*
    * Prepare four output vectors for seed candidates:
@@ -498,7 +499,8 @@ void SeedFinderOrthogonal<external_spacepoint_t>::processFromMiddleSP(
    * increasing z track, and top_hl_v are the candidate top points for a
    * decreasing z track.
    */
-  std::vector<internal_sp_t *> bottom_lh_v, bottom_hl_v, top_lh_v, top_hl_v;
+  std::vector<const external_spacepoint_t *> bottom_lh_v, bottom_hl_v, top_lh_v,
+      top_hl_v;
 
   /*
    * Storage for seed candidates
@@ -508,8 +510,7 @@ void SeedFinderOrthogonal<external_spacepoint_t>::processFromMiddleSP(
   std::size_t max_num_seeds_per_spm =
       m_config.seedFilter->getSeedFilterConfig().maxSeedsPerSpMConf;
 
-  CandidatesForMiddleSp<const InternalSpacePoint<external_spacepoint_t>>
-      candidates_collector;
+  CandidatesForMiddleSp<const external_spacepoint_t> candidates_collector;
   candidates_collector.setMaxElements(max_num_seeds_per_spm,
                                       max_num_quality_seeds_per_spm);
 
@@ -662,37 +663,39 @@ void SeedFinderOrthogonal<external_spacepoint_t>::processFromMiddleSP(
    * If we have candidates for increasing z tracks, we try to combine them.
    */
   if (!bottom_lh_v.empty() && !top_lh_v.empty()) {
-    filterCandidates(options, middle, bottom_lh_v, top_lh_v, seedFilterState,
-                     candidates_collector, spacePointData);
+    filterCandidates(options, mutableData, middle, bottom_lh_v, top_lh_v,
+                     seedFilterState, candidates_collector);
   }
   /*
    * Try to combine candidates for decreasing z tracks.
    */
   if (!bottom_hl_v.empty() && !top_hl_v.empty()) {
-    filterCandidates(options, middle, bottom_hl_v, top_hl_v, seedFilterState,
-                     candidates_collector, spacePointData);
+    filterCandidates(options, mutableData, middle, bottom_hl_v, top_hl_v,
+                     seedFilterState, candidates_collector);
   }
   /*
    * Run a seed filter, just like in other seeding algorithms.
    */
   if ((!bottom_lh_v.empty() && !top_lh_v.empty()) ||
       (!bottom_hl_v.empty() && !top_hl_v.empty())) {
-    m_config.seedFilter->filterSeeds_1SpFixed(spacePointData,
-                                              candidates_collector, out_cont);
+    m_config.seedFilter->filterSeeds_1SpFixed(mutableData, candidates_collector,
+                                              out_cont);
   }
 }
 
 template <typename external_spacepoint_t>
 auto SeedFinderOrthogonal<external_spacepoint_t>::createTree(
-    const std::vector<internal_sp_t *> &spacePoints) const -> tree_t {
+    const std::vector<const external_spacepoint_t *> &spacePoints) const
+    -> tree_t {
   std::vector<typename tree_t::pair_t> points;
+  points.reserve(spacePoints.size());
 
   /*
    * For every input point, we create a coordinate-pointer pair, which we then
    * linearly pass to the k-d tree constructor. That constructor will take
    * care of sorting the pairs and splitting the space.
    */
-  for (internal_sp_t *sp : spacePoints) {
+  for (const external_spacepoint_t *sp : spacePoints) {
     typename tree_t::coordinate_t point;
 
     point[DimPhi] = sp->phi();
@@ -702,16 +705,17 @@ auto SeedFinderOrthogonal<external_spacepoint_t>::createTree(
     points.emplace_back(point, sp);
   }
 
+  ACTS_VERBOSE("Created k-d tree populated with " << points.size()
+                                                  << " space points");
   return tree_t(std::move(points));
 }
 
 template <typename external_spacepoint_t>
-template <typename input_container_t, typename output_container_t,
-          typename callable_t>
+template <typename input_container_t, typename output_container_t>
 void SeedFinderOrthogonal<external_spacepoint_t>::createSeeds(
     const Acts::SeedFinderOptions &options,
-    const input_container_t &spacePoints, output_container_t &out_cont,
-    callable_t &&extract_coordinates) const {
+    const input_container_t &spacePoints, output_container_t &out_cont) const {
+  ACTS_VERBOSE("Creating seeds with Orthogonal strategy");
   if (!options.isInInternalUnits) {
     throw std::runtime_error(
         "SeedFinderOptions not in ACTS internal units in "
@@ -726,7 +730,7 @@ void SeedFinderOrthogonal<external_spacepoint_t>::createSeeds(
                                Seed<external_spacepoint_t>>,
                 "Output iterator container type must accept seeds.");
   static_assert(std::is_same_v<typename input_container_t::value_type,
-                               const external_spacepoint_t *>,
+                               external_spacepoint_t>,
                 "Input container must contain external spacepoints.");
 
   /*
@@ -735,19 +739,21 @@ void SeedFinderOrthogonal<external_spacepoint_t>::createSeeds(
    * take each external spacepoint, allocate a corresponding internal space
    * point, and save it in a vector.
    */
+  ACTS_VERBOSE("Running on " << spacePoints.size() << " input space points");
   Acts::Extent rRangeSPExtent;
-  std::size_t counter = 0;
-  std::vector<internal_sp_t *> internalSpacePoints;
-  Acts::SpacePointData spacePointData;
-  spacePointData.resize(spacePoints.size());
-
-  for (const external_spacepoint_t *p : spacePoints) {
-    auto [position, variance, time] = extract_coordinates(p);
-    internalSpacePoints.push_back(new InternalSpacePoint<external_spacepoint_t>(
-        counter++, *p, position, options.beamPos, variance, time));
+  std::vector<const external_spacepoint_t *> internal_sps;
+  internal_sps.reserve(spacePoints.size());
+
+  Acts::SpacePointMutableData mutableData;
+  mutableData.resize(spacePoints.size());
+
+  for (const external_spacepoint_t &p : spacePoints) {
     // store x,y,z values in extent
-    rRangeSPExtent.extend(position);
+    rRangeSPExtent.extend({p.x(), p.y(), p.z()});
+    internal_sps.push_back(&p);
   }
+  ACTS_VERBOSE(rRangeSPExtent);
+
   // variable middle SP radial region of interest
   const Acts::Range1D<float> rMiddleSPRange(
       std::floor(rRangeSPExtent.min(Acts::BinningValue::binR) / 2) * 2 +
@@ -759,13 +765,13 @@ void SeedFinderOrthogonal<external_spacepoint_t>::createSeeds(
    * Construct the k-d tree from these points. Note that this not consume or
    * take ownership of the points.
    */
-  tree_t tree = createTree(internalSpacePoints);
+  tree_t tree = createTree(internal_sps);
   /*
    * Run the seeding algorithm by iterating over all the points in the tree
    * and seeing what happens if we take them to be our middle spacepoint.
    */
   for (const typename tree_t::pair_t &middle_p : tree) {
-    internal_sp_t &middle = *middle_p.second;
+    const external_spacepoint_t &middle = *middle_p.second;
     auto rM = middle.radius();
 
     /*
@@ -792,27 +798,18 @@ void SeedFinderOrthogonal<external_spacepoint_t>::createSeeds(
       continue;
     }
 
-    processFromMiddleSP(options, tree, out_cont, middle_p, spacePointData);
-  }
-
-  /*
-   * Don't forget to get rid of all the spacepoints we just allocated!
-   */
-  for (const internal_sp_t *p : internalSpacePoints) {
-    delete p;
+    processFromMiddleSP(options, mutableData, tree, out_cont, middle_p);
   }
 }
 
 template <typename external_spacepoint_t>
-template <typename input_container_t, typename callable_t>
+template <typename input_container_t>
 std::vector<Seed<external_spacepoint_t>>
 SeedFinderOrthogonal<external_spacepoint_t>::createSeeds(
     const Acts::SeedFinderOptions &options,
-    const input_container_t &spacePoints,
-    callable_t &&extract_coordinates) const {
+    const input_container_t &spacePoints) const {
   std::vector<seed_t> r;
-  createSeeds(options, spacePoints, r,
-              std::forward<callable_t>(extract_coordinates));
+  createSeeds(options, spacePoints, r);
   return r;
 }
 
diff --git a/Core/include/Acts/Seeding/SeedFinderOrthogonalConfig.hpp b/Core/include/Acts/Seeding/SeedFinderOrthogonalConfig.hpp
index 706cb1e90cc..ac0b51f5d34 100644
--- a/Core/include/Acts/Seeding/SeedFinderOrthogonalConfig.hpp
+++ b/Core/include/Acts/Seeding/SeedFinderOrthogonalConfig.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2022 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
@@ -14,6 +14,7 @@
 #include "Acts/Utilities/Delegate.hpp"
 
 #include <memory>
+#include <numbers>
 
 namespace Acts {
 // forward declaration to avoid cyclic dependence
@@ -28,8 +29,8 @@ struct SeedFinderOrthogonalConfig {
   /// Seeding parameters for geometry settings and detector ROI
 
   // Limiting location of all measurements
-  float phiMin = -M_PI;
-  float phiMax = M_PI;
+  float phiMin = -std::numbers::pi_v<float>;
+  float phiMax = std::numbers::pi_v<float>;
   /// limiting location of measurements
   float zMin = -2800 * Acts::UnitConstants::mm;
   float zMax = 2800 * Acts::UnitConstants::mm;
diff --git a/Core/include/Acts/Seeding/SeedFinderUtils.hpp b/Core/include/Acts/Seeding/SeedFinderUtils.hpp
index 16f05c62081..90f74dea7fc 100644
--- a/Core/include/Acts/Seeding/SeedFinderUtils.hpp
+++ b/Core/include/Acts/Seeding/SeedFinderUtils.hpp
@@ -1,16 +1,14 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2023 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
-#include "Acts/EventData/SpacePointData.hpp"
-#include "Acts/Seeding/InternalSeed.hpp"
-#include "Acts/Seeding/InternalSpacePoint.hpp"
+#include "Acts/EventData/SpacePointMutableData.hpp"
 #include "Acts/Seeding/SeedFinderConfig.hpp"
 
 namespace Acts {
@@ -29,22 +27,9 @@ struct LinCircle {
   float y{0.};
 };
 
-/// @brief Transform two spacepoints to a u-v space circle.
-///
-/// This function is a non-vectorized version of @a transformCoordinates.
-///
-/// @tparam external_spacepoint_t The external spacepoint type.
-///
-/// @param[in] sp The first spacepoint to use, either a bottom or top.
-/// @param[in] spM The middle spacepoint to use.
-/// @param[in] bottom Should be true if sp is a bottom SP.
-template <typename external_spacepoint_t>
-LinCircle transformCoordinates(
-    const InternalSpacePoint<external_spacepoint_t>& sp,
-    const InternalSpacePoint<external_spacepoint_t>& spM, bool bottom);
-
 template <typename external_spacepoint_t, typename callable_t>
-LinCircle transformCoordinates(const external_spacepoint_t& sp,
+LinCircle transformCoordinates(Acts::SpacePointMutableData& mutableData,
+                               const external_spacepoint_t& sp,
                                const external_spacepoint_t& spM, bool bottom,
                                callable_t&& extractFunction);
 
@@ -53,30 +38,21 @@ LinCircle transformCoordinates(const external_spacepoint_t& sp,
 ///
 /// @tparam external_spacepoint_t The external spacepoint type.
 ///
-/// @param[in] spacePointData Auxiliary variables used by the seeding
+/// @param mutableData Container for mutable variables used in the seeding
 /// @param[in] vec The list of bottom or top spacepoints
 /// @param[in] spM The middle spacepoint.
 /// @param[in] bottom Should be true if vec are bottom spacepoints.
 /// @param[out] linCircleVec The output vector to write to.
 template <typename external_spacepoint_t>
-void transformCoordinates(
-    Acts::SpacePointData& spacePointData,
-    const std::vector<InternalSpacePoint<external_spacepoint_t>*>& vec,
-    const InternalSpacePoint<external_spacepoint_t>& spM, bool bottom,
-    std::vector<LinCircle>& linCircleVec);
-
-template <typename external_spacepoint_t, typename callable_t>
-void transformCoordinates(Acts::SpacePointData& spacePointData,
-                          const std::vector<external_spacepoint_t*>& vec,
+void transformCoordinates(Acts::SpacePointMutableData& mutableData,
+                          const std::vector<const external_spacepoint_t*>& vec,
                           const external_spacepoint_t& spM, bool bottom,
-                          std::vector<LinCircle>& linCircleVec,
-                          callable_t&& extractFunction);
+                          std::vector<LinCircle>& linCircleVec);
 
 /// @brief Check the compatibility of spacepoint coordinates in xyz assuming the Bottom-Middle direction with the strip meassument details
 ///
 /// @tparam external_spacepoint_t The external spacepoint type.
 ///
-/// @param[in] spacePointData Auxiliary variables used by the seeding
 /// @param[in] config SeedFinder config containing the delegates to the strip measurement details.
 /// @param[in] sp Input space point used in the check.
 /// @param[in] spacepointPosition Spacepoint coordinates in xyz plane.
@@ -84,10 +60,9 @@ void transformCoordinates(Acts::SpacePointData& spacePointData,
 /// @returns Boolean that says if spacepoint is compatible with being inside the detector element.
 template <typename external_spacepoint_t>
 bool xyzCoordinateCheck(
-    Acts::SpacePointData& spacePointData,
     const Acts::SeedFinderConfig<external_spacepoint_t>& config,
-    const Acts::InternalSpacePoint<external_spacepoint_t>& sp,
-    const double* spacepointPosition, double* outputCoordinates);
+    const external_spacepoint_t& sp, const double* spacepointPosition,
+    double* outputCoordinates);
 
 }  // namespace Acts
 
diff --git a/Core/include/Acts/Seeding/SeedFinderUtils.ipp b/Core/include/Acts/Seeding/SeedFinderUtils.ipp
index c5c56b0621b..133c02cbae1 100644
--- a/Core/include/Acts/Seeding/SeedFinderUtils.ipp
+++ b/Core/include/Acts/Seeding/SeedFinderUtils.ipp
@@ -1,30 +1,15 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2023 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 namespace Acts {
-template <typename external_spacepoint_t>
-inline LinCircle transformCoordinates(
-    const InternalSpacePoint<external_spacepoint_t>& sp,
-    const InternalSpacePoint<external_spacepoint_t>& spM, bool bottom) {
-  auto extractFunction =
-      [](const InternalSpacePoint<external_spacepoint_t>& obj)
-      -> std::array<float, 6> {
-    std::array<float, 6> output{obj.x(),      obj.y(),         obj.z(),
-                                obj.radius(), obj.varianceR(), obj.varianceZ()};
-    return output;
-  };
-
-  return transformCoordinates<InternalSpacePoint<external_spacepoint_t>>(
-      sp, spM, bottom, std::move(extractFunction));
-}
-
 template <typename external_spacepoint_t, typename callable_t>
-inline LinCircle transformCoordinates(const external_spacepoint_t& sp,
+inline LinCircle transformCoordinates(Acts::SpacePointMutableData& mutableData,
+                                      const external_spacepoint_t& sp,
                                       const external_spacepoint_t& spM,
                                       bool bottom,
                                       callable_t&& extractFunction) {
@@ -61,36 +46,22 @@ inline LinCircle transformCoordinates(const external_spacepoint_t& sp,
                     (cotTheta * cotTheta) * (varianceRM + varianceRSP)) *
                    iDeltaR2;
 
-  sp.setDeltaR(std::sqrt(deltaR2 + (deltaZ * deltaZ)));
+  mutableData.setDeltaR(sp.index(), std::sqrt(deltaR2 + (deltaZ * deltaZ)));
   return LinCircle(cotTheta, iDeltaR, Er, U, V, xNewFrame, yNewFrame);
 }
 
 template <typename external_spacepoint_t>
 inline void transformCoordinates(
-    Acts::SpacePointData& spacePointData,
-    const std::vector<InternalSpacePoint<external_spacepoint_t>*>& vec,
-    const InternalSpacePoint<external_spacepoint_t>& spM, bool bottom,
+    Acts::SpacePointMutableData& mutableData,
+    const std::vector<const external_spacepoint_t*>& vec,
+    const external_spacepoint_t& spM, bool bottom,
     std::vector<LinCircle>& linCircleVec) {
-  auto extractFunction =
-      [](const InternalSpacePoint<external_spacepoint_t>& obj)
-      -> std::array<float, 6> {
-    std::array<float, 6> output{obj.x(),      obj.y(),         obj.z(),
-                                obj.radius(), obj.varianceR(), obj.varianceZ()};
-    return output;
-  };
-
-  transformCoordinates<InternalSpacePoint<external_spacepoint_t>>(
-      spacePointData, vec, spM, bottom, linCircleVec,
-      std::move(extractFunction));
-}
-
-template <typename external_spacepoint_t, typename callable_t>
-inline void transformCoordinates(Acts::SpacePointData& spacePointData,
-                                 const std::vector<external_spacepoint_t*>& vec,
-                                 const external_spacepoint_t& spM, bool bottom,
-                                 std::vector<LinCircle>& linCircleVec,
-                                 callable_t&& extractFunction) {
-  auto [xM, yM, zM, rM, varianceRM, varianceZM] = extractFunction(spM);
+  const float xM = spM.x();
+  const float yM = spM.y();
+  const float zM = spM.z();
+  const float rM = spM.radius();
+  const float varianceRM = spM.varianceR();
+  const float varianceZM = spM.varianceZ();
 
   // resize + operator[] is faster than reserve and push_back
   linCircleVec.resize(vec.size());
@@ -101,37 +72,42 @@ inline void transformCoordinates(Acts::SpacePointData& spacePointData,
   int bottomFactor = bottom ? -1 : 1;
 
   for (std::size_t idx(0); idx < vec.size(); ++idx) {
-    auto& sp = vec[idx];
-    auto [xSP, ySP, zSP, rSP, varianceRSP, varianceZSP] = extractFunction(*sp);
+    const external_spacepoint_t* sp = vec[idx];
+
+    const float xSP = sp->x();
+    const float ySP = sp->y();
+    const float zSP = sp->z();
+    const float varianceRSP = sp->varianceR();
+    const float varianceZSP = sp->varianceZ();
 
-    float deltaX = xSP - xM;
-    float deltaY = ySP - yM;
-    float deltaZ = zSP - zM;
+    const float deltaX = xSP - xM;
+    const float deltaY = ySP - yM;
+    const float deltaZ = zSP - zM;
     // calculate projection fraction of spM->sp vector pointing in same
     // direction as
     // vector origin->spM (x) and projection fraction of spM->sp vector pointing
     // orthogonal to origin->spM (y)
-    float xNewFrame = deltaX * cosPhiM + deltaY * sinPhiM;
-    float yNewFrame = deltaY * cosPhiM - deltaX * sinPhiM;
+    const float xNewFrame = deltaX * cosPhiM + deltaY * sinPhiM;
+    const float yNewFrame = deltaY * cosPhiM - deltaX * sinPhiM;
     // 1/(length of M -> SP)
-    float deltaR2 = (xNewFrame * xNewFrame + yNewFrame * yNewFrame);
-    float iDeltaR2 = 1. / deltaR2;
-    float iDeltaR = std::sqrt(iDeltaR2);
+    const float deltaR2 = (xNewFrame * xNewFrame + yNewFrame * yNewFrame);
+    const float iDeltaR2 = 1. / deltaR2;
+    const float iDeltaR = std::sqrt(iDeltaR2);
     //
     // cot_theta = (deltaZ/deltaR)
-    float cotTheta = deltaZ * iDeltaR * bottomFactor;
+    const float cotTheta = deltaZ * iDeltaR * bottomFactor;
     // transformation of circle equation (x,y) into linear equation (u,v)
     // x^2 + y^2 - 2x_0*x - 2y_0*y = 0
     // is transformed into
     // 1 - 2x_0*u - 2y_0*v = 0
     // using the following m_U and m_V
     // (u = A + B*v); A and B are created later on
-    float U = xNewFrame * iDeltaR2;
-    float V = yNewFrame * iDeltaR2;
+    const float U = xNewFrame * iDeltaR2;
+    const float V = yNewFrame * iDeltaR2;
     // error term for sp-pair without correlation of middle space point
-    float Er = ((varianceZM + varianceZSP) +
-                (cotTheta * cotTheta) * (varianceRM + varianceRSP)) *
-               iDeltaR2;
+    const float Er = ((varianceZM + varianceZSP) +
+                      (cotTheta * cotTheta) * (varianceRM + varianceRSP)) *
+                     iDeltaR2;
 
     // Fill Line Circle
     linCircleVec[idx].cotTheta = cotTheta;
@@ -141,33 +117,22 @@ inline void transformCoordinates(Acts::SpacePointData& spacePointData,
     linCircleVec[idx].V = V;
     linCircleVec[idx].x = xNewFrame;
     linCircleVec[idx].y = yNewFrame;
-
-    spacePointData.setDeltaR(sp->index(),
-                             std::sqrt(deltaR2 + (deltaZ * deltaZ)));
+    mutableData.setDeltaR(sp->index(), std::sqrt(deltaR2 + (deltaZ * deltaZ)));
   }
 }
 
 template <typename external_spacepoint_t>
 inline bool xyzCoordinateCheck(
-    Acts::SpacePointData& spacePointData,
     const Acts::SeedFinderConfig<external_spacepoint_t>& m_config,
-    const Acts::InternalSpacePoint<external_spacepoint_t>& sp,
-    const double* spacepointPosition, double* outputCoordinates) {
+    const external_spacepoint_t& sp, const double* spacepointPosition,
+    double* outputCoordinates) {
   // check the compatibility of SPs coordinates in xyz assuming the
   // Bottom-Middle direction with the strip measurement details
-  bool hasValueStored = spacePointData.hasDynamicVariable();
-  if (!hasValueStored) {
-    return false;
-  }
-
-  std::size_t index = sp.index();
 
-  // prepare variables
-  const Acts::Vector3& topStripVector = spacePointData.getTopStripVector(index);
-  const Acts::Vector3& bottomStripVector =
-      spacePointData.getBottomStripVector(index);
-  const Acts::Vector3& stripCenterDistance =
-      spacePointData.getStripCenterDistance(index);
+  using namespace Acts::HashedStringLiteral;
+  const Acts::Vector3& topStripVector = sp.topStripVector();
+  const Acts::Vector3& bottomStripVector = sp.bottomStripVector();
+  const Acts::Vector3& stripCenterDistance = sp.stripCenterDistance();
 
   const double xTopStripVector = topStripVector[0];
   const double yTopStripVector = topStripVector[1];
@@ -215,8 +180,7 @@ inline bool xyzCoordinateCheck(
   // if arrive here spacepointPosition is compatible with strip directions and
   // detector elements
 
-  const Acts::Vector3& topStripCenterPosition =
-      spacePointData.getTopStripCenterPosition(index);
+  const Acts::Vector3& topStripCenterPosition = sp.topStripCenterPosition();
 
   // spacepointPosition corrected with respect to the top strip position and
   // direction and the distance between the strips
diff --git a/Core/include/Acts/Seeding/SpacePointGrid.hpp b/Core/include/Acts/Seeding/SpacePointGrid.hpp
index 17b073198a3..ae9d1661864 100644
--- a/Core/include/Acts/Seeding/SpacePointGrid.hpp
+++ b/Core/include/Acts/Seeding/SpacePointGrid.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2024 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
diff --git a/Core/include/Acts/Seeding/detail/CylindricalSpacePointGrid.hpp b/Core/include/Acts/Seeding/detail/CylindricalSpacePointGrid.hpp
index 620bbfa15ab..dcbe2289ffb 100644
--- a/Core/include/Acts/Seeding/detail/CylindricalSpacePointGrid.hpp
+++ b/Core/include/Acts/Seeding/detail/CylindricalSpacePointGrid.hpp
@@ -1,31 +1,40 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2024 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
-#include "Acts/Geometry/Extent.hpp"
 #include "Acts/Seeding/BinnedGroup.hpp"
-#include "Acts/Seeding/InternalSpacePoint.hpp"
 #include "Acts/Seeding/SeedFinderConfig.hpp"
 #include "Acts/Utilities/Grid.hpp"
+#include "Acts/Utilities/Logger.hpp"
 
+#include <numbers>
 #include <vector>
 
 namespace Acts {
 
+/// Concept to check the provided external space point type
+/// can be used to fill the space point grid
+template <typename external_spacepoint_t>
+concept CylindricalGridElement = requires(external_spacepoint_t sp) {
+  { sp.phi() } -> std::same_as<float>;
+  { sp.z() } -> std::same_as<float>;
+  { sp.radius() } -> std::same_as<float>;
+};
+
 /// Cylindrical Space Point bin is a 2D grid with (phi, z) bins
 /// It stores a vector of internal space points to external space points
-template <typename external_spacepoint_t>
+template <Acts::CylindricalGridElement external_spacepoint_t>
 using CylindricalSpacePointGrid = Acts::Grid<
-    std::vector<
-        std::unique_ptr<Acts::InternalSpacePoint<external_spacepoint_t>>>,
+    std::vector<const external_spacepoint_t*>,
     Acts::Axis<Acts::AxisType::Equidistant, Acts::AxisBoundaryType::Closed>,
-    Acts::Axis<Acts::AxisType::Variable, Acts::AxisBoundaryType::Bound>>;
+    Acts::Axis<Acts::AxisType::Variable, Acts::AxisBoundaryType::Open>,
+    Acts::Axis<Acts::AxisType::Variable, Acts::AxisBoundaryType::Open>>;
 
 /// Cylindrical Binned Group
 template <typename external_spacepoint_t>
@@ -38,28 +47,31 @@ using CylindricalBinnedGroupIterator = Acts::BinnedGroupIterator<
 
 struct CylindricalSpacePointGridConfig {
   // minimum pT to be found by seedFinder
-  float minPt = 0;
+  float minPt = 0 * Acts::UnitConstants::MeV;
+  // maximum extension of sensitive detector layer relevant for seeding as
+  // distance from x=y=0 (i.e. in r)
+  float rMax = 320 * Acts::UnitConstants::mm;
   // maximum extension of sensitive detector layer relevant for seeding as
   // distance from x=y=0 (i.e. in r)
-  float rMax = 0;
+  float rMin = 0 * Acts::UnitConstants::mm;
   // maximum extension of sensitive detector layer relevant for seeding in
   // positive direction in z
-  float zMax = 0;
+  float zMax = 0 * Acts::UnitConstants::mm;
   // maximum extension of sensitive detector layer relevant for seeding in
   // negative direction in z
-  float zMin = 0;
+  float zMin = 0 * Acts::UnitConstants::mm;
   // maximum distance in r from middle space point to bottom or top spacepoint
-  float deltaRMax = 0;
+  float deltaRMax = 0 * Acts::UnitConstants::mm;
   // maximum forward direction expressed as cot(theta)
   float cotThetaMax = 0;
   // maximum impact parameter in mm
-  float impactMax = 0;
+  float impactMax = 0 * Acts::UnitConstants::mm;
   // minimum phi value for phiAxis construction
-  float phiMin = -M_PI;
+  float phiMin = -std::numbers::pi_v<float>;
   // maximum phi value for phiAxis construction
-  float phiMax = M_PI;
+  float phiMax = std::numbers::pi_v<float>;
   // Multiplicator for the number of phi-bins. The minimum number of phi-bins
-  // depends on min_pt, magnetic field: 2*M_PI/(minPT particle phi-deflection).
+  // depends on min_pt, magnetic field: 2*pi/(minPT particle phi-deflection).
   // phiBinDeflectionCoverage is a multiplier for this number. If
   // numPhiNeighbors (in the configuration of the BinFinders) is configured to
   // return 1 neighbor on either side of the current phi-bin (and you want to
@@ -68,7 +80,8 @@ struct CylindricalSpacePointGridConfig {
   // maximum number of phi bins
   int maxPhiBins = 10000;
   // enable non equidistant binning in z
-  std::vector<float> zBinEdges;
+  std::vector<float> zBinEdges{};
+  std::vector<float> rBinEdges{};
   bool isInInternalUnits = false;
   CylindricalSpacePointGridConfig toInternalUnits() const {
     if (isInInternalUnits) {
@@ -76,22 +89,54 @@ struct CylindricalSpacePointGridConfig {
           "Repeated conversion to internal units for "
           "CylindricalSpacePointGridConfig");
     }
+
     using namespace Acts::UnitLiterals;
     CylindricalSpacePointGridConfig config = *this;
     config.isInInternalUnits = true;
     config.minPt /= 1_MeV;
+    config.rMin /= 1_mm;
     config.rMax /= 1_mm;
     config.zMax /= 1_mm;
     config.zMin /= 1_mm;
     config.deltaRMax /= 1_mm;
 
+    for (float& val : config.zBinEdges) {
+      val /= 1_mm;
+    }
+    for (float& val : config.rBinEdges) {
+      val /= 1_mm;
+    }
+
+    if (config.phiMin < -std::numbers::pi_v<float> ||
+        config.phiMax > std::numbers::pi_v<float>) {
+      throw std::runtime_error(
+          "CylindricalSpacePointGridConfig: phiMin (" +
+          std::to_string(config.phiMin) + ") and/or phiMax (" +
+          std::to_string(config.phiMax) +
+          ") are outside "
+          "the allowed phi range, defined as "
+          "[-std::numbers::pi_v<float>, std::numbers::pi_v<float>]");
+    }
+    if (config.phiMin > config.phiMax) {
+      throw std::runtime_error(
+          "CylindricalSpacePointGridConfig: phiMin is bigger then phiMax");
+    }
+    if (config.rMin > config.rMax) {
+      throw std::runtime_error(
+          "CylindricalSpacePointGridConfig: rMin is bigger then rMax");
+    }
+    if (config.zMin > config.zMax) {
+      throw std::runtime_error(
+          "CylindricalSpacePointGridConfig: zMin is bigger than zMax");
+    }
+
     return config;
   }
 };
 
 struct CylindricalSpacePointGridOptions {
   // magnetic field
-  float bFieldInZ = 0;
+  float bFieldInZ = 0. * Acts::UnitConstants::T;
   bool isInInternalUnits = false;
   CylindricalSpacePointGridOptions toInternalUnits() const {
     if (isInInternalUnits) {
@@ -114,17 +159,29 @@ class CylindricalSpacePointGridCreator {
   template <typename external_spacepoint_t>
   static Acts::CylindricalSpacePointGrid<external_spacepoint_t> createGrid(
       const Acts::CylindricalSpacePointGridConfig& _config,
-      const Acts::CylindricalSpacePointGridOptions& _options);
+      const Acts::CylindricalSpacePointGridOptions& _options,
+      const Acts::Logger& logger = Acts::getDummyLogger());
 
   template <typename external_spacepoint_t,
-            typename external_spacepoint_iterator_t, typename callable_t>
+            typename external_spacepoint_iterator_t>
   static void fillGrid(
       const Acts::SeedFinderConfig<external_spacepoint_t>& config,
       const Acts::SeedFinderOptions& options,
       Acts::CylindricalSpacePointGrid<external_spacepoint_t>& grid,
       external_spacepoint_iterator_t spBegin,
-      external_spacepoint_iterator_t spEnd, callable_t&& toGlobal,
-      Acts::Extent& rRangeSPExtent);
+      external_spacepoint_iterator_t spEnd,
+      const Acts::Logger& logger = Acts::getDummyLogger());
+
+  template <typename external_spacepoint_t, typename external_collection_t>
+    requires std::ranges::range<external_collection_t> &&
+             std::same_as<typename external_collection_t::value_type,
+                          external_spacepoint_t>
+  static void fillGrid(
+      const Acts::SeedFinderConfig<external_spacepoint_t>& config,
+      const Acts::SeedFinderOptions& options,
+      Acts::CylindricalSpacePointGrid<external_spacepoint_t>& grid,
+      const external_collection_t& collection,
+      const Acts::Logger& logger = Acts::getDummyLogger());
 };
 
 }  // namespace Acts
diff --git a/Core/include/Acts/Seeding/detail/CylindricalSpacePointGrid.ipp b/Core/include/Acts/Seeding/detail/CylindricalSpacePointGrid.ipp
index 5a88fc341ac..2a8f3dad41d 100644
--- a/Core/include/Acts/Seeding/detail/CylindricalSpacePointGrid.ipp
+++ b/Core/include/Acts/Seeding/detail/CylindricalSpacePointGrid.ipp
@@ -1,16 +1,20 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2024 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
-template <typename SpacePoint>
-Acts::CylindricalSpacePointGrid<SpacePoint>
+#include <concepts>
+#include <numbers>
+
+template <typename external_spacepoint_t>
+Acts::CylindricalSpacePointGrid<external_spacepoint_t>
 Acts::CylindricalSpacePointGridCreator::createGrid(
     const Acts::CylindricalSpacePointGridConfig& config,
-    const Acts::CylindricalSpacePointGridOptions& options) {
+    const Acts::CylindricalSpacePointGridOptions& options,
+    const Acts::Logger& logger) {
   if (!config.isInInternalUnits) {
     throw std::runtime_error(
         "CylindricalSpacePointGridConfig not in ACTS internal units in "
@@ -28,6 +32,9 @@ Acts::CylindricalSpacePointGridCreator::createGrid(
   // for no magnetic field, create 100 phi-bins
   if (options.bFieldInZ == 0) {
     phiBins = 100;
+    ACTS_VERBOSE(
+        "B-Field is 0 (z-coordinate), setting the number of bins in phi to "
+        << phiBins);
   } else {
     // calculate circle intersections of helix and max detector radius
     float minHelixRadius =
@@ -37,7 +44,7 @@ Acts::CylindricalSpacePointGridCreator::createGrid(
                               // = pT[MeV] / (300 *Bz[kT])
 
     // sanity check: if yOuter takes the square root of a negative number
-    if (minHelixRadius < config.rMax / 2) {
+    if (minHelixRadius < config.rMax * 0.5) {
       throw std::domain_error(
           "The value of minHelixRadius cannot be smaller than rMax / 2. Please "
           "check the configuration of bFieldInZ and minPt");
@@ -85,23 +92,21 @@ Acts::CylindricalSpacePointGridCreator::createGrid(
 
     // divide 2pi by angle delta to get number of phi-bins
     // size is always 2pi even for regions of interest
-    phiBins = static_cast<int>(std::ceil(2 * M_PI / deltaPhi));
+    phiBins = static_cast<int>(std::ceil(2 * std::numbers::pi / deltaPhi));
     // need to scale the number of phi bins accordingly to the number of
     // consecutive phi bins in the seed making step.
     // Each individual bin should be approximately a fraction (depending on this
     // number) of the maximum expected azimutal deflection.
 
     // set protection for large number of bins, by default it is large
-    if (phiBins > config.maxPhiBins) {
-      phiBins = config.maxPhiBins;
-    }
+    phiBins = std::min(phiBins, config.maxPhiBins);
   }
 
   Acts::Axis<AxisType::Equidistant, AxisBoundaryType::Closed> phiAxis(
       config.phiMin, config.phiMax, phiBins);
 
   // vector that will store the edges of the bins of z
-  std::vector<AxisScalar> zValues;
+  std::vector<AxisScalar> zValues{};
 
   // If zBinEdges is not defined, calculate the edges as zMin + bin * zBinSize
   if (config.zBinEdges.empty()) {
@@ -128,29 +133,35 @@ Acts::CylindricalSpacePointGridCreator::createGrid(
     }
   }
 
-  Axis<AxisType::Variable, AxisBoundaryType::Bound> zAxis(std::move(zValues));
-  return Acts::CylindricalSpacePointGrid<SpacePoint>(
-      std::make_tuple(std::move(phiAxis), std::move(zAxis)));
+  std::vector<AxisScalar> rValues{};
+  rValues.reserve(std::max(2ul, config.rBinEdges.size()));
+  if (config.rBinEdges.empty()) {
+    rValues = {config.rMin, config.rMax};
+  } else {
+    rValues.insert(rValues.end(), config.rBinEdges.begin(),
+                   config.rBinEdges.end());
+  }
+
+  Axis<AxisType::Variable, AxisBoundaryType::Open> zAxis(std::move(zValues));
+  Axis<AxisType::Variable, AxisBoundaryType::Open> rAxis(std::move(rValues));
+
+  ACTS_VERBOSE("Defining Grid:");
+  ACTS_VERBOSE("- Phi Axis: " << phiAxis);
+  ACTS_VERBOSE("- Z axis  : " << zAxis);
+  ACTS_VERBOSE("- R axis  : " << rAxis);
+
+  return Acts::CylindricalSpacePointGrid<external_spacepoint_t>(
+      std::make_tuple(std::move(phiAxis), std::move(zAxis), std::move(rAxis)));
 }
 
 template <typename external_spacepoint_t,
-          typename external_spacepoint_iterator_t, typename callable_t>
+          typename external_spacepoint_iterator_t>
 void Acts::CylindricalSpacePointGridCreator::fillGrid(
     const Acts::SeedFinderConfig<external_spacepoint_t>& config,
     const Acts::SeedFinderOptions& options,
     Acts::CylindricalSpacePointGrid<external_spacepoint_t>& grid,
     external_spacepoint_iterator_t spBegin,
-    external_spacepoint_iterator_t spEnd, callable_t&& toGlobal,
-    Acts::Extent& rRangeSPExtent) {
-  using iterated_value_t =
-      typename std::iterator_traits<external_spacepoint_iterator_t>::value_type;
-  using iterated_t = typename std::remove_const<
-      typename std::remove_pointer<iterated_value_t>::type>::type;
-  static_assert(std::is_pointer<iterated_value_t>::value,
-                "Iterator must contain pointers to space points");
-  static_assert(std::is_same<iterated_t, external_spacepoint_t>::value,
-                "Iterator does not contain type this class was templated with");
-
+    external_spacepoint_iterator_t spEnd, const Acts::Logger& logger) {
   if (!config.isInInternalUnits) {
     throw std::runtime_error(
         "SeedFinderConfig not in ACTS internal units in BinnedSPGroup");
@@ -163,67 +174,42 @@ void Acts::CylindricalSpacePointGridCreator::fillGrid(
         "SeedFinderOptions not in ACTS internal units in BinnedSPGroup");
   }
 
-  // sort by radius
-  // add magnitude of beamPos to rMax to avoid excluding measurements
-  // create number of bins equal to number of millimeters rMax
-  // (worst case minR: configured minR + 1mm)
-  // binSizeR allows to increase or reduce numRBins if needed
-  std::size_t numRBins = static_cast<std::size_t>(
-      (config.rMax + options.beamPos.norm()) / config.binSizeR);
+  // Space points are assumed to be ALREADY CORRECTED for beamspot position
+  // phi, z and r space point selection comes naturally from the
+  // grid axis definition. Calling `isInside` will let us know if we are
+  // inside the grid range.
+  // If a space point is outside the validity range of these quantities
+  // it goes in an over- or under-flow bin. We want to avoid to consider those
+  // and skip some computations.
+  // Additional cuts can be applied by customizing the space point selector
+  // in the config object.
 
   // keep track of changed bins while sorting
   std::vector<bool> usedBinIndex(grid.size(), false);
   std::vector<std::size_t> rBinsIndex;
   rBinsIndex.reserve(grid.size());
 
+  ACTS_VERBOSE("Fetching " << std::distance(spBegin, spEnd)
+                           << " space points to the grid");
   std::size_t counter = 0ul;
-  for (external_spacepoint_iterator_t it = spBegin; it != spEnd;
-       it++, ++counter) {
-    if (*it == nullptr) {
-      continue;
-    }
-    const external_spacepoint_t& sp = **it;
-    const auto& [spPosition, variance, spTime] =
-        toGlobal(sp, config.zAlign, config.rAlign, config.sigmaError);
-
-    float spX = spPosition[0];
-    float spY = spPosition[1];
-    float spZ = spPosition[2];
-
-    // store x,y,z values in extent
-    rRangeSPExtent.extend({spX, spY, spZ});
+  for (external_spacepoint_iterator_t it = spBegin; it != spEnd; ++it) {
+    const external_spacepoint_t& sp = *it;
 
     // remove SPs according to experiment specific cuts
     if (!config.spacePointSelector(sp)) {
       continue;
     }
 
-    // remove SPs outside z and phi region
-    if (spZ > config.zMax || spZ < config.zMin) {
-      continue;
-    }
-
-    float spPhi = std::atan2(spY, spX);
-    if (spPhi > config.phiMax || spPhi < config.phiMin) {
-      continue;
-    }
-
-    auto isp = std::make_unique<InternalSpacePoint<external_spacepoint_t>>(
-        counter, sp, spPosition, options.beamPos, variance, spTime);
-    // calculate r-Bin index and protect against overflow (underflow not
-    // possible)
-    std::size_t rIndex =
-        static_cast<std::size_t>(isp->radius() / config.binSizeR);
-    // if index out of bounds, the SP is outside the region of interest
-    if (rIndex >= numRBins) {
+    // fill rbins into grid
+    Acts::Vector3 position(sp.phi(), sp.z(), sp.radius());
+    if (!grid.isInside(position)) {
       continue;
     }
 
-    // fill rbins into grid
-    std::size_t globIndex =
-        grid.globalBinFromPosition(Acts::Vector2{isp->phi(), isp->z()});
+    std::size_t globIndex = grid.globalBinFromPosition(position);
     auto& rbin = grid.at(globIndex);
-    rbin.push_back(std::move(isp));
+    rbin.push_back(&sp);
+    ++counter;
 
     // keep track of the bins we modify so that we can later sort the SPs in
     // those bins only
@@ -236,9 +222,23 @@ void Acts::CylindricalSpacePointGridCreator::fillGrid(
   /// sort SPs in R for each filled bin
   for (std::size_t binIndex : rBinsIndex) {
     auto& rbin = grid.atPosition(binIndex);
-    std::sort(rbin.begin(), rbin.end(),
-              [](const auto& a, const auto& b) -> bool {
-                return a->radius() < b->radius();
-              });
+    std::ranges::sort(rbin, {}, [](const auto& rb) { return rb->radius(); });
   }
+
+  ACTS_VERBOSE(
+      "Number of space points inserted (within grid range): " << counter);
+}
+
+template <typename external_spacepoint_t, typename external_collection_t>
+  requires std::ranges::range<external_collection_t> &&
+           std::same_as<typename external_collection_t::value_type,
+                        external_spacepoint_t>
+void Acts::CylindricalSpacePointGridCreator::fillGrid(
+    const Acts::SeedFinderConfig<external_spacepoint_t>& config,
+    const Acts::SeedFinderOptions& options,
+    Acts::CylindricalSpacePointGrid<external_spacepoint_t>& grid,
+    const external_collection_t& collection, const Acts::Logger& logger) {
+  Acts::CylindricalSpacePointGridCreator::fillGrid<external_spacepoint_t>(
+      config, options, grid, std::ranges::begin(collection),
+      std::ranges::end(collection), logger);
 }
diff --git a/Core/include/Acts/Seeding/detail/UtilityFunctions.hpp b/Core/include/Acts/Seeding/detail/UtilityFunctions.hpp
index 5b73d9b416f..b4fa190fa37 100644
--- a/Core/include/Acts/Seeding/detail/UtilityFunctions.hpp
+++ b/Core/include/Acts/Seeding/detail/UtilityFunctions.hpp
@@ -1,13 +1,15 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2024 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
+#include "Acts/EventData/SourceLink.hpp"
+
 #include <ranges>
 
 namespace Acts::detail {
@@ -29,17 +31,28 @@ concept isCollectionThatSupportsInsert =
       coll.insert(std::ranges::end(coll), val);
     };
 
+template <typename grid_t>
+concept SourceLinkGrid =
+    std::same_as<typename grid_t::value_type, std::vector<Acts::SourceLink>>;
+
 // Define some functions
-template <typename value_t>
-void pushBackOrInsertAtEnd(
-    Acts::detail::isCollectionThatSupportsPushBack auto& storage,
-    value_t&& value) {
+template <Acts::detail::isCollectionThatSupportsPushBack storage_t,
+          typename value_t>
+  requires requires(storage_t coll, value_t value) {
+    coll.push_back(value);
+    coll.push_back(std::move(value));
+  }
+void pushBackOrInsertAtEnd(storage_t& storage, value_t&& value) {
   storage.push_back(std::forward<value_t>(value));
 }
 
 template <std::ranges::range storage_t, typename value_t>
   requires(!Acts::detail::isCollectionThatSupportsPushBack<storage_t> &&
-           Acts::detail::isCollectionThatSupportsInsert<storage_t>)
+           Acts::detail::isCollectionThatSupportsInsert<storage_t> &&
+           requires(storage_t coll, value_t value) {
+             coll.insert(std::ranges::end(coll), value);
+             coll.insert(std::ranges::end(coll), std::move(value));
+           })
 void pushBackOrInsertAtEnd(storage_t& storage, value_t&& value) {
   storage.insert(std::ranges::end(storage), std::forward<value_t>(value));
 }
diff --git a/Core/include/Acts/SpacePointFormation/SpacePointBuilder.hpp b/Core/include/Acts/SpacePointFormation/SpacePointBuilder.hpp
index 2703c1be953..c4dbdd70254 100644
--- a/Core/include/Acts/SpacePointFormation/SpacePointBuilder.hpp
+++ b/Core/include/Acts/SpacePointFormation/SpacePointBuilder.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2018-2022 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
diff --git a/Core/include/Acts/SpacePointFormation/SpacePointBuilderConfig.hpp b/Core/include/Acts/SpacePointFormation/SpacePointBuilderConfig.hpp
index 26269e08a3b..6870639221b 100644
--- a/Core/include/Acts/SpacePointFormation/SpacePointBuilderConfig.hpp
+++ b/Core/include/Acts/SpacePointFormation/SpacePointBuilderConfig.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2022 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
diff --git a/Core/include/Acts/SpacePointFormation/SpacePointBuilderOptions.hpp b/Core/include/Acts/SpacePointFormation/SpacePointBuilderOptions.hpp
index 7f98d8113e0..ddbc5adb3e1 100644
--- a/Core/include/Acts/SpacePointFormation/SpacePointBuilderOptions.hpp
+++ b/Core/include/Acts/SpacePointFormation/SpacePointBuilderOptions.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2022 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
diff --git a/Core/include/Acts/SpacePointFormation/detail/SpacePointBuilder.ipp b/Core/include/Acts/SpacePointFormation/detail/SpacePointBuilder.ipp
index a4626cd027c..532d2c90ec7 100644
--- a/Core/include/Acts/SpacePointFormation/detail/SpacePointBuilder.ipp
+++ b/Core/include/Acts/SpacePointFormation/detail/SpacePointBuilder.ipp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2018-2022 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include "Acts/Definitions/Algebra.hpp"
 
diff --git a/Core/include/Acts/Surfaces/AnnulusBounds.hpp b/Core/include/Acts/Surfaces/AnnulusBounds.hpp
index 548512f8100..942c20dc764 100644
--- a/Core/include/Acts/Surfaces/AnnulusBounds.hpp
+++ b/Core/include/Acts/Surfaces/AnnulusBounds.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2020 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
@@ -20,6 +20,7 @@
 #include <cmath>
 #include <exception>
 #include <iosfwd>
+#include <numbers>
 #include <stdexcept>
 #include <vector>
 
@@ -133,19 +134,20 @@ class AnnulusBounds : public DiscBounds {
   std::vector<Vector2> corners() const;
 
   /// This method returns the xy coordinates of the four corners of the
-  /// bounds in module coordinates (in x/y)
+  /// bounds in module coordinates (in x/y), and if quarterSegments is bigger or
+  /// equal to 0, the curved part of the segment is included and approximated
+  /// by the corresponding number of segments.
+  ///
   /// Starting from the upper right (max R, pos locX) and proceeding clock-wise
   /// i.e. (max R; pos locX), (min R; pos locX), (min R; neg loc X), (max R: neg
   /// locX)
   ///
-  /// @param lseg the number of segments used to approximate
-  /// and eventually curved line
-  ///
-  /// @note that that if @c lseg > 0, the extrema points are given,
-  ///  which may slightly alter the number of segments returned
+  /// @param quarterSegments the number of segments used to approximate
+  /// a quarter of a circle
   ///
   /// @return vector for vertices in 2D
-  std::vector<Vector2> vertices(unsigned int lseg) const override;
+  std::vector<Vector2> vertices(
+      unsigned int quarterSegments = 2u) const override;
 
   /// This method returns inner radius
   double rMin() const final;
@@ -230,7 +232,7 @@ inline double AnnulusBounds::phiMax() const {
 }
 
 inline bool AnnulusBounds::coversFullAzimuth() const {
-  return (std::abs((get(eMinPhiRel) - get(eMaxPhiRel)) - M_PI) <
+  return (std::abs((get(eMinPhiRel) - get(eMaxPhiRel)) - std::numbers::pi) <
           s_onSurfaceTolerance);
 }
 
diff --git a/Core/include/Acts/Surfaces/BoundaryTolerance.hpp b/Core/include/Acts/Surfaces/BoundaryTolerance.hpp
index eaadf019ffa..603b8a2abe9 100644
--- a/Core/include/Acts/Surfaces/BoundaryTolerance.hpp
+++ b/Core/include/Acts/Surfaces/BoundaryTolerance.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2016-2024 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
diff --git a/Core/include/Acts/Surfaces/ConeBounds.hpp b/Core/include/Acts/Surfaces/ConeBounds.hpp
index de40027f32b..d0d684016a8 100644
--- a/Core/include/Acts/Surfaces/ConeBounds.hpp
+++ b/Core/include/Acts/Surfaces/ConeBounds.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2016-2020 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
@@ -18,6 +18,7 @@
 #include <cmath>
 #include <cstdlib>
 #include <iosfwd>
+#include <numbers>
 #include <stdexcept>
 #include <vector>
 
@@ -55,7 +56,7 @@ class ConeBounds : public SurfaceBounds {
   /// @param halfphi is the half opening angle (default is pi)
   /// @param avphi is the phi value around which the bounds are opened
   /// (default=0)
-  ConeBounds(double alpha, bool symm, double halfphi = M_PI,
+  ConeBounds(double alpha, bool symm, double halfphi = std::numbers::pi,
              double avphi = 0.) noexcept(false);
 
   /// Constructor - open cone with alpha, minz and maxz, by
@@ -67,7 +68,8 @@ class ConeBounds : public SurfaceBounds {
   /// @param halfphi is the half opening angle (default is pi)
   /// @param avphi is the phi value around which the bounds are opened
   /// (default=0)
-  ConeBounds(double alpha, double minz, double maxz, double halfphi = M_PI,
+  ConeBounds(double alpha, double minz, double maxz,
+             double halfphi = std::numbers::pi,
              double avphi = 0.) noexcept(false);
 
   /// Constructor - from parameters array
@@ -141,14 +143,14 @@ inline std::vector<double> ConeBounds::values() const {
 }
 
 inline void ConeBounds::checkConsistency() noexcept(false) {
-  if (get(eAlpha) < 0. || get(eAlpha) >= M_PI) {
+  if (get(eAlpha) < 0. || get(eAlpha) >= std::numbers::pi) {
     throw std::invalid_argument("ConeBounds: invalid open angle.");
   }
   if (get(eMinZ) > get(eMaxZ) ||
       std::abs(get(eMinZ) - get(eMaxZ)) < s_epsilon) {
     throw std::invalid_argument("ConeBounds: invalid z range setup.");
   }
-  if (get(eHalfPhiSector) < 0. || abs(eHalfPhiSector) > M_PI) {
+  if (get(eHalfPhiSector) < 0. || abs(eHalfPhiSector) > std::numbers::pi) {
     throw std::invalid_argument("ConeBounds: invalid phi sector setup.");
   }
   if (get(eAveragePhi) != detail::radian_sym(get(eAveragePhi))) {
diff --git a/Core/include/Acts/Surfaces/ConeSurface.hpp b/Core/include/Acts/Surfaces/ConeSurface.hpp
index 45377c2de68..2f88bfe9532 100644
--- a/Core/include/Acts/Surfaces/ConeSurface.hpp
+++ b/Core/include/Acts/Surfaces/ConeSurface.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2016-2020 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
@@ -26,6 +26,7 @@
 #include <cmath>
 #include <cstddef>
 #include <memory>
+#include <numbers>
 #include <string>
 
 namespace Acts {
@@ -61,7 +62,7 @@ class ConeSurface : public RegularSurface {
   /// @param zmax is the z range over which the cone spans
   /// @param halfPhi is the opening angle for cone ssectors
   ConeSurface(const Transform3& transform, double alpha, double zmin,
-              double zmax, double halfPhi = M_PI);
+              double zmax, double halfPhi = std::numbers::pi);
 
   /// Constructor from HepTransform and ConeBounds
   ///
@@ -200,15 +201,16 @@ class ConeSurface : public RegularSurface {
   /// Return a Polyhedron for the surfaces
   ///
   /// @param gctx The current geometry context object, e.g. alignment
-  /// @param lseg Number of segments along curved lines, it represents
-  /// the full 2*M_PI coverange, if lseg is set to 1 only the extrema
-  /// are given
-  /// @note that a surface transform can invalidate the extrema
-  /// in the transformed space
+  /// @param quarterSegments Number of segments used to approximate a quarter
+  ///
+  /// @note The phi extrema points at (-pi, -1/2 pi, 0, 1/2 pi) that fall within
+  /// the surface will be inserted to guarantee an appropriate extent
+  /// measurement in x and y
   ///
   /// @return A list of vertices and a face/facett description of it
-  Polyhedron polyhedronRepresentation(const GeometryContext& gctx,
-                                      std::size_t lseg) const override;
+  Polyhedron polyhedronRepresentation(
+      const GeometryContext& gctx,
+      unsigned int quarterSegments = 2u) const override;
 
   /// Return properly formatted class name for screen output
   std::string name() const override;
diff --git a/Core/include/Acts/Surfaces/ConvexPolygonBounds.hpp b/Core/include/Acts/Surfaces/ConvexPolygonBounds.hpp
index 96aa0b33bc3..e802056e7fd 100644
--- a/Core/include/Acts/Surfaces/ConvexPolygonBounds.hpp
+++ b/Core/include/Acts/Surfaces/ConvexPolygonBounds.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2020 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
@@ -16,6 +16,7 @@
 
 #include <array>
 #include <cmath>
+#include <concepts>
 #include <cstddef>
 #include <exception>
 #include <iosfwd>
@@ -54,6 +55,7 @@ class ConvexPolygonBoundsBase : public PlanarBounds {
   /// @param vertices A collection of vertices.
   /// throws a logic error if this is not the case
   template <typename coll_t>
+    requires std::same_as<typename coll_t::value_type, Acts::Vector2>
   static void convex_impl(const coll_t& vertices) noexcept(false);
 };
 
@@ -112,13 +114,13 @@ class ConvexPolygonBounds : public ConvexPolygonBoundsBase {
 
   /// Return the vertices
   ///
-  /// @param lseg the number of segments used to approximate
+  /// @param ignoredSegments the number of segments used to approximate
   /// and eventually curved line
   ///
   /// @note the number of segments is ignored in this representation
   ///
   /// @return vector for vertices in 2D
-  std::vector<Vector2> vertices(unsigned int lseg = 1) const final;
+  std::vector<Vector2> vertices(unsigned int ignoredSegments = 0u) const final;
 
   /// Return a rectangle bounds object that encloses this polygon.
   /// @return The rectangular bounds
diff --git a/Core/include/Acts/Surfaces/ConvexPolygonBounds.ipp b/Core/include/Acts/Surfaces/ConvexPolygonBounds.ipp
index 88ddbe8db10..9f1a61955ae 100644
--- a/Core/include/Acts/Surfaces/ConvexPolygonBounds.ipp
+++ b/Core/include/Acts/Surfaces/ConvexPolygonBounds.ipp
@@ -1,23 +1,22 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2019 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include "Acts/Surfaces/BoundaryTolerance.hpp"
 #include "Acts/Surfaces/detail/BoundaryCheckHelper.hpp"
 #include "Acts/Utilities/ThrowAssert.hpp"
 
+#include <concepts>
 #include <optional>
 
 template <typename coll_t>
+  requires std::same_as<typename coll_t::value_type, Acts::Vector2>
 void Acts::ConvexPolygonBoundsBase::convex_impl(
     const coll_t& vertices) noexcept(false) {
-  static_assert(std::is_same<typename coll_t::value_type, Vector2>::value,
-                "Must be collection of Vector2");
-
   const std::size_t N = vertices.size();
   for (std::size_t i = 0; i < N; i++) {
     std::size_t j = (i + 1) % N;
@@ -112,7 +111,7 @@ bool Acts::ConvexPolygonBounds<N>::inside(
 
 template <int N>
 std::vector<Acts::Vector2> Acts::ConvexPolygonBounds<N>::vertices(
-    unsigned int /*lseg*/) const {
+    unsigned int /*ignoredSegments*/) const {
   return {m_vertices.begin(), m_vertices.end()};
 }
 
diff --git a/Core/include/Acts/Surfaces/CurvilinearSurface.hpp b/Core/include/Acts/Surfaces/CurvilinearSurface.hpp
index 299c1e9ab46..4c9cae727df 100644
--- a/Core/include/Acts/Surfaces/CurvilinearSurface.hpp
+++ b/Core/include/Acts/Surfaces/CurvilinearSurface.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2023-2024 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
diff --git a/Core/include/Acts/Surfaces/CylinderBounds.hpp b/Core/include/Acts/Surfaces/CylinderBounds.hpp
index c291ae1ea56..d144c8b995b 100644
--- a/Core/include/Acts/Surfaces/CylinderBounds.hpp
+++ b/Core/include/Acts/Surfaces/CylinderBounds.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2016-2024 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
@@ -18,6 +18,7 @@
 #include <cmath>
 #include <cstddef>
 #include <iostream>
+#include <numbers>
 #include <stdexcept>
 #include <vector>
 
@@ -69,11 +70,11 @@ class CylinderBounds : public SurfaceBounds {
   /// @param avgPhi (optional) The phi value from which the opening angle spans
   /// @param bevelMinZ (optional) The bevel on the negative z side
   /// @param bevelMaxZ (optional) The bevel on the positive z sid The bevel on the positive z side
-  CylinderBounds(double r, double halfZ, double halfPhi = M_PI,
+  CylinderBounds(double r, double halfZ, double halfPhi = std::numbers::pi,
                  double avgPhi = 0., double bevelMinZ = 0.,
                  double bevelMaxZ = 0.) noexcept(false)
       : m_values({r, halfZ, halfPhi, avgPhi, bevelMinZ, bevelMaxZ}),
-        m_closed(std::abs(halfPhi - M_PI) < s_epsilon) {
+        m_closed(std::abs(halfPhi - std::numbers::pi) < s_epsilon) {
     checkConsistency();
   }
 
@@ -82,7 +83,8 @@ class CylinderBounds : public SurfaceBounds {
   /// @param values The parameter values
   CylinderBounds(const std::array<double, eSize>& values) noexcept(false)
       : m_values(values),
-        m_closed(std::abs(values[eHalfPhiSector] - M_PI) < s_epsilon) {
+        m_closed(std::abs(values[eHalfPhiSector] - std::numbers::pi) <
+                 s_epsilon) {
     checkConsistency();
   }
 
@@ -112,12 +114,18 @@ class CylinderBounds : public SurfaceBounds {
   /// Returns true for full phi coverage
   bool coversFullAzimuth() const;
 
-  /// Create the bows/circles on either side of the cylinder
+  /// Create the bow/circle vertices on either side of the cylinder
   ///
-  /// @param trans is the global transform
-  /// @param lseg  are the numbero if phi segments
-  std::vector<Vector3> createCircles(const Transform3 trans,
-                                     std::size_t lseg) const;
+  /// @param transform is the global transform
+  /// @param quarterSegments is the number of segments to approximate a quarter
+  /// of a circle. In order to symmetrize fully closed and sectoral cylinders,
+  /// also in the first case the two end points are given (albeit they overlap)
+  /// in -pi / pi
+  ///
+  /// @return a singlevector containing the vertices from one side and then
+  /// from the other side consecutively
+  std::vector<Vector3> circleVertices(const Transform3 transform,
+                                      unsigned int quarterSegments) const;
 
   /// Output Method for std::ostream
   std::ostream& toStream(std::ostream& sl) const final;
diff --git a/Core/include/Acts/Surfaces/CylinderSurface.hpp b/Core/include/Acts/Surfaces/CylinderSurface.hpp
index b7b1cc34fbd..53c52f13f50 100644
--- a/Core/include/Acts/Surfaces/CylinderSurface.hpp
+++ b/Core/include/Acts/Surfaces/CylinderSurface.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2016-2020 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
@@ -27,6 +27,7 @@
 #include <cmath>
 #include <cstddef>
 #include <memory>
+#include <numbers>
 #include <string>
 
 namespace Acts {
@@ -57,7 +58,7 @@ class CylinderSurface : public RegularSurface {
   /// @param bevelMinZ (optional) The bevel on the negative z side
   /// @param bevelMaxZ (optional) The bevel on the positive z sid The bevel on the positive z side
   CylinderSurface(const Transform3& transform, double radius, double halfz,
-                  double halfphi = M_PI, double avphi = 0.,
+                  double halfphi = std::numbers::pi, double avphi = 0.,
                   double bevelMinZ = 0., double bevelMaxZ = 0.);
 
   /// Constructor from Transform3 and CylinderBounds arguments
@@ -214,14 +215,20 @@ class CylinderSurface : public RegularSurface {
 
   /// Return a Polyhedron for a cylinder
   ///
+  /// This method represents the cylinder as a polyhedron with a given number
+  /// of segments to represent a quarter of a full circle. The polyedron will
+  /// consist of the vertices of the cylinder on both sides, and faces between
+  /// them, both as rectangular faces and as triangular faces.
+  ///
   /// @param gctx The current geometry context object, e.g. alignment
-  /// @param lseg Number of segments along curved lines, it represents
-  /// the full 2*M_PI coverange, if lseg is set to 1 only the extrema
-  /// are given
+  /// @param quarterSegments The number of segments to approximate a quarter of the
+  /// full circle; it's chosen to be 1, only the extrema points (-pi, -0.5pi,
+  /// 0., 0.5pi) are inserted to capture the correct extent in the x-y plane
   ///
   /// @return A list of vertices and a face/facett description of it
-  Polyhedron polyhedronRepresentation(const GeometryContext& gctx,
-                                      std::size_t lseg) const override;
+  Polyhedron polyhedronRepresentation(
+      const GeometryContext& gctx,
+      unsigned int quarterSegments = 2u) const override;
 
   /// Calculate the derivative of path length at the geometry constraint or
   /// point-of-closest-approach w.r.t. alignment parameters of the surface (i.e.
diff --git a/Core/include/Acts/Surfaces/DiamondBounds.hpp b/Core/include/Acts/Surfaces/DiamondBounds.hpp
index 3e50e934bbb..7497bd22309 100644
--- a/Core/include/Acts/Surfaces/DiamondBounds.hpp
+++ b/Core/include/Acts/Surfaces/DiamondBounds.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2016-2020 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
@@ -90,15 +90,13 @@ class DiamondBounds : public PlanarBounds {
   bool inside(const Vector2& lposition,
               const BoundaryTolerance& boundaryTolerance) const final;
 
-  /// Return the vertices
+  /// Return the vertices that describe this shape
   ///
-  /// @param lseg the number of segments used to approximate
-  /// and eventually curved line
-  ///
-  /// @note the number of segments is ignored for this representation
+  /// @param ignoredSegments is an ignored parameter only used for
+  /// curved bound segments
   ///
   /// @return vector for vertices in 2D
-  std::vector<Vector2> vertices(unsigned int lseg = 1) const final;
+  std::vector<Vector2> vertices(unsigned int ignoredSegments = 0u) const final;
 
   // Bounding box representation
   const RectangleBounds& boundingBox() const final;
@@ -128,8 +126,7 @@ inline std::vector<double> DiamondBounds::values() const {
 }
 
 inline void DiamondBounds::checkConsistency() noexcept(false) {
-  if (std::any_of(m_values.begin(), m_values.end(),
-                  [](auto v) { return v <= 0.; })) {
+  if (std::ranges::any_of(m_values, [](auto v) { return v <= 0.; })) {
     throw std::invalid_argument("DiamondBounds: negative half length.");
   }
   if (get(eHalfLengthXnegY) > get(eHalfLengthXzeroY) ||
diff --git a/Core/include/Acts/Surfaces/DiscBounds.hpp b/Core/include/Acts/Surfaces/DiscBounds.hpp
index cc4a8a265ee..626f8e2405c 100644
--- a/Core/include/Acts/Surfaces/DiscBounds.hpp
+++ b/Core/include/Acts/Surfaces/DiscBounds.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2016-2020 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
@@ -29,14 +29,13 @@ class DiscBounds : public SurfaceBounds {
 
   /// Return the vertices
   ///
-  /// @param lseg the number of segments used to approximate
-  /// and eventually curved line, the number refers to full 2*PI
-  ///
-  /// @note that the extremas are given, which may slightly alter the
-  /// number of segments returned
+  /// @param quarterSegments The number of segments used to describe a quarter
+  /// of a circle, if it is 1, then only the extrema points in phi are inserted
+  /// next to the segment corners
   ///
   /// @return vector for vertices in 2D
-  virtual std::vector<Vector2> vertices(unsigned int lseg) const = 0;
+  virtual std::vector<Vector2> vertices(
+      unsigned int quarterSegments = 2u) const = 0;
 
   /// Returns a reference radius for binning
   virtual double binningValueR() const = 0;
diff --git a/Core/include/Acts/Surfaces/DiscSurface.hpp b/Core/include/Acts/Surfaces/DiscSurface.hpp
index 819d3d3d106..d2db14fc566 100644
--- a/Core/include/Acts/Surfaces/DiscSurface.hpp
+++ b/Core/include/Acts/Surfaces/DiscSurface.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2016-2020 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
@@ -25,6 +25,7 @@
 #include <cmath>
 #include <cstddef>
 #include <memory>
+#include <numbers>
 #include <string>
 
 namespace Acts {
@@ -64,7 +65,7 @@ class DiscSurface : public RegularSurface {
   /// @param hphisec The opening angle of the disc surface and is optional
   ///        the default is a full disc
   DiscSurface(const Transform3& transform, double rmin, double rmax,
-              double hphisec = M_PI);
+              double hphisec = std::numbers::pi);
 
   /// Constructor for Discs from Transform3, \f$ r_{min}, r_{max}, hx_{min},
   /// hx_{max} \f$
@@ -312,13 +313,12 @@ class DiscSurface : public RegularSurface {
   /// Return a Polyhedron for the surfaces
   ///
   /// @param gctx The current geometry context object, e.g. alignment
-  /// @param lseg Number of segments along curved lines, it represents
-  /// the full 2*M_PI coverange, if lseg is set to 1 only the extrema
-  /// are given
+  /// @param quarterSegments Number of segments used to describe the
+  /// quarter of a full circle
   ///
   /// @return A list of vertices and a face/facett description of it
-  Polyhedron polyhedronRepresentation(const GeometryContext& gctx,
-                                      std::size_t lseg) const override;
+  Polyhedron polyhedronRepresentation(
+      const GeometryContext& gctx, unsigned int quarterSegments) const override;
 
   /// Calculate the derivative of bound track parameters local position w.r.t.
   /// position in local 3D Cartesian coordinates
diff --git a/Core/include/Acts/Surfaces/DiscTrapezoidBounds.hpp b/Core/include/Acts/Surfaces/DiscTrapezoidBounds.hpp
index b1f92d96f5c..32c63c2aef6 100644
--- a/Core/include/Acts/Surfaces/DiscTrapezoidBounds.hpp
+++ b/Core/include/Acts/Surfaces/DiscTrapezoidBounds.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2016-2020 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 #include "Acts/Definitions/Algebra.hpp"
@@ -18,6 +18,7 @@
 #include <array>
 #include <cmath>
 #include <iosfwd>
+#include <numbers>
 #include <stdexcept>
 #include <vector>
 
@@ -52,7 +53,7 @@ class DiscTrapezoidBounds : public DiscBounds {
   /// @param avgPhi average phi value
   /// @param stereo optional stero angle applied
   DiscTrapezoidBounds(double halfXminR, double halfXmaxR, double minR,
-                      double maxR, double avgPhi = M_PI_2,
+                      double maxR, double avgPhi = std::numbers::pi / 2.,
                       double stereo = 0.) noexcept(false);
 
   /// Constructor - from fixed size array
@@ -123,13 +124,11 @@ class DiscTrapezoidBounds : public DiscBounds {
   /// This method returns the xy coordinates of the four corners of the
   /// bounds in module coorindates (in xy)
   ///
-  /// @param lseg the number of segments used to approximate
-  /// and eventually curved line
-  ///
-  /// @note that the number of segments are ignored for this surface
+  /// @param ignoredSegments is an ignored parameter only used for
+  /// curved bound segments
   ///
   /// @return vector for vertices in 2D
-  std::vector<Vector2> vertices(unsigned int lseg) const final;
+  std::vector<Vector2> vertices(unsigned int ignoredSegments = 0u) const final;
 
  private:
   std::array<double, eSize> m_values;
diff --git a/Core/include/Acts/Surfaces/EllipseBounds.hpp b/Core/include/Acts/Surfaces/EllipseBounds.hpp
index 1f3d03b7d29..ea90e3d2a88 100644
--- a/Core/include/Acts/Surfaces/EllipseBounds.hpp
+++ b/Core/include/Acts/Surfaces/EllipseBounds.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2016-2020 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
@@ -20,6 +20,7 @@
 #include <cstdlib>
 #include <exception>
 #include <iosfwd>
+#include <numbers>
 #include <stdexcept>
 #include <vector>
 
@@ -57,7 +58,8 @@ class EllipseBounds : public PlanarBounds {
   /// @param halfPhi spanning phi sector (is set to pi as default)
   /// @param averagePhi average phi (is set to 0. as default)
   EllipseBounds(double innerRx, double innerRy, double outerRx, double outerRy,
-                double halfPhi = M_PI, double averagePhi = 0.) noexcept(false)
+                double halfPhi = std::numbers::pi,
+                double averagePhi = 0.) noexcept(false)
       : m_values({innerRx, innerRy, outerRx, outerRy, halfPhi, averagePhi}),
         m_boundingBox(m_values[eInnerRy], m_values[eOuterRy]) {
     checkConsistency();
@@ -92,14 +94,13 @@ class EllipseBounds : public PlanarBounds {
 
   /// Return the vertices
   ///
-  /// @param lseg the number of segments used to approximate
-  /// and eventually curved line, here it refers to the full 2PI Ellipse
-  ///
-  /// @note the number of segments to may be altered by also providing
-  /// the extremas in all direction
+  /// @param quarterSegments is the number of segments to approximate a quarter
+  /// of a circle. In order to symmetrize fully closed and sectoral cylinders,
+  /// also in the first case the two end points are given (albeit they overlap)
+  /// in -pi / pi
   ///
   /// @return vector for vertices in 2D
-  std::vector<Vector2> vertices(unsigned int lseg) const final;
+  std::vector<Vector2> vertices(unsigned int quarterSegments) const final;
 
   // Bounding box representation
   const RectangleBounds& boundingBox() const final;
@@ -135,7 +136,7 @@ inline void EllipseBounds::checkConsistency() noexcept(false) {
       get(eOuterRy) <= 0.) {
     throw std::invalid_argument("EllipseBounds: invalid along y axis.");
   }
-  if (get(eHalfPhiSector) < 0. || get(eHalfPhiSector) > M_PI) {
+  if (get(eHalfPhiSector) < 0. || get(eHalfPhiSector) > std::numbers::pi) {
     throw std::invalid_argument("EllipseBounds: invalid phi sector setup.");
   }
   if (get(eAveragePhi) != detail::radian_sym(get(eAveragePhi))) {
diff --git a/Core/include/Acts/Surfaces/InfiniteBounds.hpp b/Core/include/Acts/Surfaces/InfiniteBounds.hpp
index 3a05548108f..261f40e4729 100644
--- a/Core/include/Acts/Surfaces/InfiniteBounds.hpp
+++ b/Core/include/Acts/Surfaces/InfiniteBounds.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2016-2020 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
diff --git a/Core/include/Acts/Surfaces/LineBounds.hpp b/Core/include/Acts/Surfaces/LineBounds.hpp
index 8388cb85898..e3169d8a845 100644
--- a/Core/include/Acts/Surfaces/LineBounds.hpp
+++ b/Core/include/Acts/Surfaces/LineBounds.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2016-2020 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
diff --git a/Core/include/Acts/Surfaces/LineSurface.hpp b/Core/include/Acts/Surfaces/LineSurface.hpp
index 5a4b6245390..d07e9f6dc37 100644
--- a/Core/include/Acts/Surfaces/LineSurface.hpp
+++ b/Core/include/Acts/Surfaces/LineSurface.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2016-2020 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 #include "Acts/Definitions/Algebra.hpp"
diff --git a/Core/include/Acts/Surfaces/PerigeeSurface.hpp b/Core/include/Acts/Surfaces/PerigeeSurface.hpp
index c5ea7e957c7..1d913ecc43e 100644
--- a/Core/include/Acts/Surfaces/PerigeeSurface.hpp
+++ b/Core/include/Acts/Surfaces/PerigeeSurface.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2016-2020 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 #include "Acts/Definitions/Algebra.hpp"
@@ -76,11 +76,11 @@ class PerigeeSurface : public LineSurface {
   /// Return a Polyhedron for the surfaces
   ///
   /// @param gctx The current geometry context object, e.g. alignment
-  /// @param lseg is ignored for a perigee @note ignored
+  /// @param ingoreSegments is an ignored parameter
   ///
   /// @return A list of vertices and a face/facett description of it
   Polyhedron polyhedronRepresentation(const GeometryContext& gctx,
-                                      std::size_t lseg) const final;
+                                      unsigned int ingoreSegments) const final;
 
  protected:
   /// Output Method for std::ostream
diff --git a/Core/include/Acts/Surfaces/PlanarBounds.hpp b/Core/include/Acts/Surfaces/PlanarBounds.hpp
index 22762fc3e1e..28bc0e42b60 100644
--- a/Core/include/Acts/Surfaces/PlanarBounds.hpp
+++ b/Core/include/Acts/Surfaces/PlanarBounds.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2016-2020 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
@@ -26,14 +26,15 @@ class PlanarBounds : public SurfaceBounds {
  public:
   /// Return the vertices
   ///
-  /// @param lseg the number of segments used to approximate
-  /// and eventually curved line
+  /// @param quarterSegments is the number of segments used to describe curved
+  /// segments in a quarter of the phi range. If it is 1, then only the extrema
+  /// points in phi are inserted next to the segment corners.
   ///
-  /// @note that the extremas are given, which may slightly alter the
-  /// number of segments returned
+  /// @note for planar bounds without curved segments @c quarterSegments is ignored
   ///
   /// @return vector for vertices in 2D
-  virtual std::vector<Vector2> vertices(unsigned int lseg = 1) const = 0;
+  virtual std::vector<Vector2> vertices(
+      unsigned int quarterSegments = 2u) const = 0;
 
   /// Bounding box parameters
   ///
diff --git a/Core/include/Acts/Surfaces/PlaneSurface.hpp b/Core/include/Acts/Surfaces/PlaneSurface.hpp
index bbfa1374362..2bc65398f8d 100644
--- a/Core/include/Acts/Surfaces/PlaneSurface.hpp
+++ b/Core/include/Acts/Surfaces/PlaneSurface.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2016-2020 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
@@ -58,15 +58,6 @@ class PlaneSurface : public RegularSurface {
   PlaneSurface(const GeometryContext& gctx, const PlaneSurface& other,
                const Transform3& transform);
 
-  /// @deprecated Use `CurvilinearSurface` instead
-  ///
-  /// Dedicated Constructor with normal vector
-  /// This is for curvilinear surfaces which are by definition boundless
-  ///
-  /// @param center is the center position of the surface
-  /// @param normal is thenormal vector of the plane surface
-  PlaneSurface(const Vector3& center, const Vector3& normal);
-
   /// Constructor from DetectorElementBase : Element proxy
   ///
   /// @param pbounds are the provided planar bounds
@@ -207,13 +198,15 @@ class PlaneSurface : public RegularSurface {
   /// Return a Polyhedron for the surfaces
   ///
   /// @param gctx The current geometry context object, e.g. alignment
-  /// @param lseg Number of segments along curved lines, it represents
-  /// the full 2*M_PI coverange, if lseg is set to 1 only the extrema
-  /// are given
+  /// @param quarterSegments is the number of segments used to describe curved
+  /// segments in a quarter of the phi range. If it is 1, then only the extrema
+  /// points in phi are inserted next to the segment corners.
+  ///
+  /// @note for planar surfaces without curved segments @c quarterSegments is ignored
   ///
   /// @return A list of vertices and a face/facett description of it
-  Polyhedron polyhedronRepresentation(const GeometryContext& gctx,
-                                      std::size_t lseg) const override;
+  Polyhedron polyhedronRepresentation(
+      const GeometryContext& gctx, unsigned int quarterSegments) const override;
 
   /// Return properly formatted class name for screen output
   std::string name() const override;
diff --git a/Core/include/Acts/Surfaces/RadialBounds.hpp b/Core/include/Acts/Surfaces/RadialBounds.hpp
index 8b7eb08c9f0..ef3e8996572 100644
--- a/Core/include/Acts/Surfaces/RadialBounds.hpp
+++ b/Core/include/Acts/Surfaces/RadialBounds.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2016-2020 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
@@ -18,6 +18,7 @@
 #include <array>
 #include <cmath>
 #include <iosfwd>
+#include <numbers>
 #include <stdexcept>
 #include <vector>
 
@@ -47,7 +48,7 @@ class RadialBounds : public DiscBounds {
   /// @param maxR The outer radius
   /// @param halfPhi The half opening angle (Pi for full angular coverage)
   /// @param avgPhi The average phi for the disc/ring sector
-  RadialBounds(double minR, double maxR, double halfPhi = M_PI,
+  RadialBounds(double minR, double maxR, double halfPhi = std::numbers::pi,
                double avgPhi = 0.) noexcept(false)
       : m_values({minR, maxR, halfPhi, avgPhi}) {
     checkConsistency();
@@ -142,7 +143,7 @@ inline double RadialBounds::rMax() const {
 }
 
 inline bool RadialBounds::coversFullAzimuth() const {
-  return (get(eHalfPhiSector) == M_PI);
+  return (get(eHalfPhiSector) == std::numbers::pi);
 }
 
 inline bool RadialBounds::insideRadialBounds(double R, double tolerance) const {
@@ -167,7 +168,7 @@ inline void RadialBounds::checkConsistency() noexcept(false) {
   if (get(eMinR) < 0. || get(eMaxR) <= 0. || get(eMinR) > get(eMaxR)) {
     throw std::invalid_argument("RadialBounds: invalid radial setup");
   }
-  if (get(eHalfPhiSector) < 0. || get(eHalfPhiSector) > M_PI) {
+  if (get(eHalfPhiSector) < 0. || get(eHalfPhiSector) > std::numbers::pi) {
     throw std::invalid_argument("RadialBounds: invalid phi sector setup.");
   }
   if (get(eAveragePhi) != detail::radian_sym(get(eAveragePhi))) {
diff --git a/Core/include/Acts/Surfaces/RectangleBounds.hpp b/Core/include/Acts/Surfaces/RectangleBounds.hpp
index 813e9cb2130..aba1743fa74 100644
--- a/Core/include/Acts/Surfaces/RectangleBounds.hpp
+++ b/Core/include/Acts/Surfaces/RectangleBounds.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2016-2020 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
@@ -86,13 +86,12 @@ class RectangleBounds : public PlanarBounds {
 
   /// Return the vertices
   ///
-  /// @param lseg the number of segments used to approximate
-  /// and eventually curved line
-  ///
+  /// @param quarterSegments is the number of segments used to describe curved
+  /// segments in a quarter of the phi range.
   /// @note the number of segments is ignored in this representation
   ///
   /// @return vector for vertices in 2D
-  std::vector<Vector2> vertices(unsigned int lseg = 1) const final;
+  std::vector<Vector2> vertices(unsigned int quarterSegments = 0u) const final;
 
   // Bounding box representation
   const RectangleBounds& boundingBox() const final;
diff --git a/Core/include/Acts/Surfaces/RegularSurface.hpp b/Core/include/Acts/Surfaces/RegularSurface.hpp
index d23824dc7ca..f091c73b99a 100644
--- a/Core/include/Acts/Surfaces/RegularSurface.hpp
+++ b/Core/include/Acts/Surfaces/RegularSurface.hpp
@@ -1,13 +1,14 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2016-2020 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
+#include "Acts/Definitions/Tolerance.hpp"
 #include "Acts/Surfaces/Surface.hpp"
 #include "Acts/Utilities/ThrowAssert.hpp"
 
@@ -105,11 +106,13 @@ class RegularSurface : public Surface {
   /// @param gctx The current geometry context object, e.g. alignment
   /// @param position global position to be evaludated
   /// @param boundaryTolerance BoundaryTolerance directive for this onSurface check
+  /// @param tolerance optional tolerance within which a point is considered on surface
   ///
   /// @return boolean indication if operation was successful
-  bool isOnSurface(const GeometryContext& gctx, const Vector3& position,
-                   const BoundaryTolerance& boundaryTolerance =
-                       BoundaryTolerance::None()) const;
+  bool isOnSurface(
+      const GeometryContext& gctx, const Vector3& position,
+      const BoundaryTolerance& boundaryTolerance = BoundaryTolerance::None(),
+      double tolerance = s_onSurfaceTolerance) const;
 
   using Surface::isOnSurface;
 };
diff --git a/Core/include/Acts/Surfaces/StrawSurface.hpp b/Core/include/Acts/Surfaces/StrawSurface.hpp
index dffa85fc4a4..706bb7d9823 100644
--- a/Core/include/Acts/Surfaces/StrawSurface.hpp
+++ b/Core/include/Acts/Surfaces/StrawSurface.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2016-2020 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
@@ -92,13 +92,13 @@ class StrawSurface : public LineSurface {
   /// Return a Polyhedron for the surfaces
   ///
   /// @param gctx The current geometry context object, e.g. alignment
-  /// @param lseg Number of segments along curved lines, it represents
-  /// the full 2*M_PI coverange, if lseg is set to 1 only the extrema
-  /// are given @note if lseg is set to 1 then only the straw is created
+  /// @param quarterSegments is the number of segments used to describe curved
+  /// segments in a quarter of the phi range. If it is 1, then only the extrema
+  /// points in phi are inserted next to the segment corners.
   ///
   /// @return A list of vertices and a face/facett description of it
   Polyhedron polyhedronRepresentation(const GeometryContext& gctx,
-                                      std::size_t lseg) const final;
+                                      unsigned int quarterSegments) const final;
 };
 
 inline Surface::SurfaceType StrawSurface::type() const {
diff --git a/Core/include/Acts/Surfaces/Surface.hpp b/Core/include/Acts/Surfaces/Surface.hpp
index f0f204d0791..79153e8c98e 100644
--- a/Core/include/Acts/Surfaces/Surface.hpp
+++ b/Core/include/Acts/Surfaces/Surface.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2016-2024 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
@@ -25,6 +25,7 @@
 #include "Acts/Utilities/BinningType.hpp"
 #include "Acts/Utilities/Intersection.hpp"
 #include "Acts/Utilities/Result.hpp"
+#include "Acts/Visualization/ViewConfig.hpp"
 
 #include <array>
 #include <cstddef>
@@ -164,11 +165,6 @@ class Surface : public virtual GeometryObject,
   /// @param other source surface for the comparison
   virtual bool operator==(const Surface& other) const;
 
-  /// Comparison (non-equality) operator
-  ///
-  /// @param sf Source surface for the comparison
-  virtual bool operator!=(const Surface& sf) const;
-
  public:
   /// Return method for the Surface type to avoid dynamic casts
   virtual SurfaceType type() const = 0;
@@ -252,12 +248,14 @@ class Surface : public virtual GeometryObject,
   /// @param position global position to be evaludated
   /// @param direction global momentum direction (required for line-type surfaces)
   /// @param boundaryTolerance BoundaryTolerance directive for this onSurface check
+  /// @param tolerance optional tolerance within which a point is considered on surface
   ///
   /// @return boolean indication if operation was successful
-  bool isOnSurface(const GeometryContext& gctx, const Vector3& position,
-                   const Vector3& direction,
-                   const BoundaryTolerance& boundaryTolerance =
-                       BoundaryTolerance::None()) const;
+  bool isOnSurface(
+      const GeometryContext& gctx, const Vector3& position,
+      const Vector3& direction,
+      const BoundaryTolerance& boundaryTolerance = BoundaryTolerance::None(),
+      double tolerance = s_onSurfaceTolerance) const;
 
   /// The insideBounds method for local positions
   ///
@@ -420,20 +418,21 @@ class Surface : public virtual GeometryObject,
   /// Return properly formatted class name
   virtual std::string name() const = 0;
 
-  /// Return a Polyhedron for this object
+  /// Return a Polyhedron for surface objects
   ///
   /// @param gctx The current geometry context object, e.g. alignment
-  /// @param lseg Number of segments along curved lines, if the lseg
-  /// is set to one, only the corners and the extrema are given,
-  /// otherwise it represents the number of segments for a full 2*M_PI
-  /// circle and is scaled to the relevant sector
+  /// @param quarterSegments The number of segemtns to approximate a 0.5*pi sector,
+  /// which represents a quarter of the full circle
+  ///
+  /// @note In order to symmetrize the code between sectoral and closed cylinders
+  /// in case of closed cylinders, both (-pi, pi) are given as separate vertices
   ///
   /// @note An internal surface transform can invalidate the extrema
   /// in the transformed space
   ///
   /// @return A list of vertices and a face/facett description of it
-  virtual Polyhedron polyhedronRepresentation(const GeometryContext& gctx,
-                                              std::size_t lseg) const = 0;
+  virtual Polyhedron polyhedronRepresentation(
+      const GeometryContext& gctx, unsigned int quarterSegments = 2u) const = 0;
 
   /// The derivative of bound track parameters w.r.t. alignment
   /// parameters of its reference surface (i.e. local frame origin in
@@ -482,6 +481,9 @@ class Surface : public virtual GeometryObject,
   virtual ActsMatrix<2, 3> localCartesianToBoundLocalDerivative(
       const GeometryContext& gctx, const Vector3& position) const = 0;
 
+  void visualize(IVisualization3D& helper, const GeometryContext& gctx,
+                 const ViewConfig& viewConfig = s_viewSurface) const;
+
  protected:
   /// Output Method for std::ostream, to be overloaded by child classes
   ///
diff --git a/Core/include/Acts/Surfaces/SurfaceArray.hpp b/Core/include/Acts/Surfaces/SurfaceArray.hpp
index 39f1433ba9f..94a571268d5 100644
--- a/Core/include/Acts/Surfaces/SurfaceArray.hpp
+++ b/Core/include/Acts/Surfaces/SurfaceArray.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2017-2020 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 #include "Acts/Definitions/Algebra.hpp"
@@ -328,16 +328,18 @@ class SurfaceArray {
     /// interface stays the same, since we don't care what happens
     /// here on the callers end
     /// This is the version for DIM>1
-    template <std::size_t D = DIM, std::enable_if_t<D != 1, int> = 0>
-    Vector3 getBinCenterImpl(std::size_t bin) const {
+    Vector3 getBinCenterImpl(std::size_t bin) const
+      requires(DIM != 1)
+    {
       return m_localToGlobal(ActsVector<DIM>(
           m_grid.binCenter(m_grid.localBinsFromGlobalBin(bin)).data()));
     }
 
     /// Internal method, see above.
     /// This is the version for DIM==1
-    template <std::size_t D = DIM, std::enable_if_t<D == 1, int> = 0>
-    Vector3 getBinCenterImpl(std::size_t bin) const {
+    Vector3 getBinCenterImpl(std::size_t bin) const
+      requires(DIM == 1)
+    {
       point_t pos = m_grid.binCenter(m_grid.localBinsFromGlobalBin(bin));
       return m_localToGlobal(pos);
     }
diff --git a/Core/include/Acts/Surfaces/SurfaceBounds.hpp b/Core/include/Acts/Surfaces/SurfaceBounds.hpp
index 1fd3d2178b8..62216f75c29 100644
--- a/Core/include/Acts/Surfaces/SurfaceBounds.hpp
+++ b/Core/include/Acts/Surfaces/SurfaceBounds.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2016-2020 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 #include "Acts/Definitions/Algebra.hpp"
@@ -72,21 +72,17 @@ class SurfaceBounds {
   ///
   /// @param os is the outstream in which the string dump is done
   virtual std::ostream& toStream(std::ostream& os) const = 0;
-};
 
-inline bool operator==(const SurfaceBounds& lhs, const SurfaceBounds& rhs) {
-  if (&lhs == &rhs) {
-    return true;
+  friend bool operator==(const SurfaceBounds& lhs, const SurfaceBounds& rhs) {
+    if (&lhs == &rhs) {
+      return true;
+    }
+    return (lhs.type() == rhs.type()) && (lhs.values() == rhs.values());
   }
-  return (lhs.type() == rhs.type()) && (lhs.values() == rhs.values());
-}
-
-inline bool operator!=(const SurfaceBounds& lhs, const SurfaceBounds& rhs) {
-  return !(lhs == rhs);
-}
 
-inline std::ostream& operator<<(std::ostream& os, const SurfaceBounds& sb) {
-  return sb.toStream(os);
-}
+  friend std::ostream& operator<<(std::ostream& os, const SurfaceBounds& sb) {
+    return sb.toStream(os);
+  }
+};
 
 }  // namespace Acts
diff --git a/Core/include/Acts/Surfaces/SurfaceConcept.hpp b/Core/include/Acts/Surfaces/SurfaceConcept.hpp
index 5425ad3a4ca..2abcda1d5d7 100644
--- a/Core/include/Acts/Surfaces/SurfaceConcept.hpp
+++ b/Core/include/Acts/Surfaces/SurfaceConcept.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2023 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
@@ -87,7 +87,7 @@ concept SurfaceConcept = requires(S s, const S cs, S s2, const S cs2,
   { cs.name() } -> std::same_as<std::string>;
 
   {
-    cs.polyhedronRepresentation(gctx, std::declval<std::size_t>())
+    cs.polyhedronRepresentation(gctx, std::declval<unsigned int>())
   } -> std::same_as<Polyhedron>;
 
   {
diff --git a/Core/include/Acts/Surfaces/SurfaceError.hpp b/Core/include/Acts/Surfaces/SurfaceError.hpp
index 9530cb31822..cc41c6de9e3 100644
--- a/Core/include/Acts/Surfaces/SurfaceError.hpp
+++ b/Core/include/Acts/Surfaces/SurfaceError.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2020 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
diff --git a/Core/include/Acts/Surfaces/SurfaceMergingException.hpp b/Core/include/Acts/Surfaces/SurfaceMergingException.hpp
index ed5511302ad..f2ae605aab7 100644
--- a/Core/include/Acts/Surfaces/SurfaceMergingException.hpp
+++ b/Core/include/Acts/Surfaces/SurfaceMergingException.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2024 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
diff --git a/Core/include/Acts/Surfaces/SurfaceVisitorConcept.hpp b/Core/include/Acts/Surfaces/SurfaceVisitorConcept.hpp
index 1de5b60d50c..1c000d9d61d 100644
--- a/Core/include/Acts/Surfaces/SurfaceVisitorConcept.hpp
+++ b/Core/include/Acts/Surfaces/SurfaceVisitorConcept.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2023 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
diff --git a/Core/include/Acts/Surfaces/TrapezoidBounds.hpp b/Core/include/Acts/Surfaces/TrapezoidBounds.hpp
index 9aeec429138..8ccd3a5c928 100644
--- a/Core/include/Acts/Surfaces/TrapezoidBounds.hpp
+++ b/Core/include/Acts/Surfaces/TrapezoidBounds.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2016-2020 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 #include "Acts/Definitions/Algebra.hpp"
@@ -108,13 +108,13 @@ class TrapezoidBounds : public PlanarBounds {
 
   /// Return the vertices
   ///
-  /// @param lseg the number of segments used to approximate
-  /// and eventually curved line
+  /// @param ignoredSegments is and ignored parameter used to describe
+  /// the number of segments to approximate curved sectors.
   ///
   /// @note the number of segments is ignored in this representation
   ///
   /// @return vector for vertices in 2D
-  std::vector<Vector2> vertices(unsigned int lseg = 1) const final;
+  std::vector<Vector2> vertices(unsigned int ignoredSegments = 0u) const final;
 
   // Bounding box representation
   const RectangleBounds& boundingBox() const final;
diff --git a/Core/include/Acts/Surfaces/detail/AlignmentHelper.hpp b/Core/include/Acts/Surfaces/detail/AlignmentHelper.hpp
index 9dd5ddad59a..5d4ef72b8bd 100644
--- a/Core/include/Acts/Surfaces/detail/AlignmentHelper.hpp
+++ b/Core/include/Acts/Surfaces/detail/AlignmentHelper.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2020 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
diff --git a/Core/include/Acts/Surfaces/detail/AnnulusBoundsHelper.hpp b/Core/include/Acts/Surfaces/detail/AnnulusBoundsHelper.hpp
index 5cd081bbdee..84f2d4ec61a 100644
--- a/Core/include/Acts/Surfaces/detail/AnnulusBoundsHelper.hpp
+++ b/Core/include/Acts/Surfaces/detail/AnnulusBoundsHelper.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2024 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
diff --git a/Core/include/Acts/Surfaces/detail/BoundaryCheckHelper.hpp b/Core/include/Acts/Surfaces/detail/BoundaryCheckHelper.hpp
index a210693908b..898fe5541ae 100644
--- a/Core/include/Acts/Surfaces/detail/BoundaryCheckHelper.hpp
+++ b/Core/include/Acts/Surfaces/detail/BoundaryCheckHelper.hpp
@@ -1,15 +1,17 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2024 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
 #include "Acts/Surfaces/detail/VerticesHelper.hpp"
 
+#include <span>
+
 namespace Acts::detail {
 
 /// Check if a point is inside a box.
@@ -72,8 +74,7 @@ inline bool insideAlignedBox(const Vector2& lowerLeft,
 /// @param jacobianOpt The Jacobian to transform the distance to Cartesian
 ///
 /// @return True if the point is inside the polygon.
-template <typename Vector2Container>
-inline bool insidePolygon(const Vector2Container& vertices,
+inline bool insidePolygon(std::span<const Vector2> vertices,
                           const BoundaryTolerance& tolerance,
                           const Vector2& point,
                           const std::optional<SquareMatrix2>& jacobianOpt) {
diff --git a/Core/include/Acts/Surfaces/detail/FacesHelper.hpp b/Core/include/Acts/Surfaces/detail/FacesHelper.hpp
index a9eaf763db6..ca2922c325e 100644
--- a/Core/include/Acts/Surfaces/detail/FacesHelper.hpp
+++ b/Core/include/Acts/Surfaces/detail/FacesHelper.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2020 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
@@ -21,7 +21,7 @@ namespace Acts::detail {
 struct FacesHelper {
   using FaceVector = std::vector<Polyhedron::FaceType>;
 
-  /// @brief This method words for all convex type surface setups
+  /// @brief This method works for all convex type surface setups
   /// It includes:
   ///
   /// Rectangle / Triangle / Polygon
@@ -60,14 +60,12 @@ struct FacesHelper {
   /// vector is splittable in half into the two bows.
   ///
   /// @param vertices The vector of vertices
-  /// @param fullTwoPi The indicator if the concentric face is closed
   static std::pair<FaceVector, FaceVector> cylindricalFaceMesh(
-      const std::vector<Vector3>& vertices, bool fullTwoPi = true) {
+      const std::vector<Vector3>& vertices) {
     FaceVector faces;
     FaceVector triangularMesh;
     std::size_t nqfaces = static_cast<std::size_t>(0.5 * vertices.size());
-    std::size_t reduce = (!fullTwoPi) ? 1 : 0;
-    for (std::size_t iface = 0; iface < nqfaces - reduce; ++iface) {
+    for (std::size_t iface = 0; iface < nqfaces - 1; ++iface) {
       std::size_t p2 = (iface + 1 == nqfaces) ? 0 : iface + 1;
       std::vector<std::size_t> face = {iface, p2, p2 + nqfaces,
                                        nqfaces + iface};
diff --git a/Core/include/Acts/Surfaces/detail/IntersectionHelper2D.hpp b/Core/include/Acts/Surfaces/detail/IntersectionHelper2D.hpp
index 125d1fc8bc3..db6860006a3 100644
--- a/Core/include/Acts/Surfaces/detail/IntersectionHelper2D.hpp
+++ b/Core/include/Acts/Surfaces/detail/IntersectionHelper2D.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2020 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
diff --git a/Core/include/Acts/Surfaces/detail/MergeHelper.hpp b/Core/include/Acts/Surfaces/detail/MergeHelper.hpp
index 33b2c53d709..a0121173591 100644
--- a/Core/include/Acts/Surfaces/detail/MergeHelper.hpp
+++ b/Core/include/Acts/Surfaces/detail/MergeHelper.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2024 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
diff --git a/Core/include/Acts/Surfaces/detail/PlanarHelper.hpp b/Core/include/Acts/Surfaces/detail/PlanarHelper.hpp
index a83cc6563c4..f7b21a960aa 100644
--- a/Core/include/Acts/Surfaces/detail/PlanarHelper.hpp
+++ b/Core/include/Acts/Surfaces/detail/PlanarHelper.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2019 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
diff --git a/Core/include/Acts/Surfaces/detail/VerticesHelper.hpp b/Core/include/Acts/Surfaces/detail/VerticesHelper.hpp
index 80d16c8c017..4384c17139c 100644
--- a/Core/include/Acts/Surfaces/detail/VerticesHelper.hpp
+++ b/Core/include/Acts/Surfaces/detail/VerticesHelper.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2020 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
@@ -13,6 +13,8 @@
 
 #include <algorithm>
 #include <cmath>
+#include <numbers>
+#include <span>
 #include <utility>
 #include <vector>
 
@@ -22,51 +24,54 @@ namespace Acts::detail::VerticesHelper {
 /// A method that inserts the cartesian extrema points and segments
 /// a curved segment into sub segments
 ///
-/// @param phiMin the minimum Phi of the bounds object
-/// @param phiMax the maximum Phi of the bounds object
+/// @param phiMin the minimum phi value
+/// @param phiMax The second phi value
 /// @param phiRef is a vector of reference phi values to be included as well
-/// @param phiTolerance is the tolerance for reference phi insertion
-/// @return a vector
-std::vector<ActsScalar> phiSegments(ActsScalar phiMin = -M_PI,
-                                    ActsScalar phiMax = M_PI,
-                                    const std::vector<ActsScalar>& phiRefs = {},
-                                    ActsScalar phiTolerance = 1e-6);
+/// @param quarterSegments number of segments used to approximate a segment quarter
+///
+/// @return a vector of generated phi values
+std::vector<ActsScalar> phiSegments(
+    ActsScalar phiMin = -std::numbers::pi_v<ActsScalar>,
+    ActsScalar phiMax = std::numbers::pi_v<ActsScalar>,
+    const std::vector<ActsScalar>& phiRefs = {},
+    unsigned int quarterSegments = 2u);
 
 /// Helper method to create a regular 2 or 3 D segment
-///  between two phi values
+/// between two phi values with a given number of segments
+///
+/// It will insert the phi at extrema points and reference points, it uses
+/// a minimum approximation of a circle with 8 segments
 ///
 /// @tparam vertex_t Type of vertex to be applied
 /// @tparam transform_t Optional transform
 ///
-/// @param vertices [in,out] The 3D vertices to be filled
-/// @param rxy The radius description if first +/= second: ellipse
-/// @param phi1 The first phi value
-/// @param phi2 The second phi value
-/// @param lseg The number of segments for full 2*PI
-/// @param addon The additional segments to be built
+/// @param rXY The radius description if first +/= second: ellipse
+/// @param phiMin the minimum phi value
+/// @param phiMax the second phi value
+/// @param phiRef is a vector of reference phi values to be included as well
+/// @param quarterSegments number of segments used to approximate a segment quarter
 /// @param offset The out of plane offset position of the bow
 /// @param transform The transform applied (optional)
+///
+/// @return a vector of vertices
 template <typename vertex_t, typename transform_t>
-void createSegment(std::vector<vertex_t>& vertices,
-                   std::pair<ActsScalar, ActsScalar> rxy, ActsScalar phi1,
-                   ActsScalar phi2, unsigned int lseg, int addon = 0,
-                   const vertex_t& offset = vertex_t::Zero(),
-                   const transform_t& transform = transform_t::Identity()) {
-  // Calculate the number of segments - 1 is the minimum
-  unsigned int segs =
-      static_cast<unsigned int>(std::abs(phi2 - phi1) / (2 * M_PI) * lseg);
-  segs = segs > 0 ? segs : 1;
-  ActsScalar phistep = (phi2 - phi1) / segs;
-  // Create the segments
-  for (unsigned int iphi = 0; iphi < segs + addon; ++iphi) {
-    ActsScalar phi = phi1 + iphi * phistep;
+std::vector<vertex_t> segmentVertices(
+    std::pair<ActsScalar, ActsScalar> rXY, ActsScalar phiMin, ActsScalar phiMax,
+    const std::vector<ActsScalar>& phiRefs = {},
+    unsigned int quarterSegments = 2u,
+    const vertex_t& offset = vertex_t::Zero(),
+    const transform_t& transform = transform_t::Identity()) {
+  std::vector<vertex_t> vertices;
+  std::vector<ActsScalar> phis =
+      phiSegments(phiMin, phiMax, phiRefs, quarterSegments);
+  for (ActsScalar phi : phis) {
     vertex_t vertex = vertex_t::Zero();
-    vertex(0) = rxy.first * std::cos(phi);
-    vertex(1) = rxy.second * std::sin(phi);
-
+    vertex(0) = rXY.first * std::cos(phi);
+    vertex(1) = rXY.second * std::sin(phi);
     vertex = vertex + offset;
     vertices.push_back(transform * vertex);
   }
+  return vertices;
 }
 
 /// Construct vertices on an ellipse-like bound object.
@@ -76,14 +81,15 @@ void createSegment(std::vector<vertex_t>& vertices,
 /// @param outerRx The radius of the outer ellipse (in x)
 /// @param outerRy The radius of the outer ellipse (in y)
 /// @param avgPhi The phi direction of the center if sector
-/// @param halfPhi The half phi sector if sector
-/// @param lseg The number of segments for for a full 2*pi segment
+/// @param halfPhi The half phi sector of the ellipse
+/// @param quarterSegments number of segments used to approximate a segment quarter
+///
 /// @return a vector of 2d-vectors
-std::vector<Vector2> ellipsoidVertices(ActsScalar innerRx, ActsScalar innerRy,
-                                       ActsScalar outerRx, ActsScalar outerRy,
-                                       ActsScalar avgPhi = 0.,
-                                       ActsScalar halfPhi = M_PI,
-                                       unsigned int lseg = 1);
+std::vector<Vector2> ellipsoidVertices(
+    ActsScalar innerRx, ActsScalar innerRy, ActsScalar outerRx,
+    ActsScalar outerRy, ActsScalar avgPhi = 0.,
+    ActsScalar halfPhi = std::numbers::pi_v<ActsScalar>,
+    unsigned int quarterSegments = 2u);
 
 /// Construct vertices on an disc/wheel-like bound object.
 ///
@@ -91,12 +97,14 @@ std::vector<Vector2> ellipsoidVertices(ActsScalar innerRx, ActsScalar innerRy,
 /// @param outerR The radius of the outer circle (sector)
 /// @param avgPhi The phi direction of the center if sector
 /// @param halfPhi The half phi sector if sector
-/// @param lseg The number of segments for for a full 2*pi segment
+/// @param quarterSegments number of segments used to approximate a segment quarter
+///
 /// @return a vector of 2d-vectors
-std::vector<Vector2> circularVertices(ActsScalar innerR, ActsScalar outerR,
-                                      ActsScalar avgPhi = 0.,
-                                      ActsScalar halfPhi = M_PI,
-                                      unsigned int lseg = 1);
+std::vector<Vector2> circularVertices(
+    ActsScalar innerR, ActsScalar outerR, ActsScalar avgPhi = 0.,
+    ActsScalar halfPhi = std::numbers::pi_v<ActsScalar>,
+    unsigned int quarterSegments = 2u);
+
 /// Check if the point is inside the polygon w/o any tolerances.
 ///
 /// @tparam vertex_container_t is an iterable container
@@ -169,9 +177,8 @@ bool onHyperPlane(const std::vector<Vector3>& vertices,
                   ActsScalar tolerance = s_onSurfaceTolerance);
 
 /// Calculate the closest point on the polygon.
-template <typename Vector2Container>
 inline Vector2 computeClosestPointOnPolygon(const Vector2& point,
-                                            const Vector2Container& vertices,
+                                            std::span<const Vector2> vertices,
                                             const SquareMatrix2& metric) {
   auto squaredNorm = [&](const Vector2& x) {
     return (x.transpose() * metric * x).value();
diff --git a/Core/include/Acts/TrackFinding/CombinatorialKalmanFilter.hpp b/Core/include/Acts/TrackFinding/CombinatorialKalmanFilter.hpp
index 51730f33adf..35acbc49feb 100644
--- a/Core/include/Acts/TrackFinding/CombinatorialKalmanFilter.hpp
+++ b/Core/include/Acts/TrackFinding/CombinatorialKalmanFilter.hpp
@@ -1,53 +1,41 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2016-2024 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
 // Workaround for building on clang+libstdc++
 #include "Acts/Utilities/detail/ReferenceWrapperAnyCompat.hpp"
 
-#include "Acts/Definitions/Algebra.hpp"
 #include "Acts/Definitions/Common.hpp"
-#include "Acts/EventData/MeasurementHelpers.hpp"
 #include "Acts/EventData/MultiTrajectory.hpp"
 #include "Acts/EventData/MultiTrajectoryHelpers.hpp"
-#include "Acts/EventData/ProxyAccessor.hpp"
-#include "Acts/EventData/TrackContainer.hpp"
 #include "Acts/EventData/TrackParameters.hpp"
 #include "Acts/EventData/TrackStatePropMask.hpp"
 #include "Acts/EventData/Types.hpp"
 #include "Acts/Geometry/GeometryContext.hpp"
 #include "Acts/MagneticField/MagneticFieldContext.hpp"
-#include "Acts/Material/MaterialSlab.hpp"
-#include "Acts/Propagator/AbortList.hpp"
-#include "Acts/Propagator/ActionList.hpp"
+#include "Acts/Propagator/ActorList.hpp"
 #include "Acts/Propagator/ConstrainedStep.hpp"
-#include "Acts/Propagator/Propagator.hpp"
 #include "Acts/Propagator/StandardAborters.hpp"
 #include "Acts/Propagator/detail/LoopProtection.hpp"
 #include "Acts/Propagator/detail/PointwiseMaterialInteraction.hpp"
-#include "Acts/Surfaces/BoundaryTolerance.hpp"
 #include "Acts/TrackFinding/CombinatorialKalmanFilterError.hpp"
 #include "Acts/TrackFitting/KalmanFitter.hpp"
 #include "Acts/TrackFitting/detail/VoidFitterComponents.hpp"
 #include "Acts/Utilities/CalibrationContext.hpp"
-#include "Acts/Utilities/HashedString.hpp"
 #include "Acts/Utilities/Logger.hpp"
 #include "Acts/Utilities/Result.hpp"
-#include "Acts/Utilities/TrackHelpers.hpp"
-#include "Acts/Utilities/Zip.hpp"
 
 #include <functional>
 #include <limits>
 #include <memory>
-#include <string_view>
+#include <optional>
 #include <type_traits>
-#include <unordered_map>
 
 namespace Acts {
 
@@ -166,7 +154,7 @@ struct CombinatorialKalmanFilterOptions {
       : geoContext(gctx),
         magFieldContext(mctx),
         calibrationContext(cctx),
-        sourcelinkAccessor(std::move(accessor_)),
+        sourceLinkAccessor(std::move(accessor_)),
         extensions(extensions_),
         propagatorPlainOptions(pOptions),
         multipleScattering(mScattering),
@@ -183,7 +171,7 @@ struct CombinatorialKalmanFilterOptions {
   std::reference_wrapper<const CalibrationContext> calibrationContext;
 
   /// The source link accessor
-  SourceLinkAccessor sourcelinkAccessor;
+  SourceLinkAccessor sourceLinkAccessor;
 
   /// The filter extensions
   CombinatorialKalmanFilterExtensions<track_container_t> extensions;
@@ -200,7 +188,7 @@ struct CombinatorialKalmanFilterOptions {
 
   /// Delegate definition to create track states for selected measurements
   ///
-  /// @note expected to iterator over the given sourcelink range,
+  /// @note expected to iterator over the given sourceLink range,
   ///       select measurements, and create track states for
   ///       which new tips are to be created, more over the outlier
   ///       flag should be set for states that are outlier.
@@ -209,8 +197,8 @@ struct CombinatorialKalmanFilterOptions {
   /// @param calibrationContext pointer to the current calibration context
   /// @param surface the surface at which new track states are to be created
   /// @param boundState the current bound state of the trajectory
-  /// @param slBegin Begin iterator for sourcelinks
-  /// @param slEnd End iterator for sourcelinks
+  /// @param slBegin Begin iterator for sourceLinks
+  /// @param slEnd End iterator for sourceLinks
   /// @param prevTip Index pointing at previous trajectory state (i.e. tip)
   /// @param bufferTrajectory a temporary trajectory which can be used to create temporary track states
   /// @param trackStateCandidates a temporary buffer that can be used to collect track states
@@ -234,6 +222,10 @@ struct CombinatorialKalmanFilterOptions {
 
   /// Whether to consider energy loss.
   bool energyLoss = true;
+
+  /// Skip the pre propagation call. This effectively skips the first surface
+  /// @note This is useful if the first surface should not be considered in a second reverse pass
+  bool skipPrePropagationUpdate = false;
 };
 
 template <typename track_container_t>
@@ -329,8 +321,8 @@ class CombinatorialKalmanFilter {
     /// @param calibrationContext pointer to the current calibration context
     /// @param surface the surface the sourceLinks are associated to
     /// @param boundState Bound state from the propagation on this surface
-    /// @param slBegin Begin iterator for sourcelinks
-    /// @param slEnd End iterator for sourcelinks
+    /// @param slBegin Begin iterator for sourceLinks
+    /// @param slEnd End iterator for sourceLinks
     /// @param prevTip Index pointing at previous trajectory state (i.e. tip)
     /// @param bufferTrajectory a buffer for temporary candidate track states
     /// @param trackStateCandidates a buffer for temporary track state proxies for candidates
@@ -354,10 +346,7 @@ class CombinatorialKalmanFilter {
       const auto& [boundParams, jacobian, pathLength] = boundState;
 
       trackStateCandidates.clear();
-      if constexpr (std::is_same_v<
-                        typename std::iterator_traits<
-                            source_link_iterator_t>::iterator_category,
-                        std::random_access_iterator_tag>) {
+      if constexpr (std::ranges::random_access_range<source_link_iterator_t>) {
         trackStateCandidates.reserve(std::distance(slBegin, slEnd));
       }
 
@@ -410,7 +399,7 @@ class CombinatorialKalmanFilter {
               measurementSelector(trackStateCandidates, isOutlier, logger);
       if (!selectorResult.ok()) {
         ACTS_ERROR("Selection of calibrated measurements failed: "
-                   << selectorResult.error());
+                   << selectorResult.error().message());
         resultTrackStateList =
             ResultTrackStateList::failure(selectorResult.error());
       } else {
@@ -524,6 +513,9 @@ class CombinatorialKalmanFilter {
     /// Whether to consider energy loss.
     bool energyLoss = true;
 
+    /// Skip the pre propagation call. This effectively skips the first surface
+    bool skipPrePropagationUpdate = false;
+
     /// Calibration context for the finding run
     const CalibrationContext* calibrationContextPtr{nullptr};
 
@@ -538,15 +530,21 @@ class CombinatorialKalmanFilter {
     /// @param result is the mutable result state object
     template <typename propagator_state_t, typename stepper_t,
               typename navigator_t>
-    void operator()(propagator_state_t& state, const stepper_t& stepper,
-                    const navigator_t& navigator, result_type& result,
-                    const Logger& /*logger*/) const {
+    void act(propagator_state_t& state, const stepper_t& stepper,
+             const navigator_t& navigator, result_type& result,
+             const Logger& /*logger*/) const {
       assert(result.trackStates && "No MultiTrajectory set");
 
       if (result.finished) {
         return;
       }
 
+      if (state.stage == PropagatorStage::prePropagation &&
+          skipPrePropagationUpdate) {
+        ACTS_VERBOSE("Skip pre-propagation update (first surface)");
+        return;
+      }
+
       ACTS_VERBOSE("CombinatorialKalmanFilter step");
 
       assert(!result.activeBranches.empty() && "No active branches");
@@ -582,17 +580,28 @@ class CombinatorialKalmanFilter {
           ACTS_ERROR("Error in filter: " << res.error());
           result.lastError = res.error();
         }
+
+        if (result.finished) {
+          return;
+        }
       }
 
+      assert(!result.activeBranches.empty() && "No active branches");
+
       const bool isEndOfWorldReached =
-          endOfWorldReached(state, stepper, navigator, logger());
-      const bool isPathLimitReached =
-          result.pathLimitReached(state, stepper, navigator, logger());
+          endOfWorldReached.checkAbort(state, stepper, navigator, logger());
+      const bool isVolumeConstraintReached = volumeConstraintAborter.checkAbort(
+          state, stepper, navigator, logger());
+      const bool isPathLimitReached = result.pathLimitReached.checkAbort(
+          state, stepper, navigator, logger());
       const bool isTargetReached =
-          targetReached(state, stepper, navigator, logger());
-      if (isEndOfWorldReached || isPathLimitReached || isTargetReached) {
+          targetReached.checkAbort(state, stepper, navigator, logger());
+      if (isEndOfWorldReached || isVolumeConstraintReached ||
+          isPathLimitReached || isTargetReached) {
         if (isEndOfWorldReached) {
           ACTS_VERBOSE("End of world reached");
+        } else if (isVolumeConstraintReached) {
+          ACTS_VERBOSE("Volume constraint reached");
         } else if (isPathLimitReached) {
           ACTS_VERBOSE("Path limit reached");
         } else if (isTargetReached) {
@@ -617,25 +626,23 @@ class CombinatorialKalmanFilter {
           stepper.releaseStepSize(state.stepping, ConstrainedStep::actor);
         }
 
-        if (!result.activeBranches.empty()) {
-          // Record the active branch and remove it from the list
-          storeLastActiveBranch(result);
-          result.activeBranches.pop_back();
-        }
-        // If no more active branches, done with filtering; Otherwise, reset
-        // propagation state to track state at next active branch
-        if (result.activeBranches.empty()) {
-          ACTS_VERBOSE("Kalman filtering finds "
-                       << result.collectedTracks.size() << " tracks");
-          result.finished = true;
-        } else {
-          ACTS_VERBOSE("Propagation jumps to branch with tip = "
-                       << result.activeBranches.back().tipIndex());
-          reset(state, stepper, navigator, result);
-        }
+        // Record the active branch and remove it from the list
+        storeLastActiveBranch(result);
+        result.activeBranches.pop_back();
+
+        // Reset propagation state to track state at next active branch
+        reset(state, stepper, navigator, result);
       }
     }
 
+    template <typename propagator_state_t, typename stepper_t,
+              typename navigator_t>
+    bool checkAbort(propagator_state_t& /*state*/, const stepper_t& /*stepper*/,
+                    const navigator_t& /*navigator*/, const result_type& result,
+                    const Logger& /*logger*/) const {
+      return !result.lastError.ok() || result.finished;
+    }
+
     /// @brief CombinatorialKalmanFilter actor operation: reset propagation
     ///
     /// @tparam propagator_state_t Type of Propagator state
@@ -650,7 +657,19 @@ class CombinatorialKalmanFilter {
               typename navigator_t>
     void reset(propagator_state_t& state, const stepper_t& stepper,
                const navigator_t& navigator, result_type& result) const {
-      auto currentState = result.activeBranches.back().outermostTrackState();
+      if (result.activeBranches.empty()) {
+        ACTS_VERBOSE("Stop CKF with " << result.collectedTracks.size()
+                                      << " found tracks");
+        result.finished = true;
+
+        return;
+      }
+
+      auto currentBranch = result.activeBranches.back();
+      auto currentState = currentBranch.outermostTrackState();
+
+      ACTS_VERBOSE("Propagation jumps to branch with tip = "
+                   << currentBranch.tipIndex());
 
       // Reset the stepping state
       stepper.resetState(state.stepping, currentState.filtered(),
@@ -696,38 +715,68 @@ class CombinatorialKalmanFilter {
                         result_type& result) const {
       using PM = TrackStatePropMask;
 
-      std::size_t nBranchesOnSurface = 0;
+      bool isSensitive = surface->associatedDetectorElement() != nullptr;
+      bool hasMaterial = surface->surfaceMaterial() != nullptr;
+      bool isMaterialOnly = hasMaterial && !isSensitive;
+      bool expectMeasurements = isSensitive;
 
-      if (auto [slBegin, slEnd] = m_sourcelinkAccessor(*surface);
-          slBegin != slEnd) {
-        // Screen output message
+      if (isSensitive) {
         ACTS_VERBOSE("Measurement surface " << surface->geometryId()
                                             << " detected.");
+      } else if (isMaterialOnly) {
+        ACTS_VERBOSE("Material surface " << surface->geometryId()
+                                         << " detected.");
+      } else {
+        ACTS_VERBOSE("Passive surface " << surface->geometryId()
+                                        << " detected.");
+        return Result<void>::success();
+      }
 
-        // Transport the covariance to the surface
+      using SourceLinkRange = decltype(m_sourceLinkAccessor(*surface));
+      std::optional<SourceLinkRange> slRange = std::nullopt;
+      bool hasMeasurements = false;
+      if (isSensitive) {
+        slRange = m_sourceLinkAccessor(*surface);
+        hasMeasurements = slRange->first != slRange->second;
+      }
+      bool isHole = isSensitive && !hasMeasurements;
+
+      if (isHole) {
+        ACTS_VERBOSE("Detected hole before measurement selection on surface "
+                     << surface->geometryId());
+      }
+
+      // Transport the covariance to the surface
+      if (isHole || isMaterialOnly) {
+        stepper.transportCovarianceToCurvilinear(state.stepping);
+      } else {
         stepper.transportCovarianceToBound(state.stepping, *surface);
+      }
 
-        // Update state and stepper with pre material effects
-        materialInteractor(surface, state, stepper, navigator,
-                           MaterialUpdateStage::PreUpdate);
+      // Update state and stepper with pre material effects
+      materialInteractor(surface, state, stepper, navigator,
+                         MaterialUpdateStage::PreUpdate);
 
-        // Bind the transported state to the current surface
-        auto boundStateRes =
-            stepper.boundState(state.stepping, *surface, false);
-        if (!boundStateRes.ok()) {
-          return boundStateRes.error();
-        }
-        auto& boundState = *boundStateRes;
-        auto& [boundParams, jacobian, pathLength] = boundState;
-        boundParams.covariance() = state.stepping.cov;
+      // Bind the transported state to the current surface
+      auto boundStateRes = stepper.boundState(state.stepping, *surface, false);
+      if (!boundStateRes.ok()) {
+        return boundStateRes.error();
+      }
+      auto& boundState = *boundStateRes;
+      auto& [boundParams, jacobian, pathLength] = boundState;
+      boundParams.covariance() = state.stepping.cov;
+
+      auto currentBranch = result.activeBranches.back();
+      TrackIndexType prevTip = currentBranch.tipIndex();
 
-        auto currentBranch = result.activeBranches.back();
-        TrackIndexType prevTip = currentBranch.tipIndex();
+      // Create trackstates for all source links (will be filtered later)
+      using TrackStatesResult =
+          Acts::Result<CkfTypes::BranchVector<TrackIndexType>>;
+      TrackStatesResult tsRes = TrackStatesResult::success({});
+      if (hasMeasurements) {
+        auto [slBegin, slEnd] = *slRange;
 
-        // Create trackstates for all source links (will be filtered later)
-        using TrackStatesResult =
-            Acts::Result<CkfTypes::BranchVector<TrackIndexType>>;
-        TrackStatesResult tsRes = trackStateCandidateCreator(
+        tsRes = trackStateCandidateCreator(
             state.geoContext, *calibrationContextPtr, *surface, boundState,
             slBegin, slEnd, prevTip, *result.trackStates,
             result.trackStateCandidates, *result.trackStates, logger());
@@ -736,179 +785,98 @@ class CombinatorialKalmanFilter {
               "Processing of selected track states failed: " << tsRes.error());
           return tsRes.error();
         }
-        const CkfTypes::BranchVector<TrackIndexType>& newTrackStateList =
-            *tsRes;
+      }
+      const CkfTypes::BranchVector<TrackIndexType>& newTrackStateList = *tsRes;
+
+      if (!newTrackStateList.empty()) {
+        Result<unsigned int> procRes =
+            processNewTrackStates(state.geoContext, newTrackStateList, result);
+        if (!procRes.ok()) {
+          ACTS_ERROR("Processing of selected track states failed: "
+                     << procRes.error());
+          return procRes.error();
+        }
+        unsigned int nBranchesOnSurface = *procRes;
 
-        if (newTrackStateList.empty()) {
+        if (nBranchesOnSurface == 0) {
+          ACTS_VERBOSE("All branches on surface " << surface->geometryId()
+                                                  << " have been stopped");
+
+          reset(state, stepper, navigator, result);
+
+          return Result<void>::success();
+        }
+
+        // `currentBranch` is invalidated after `processNewTrackStates`
+        currentBranch = result.activeBranches.back();
+        prevTip = currentBranch.tipIndex();
+      } else {
+        if (expectMeasurements) {
           ACTS_VERBOSE("Detected hole after measurement selection on surface "
                        << surface->geometryId());
+        }
 
-          // Setting the number of branches on the surface to 1 as the hole
-          // still counts as a branch
-          nBranchesOnSurface = 1;
-
-          auto stateMask = PM::Predicted | PM::Jacobian;
+        auto stateMask = PM::Predicted | PM::Jacobian;
 
-          // Add a hole track state to the multitrajectory
-          TrackIndexType currentTip = addNonSourcelinkState(
-              stateMask, boundState, result, true, prevTip);
-          auto nonSourcelinkState =
-              result.trackStates->getTrackState(currentTip);
-          currentBranch.tipIndex() = currentTip;
+        // Add a hole or material track state to the multitrajectory
+        TrackIndexType currentTip = addNonSourcelinkState(
+            stateMask, boundState, result, expectMeasurements, prevTip);
+        currentBranch.tipIndex() = currentTip;
+        auto currentState = currentBranch.outermostTrackState();
+        if (expectMeasurements) {
           currentBranch.nHoles()++;
+        }
 
-          BranchStopperResult branchStopperResult =
-              m_extensions.branchStopper(currentBranch, nonSourcelinkState);
+        BranchStopperResult branchStopperResult =
+            m_extensions.branchStopper(currentBranch, currentState);
 
-          // Check the branch
-          if (branchStopperResult == BranchStopperResult::Continue) {
-            // Remembered the active branch and its state
-          } else {
-            // No branch on this surface
-            nBranchesOnSurface = 0;
-            if (branchStopperResult == BranchStopperResult::StopAndKeep) {
-              storeLastActiveBranch(result);
-            }
-            // Remove the branch from list
-            result.activeBranches.pop_back();
-          }
+        // Check the branch
+        if (branchStopperResult == BranchStopperResult::Continue) {
+          // Remembered the active branch and its state
         } else {
-          Result<unsigned int> procRes = processNewTrackStates(
-              state.geoContext, newTrackStateList, result);
-          if (!procRes.ok()) {
-            ACTS_ERROR("Processing of selected track states failed: "
-                       << procRes.error());
-            return procRes.error();
-          }
-          nBranchesOnSurface = *procRes;
-
-          if (nBranchesOnSurface == 0) {
-            // All branches on the surface have been stopped. Reset happens at
-            // the end of the function
-            ACTS_VERBOSE("All branches on surface " << surface->geometryId()
-                                                    << " have been stopped");
-          } else {
-            // `currentBranch` is invalidated after `processNewTrackStates`
-            currentBranch = result.activeBranches.back();
-            prevTip = currentBranch.tipIndex();
-
-            if (currentBranch.outermostTrackState().typeFlags().test(
-                    TrackStateFlag::OutlierFlag)) {
-              // We don't need to update the stepper given an outlier state
-              ACTS_VERBOSE("Outlier state detected on surface "
-                           << surface->geometryId());
-            } else {
-              // If there are measurement track states on this surface
-              ACTS_VERBOSE("Filtering step successful with "
-                           << nBranchesOnSurface << " branches");
-              // Update stepping state using filtered parameters of last track
-              // state on this surface
-              auto ts = result.activeBranches.back().outermostTrackState();
-              stepper.update(state.stepping,
-                             MultiTrajectoryHelpers::freeFiltered(
-                                 state.options.geoContext, ts),
-                             ts.filtered(), ts.filteredCovariance(), *surface);
-              ACTS_VERBOSE(
-                  "Stepping state is updated with filtered parameter:");
-              ACTS_VERBOSE("-> "
-                           << ts.filtered().transpose()
-                           << " of track state with tip = " << ts.index());
-            }
-          }
-        }
-
-        // Update state and stepper with post material effects
-        materialInteractor(surface, state, stepper, navigator,
-                           MaterialUpdateStage::PostUpdate);
-      } else if (surface->associatedDetectorElement() != nullptr ||
-                 surface->surfaceMaterial() != nullptr) {
-        // No splitting on the surface without source links. Set it to one
-        // first, but could be changed later
-        nBranchesOnSurface = 1;
-
-        auto currentBranch = result.activeBranches.back();
-        TrackIndexType prevTip = currentBranch.tipIndex();
-
-        // The surface could be either sensitive or passive
-        bool isSensitive = (surface->associatedDetectorElement() != nullptr);
-        bool isMaterial = (surface->surfaceMaterial() != nullptr);
-        ACTS_VERBOSE("Detected " << (isSensitive ? "sensitive" : "passive")
-                                 << " surface: " << surface->geometryId());
-        // Add state if there is already measurement detected on this branch
-        if (currentBranch.nMeasurements() > 0 || isMaterial) {
-          // No source links on surface, add either hole or passive material
-          // TrackState. No storage allocation for uncalibrated/calibrated
-          // measurement and filtered parameter
-          auto stateMask = PM::Predicted | PM::Jacobian;
-
-          // Transport the covariance to a curvilinear surface
-          stepper.transportCovarianceToCurvilinear(state.stepping);
-
-          // Update state and stepper with pre material effects
-          materialInteractor(surface, state, stepper, navigator,
-                             MaterialUpdateStage::PreUpdate);
-
-          // Transport & bind the state to the current surface
-          auto boundStateRes =
-              stepper.boundState(state.stepping, *surface, false);
-          if (!boundStateRes.ok()) {
-            return boundStateRes.error();
-          }
-          auto& boundState = *boundStateRes;
-          auto& [boundParams, jacobian, pathLength] = boundState;
-          boundParams.covariance() = state.stepping.cov;
-
-          // Add a hole or material track state to the multitrajectory
-          TrackIndexType currentTip = addNonSourcelinkState(
-              stateMask, boundState, result, isSensitive, prevTip);
-          auto nonSourcelinkState =
-              result.trackStates->getTrackState(currentTip);
-          currentBranch.tipIndex() = currentTip;
-          if (isSensitive) {
-            currentBranch.nHoles()++;
+          // No branch on this surface
+          if (branchStopperResult == BranchStopperResult::StopAndKeep) {
+            storeLastActiveBranch(result);
           }
+          // Remove the branch from list
+          result.activeBranches.pop_back();
 
-          BranchStopperResult branchStopperResult =
-              m_extensions.branchStopper(currentBranch, nonSourcelinkState);
+          // Branch on the surface has been stopped - reset
+          ACTS_VERBOSE("Branch on surface " << surface->geometryId()
+                                            << " has been stopped");
 
-          // Check the branch
-          if (branchStopperResult == BranchStopperResult::Continue) {
-            // Remembered the active branch and its state
-          } else {
-            // No branch on this surface
-            nBranchesOnSurface = 0;
-            if (branchStopperResult == BranchStopperResult::StopAndKeep) {
-              storeLastActiveBranch(result);
-            }
-            // Remove the branch from list
-            result.activeBranches.pop_back();
-          }
+          reset(state, stepper, navigator, result);
 
-          // Update state and stepper with post material effects
-          materialInteractor(surface, state, stepper, navigator,
-                             MaterialUpdateStage::PostUpdate);
+          return Result<void>::success();
         }
-      } else {
-        // Neither measurement nor material on surface, this branch is still
-        // valid. Count the branch on current surface
-        nBranchesOnSurface = 1;
       }
 
-      // Reset current branch if there is no branch on current surface
-      if (nBranchesOnSurface == 0) {
-        ACTS_DEBUG("Branch on surface " << surface->geometryId()
-                                        << " is stopped");
-        if (!result.activeBranches.empty()) {
-          ACTS_VERBOSE("Propagation jumps to branch with tip = "
-                       << result.activeBranches.back().tipIndex());
-          reset(state, stepper, navigator, result);
-        } else {
-          ACTS_VERBOSE("Stop Kalman filtering with "
-                       << result.collectedTracks.size() << " found tracks");
-          result.finished = true;
-        }
+      auto currentState = currentBranch.outermostTrackState();
+
+      if (currentState.typeFlags().test(TrackStateFlag::OutlierFlag)) {
+        // We don't need to update the stepper given an outlier state
+        ACTS_VERBOSE("Outlier state detected on surface "
+                     << surface->geometryId());
+      } else if (currentState.typeFlags().test(
+                     TrackStateFlag::MeasurementFlag)) {
+        // If there are measurement track states on this surface
+        // Update stepping state using filtered parameters of last track
+        // state on this surface
+        stepper.update(state.stepping,
+                       MultiTrajectoryHelpers::freeFiltered(
+                           state.options.geoContext, currentState),
+                       currentState.filtered(),
+                       currentState.filteredCovariance(), *surface);
+        ACTS_VERBOSE("Stepping state is updated with filtered parameter:");
+        ACTS_VERBOSE("-> " << currentState.filtered().transpose()
+                           << " of track state with tip = "
+                           << currentState.index());
       }
 
+      // Update state and stepper with post material effects
+      materialInteractor(surface, state, stepper, navigator,
+                         MaterialUpdateStage::PostUpdate);
+
       return Result<void>::success();
     }
 
@@ -932,12 +900,13 @@ class CombinatorialKalmanFilter {
 
       auto rootBranch = result.activeBranches.back();
 
-      // Build the new branches by forking the root branch. Reverse the order to
-      // process the best candidate first
+      // Build the new branches by forking the root branch. Reverse the order
+      // to process the best candidate first
       CkfTypes::BranchVector<TrackProxy> newBranches;
       for (auto it = newTrackStateList.rbegin(); it != newTrackStateList.rend();
            ++it) {
-        // Keep the root branch as the first branch, make a copy for the others
+        // Keep the root branch as the first branch, make a copy for the
+        // others
         auto newBranch = (it == newTrackStateList.rbegin())
                              ? rootBranch
                              : rootBranch.shallowCopy();
@@ -974,6 +943,8 @@ class CombinatorialKalmanFilter {
           typeFlags.set(TrackStateFlag::MeasurementFlag);
           // Increment number of measurements
           newBranch.nMeasurements()++;
+          newBranch.nDoF() += trackState.calibratedSize();
+          newBranch.chi2() += trackState.chi2();
         } else {
           ACTS_WARNING("Cannot handle this track state flags");
           continue;
@@ -1116,46 +1087,28 @@ class CombinatorialKalmanFilter {
       auto currentBranch = result.activeBranches.back();
       TrackIndexType currentTip = currentBranch.tipIndex();
 
-      ACTS_VERBOSE("Find track with entry index = "
-                   << currentTip << " and there are nMeasurements = "
-                   << currentBranch.nMeasurements()
+      ACTS_VERBOSE("Storing track "
+                   << currentBranch.index() << " with tip index " << currentTip
+                   << ". nMeasurements = " << currentBranch.nMeasurements()
                    << ", nOutliers = " << currentBranch.nOutliers()
-                   << ", nHoles = " << currentBranch.nHoles() << " on track");
+                   << ", nHoles = " << currentBranch.nHoles());
 
-      std::optional<TrackStateProxy> lastMeasurement;
-      for (const auto& trackState : currentBranch.trackStatesReversed()) {
-        if (trackState.typeFlags().test(TrackStateFlag::MeasurementFlag)) {
-          lastMeasurement = trackState;
-          break;
-        }
-      }
-
-      if (lastMeasurement.has_value()) {
-        currentBranch.tipIndex() = lastMeasurement->index();
-        result.collectedTracks.push_back(currentBranch);
-        ACTS_VERBOSE("Last measurement found on track with entry index = "
-                     << currentTip << " and measurement index = "
-                     << lastMeasurement->index());
-      } else {
-        ACTS_VERBOSE(
-            "No measurement found on track with entry index = " << currentTip);
-      }
+      result.collectedTracks.push_back(currentBranch);
     }
 
     CombinatorialKalmanFilterExtensions<track_container_t> m_extensions;
 
     /// The source link accessor
-    source_link_accessor_t m_sourcelinkAccessor;
+    source_link_accessor_t m_sourceLinkAccessor;
 
-    using source_link_iterator_t =
-        decltype(std::declval<decltype(m_sourcelinkAccessor(
+    using SourceLinkIterator =
+        decltype(std::declval<decltype(m_sourceLinkAccessor(
                      *static_cast<const Surface*>(nullptr)))>()
                      .first);
 
     using TrackStateCandidateCreator =
         typename CombinatorialKalmanFilterOptions<
-            source_link_iterator_t,
-            track_container_t>::TrackStateCandidateCreator;
+            SourceLinkIterator, track_container_t>::TrackStateCandidateCreator;
 
     /// the stateCandidator to be used
     /// @note will be set to a default trackStateCandidateCreator or the one
@@ -1165,6 +1118,9 @@ class CombinatorialKalmanFilter {
     /// End of world aborter
     EndOfWorldReached endOfWorldReached;
 
+    /// Volume constraint aborter
+    VolumeConstraintAborter volumeConstraintAborter;
+
     /// Actor logger instance
     const Logger* actorLogger{nullptr};
     /// Updater logger instance
@@ -1173,21 +1129,6 @@ class CombinatorialKalmanFilter {
     const Logger& logger() const { return *actorLogger; }
   };
 
-  template <typename source_link_accessor_t, typename parameters_t>
-  class Aborter {
-   public:
-    /// Broadcast the action type
-    using action_type = Actor<source_link_accessor_t, parameters_t>;
-
-    template <typename propagator_state_t, typename stepper_t,
-              typename navigator_t, typename result_t>
-    bool operator()(propagator_state_t& /*state*/, const stepper_t& /*stepper*/,
-                    const navigator_t& /*navigator*/, const result_t& result,
-                    const Logger& /*logger*/) const {
-      return !result.lastError.ok() || result.finished;
-    }
-  };
-
   /// Void path limit reached aborter to replace the default since the path
   /// limit is handled in the CKF actor internally.
   struct StubPathLimitReached {
@@ -1195,7 +1136,7 @@ class CombinatorialKalmanFilter {
 
     template <typename propagator_state_t, typename stepper_t,
               typename navigator_t>
-    bool operator()(propagator_state_t& /*state*/, const stepper_t& /*stepper*/,
+    bool checkAbort(propagator_state_t& /*state*/, const stepper_t& /*stepper*/,
                     const navigator_t& /*navigator*/,
                     const Logger& /*logger*/) const {
       return false;
@@ -1212,7 +1153,9 @@ class CombinatorialKalmanFilter {
   /// @param initialParameters The initial track parameters
   /// @param tfOptions CombinatorialKalmanFilterOptions steering the track
   ///                  finding
-  /// @param trackContainer Input track container to use
+  /// @param trackContainer Track container in which to store the results
+  /// @param rootBranch The track to be used as the root branch
+  ///
   /// @note The input measurements are given in the form of @c SourceLinks.
   ///       It's @c calibrator_t's job to turn them into calibrated measurements
   ///       used in the track finding.
@@ -1224,23 +1167,20 @@ class CombinatorialKalmanFilter {
   auto findTracks(const start_parameters_t& initialParameters,
                   const CombinatorialKalmanFilterOptions<
                       source_link_iterator_t, track_container_t>& tfOptions,
-                  track_container_t& trackContainer) const
+                  track_container_t& trackContainer,
+                  typename track_container_t::TrackProxy rootBranch) const
       -> Result<std::vector<
           typename std::decay_t<decltype(trackContainer)>::TrackProxy>> {
     using SourceLinkAccessor =
         SourceLinkAccessorDelegate<source_link_iterator_t>;
 
-    // Create the ActionList and AbortList
-    using CombinatorialKalmanFilterAborter =
-        Aborter<SourceLinkAccessor, parameters_t>;
+    // Create the ActorList
     using CombinatorialKalmanFilterActor =
         Actor<SourceLinkAccessor, parameters_t>;
-    using Actors = ActionList<CombinatorialKalmanFilterActor>;
-    using Aborters = AbortList<CombinatorialKalmanFilterAborter>;
+    using Actors = ActorList<CombinatorialKalmanFilterActor>;
 
     // Create relevant options for the propagation options
-    using PropagatorOptions =
-        typename propagator_t::template Options<Actors, Aborters>;
+    using PropagatorOptions = typename propagator_t::template Options<Actors>;
     PropagatorOptions propOptions(tfOptions.geoContext,
                                   tfOptions.magFieldContext);
 
@@ -1249,16 +1189,18 @@ class CombinatorialKalmanFilter {
 
     // Catch the actor
     auto& combKalmanActor =
-        propOptions.actionList.template get<CombinatorialKalmanFilterActor>();
+        propOptions.actorList.template get<CombinatorialKalmanFilterActor>();
     combKalmanActor.targetReached.surface = tfOptions.targetSurface;
     combKalmanActor.multipleScattering = tfOptions.multipleScattering;
     combKalmanActor.energyLoss = tfOptions.energyLoss;
+    combKalmanActor.skipPrePropagationUpdate =
+        tfOptions.skipPrePropagationUpdate;
     combKalmanActor.actorLogger = m_actorLogger.get();
     combKalmanActor.updaterLogger = m_updaterLogger.get();
     combKalmanActor.calibrationContextPtr = &tfOptions.calibrationContext.get();
 
     // copy source link accessor, calibrator and measurement selector
-    combKalmanActor.m_sourcelinkAccessor = tfOptions.sourcelinkAccessor;
+    combKalmanActor.m_sourceLinkAccessor = tfOptions.sourceLinkAccessor;
     combKalmanActor.m_extensions = tfOptions.extensions;
     combKalmanActor.trackStateCandidateCreator =
         tfOptions.trackStateCandidateCreator;
@@ -1285,7 +1227,6 @@ class CombinatorialKalmanFilter {
     r.tracks = &trackContainer;
     r.trackStates = &trackContainer.trackStateContainer();
 
-    auto rootBranch = trackContainer.makeTrack();
     r.activeBranches.push_back(rootBranch);
 
     auto propagationResult = m_propagator.propagate(propState);
@@ -1322,12 +1263,36 @@ class CombinatorialKalmanFilter {
       return error.error();
     }
 
-    for (const auto& track : combKalmanResult.collectedTracks) {
-      calculateTrackQuantities(track);
-    }
-
     return std::move(combKalmanResult.collectedTracks);
   }
+
+  /// Combinatorial Kalman Filter implementation, calls the Kalman filter
+  ///
+  /// @tparam source_link_iterator_t Type of the source link iterator
+  /// @tparam start_parameters_t Type of the initial parameters
+  /// @tparam parameters_t Type of parameters used for local parameters
+  ///
+  /// @param initialParameters The initial track parameters
+  /// @param tfOptions CombinatorialKalmanFilterOptions steering the track
+  ///                  finding
+  /// @param trackContainer Track container in which to store the results
+  /// @note The input measurements are given in the form of @c SourceLinks.
+  ///       It's @c calibrator_t's job to turn them into calibrated measurements
+  ///       used in the track finding.
+  ///
+  /// @return a container of track finding result for all the initial track
+  /// parameters
+  template <typename source_link_iterator_t, typename start_parameters_t,
+            typename parameters_t = BoundTrackParameters>
+  auto findTracks(const start_parameters_t& initialParameters,
+                  const CombinatorialKalmanFilterOptions<
+                      source_link_iterator_t, track_container_t>& tfOptions,
+                  track_container_t& trackContainer) const
+      -> Result<std::vector<
+          typename std::decay_t<decltype(trackContainer)>::TrackProxy>> {
+    auto rootBranch = trackContainer.makeTrack();
+    return findTracks(initialParameters, tfOptions, trackContainer, rootBranch);
+  }
 };
 
 }  // namespace Acts
diff --git a/Core/include/Acts/TrackFinding/CombinatorialKalmanFilterError.hpp b/Core/include/Acts/TrackFinding/CombinatorialKalmanFilterError.hpp
index dd2088a04e7..85e9240950e 100644
--- a/Core/include/Acts/TrackFinding/CombinatorialKalmanFilterError.hpp
+++ b/Core/include/Acts/TrackFinding/CombinatorialKalmanFilterError.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2019-2020 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
diff --git a/Core/include/Acts/TrackFinding/GbtsConnector.hpp b/Core/include/Acts/TrackFinding/GbtsConnector.hpp
index f4a53a0241b..f4cddd2527b 100644
--- a/Core/include/Acts/TrackFinding/GbtsConnector.hpp
+++ b/Core/include/Acts/TrackFinding/GbtsConnector.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2021 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
diff --git a/Core/include/Acts/TrackFinding/MeasurementSelector.hpp b/Core/include/Acts/TrackFinding/MeasurementSelector.hpp
index a05f67d7cc0..fd348d44075 100644
--- a/Core/include/Acts/TrackFinding/MeasurementSelector.hpp
+++ b/Core/include/Acts/TrackFinding/MeasurementSelector.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2019-2024 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
@@ -12,12 +12,12 @@
 #include "Acts/EventData/MeasurementHelpers.hpp"
 #include "Acts/EventData/MultiTrajectory.hpp"
 #include "Acts/EventData/TrackParameters.hpp"
+#include "Acts/EventData/Types.hpp"
 #include "Acts/Geometry/GeometryHierarchyMap.hpp"
 #include "Acts/Geometry/GeometryIdentifier.hpp"
 #include "Acts/TrackFinding/CombinatorialKalmanFilterError.hpp"
 #include "Acts/Utilities/Logger.hpp"
 #include "Acts/Utilities/Result.hpp"
-#include "Acts/Utilities/TypeTraits.hpp"
 
 #include <cassert>
 #include <cstddef>
@@ -36,10 +36,12 @@ namespace Acts {
 struct MeasurementSelectorCuts {
   /// bins in |eta| to specify variable selections
   std::vector<double> etaBins{};
-  /// Maximum local chi2 contribution.
+  /// Maximum local chi2 contribution to classify as measurement.
   std::vector<double> chi2CutOff{15};
   /// Maximum number of associated measurements on a single surface.
   std::vector<std::size_t> numMeasurementsCutOff{1};
+  /// Maximum local chi2 contribution to classify as outlier.
+  std::vector<double> chi2CutOffOutlier{};
 };
 
 /// @brief Measurement selection struct selecting those measurements compatible
@@ -73,7 +75,7 @@ class MeasurementSelector {
   /// @brief Constructor with config
   ///
   /// @param config a config instance
-  explicit MeasurementSelector(Config config);
+  explicit MeasurementSelector(const Config& config);
 
   /// @brief Function that select the measurements compatible with
   /// the given track parameter on a surface
@@ -93,11 +95,25 @@ class MeasurementSelector {
          bool& isOutlier, const Logger& logger) const;
 
  private:
-  template <typename traj_t, typename cut_value_t>
-  static cut_value_t getCut(
-      const typename traj_t::TrackStateProxy& trackState,
-      const Acts::MeasurementSelector::Config::Iterator selector,
-      const std::vector<cut_value_t>& cuts, const Logger& logger);
+  struct InternalCutBin {
+    double maxTheta{};
+    std::size_t maxNumMeasurements{};
+    double maxChi2Measurement{};
+    double maxChi2Outlier{};
+  };
+  using InternalCutBins = std::vector<InternalCutBin>;
+  using InternalConfig = Acts::GeometryHierarchyMap<InternalCutBins>;
+
+  struct Cuts {
+    std::size_t numMeasurements{};
+    double chi2Measurement{};
+    double chi2Outlier{};
+  };
+
+  static InternalCutBins convertCutBins(const MeasurementSelectorCuts& config);
+
+  static Cuts getCutsByTheta(const InternalCutBins& config, double theta);
+  Result<Cuts> getCuts(const GeometryIdentifier& geoID, double theta) const;
 
   double calculateChi2(
       const double* fullCalibrated, const double* fullCalibratedCovariance,
@@ -105,11 +121,9 @@ class MeasurementSelector {
                        false>::Parameters predicted,
       TrackStateTraits<MultiTrajectoryTraits::MeasurementSizeMax,
                        false>::Covariance predictedCovariance,
-      TrackStateTraits<MultiTrajectoryTraits::MeasurementSizeMax,
-                       false>::Projector projector,
-      unsigned int calibratedSize) const;
+      BoundSubspaceIndices projector, unsigned int calibratedSize) const;
 
-  Config m_config;
+  InternalConfig m_config;
 };
 
 }  // namespace Acts
diff --git a/Core/include/Acts/TrackFinding/MeasurementSelector.ipp b/Core/include/Acts/TrackFinding/MeasurementSelector.ipp
index 49b03e4730e..30d09c002be 100644
--- a/Core/include/Acts/TrackFinding/MeasurementSelector.ipp
+++ b/Core/include/Acts/TrackFinding/MeasurementSelector.ipp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2019-2024 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 namespace Acts {
 
@@ -21,31 +21,23 @@ MeasurementSelector::select(
 
   ACTS_VERBOSE("Invoked MeasurementSelector");
 
-  // Return error if no measurement
+  // Return if no measurement
   if (candidates.empty()) {
-    return CombinatorialKalmanFilterError::MeasurementSelectionFailed;
+    return Result::success(std::pair(candidates.begin(), candidates.end()));
   }
 
   // Get geoID of this surface
-  auto geoID = candidates.front().referenceSurface().geometryId();
+  GeometryIdentifier geoID = candidates.front().referenceSurface().geometryId();
+  // Get the theta of the first track state
+  const double theta = candidates.front().predicted()[eBoundTheta];
   // Find the appropriate cuts
-  auto cuts = m_config.find(geoID);
-  if (cuts == m_config.end()) {
-    // for now we consider missing cuts an unrecoverable error
-    // TODO consider other options e.g. do not add measurements at all (not
-    // even as outliers)
-    return CombinatorialKalmanFilterError::MeasurementSelectionFailed;
+  const auto cutsResult = getCuts(geoID, theta);
+  if (!cutsResult.ok()) {
+    return cutsResult.error();
   }
+  const Cuts& cuts = *cutsResult;
 
-  assert(!cuts->chi2CutOff.empty());
-  const std::vector<double>& chi2CutOff = cuts->chi2CutOff;
-  const double maxChi2Cut =
-      std::min(*std::max_element(chi2CutOff.begin(), chi2CutOff.end()),
-               getCut<traj_t>(candidates.front(), cuts, chi2CutOff, logger));
-  const std::size_t numMeasurementsCut = getCut<traj_t>(
-      candidates.front(), cuts, cuts->numMeasurementsCutOff, logger);
-
-  if (numMeasurementsCut == 0ul) {
+  if (cuts.numMeasurements == 0ul) {
     return CombinatorialKalmanFilterError::MeasurementSelectionFailed;
   }
 
@@ -67,11 +59,11 @@ MeasurementSelector::select(
     // with compile time size. That way the Eigen math operations are
     // still done with compile time size and no dynamic memory allocation
     // is needed.
-    double chi2 =
-        calculateChi2(trackState.effectiveCalibrated().data(),
-                      trackState.effectiveCalibratedCovariance().data(),
-                      trackState.predicted(), trackState.predictedCovariance(),
-                      trackState.projector(), trackState.calibratedSize());
+    double chi2 = calculateChi2(
+        trackState.effectiveCalibrated().data(),
+        trackState.effectiveCalibratedCovariance().data(),
+        trackState.predicted(), trackState.predictedCovariance(),
+        trackState.boundSubspaceIndices(), trackState.calibratedSize());
     trackState.chi2() = chi2;
 
     if (chi2 < minChi2) {
@@ -80,7 +72,7 @@ MeasurementSelector::select(
     }
 
     // only consider track states which pass the chi2 cut
-    if (chi2 >= maxChi2Cut) {
+    if (chi2 >= cuts.chi2Measurement) {
       continue;
     }
 
@@ -93,62 +85,38 @@ MeasurementSelector::select(
     ++passedCandidates;
   }
 
-  // If there are no measurements below the chi2 cut off, return the
-  // measurement with the best chi2 and tag it as an outlier
+  // Handle if there are no measurements below the chi2 cut off
   if (passedCandidates == 0ul) {
-    ACTS_VERBOSE("No measurement candidate. Return an outlier measurement chi2="
-                 << minChi2);
-    isOutlier = true;
+    if (minChi2 < cuts.chi2Outlier) {
+      ACTS_VERBOSE(
+          "No measurement candidate. Return an outlier measurement chi2="
+          << minChi2);
+      isOutlier = true;
+      return Result::success(std::pair(candidates.begin() + minIndex,
+                                       candidates.begin() + minIndex + 1));
+    } else {
+      ACTS_VERBOSE("No measurement candidate. Return empty chi2=" << minChi2);
+      return Result::success(std::pair(candidates.begin(), candidates.begin()));
+    }
   }
 
-  if (passedCandidates <= 1ul || numMeasurementsCut == 1ul) {
+  if (passedCandidates <= 1ul) {
     // return single item range, no sorting necessary
-    ACTS_VERBOSE("Returning only 1 element");
-    return Result::success(std::make_pair(candidates.begin() + minIndex,
-                                          candidates.begin() + minIndex + 1));
+    ACTS_VERBOSE("Returning only 1 element chi2=" << minChi2);
+    return Result::success(std::pair(candidates.begin() + minIndex,
+                                     candidates.begin() + minIndex + 1));
   }
 
   std::sort(
       candidates.begin(), candidates.begin() + passedCandidates,
       [](const auto& tsa, const auto& tsb) { return tsa.chi2() < tsb.chi2(); });
 
-  if (passedCandidates <= numMeasurementsCut) {
-    ACTS_VERBOSE("Number of selected measurements: "
-                 << passedCandidates << ", max: " << numMeasurementsCut);
-    return Result::success(std::make_pair(
-        candidates.begin(), candidates.begin() + passedCandidates));
-  }
-
   ACTS_VERBOSE("Number of selected measurements: "
-               << numMeasurementsCut << ", max: " << numMeasurementsCut);
+               << passedCandidates << ", max: " << cuts.numMeasurements);
 
-  return Result::success(std::make_pair(
-      candidates.begin(), candidates.begin() + numMeasurementsCut));
-}
-
-template <typename traj_t, typename cut_value_t>
-cut_value_t MeasurementSelector::getCut(
-    const typename traj_t::TrackStateProxy& trackState,
-    const Acts::MeasurementSelector::Config::Iterator selector,
-    const std::vector<cut_value_t>& cuts, const Logger& logger) {
-  const auto& etaBins = selector->etaBins;
-  if (etaBins.empty()) {
-    return cuts[0];  // shortcut if no etaBins
-  }
-  const auto eta = std::atanh(std::cos(trackState.predicted()[eBoundTheta]));
-  const auto abseta = std::abs(eta);
-  std::size_t bin = 0;
-  for (auto etaBin : etaBins) {
-    if (etaBin >= abseta) {
-      break;
-    }
-    bin++;
-  }
-  if (bin >= cuts.size()) {
-    bin = cuts.size() - 1;
-  }
-  ACTS_VERBOSE("Get cut for eta=" << eta << ": " << cuts[bin]);
-  return cuts[bin];
+  return Result::success(std::pair(
+      candidates.begin(),
+      candidates.begin() + std::min(cuts.numMeasurements, passedCandidates)));
 }
 
 }  // namespace Acts
diff --git a/Core/include/Acts/TrackFinding/RoiDescriptor.hpp b/Core/include/Acts/TrackFinding/RoiDescriptor.hpp
index 0d7ac2e9c01..4e3b07eb4af 100644
--- a/Core/include/Acts/TrackFinding/RoiDescriptor.hpp
+++ b/Core/include/Acts/TrackFinding/RoiDescriptor.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2021 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
diff --git a/Core/include/Acts/TrackFinding/TrackSelector.hpp b/Core/include/Acts/TrackFinding/TrackSelector.hpp
index 1316932d32b..5a2cf53df27 100644
--- a/Core/include/Acts/TrackFinding/TrackSelector.hpp
+++ b/Core/include/Acts/TrackFinding/TrackSelector.hpp
@@ -1,21 +1,22 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2023 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
+#include "Acts/EventData/TrackProxyConcept.hpp"
 #include "Acts/EventData/TrackStateType.hpp"
 #include "Acts/Geometry/GeometryHierarchyMap.hpp"
 #include "Acts/Geometry/GeometryIdentifier.hpp"
+#include "Acts/Utilities/AngleHelpers.hpp"
 
 #include <cmath>
 #include <functional>
 #include <limits>
-#include <numeric>
 #include <ostream>
 #include <vector>
 
@@ -37,7 +38,7 @@ class TrackSelector {
 
     boost::container::small_vector<CounterElement, 4> counters;
 
-    template <typename track_proxy_t>
+    template <TrackProxyConcept track_proxy_t>
     bool isValidTrack(const track_proxy_t& track) const;
 
     void addCounter(const std::vector<GeometryIdentifier>& identifiers,
@@ -75,6 +76,7 @@ class TrackSelector {
     std::size_t minMeasurements = 0;
     std::size_t maxHoles = std::numeric_limits<std::size_t>::max();
     std::size_t maxOutliers = std::numeric_limits<std::size_t>::max();
+    std::size_t maxHolesAndOutliers = std::numeric_limits<std::size_t>::max();
     std::size_t maxSharedHits = std::numeric_limits<std::size_t>::max();
     double maxChi2 = inf;
 
@@ -140,7 +142,7 @@ class TrackSelector {
     std::vector<Config> cutSets = {};
 
     /// Eta bin edges for varying cuts by eta
-    std::vector<double> absEtaEdges = {};
+    std::vector<double> absEtaEdges = {0, inf};
 
     /// Get the number of eta bins
     /// @return Number of eta bins
@@ -148,7 +150,7 @@ class TrackSelector {
 
     /// Construct an empty (accepts everything) configuration.
     /// Results in a single cut set and one abs eta bin from 0 to infinity.
-    EtaBinnedConfig() : cutSets{{}}, absEtaEdges{{0, inf}} {};
+    EtaBinnedConfig() : cutSets{{}} {};
 
     /// Constructor to create a config object that is not upper-bounded.
     /// This is useful to use the "fluent" API to populate the configuration.
@@ -161,13 +163,12 @@ class TrackSelector {
     /// @param absEtaEdgesIn is the vector of eta bin edges
     EtaBinnedConfig(std::vector<double> absEtaEdgesIn)
         : absEtaEdges{std::move(absEtaEdgesIn)} {
-      cutSets.resize(absEtaEdges.size() - 1);
+      cutSets.resize(nEtaBins());
     }
 
     /// Auto-converting constructor from a single cut configuration.
     /// Results in a single absolute eta bin from 0 to infinity.
-    EtaBinnedConfig(Config cutSet)
-        : cutSets{std::move(cutSet)}, absEtaEdges{{0, inf}} {}
+    EtaBinnedConfig(Config cutSet) : cutSets{std::move(cutSet)} {}
 
     /// Add a new eta bin with the given upper bound.
     /// @param etaMax Upper bound of the new eta bin
@@ -193,11 +194,17 @@ class TrackSelector {
     /// @return True if the configuration has a bin for the given eta
     bool hasCuts(double eta) const;
 
-    /// Get the index of the eta bin for a given eta
+    /// Get the index of the eta bin for a given eta.
+    /// throws an exception if Eta is outside the abs eta bin edges.
     /// @param eta Eta value
     /// @return Index of the eta bin
     std::size_t binIndex(double eta) const;
 
+    /// Get the index of the eta bin for a given eta
+    /// @param eta Eta value
+    /// @return Index of the eta bin, or >= nEtaBins() if Eta is outside the abs eta bin edges.
+    std::size_t binIndexNoCheck(double eta) const;
+
     /// Get the cuts for a given eta
     /// @param eta Eta value
     /// @return Cuts for the given eta
@@ -226,7 +233,7 @@ class TrackSelector {
   /// @tparam track_proxy_t is the type of the track proxy
   /// @param track is the track proxy
   /// @return true if the track is valid
-  template <typename track_proxy_t>
+  template <TrackProxyConcept track_proxy_t>
   bool isValidTrack(const track_proxy_t& track) const;
 
   /// Get readonly access to the config parameters
@@ -235,8 +242,7 @@ class TrackSelector {
 
  private:
   EtaBinnedConfig m_cfg;
-  bool m_isUnbinned;
-  bool m_noEtaCuts;
+  bool m_isUnbinned = false;
 };
 
 inline TrackSelector::Config& TrackSelector::Config::loc0(double min,
@@ -298,23 +304,32 @@ inline TrackSelector::Config& TrackSelector::Config::pt(double min,
 
 inline std::ostream& operator<<(std::ostream& os,
                                 const TrackSelector::Config& cuts) {
-  auto print = [&](const char* name, const auto& min, const auto& max) {
+  // for printing cuts set up with `within`
+  auto printMinMax = [&](const char* name, const auto& min, const auto& max) {
     os << " - " << min << " <= " << name << " < " << max << "\n";
   };
+  // for printing cuts set up with `checkMin`
+  auto printMin = [&](const char* name, const auto& min) {
+    os << " - " << min << " <= " << name << "\n";
+  };
+  // for printing cuts set up with `checkMax`
+  auto printMax = [&](const char* name, const auto& max) {
+    os << " - " << name << " <= " << max << "\n";
+  };
 
-  print("loc0", cuts.loc0Min, cuts.loc0Max);
-  print("loc1", cuts.loc1Min, cuts.loc1Max);
-  print("time", cuts.timeMin, cuts.timeMax);
-  print("phi", cuts.phiMin, cuts.phiMax);
-  print("eta", cuts.etaMin, cuts.etaMax);
-  print("absEta", cuts.absEtaMin, cuts.absEtaMax);
-  print("pt", cuts.ptMin, cuts.ptMax);
-  print("nHoles", 0, cuts.maxHoles);
-  print("nOutliers", 0, cuts.maxOutliers);
-  print("nSharedHits", 0, cuts.maxSharedHits);
-  print("chi2", 0.0, cuts.maxChi2);
-  os << " - " << cuts.minMeasurements << " <= nMeasurements\n";
-
+  printMinMax("loc0", cuts.loc0Min, cuts.loc0Max);
+  printMinMax("loc1", cuts.loc1Min, cuts.loc1Max);
+  printMinMax("time", cuts.timeMin, cuts.timeMax);
+  printMinMax("phi", cuts.phiMin, cuts.phiMax);
+  printMinMax("eta", cuts.etaMin, cuts.etaMax);
+  printMinMax("absEta", cuts.absEtaMin, cuts.absEtaMax);
+  printMinMax("pt", cuts.ptMin, cuts.ptMax);
+  printMax("nHoles", cuts.maxHoles);
+  printMax("nOutliers", cuts.maxOutliers);
+  printMax("nHoles + nOutliers", cuts.maxHolesAndOutliers);
+  printMax("nSharedHits", cuts.maxSharedHits);
+  printMax("chi2", cuts.maxChi2);
+  printMin("nMeasurements", cuts.minMeasurements);
   return os;
 }
 
@@ -347,14 +362,22 @@ inline bool TrackSelector::EtaBinnedConfig::hasCuts(double eta) const {
 }
 
 inline std::size_t TrackSelector::EtaBinnedConfig::binIndex(double eta) const {
-  if (!hasCuts(eta)) {
+  std::size_t index = binIndexNoCheck(eta);
+  if (!(index < nEtaBins())) {
     throw std::invalid_argument{"Eta is outside the abs eta bin edges"};
   }
+  return index;
+}
 
+inline std::size_t TrackSelector::EtaBinnedConfig::binIndexNoCheck(
+    double eta) const {
   auto binIt =
       std::upper_bound(absEtaEdges.begin(), absEtaEdges.end(), std::abs(eta));
-  std::size_t index = std::distance(absEtaEdges.begin(), binIt) - 1;
-  return index;
+  std::size_t index = std::distance(absEtaEdges.begin(), binIt);
+  if (index == 0) {
+    index = absEtaEdges.size() + 1;  // positive value to check for underflow
+  }
+  return index - 1;
 }
 
 inline const TrackSelector::Config& TrackSelector::EtaBinnedConfig::getCuts(
@@ -387,7 +410,7 @@ void TrackSelector::selectTracks(const input_tracks_t& inputTracks,
   }
 }
 
-template <typename track_proxy_t>
+template <TrackProxyConcept track_proxy_t>
 bool TrackSelector::isValidTrack(const track_proxy_t& track) const {
   auto checkMin = [](auto x, auto min) { return min <= x; };
   auto checkMax = [](auto x, auto max) { return x <= max; };
@@ -404,7 +427,7 @@ bool TrackSelector::isValidTrack(const track_proxy_t& track) const {
 
   auto absEta = [&]() {
     if (_absEta == kUnset) {
-      _eta = -std::log(std::tan(theta / 2));
+      _eta = AngleHelpers::etaFromTheta(theta);
       _absEta = std::abs(_eta);
     }
     return _absEta;
@@ -412,8 +435,9 @@ bool TrackSelector::isValidTrack(const track_proxy_t& track) const {
 
   const Config* cutsPtr{nullptr};
   if (!m_isUnbinned) {
-    if (absEta() < m_cfg.absEtaEdges.front() ||
-        _absEta >= m_cfg.absEtaEdges.back()) {
+    // return false if |eta| is outside its range, or nan.
+    if (!(absEta() >= m_cfg.absEtaEdges.front() &&
+          _absEta < m_cfg.absEtaEdges.back())) {
       return false;
     }
     cutsPtr = &m_cfg.getCuts(_eta);
@@ -425,8 +449,8 @@ bool TrackSelector::isValidTrack(const track_proxy_t& track) const {
 
   return track.hasReferenceSurface() &&
          within(track.transverseMomentum(), cuts.ptMin, cuts.ptMax) &&
-         (m_noEtaCuts || (within(absEta(), cuts.absEtaMin, cuts.absEtaMax) &&
-                          within(_eta, cuts.etaMin, cuts.etaMax))) &&
+         (!m_isUnbinned || (within(absEta(), cuts.absEtaMin, cuts.absEtaMax) &&
+                            within(_eta, cuts.etaMin, cuts.etaMax))) &&
          within(track.phi(), cuts.phiMin, cuts.phiMax) &&
          within(track.loc0(), cuts.loc0Min, cuts.loc0Max) &&
          within(track.loc1(), cuts.loc1Min, cuts.loc1Max) &&
@@ -434,6 +458,8 @@ bool TrackSelector::isValidTrack(const track_proxy_t& track) const {
          checkMin(track.nMeasurements(), cuts.minMeasurements) &&
          checkMax(track.nHoles(), cuts.maxHoles) &&
          checkMax(track.nOutliers(), cuts.maxOutliers) &&
+         checkMax(track.nHoles() + track.nOutliers(),
+                  cuts.maxHolesAndOutliers) &&
          checkMax(track.nSharedHits(), cuts.maxSharedHits) &&
          checkMax(track.chi2(), cuts.maxChi2) &&
          cuts.measurementCounter.isValidTrack(track);
@@ -447,26 +473,19 @@ inline TrackSelector::TrackSelector(
         "TrackSelector cut / eta bin configuration is inconsistent"};
   }
 
-  m_isUnbinned = false;
   if (m_cfg.nEtaBins() == 1) {
     static const std::vector<double> infVec = {0, inf};
-    bool limitEta = m_cfg.absEtaEdges != infVec;
-    m_isUnbinned = !limitEta;  // single bin, no eta edges given
-
-    const Config& cuts = m_cfg.cutSets[0];
-
-    if (limitEta && (cuts.etaMin != -inf || cuts.etaMax != inf ||
-                     cuts.absEtaMin != 0.0 || cuts.absEtaMax != inf)) {
-      throw std::invalid_argument{
-          "Explicit eta cuts are only valid for single eta bin"};
-    }
+    m_isUnbinned =
+        m_cfg.absEtaEdges == infVec;  // single bin, no eta edges given
   }
 
-  m_noEtaCuts = m_isUnbinned;
-  for (const auto& cuts : m_cfg.cutSets) {
-    if (cuts.etaMin != -inf || cuts.etaMax != inf || cuts.absEtaMin != 0.0 ||
-        cuts.absEtaMax != inf) {
-      m_noEtaCuts = false;
+  if (!m_isUnbinned) {
+    for (const auto& cuts : m_cfg.cutSets) {
+      if (cuts.etaMin != -inf || cuts.etaMax != inf || cuts.absEtaMin != 0.0 ||
+          cuts.absEtaMax != inf) {
+        throw std::invalid_argument{
+            "Explicit eta cuts are only valid for single eta bin"};
+      }
     }
   }
 }
@@ -474,7 +493,7 @@ inline TrackSelector::TrackSelector(
 inline TrackSelector::TrackSelector(const Config& config)
     : TrackSelector{EtaBinnedConfig{config}} {}
 
-template <typename track_proxy_t>
+template <TrackProxyConcept track_proxy_t>
 bool TrackSelector::MeasurementCounter::isValidTrack(
     const track_proxy_t& track) const {
   // No hit cuts, accept everything
diff --git a/Core/include/Acts/TrackFinding/detail/AmbiguityTrackClustering.hpp b/Core/include/Acts/TrackFinding/detail/AmbiguityTrackClustering.hpp
index 14a30bb2dd3..6bc565f80eb 100644
--- a/Core/include/Acts/TrackFinding/detail/AmbiguityTrackClustering.hpp
+++ b/Core/include/Acts/TrackFinding/detail/AmbiguityTrackClustering.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2023 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
diff --git a/Core/include/Acts/TrackFitting/BetheHeitlerApprox.hpp b/Core/include/Acts/TrackFitting/BetheHeitlerApprox.hpp
index b13f11c2d53..5d0c5601bea 100644
--- a/Core/include/Acts/TrackFitting/BetheHeitlerApprox.hpp
+++ b/Core/include/Acts/TrackFitting/BetheHeitlerApprox.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2021 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
@@ -18,6 +18,7 @@
 #include <cstddef>
 #include <fstream>
 #include <mutex>
+#include <numbers>
 #include <random>
 #include <stdexcept>
 #include <string>
@@ -86,7 +87,7 @@ struct BetheHeitlerApproxSingleCmp {
 
     ret[0].weight = 1.0;
 
-    const double c = x / std::log(2);
+    const double c = x / std::numbers::ln2;
     ret[0].mean = std::pow(2, -c);
     ret[0].var = std::pow(3, -c) - std::pow(4, -c);
 
@@ -125,6 +126,7 @@ class AtlasBetheHeitlerApprox {
   constexpr static double m_singleGaussianLimit = 0.002;
   double m_lowLimit = 0.10;
   double m_highLimit = 0.20;
+  bool m_clampToRange = false;
 
  public:
   /// Construct the Bethe-Heitler approximation description with two
@@ -138,16 +140,19 @@ class AtlasBetheHeitlerApprox {
   /// @param highTransform whether the high data need to be transformed
   /// @param lowLimit the upper limit for the low data
   /// @param highLimit the upper limit for the high data
+  /// @param clampToRange whether to clamp the input x/x0 to the allowed range
   constexpr AtlasBetheHeitlerApprox(const Data &lowData, const Data &highData,
                                     bool lowTransform, bool highTransform,
                                     double lowLimit = 0.1,
-                                    double highLimit = 0.2)
+                                    double highLimit = 0.2,
+                                    bool clampToRange = false)
       : m_lowData(lowData),
         m_highData(highData),
         m_lowTransform(lowTransform),
         m_highTransform(highTransform),
         m_lowLimit(lowLimit),
-        m_highLimit(highLimit) {}
+        m_highLimit(highLimit),
+        m_clampToRange(clampToRange) {}
 
   /// Returns the number of components the returned mixture will have
   constexpr auto numComponents() const { return NComponents; }
@@ -155,7 +160,13 @@ class AtlasBetheHeitlerApprox {
   /// Checks if an input is valid for the parameterization
   ///
   /// @param x pathlength in terms of the radiation length
-  constexpr bool validXOverX0(ActsScalar x) const { return x < m_highLimit; }
+  constexpr bool validXOverX0(ActsScalar x) const {
+    if (m_clampToRange) {
+      return true;
+    } else {
+      return x < m_highLimit;
+    }
+  }
 
   /// Generates the mixture from the polynomials and reweights them, so
   /// that the sum of all weights is 1
@@ -164,6 +175,11 @@ class AtlasBetheHeitlerApprox {
   auto mixture(ActsScalar x) const {
     using Array =
         boost::container::static_vector<detail::GaussianComponent, NComponents>;
+
+    if (m_clampToRange) {
+      x = std::clamp(x, 0.0, m_highLimit);
+    }
+
     // Build a polynom
     auto poly = [](ActsScalar xx,
                    const std::array<ActsScalar, PolyDegree + 1> &coeffs) {
@@ -238,9 +254,11 @@ class AtlasBetheHeitlerApprox {
   /// the parameterization for high x/x0
   /// @param lowLimit the upper limit for the low x/x0-data
   /// @param highLimit the upper limit for the high x/x0-data
+  /// @param clampToRange forwarded to constructor
   static auto loadFromFiles(const std::string &low_parameters_path,
                             const std::string &high_parameters_path,
-                            double lowLimit = 0.1, double highLimit = 0.2) {
+                            double lowLimit = 0.1, double highLimit = 0.2,
+                            bool clampToRange = false) {
     auto read_file = [](const std::string &filepath) {
       std::ifstream file(filepath);
 
@@ -284,7 +302,8 @@ class AtlasBetheHeitlerApprox {
     const auto [highData, highTransform] = read_file(high_parameters_path);
 
     return AtlasBetheHeitlerApprox(lowData, highData, lowTransform,
-                                   highTransform, lowLimit, highLimit);
+                                   highTransform, lowLimit, highLimit,
+                                   clampToRange);
   }
 };
 
@@ -292,6 +311,7 @@ class AtlasBetheHeitlerApprox {
 /// configuration, that are stored as static data in the source code.
 /// This may not be an optimal configuration, but should allow to run
 /// the GSF without the need to load files
-AtlasBetheHeitlerApprox<6, 5> makeDefaultBetheHeitlerApprox();
+AtlasBetheHeitlerApprox<6, 5> makeDefaultBetheHeitlerApprox(
+    bool clampToRange = false);
 
 }  // namespace Acts
diff --git a/Core/include/Acts/TrackFitting/GainMatrixSmoother.hpp b/Core/include/Acts/TrackFitting/GainMatrixSmoother.hpp
index 4847364b663..cf5b372f487 100644
--- a/Core/include/Acts/TrackFitting/GainMatrixSmoother.hpp
+++ b/Core/include/Acts/TrackFitting/GainMatrixSmoother.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2018-2024 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
diff --git a/Core/include/Acts/TrackFitting/GainMatrixUpdater.hpp b/Core/include/Acts/TrackFitting/GainMatrixUpdater.hpp
index b5a49a6295d..0ac45a79b1d 100644
--- a/Core/include/Acts/TrackFitting/GainMatrixUpdater.hpp
+++ b/Core/include/Acts/TrackFitting/GainMatrixUpdater.hpp
@@ -1,15 +1,16 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2016-2024 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
 #include "Acts/EventData/MeasurementHelpers.hpp"
 #include "Acts/EventData/MultiTrajectory.hpp"
+#include "Acts/EventData/Types.hpp"
 #include "Acts/Geometry/GeometryContext.hpp"
 #include "Acts/TrackFitting/KalmanFitterError.hpp"
 #include "Acts/Utilities/Logger.hpp"
@@ -28,8 +29,7 @@ class GainMatrixUpdater {
     // This is used to build a covariance matrix view in the .cpp file
     const double* calibrated;
     const double* calibratedCovariance;
-    TrackStateTraits<MultiTrajectoryTraits::MeasurementSizeMax,
-                     false>::Projector projector;
+    BoundSubspaceIndices projector;
 
     TrackStateTraits<MultiTrajectoryTraits::MeasurementSizeMax,
                      false>::Parameters predicted;
@@ -80,7 +80,7 @@ class GainMatrixUpdater {
             // shape later
             trackState.effectiveCalibrated().data(),
             trackState.effectiveCalibratedCovariance().data(),
-            trackState.projector(),
+            trackState.boundSubspaceIndices(),
             trackState.predicted(),
             trackState.predictedCovariance(),
             trackState.filtered(),
diff --git a/Core/include/Acts/TrackFitting/GaussianSumFitter.hpp b/Core/include/Acts/TrackFitting/GaussianSumFitter.hpp
index 0b1f9d5e78d..f6c990a696d 100644
--- a/Core/include/Acts/TrackFitting/GaussianSumFitter.hpp
+++ b/Core/include/Acts/TrackFitting/GaussianSumFitter.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2021 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
@@ -16,6 +16,7 @@
 #include "Acts/Surfaces/BoundaryTolerance.hpp"
 #include "Acts/TrackFitting/GsfOptions.hpp"
 #include "Acts/TrackFitting/detail/GsfActor.hpp"
+#include "Acts/Utilities/Helpers.hpp"
 #include "Acts/Utilities/Logger.hpp"
 #include "Acts/Utilities/TrackHelpers.hpp"
 
@@ -82,7 +83,7 @@ struct GaussianSumFitter {
 
     template <typename propagator_state_t, typename stepper_t,
               typename navigator_t>
-    bool operator()(propagator_state_t& state, const stepper_t& /*stepper*/,
+    bool checkAbort(propagator_state_t& state, const stepper_t& /*stepper*/,
                     const navigator_t& navigator,
                     const Logger& /*logger*/) const {
       return navigator.navigationBreak(state.navigation);
@@ -91,30 +92,27 @@ struct GaussianSumFitter {
 
   /// @brief The fit function for the Direct navigator
   template <typename source_link_it_t, typename start_parameters_t,
-            typename track_container_t, template <typename> class holder_t>
+            TrackContainerFrontend track_container_t>
   auto fit(source_link_it_t begin, source_link_it_t end,
            const start_parameters_t& sParameters,
            const GsfOptions<traj_t>& options,
            const std::vector<const Surface*>& sSequence,
-           TrackContainer<track_container_t, traj_t, holder_t>& trackContainer)
-      const {
+           track_container_t& trackContainer) const {
     // Check if we have the correct navigator
     static_assert(
         std::is_same_v<DirectNavigator, typename propagator_t::Navigator>);
 
     // Initialize the forward propagation with the DirectNavigator
     auto fwdPropInitializer = [&sSequence, this](const auto& opts) {
-      using Actors = ActionList<GsfActor>;
-      using Aborters = AbortList<NavigationBreakAborter>;
-      using PropagatorOptions =
-          typename propagator_t::template Options<Actors, Aborters>;
+      using Actors = ActorList<GsfActor, NavigationBreakAborter>;
+      using PropagatorOptions = typename propagator_t::template Options<Actors>;
 
       PropagatorOptions propOptions(opts.geoContext, opts.magFieldContext);
 
       propOptions.setPlainOptions(opts.propagatorPlainOptions);
 
       propOptions.navigation.surfaces = sSequence;
-      propOptions.actionList.template get<GsfActor>()
+      propOptions.actorList.template get<GsfActor>()
           .m_cfg.bethe_heitler_approx = &m_betheHeitlerApproximation;
 
       return propOptions;
@@ -122,21 +120,15 @@ struct GaussianSumFitter {
 
     // Initialize the backward propagation with the DirectNavigator
     auto bwdPropInitializer = [&sSequence, this](const auto& opts) {
-      using Actors = ActionList<GsfActor>;
-      using Aborters = AbortList<>;
-      using PropagatorOptions =
-          typename propagator_t::template Options<Actors, Aborters>;
-
-      std::vector<const Surface*> backwardSequence(
-          std::next(sSequence.rbegin()), sSequence.rend());
-      backwardSequence.push_back(opts.referenceSurface);
+      using Actors = ActorList<GsfActor>;
+      using PropagatorOptions = typename propagator_t::template Options<Actors>;
 
       PropagatorOptions propOptions(opts.geoContext, opts.magFieldContext);
 
       propOptions.setPlainOptions(opts.propagatorPlainOptions);
 
-      propOptions.navigation.surfaces = backwardSequence;
-      propOptions.actionList.template get<GsfActor>()
+      propOptions.navigation.surfaces = sSequence;
+      propOptions.actorList.template get<GsfActor>()
           .m_cfg.bethe_heitler_approx = &m_betheHeitlerApproximation;
 
       return propOptions;
@@ -148,27 +140,25 @@ struct GaussianSumFitter {
 
   /// @brief The fit function for the standard navigator
   template <typename source_link_it_t, typename start_parameters_t,
-            typename track_container_t, template <typename> class holder_t>
+            TrackContainerFrontend track_container_t>
   auto fit(source_link_it_t begin, source_link_it_t end,
            const start_parameters_t& sParameters,
            const GsfOptions<traj_t>& options,
-           TrackContainer<track_container_t, traj_t, holder_t>& trackContainer)
-      const {
+           track_container_t& trackContainer) const {
     // Check if we have the correct navigator
     static_assert(std::is_same_v<Navigator, typename propagator_t::Navigator>);
 
     // Initialize the forward propagation with the DirectNavigator
     auto fwdPropInitializer = [this](const auto& opts) {
-      using Actors = ActionList<GsfActor>;
-      using Aborters = AbortList<EndOfWorldReached, NavigationBreakAborter>;
-      using PropagatorOptions =
-          typename propagator_t::template Options<Actors, Aborters>;
+      using Actors =
+          ActorList<GsfActor, EndOfWorldReached, NavigationBreakAborter>;
+      using PropagatorOptions = typename propagator_t::template Options<Actors>;
 
       PropagatorOptions propOptions(opts.geoContext, opts.magFieldContext);
 
       propOptions.setPlainOptions(opts.propagatorPlainOptions);
 
-      propOptions.actionList.template get<GsfActor>()
+      propOptions.actorList.template get<GsfActor>()
           .m_cfg.bethe_heitler_approx = &m_betheHeitlerApproximation;
 
       return propOptions;
@@ -176,16 +166,14 @@ struct GaussianSumFitter {
 
     // Initialize the backward propagation with the DirectNavigator
     auto bwdPropInitializer = [this](const auto& opts) {
-      using Actors = ActionList<GsfActor>;
-      using Aborters = AbortList<EndOfWorldReached>;
-      using PropagatorOptions =
-          typename propagator_t::template Options<Actors, Aborters>;
+      using Actors = ActorList<GsfActor, EndOfWorldReached>;
+      using PropagatorOptions = typename propagator_t::template Options<Actors>;
 
       PropagatorOptions propOptions(opts.geoContext, opts.magFieldContext);
 
       propOptions.setPlainOptions(opts.propagatorPlainOptions);
 
-      propOptions.actionList.template get<GsfActor>()
+      propOptions.actorList.template get<GsfActor>()
           .m_cfg.bethe_heitler_approx = &m_betheHeitlerApproximation;
 
       return propOptions;
@@ -200,16 +188,13 @@ struct GaussianSumFitter {
   /// first measurementSurface
   template <typename source_link_it_t, typename start_parameters_t,
             typename fwd_prop_initializer_t, typename bwd_prop_initializer_t,
-            typename track_container_t, template <typename> class holder_t>
-  Acts::Result<
-      typename TrackContainer<track_container_t, traj_t, holder_t>::TrackProxy>
-  fit_impl(source_link_it_t begin, source_link_it_t end,
-           const start_parameters_t& sParameters,
-           const GsfOptions<traj_t>& options,
-           const fwd_prop_initializer_t& fwdPropInitializer,
-           const bwd_prop_initializer_t& bwdPropInitializer,
-           TrackContainer<track_container_t, traj_t, holder_t>& trackContainer)
-      const {
+            TrackContainerFrontend track_container_t>
+  Acts::Result<typename track_container_t::TrackProxy> fit_impl(
+      source_link_it_t begin, source_link_it_t end,
+      const start_parameters_t& sParameters, const GsfOptions<traj_t>& options,
+      const fwd_prop_initializer_t& fwdPropInitializer,
+      const bwd_prop_initializer_t& bwdPropInitializer,
+      track_container_t& trackContainer) const {
     // return or abort utility
     auto return_error_or_abort = [&](auto error) {
       if (options.abortOnError) {
@@ -266,7 +251,7 @@ struct GaussianSumFitter {
       auto fwdPropOptions = fwdPropInitializer(options);
 
       // Catch the actor and set the measurements
-      auto& actor = fwdPropOptions.actionList.template get<GsfActor>();
+      auto& actor = fwdPropOptions.actorList.template get<GsfActor>();
       actor.setOptions(options);
       actor.m_cfg.inputMeasurements = &inputMeasurements;
       actor.m_cfg.numberMeasurements = inputMeasurements.size();
@@ -337,7 +322,7 @@ struct GaussianSumFitter {
     auto bwdResult = [&]() {
       auto bwdPropOptions = bwdPropInitializer(options);
 
-      auto& actor = bwdPropOptions.actionList.template get<GsfActor>();
+      auto& actor = bwdPropOptions.actorList.template get<GsfActor>();
       actor.setOptions(options);
       actor.m_cfg.inputMeasurements = &inputMeasurements;
       actor.m_cfg.inReversePass = true;
@@ -437,8 +422,8 @@ struct GaussianSumFitter {
 
     for (auto state : fwdGsfResult.fittedStates->reverseTrackStateRange(
              fwdGsfResult.currentTip)) {
-      const bool found = std::find(foundBwd.begin(), foundBwd.end(),
-                                   &state.referenceSurface()) != foundBwd.end();
+      const bool found =
+          rangeContainsValue(foundBwd, &state.referenceSurface());
       if (!found && state.typeFlags().test(MeasurementFlag)) {
         state.typeFlags().set(OutlierFlag);
         state.typeFlags().reset(MeasurementFlag);
diff --git a/Core/include/Acts/TrackFitting/GlobalChiSquareFitter.hpp b/Core/include/Acts/TrackFitting/GlobalChiSquareFitter.hpp
index ccd05bfbc27..8442071a23f 100644
--- a/Core/include/Acts/TrackFitting/GlobalChiSquareFitter.hpp
+++ b/Core/include/Acts/TrackFitting/GlobalChiSquareFitter.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2023-2024 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
@@ -16,15 +16,17 @@
 #include "Acts/EventData/MultiTrajectory.hpp"
 #include "Acts/EventData/MultiTrajectoryHelpers.hpp"
 #include "Acts/EventData/SourceLink.hpp"
+#include "Acts/EventData/TrackContainerFrontendConcept.hpp"
 #include "Acts/EventData/TrackParameters.hpp"
+#include "Acts/EventData/TrackProxyConcept.hpp"
 #include "Acts/EventData/VectorMultiTrajectory.hpp"
 #include "Acts/EventData/VectorTrackContainer.hpp"
 #include "Acts/Geometry/GeometryContext.hpp"
 #include "Acts/Geometry/TrackingVolume.hpp"
 #include "Acts/MagneticField/MagneticFieldContext.hpp"
+#include "Acts/Material/Interactions.hpp"
 #include "Acts/Material/MaterialSlab.hpp"
-#include "Acts/Propagator/AbortList.hpp"
-#include "Acts/Propagator/ActionList.hpp"
+#include "Acts/Propagator/ActorList.hpp"
 #include "Acts/Propagator/ConstrainedStep.hpp"
 #include "Acts/Propagator/DirectNavigator.hpp"
 #include "Acts/Propagator/Navigator.hpp"
@@ -44,16 +46,28 @@
 #include <limits>
 #include <map>
 #include <memory>
+#include <type_traits>
+#include <unordered_map>
 
 namespace Acts::Experimental {
 
 namespace Gx2fConstants {
 constexpr std::string_view gx2fnUpdateColumn = "Gx2fnUpdateColumn";
 
-// Mask for the track states. We don't need Smoothed and Filtered
-constexpr TrackStatePropMask trackStateMask = TrackStatePropMask::Predicted |
+// Mask for the track states. We don't need Predicted and Filtered
+constexpr TrackStatePropMask trackStateMask = TrackStatePropMask::Smoothed |
                                               TrackStatePropMask::Jacobian |
                                               TrackStatePropMask::Calibrated;
+
+// A projector used for scattering. By using Jacobian * phiThetaProjector one
+// gets only the derivatives for the variables phi and theta.
+const Eigen::Matrix<double, eBoundSize, 2> phiThetaProjector = [] {
+  Eigen::Matrix<double, eBoundSize, 2> m =
+      Eigen::Matrix<double, eBoundSize, 2>::Zero();
+  m(eBoundPhi, 0) = 1.0;
+  m(eBoundTheta, 1) = 1.0;
+  return m;
+}();
 }  // namespace Gx2fConstants
 
 /// Extension struct which holds delegates to customise the GX2F behaviour
@@ -222,13 +236,133 @@ struct Gx2FitterResult {
 
   // Count how many surfaces have been hit
   std::size_t surfaceCount = 0;
+};
+
+/// @brief A container to store scattering properties for each material surface
+///
+/// This struct holds the scattering angles, the inverse covariance of the
+/// material, and a validity flag indicating whether the material is valid for
+/// the scattering process.
+struct ScatteringProperties {
+ public:
+  /// @brief Constructor to initialize scattering properties.
+  ///
+  /// @param scatteringAngles_ The vector of scattering angles.
+  /// @param invCovarianceMaterial_ The inverse covariance of the material.
+  /// @param materialIsValid_ A boolean flag indicating whether the material is valid.
+  ScatteringProperties(const BoundVector& scatteringAngles_,
+                       const ActsScalar invCovarianceMaterial_,
+                       const bool materialIsValid_)
+      : m_scatteringAngles(scatteringAngles_),
+        m_invCovarianceMaterial(invCovarianceMaterial_),
+        m_materialIsValid(materialIsValid_) {}
+
+  // Accessor for the scattering angles.
+  const BoundVector& scatteringAngles() const { return m_scatteringAngles; }
+
+  // Accessor for a modifiable reference to the scattering angles
+  BoundVector& scatteringAngles() { return m_scatteringAngles; }
+
+  // Accessor for the inverse covariance of the material.
+  ActsScalar invCovarianceMaterial() const { return m_invCovarianceMaterial; }
+
+  // Accessor for the material validity flag.
+  bool materialIsValid() const { return m_materialIsValid; }
+
+ private:
+  /// Vector of scattering angles. The vector is usually all zeros except for
+  /// eBoundPhi and eBoundTheta.
+  BoundVector m_scatteringAngles;
+
+  /// Inverse covariance of the material. Compute with e.g. the Highland
+  /// formula.
+  ActsScalar m_invCovarianceMaterial;
+
+  /// Flag indicating whether the material is valid. Commonly vacuum and zero
+  /// thickness material will be ignored.
+  bool m_materialIsValid;
+};
+
+/// @brief A container to manage all properties of a gx2f system
+///
+/// This struct manages the mathematical infrastructure for the gx2f. It
+/// initializes and maintains the extended aMatrix and extended bVector.
+struct Gx2fSystem {
+ public:
+  /// @brief Constructor to initialize matrices and vectors to zero based on specified dimensions.
+  ///
+  /// @param nDims Number of dimensions for the extended matrix and vector.
+  explicit Gx2fSystem(std::size_t nDims)
+      : m_nDims{nDims},
+        m_aMatrix{Eigen::MatrixXd::Zero(nDims, nDims)},
+        m_bVector{Eigen::VectorXd::Zero(nDims)} {}
+
+  // Accessor for nDims (const reference).
+  std::size_t nDims() const { return m_nDims; }
+
+  // Accessor for chi2
+  double chi2() const { return m_chi2; }
+
+  // Modifier for chi2
+  double& chi2() { return m_chi2; }
+
+  // Accessor for the matrix.
+  const Eigen::MatrixXd& aMatrix() const { return m_aMatrix; }
+
+  // Accessor for a modifiable reference to the matrix.
+  Eigen::MatrixXd& aMatrix() { return m_aMatrix; }
+
+  // Accessor for the vector.
+  const Eigen::VectorXd& bVector() const { return m_bVector; }
+
+  // Accessor for a modifiable reference to the vector.
+  Eigen::VectorXd& bVector() { return m_bVector; }
+
+  // Accessor for NDF
+  std::size_t ndf() const { return m_ndf; }
+
+  // Modifier for NDF
+  std::size_t& ndf() { return m_ndf; }
+
+  //  It automatically deduces if we want to fit e.g. q/p and adjusts itself
+  //  later. We have only 3 cases, because we always have l0, l1, phi, theta:
+  // - 4: no magnetic field -> q/p is empty
+  // - 5: no time measurement -> time is not fittable
+  // - 6: full fit
+  std::size_t findRequiredNdf() {
+    std::size_t ndfSystem = 0;
+    if (m_aMatrix(4, 4) == 0) {
+      ndfSystem = 4;
+    } else if (m_aMatrix(5, 5) == 0) {
+      ndfSystem = 5;
+    } else {
+      ndfSystem = 6;
+    }
+
+    return ndfSystem;
+  }
+
+  bool isWellDefined() { return m_ndf > findRequiredNdf(); }
+
+ private:
+  /// Number of dimensions of the (extended) system
+  std::size_t m_nDims;
 
-  // Monitor which volume we start in. We do not allow to switch the start of a
-  // following iteration in a different volume.
-  const TrackingVolume* startVolume = nullptr;
+  /// Sum of chi-squared values.
+  double m_chi2 = 0.;
+
+  /// Extended matrix for accumulation.
+  Eigen::MatrixXd m_aMatrix;
+
+  /// Extended vector for accumulation.
+  Eigen::VectorXd m_bVector;
+
+  /// Number of degrees of freedom of the system
+  std::size_t m_ndf = 0u;
 };
 
-/// addToGx2fSums Function
+/// @brief Process measurements and fill the aMatrix and bVector
+///
 /// The function processes each measurement for the GX2F Actor fitting process.
 /// It extracts the information from the track state and adds it to aMatrix,
 /// bVector, and chi2sum.
@@ -236,90 +370,356 @@ struct Gx2FitterResult {
 /// @tparam kMeasDim Number of dimensions of the measurement
 /// @tparam track_state_t The type of the track state
 ///
-/// @param aMatrix The aMatrix sums over the second derivatives
-/// @param bVector The bVector sums over the first derivatives
-/// @param chi2sum The total chi2 of the system
+/// @param extendedSystem All parameters of the current equation system
 /// @param jacobianFromStart The Jacobian matrix from start to the current state
 /// @param trackState The track state to analyse
 /// @param logger A logger instance
 template <std::size_t kMeasDim, typename track_state_t>
-void addToGx2fSums(BoundMatrix& aMatrix, BoundVector& bVector, double& chi2sum,
-                   const BoundMatrix& jacobianFromStart,
-                   const track_state_t& trackState, const Logger& logger) {
-  BoundVector predicted = trackState.predicted();
+void addMeasurementToGx2fSums(Gx2fSystem& extendedSystem,
+                              const std::vector<BoundMatrix>& jacobianFromStart,
+                              const track_state_t& trackState,
+                              const Logger& logger) {
+  // First we get back the covariance and try to invert it. If the inversion
+  // fails, we can already abort.
+  const ActsSquareMatrix<kMeasDim> covarianceMeasurement =
+      trackState.template calibratedCovariance<kMeasDim>();
+
+  const auto safeInvCovMeasurement = safeInverse(covarianceMeasurement);
+  if (!safeInvCovMeasurement) {
+    ACTS_WARNING("addMeasurementToGx2fSums: safeInvCovMeasurement failed.");
+    ACTS_VERBOSE("    covarianceMeasurement:\n" << covarianceMeasurement);
+    return;
+  }
 
-  ActsVector<kMeasDim> measurement = trackState.template calibrated<kMeasDim>();
+  // Create an extended Jacobian. This one contains only eBoundSize rows,
+  // because the rest is irrelevant. We fill it in the next steps.
+  // TODO make dimsExtendedParams template with unrolling
+  Eigen::MatrixXd extendedJacobian =
+      Eigen::MatrixXd::Zero(eBoundSize, extendedSystem.nDims());
 
-  ActsSquareMatrix<kMeasDim> covarianceMeasurement =
-      trackState.template calibratedCovariance<kMeasDim>();
+  // This part of the Jacobian comes from the material-less propagation
+  extendedJacobian.topLeftCorner<eBoundSize, eBoundSize>() =
+      jacobianFromStart[0];
 
-  ActsMatrix<kMeasDim, eBoundSize> projector =
+  // If we have material, loop here over all Jacobians. We add extra columns for
+  // their phi-theta projections. These parts account for the propagation of the
+  // scattering angles.
+  for (std::size_t matSurface = 1; matSurface < jacobianFromStart.size();
+       matSurface++) {
+    const BoundMatrix jac = jacobianFromStart[matSurface];
+
+    const ActsMatrix<eBoundSize, 2> jacPhiTheta =
+        jac * Gx2fConstants::phiThetaProjector;
+
+    // The position, where we need to insert the values in the extended Jacobian
+    const std::size_t deltaPosition = eBoundSize + 2 * (matSurface - 1);
+
+    extendedJacobian.block<eBoundSize, 2>(0, deltaPosition) = jacPhiTheta;
+  }
+
+  const BoundVector predicted = trackState.smoothed();
+
+  const ActsVector<kMeasDim> measurement =
+      trackState.template calibrated<kMeasDim>();
+
+  const ActsMatrix<kMeasDim, eBoundSize> projector =
       trackState.projector().template topLeftCorner<kMeasDim, eBoundSize>();
 
-  ActsMatrix<kMeasDim, eBoundSize> projJacobian = projector * jacobianFromStart;
-
-  ActsMatrix<kMeasDim, 1> projPredicted = projector * predicted;
-
-  ActsVector<kMeasDim> residual = measurement - projPredicted;
-
-  ACTS_VERBOSE("Contributions in addToGx2fSums:\n"
-               << "kMeasDim: " << kMeasDim << "\n"
-               << "predicted" << predicted.transpose() << "\n"
-               << "measurement: " << measurement.transpose() << "\n"
-               << "covarianceMeasurement:\n"
-               << covarianceMeasurement << "\n"
-               << "projector:\n"
-               << projector.eval() << "\n"
-               << "projJacobian:\n"
-               << projJacobian.eval() << "\n"
-               << "projPredicted: " << (projPredicted.transpose()).eval()
-               << "\n"
-               << "residual: " << (residual.transpose()).eval());
-
-  auto safeInvCovMeasurement = safeInverse(covarianceMeasurement);
-
-  if (safeInvCovMeasurement) {
-    chi2sum +=
-        (residual.transpose() * (*safeInvCovMeasurement) * residual)(0, 0);
-    aMatrix +=
-        (projJacobian.transpose() * (*safeInvCovMeasurement) * projJacobian)
-            .eval();
-    bVector +=
-        (residual.transpose() * (*safeInvCovMeasurement) * projJacobian).eval();
+  const Eigen::MatrixXd projJacobian = projector * extendedJacobian;
+
+  const ActsMatrix<kMeasDim, 1> projPredicted = projector * predicted;
+
+  const ActsVector<kMeasDim> residual = measurement - projPredicted;
+
+  // Finally contribute to chi2sum, aMatrix, and bVector
+  extendedSystem.chi2() +=
+      (residual.transpose() * (*safeInvCovMeasurement) * residual)(0, 0);
+
+  extendedSystem.aMatrix() +=
+      (projJacobian.transpose() * (*safeInvCovMeasurement) * projJacobian)
+          .eval();
+
+  extendedSystem.bVector() +=
+      (residual.transpose() * (*safeInvCovMeasurement) * projJacobian)
+          .eval()
+          .transpose();
+
+  ACTS_VERBOSE(
+      "Contributions in addMeasurementToGx2fSums:\n"
+      << "    kMeasDim:    " << kMeasDim << "\n"
+      << "    predicted:   " << predicted.transpose() << "\n"
+      << "    measurement: " << measurement.transpose() << "\n"
+      << "    covarianceMeasurement:\n"
+      << covarianceMeasurement << "\n"
+      << "    projector:\n"
+      << projector.eval() << "\n"
+      << "    projJacobian:\n"
+      << projJacobian.eval() << "\n"
+      << "    projPredicted: " << (projPredicted.transpose()).eval() << "\n"
+      << "    residual: " << (residual.transpose()).eval() << "\n"
+      << "    extendedJacobian:\n"
+      << extendedJacobian << "\n"
+      << "    aMatrix contribution:\n"
+      << (projJacobian.transpose() * (*safeInvCovMeasurement) * projJacobian)
+             .eval()
+      << "\n"
+      << "    bVector contribution: "
+      << (residual.transpose() * (*safeInvCovMeasurement) * projJacobian).eval()
+      << "\n"
+      << "    chi2sum contribution: "
+      << (residual.transpose() * (*safeInvCovMeasurement) * residual)(0, 0)
+      << "\n"
+      << "    safeInvCovMeasurement:\n"
+      << (*safeInvCovMeasurement));
+
+  return;
+}
 
-    ACTS_VERBOSE(
-        "aMatrixMeas:\n"
-        << (projJacobian.transpose() * (*safeInvCovMeasurement) * projJacobian)
-               .eval()
-        << "\n"
-        << "bVectorMeas: "
-        << (residual.transpose() * (*safeInvCovMeasurement) * projJacobian)
-               .eval()
-        << "\n"
-        << "chi2sumMeas: "
-        << (residual.transpose() * (*safeInvCovMeasurement) * residual)(0, 0)
-        << "\n"
-        << "safeInvCovMeasurement:\n"
-        << (*safeInvCovMeasurement));
-  } else {
-    ACTS_WARNING("safeInvCovMeasurement failed");
+/// @brief Process material and fill the aMatrix and bVector
+///
+/// The function processes each material for the GX2F Actor fitting process.
+/// It extracts the information from the track state and adds it to aMatrix,
+/// bVector, and chi2sum.
+///
+/// @tparam track_state_t The type of the track state
+///
+/// @param extendedSystem All parameters of the current equation system
+/// @param nMaterialsHandled How many materials we already handled. Used for the offset.
+/// @param scatteringMap The scattering map, containing all scattering angles and covariances
+/// @param trackState The track state to analyse
+/// @param logger A logger instance
+template <typename track_state_t>
+void addMaterialToGx2fSums(
+    Gx2fSystem& extendedSystem, const std::size_t nMaterialsHandled,
+    const std::unordered_map<GeometryIdentifier, ScatteringProperties>&
+        scatteringMap,
+    const track_state_t& trackState, const Logger& logger) {
+  // Get and store geoId for the current material surface
+  const GeometryIdentifier geoId = trackState.referenceSurface().geometryId();
+  const auto scatteringMapId = scatteringMap.find(geoId);
+  if (scatteringMapId == scatteringMap.end()) {
+    ACTS_ERROR("No scattering angles found for material surface " << geoId);
+    throw std::runtime_error(
+        "No scattering angles found for material surface.");
+  }
+
+  const ActsScalar sinThetaLoc = std::sin(trackState.smoothed()[eBoundTheta]);
+
+  // The position, where we need to insert the values in aMatrix and bVector
+  const std::size_t deltaPosition = eBoundSize + 2 * nMaterialsHandled;
+
+  const BoundVector& scatteringAngles =
+      scatteringMapId->second.scatteringAngles();
+
+  const ActsScalar invCov = scatteringMapId->second.invCovarianceMaterial();
+
+  // Phi contribution
+  extendedSystem.aMatrix()(deltaPosition, deltaPosition) +=
+      invCov * sinThetaLoc * sinThetaLoc;
+  extendedSystem.bVector()(deltaPosition, 0) -=
+      invCov * scatteringAngles[eBoundPhi] * sinThetaLoc;
+  extendedSystem.chi2() += invCov * scatteringAngles[eBoundPhi] * sinThetaLoc *
+                           scatteringAngles[eBoundPhi] * sinThetaLoc;
+
+  // Theta Contribution
+  extendedSystem.aMatrix()(deltaPosition + 1, deltaPosition + 1) += invCov;
+  extendedSystem.bVector()(deltaPosition + 1, 0) -=
+      invCov * scatteringAngles[eBoundTheta];
+  extendedSystem.chi2() +=
+      invCov * scatteringAngles[eBoundTheta] * scatteringAngles[eBoundTheta];
+
+  ACTS_VERBOSE(
+      "Contributions in addMaterialToGx2fSums:\n"
+      << "    invCov:        " << invCov << "\n"
+      << "    sinThetaLoc:   " << sinThetaLoc << "\n"
+      << "    deltaPosition: " << deltaPosition << "\n"
+      << "    Phi:\n"
+      << "        scattering angle:     " << scatteringAngles[eBoundPhi] << "\n"
+      << "        aMatrix contribution: " << invCov * sinThetaLoc * sinThetaLoc
+      << "\n"
+      << "        bVector contribution: "
+      << invCov * scatteringAngles[eBoundPhi] * sinThetaLoc << "\n"
+      << "        chi2sum contribution: "
+      << invCov * scatteringAngles[eBoundPhi] * sinThetaLoc *
+             scatteringAngles[eBoundPhi] * sinThetaLoc
+      << "\n"
+      << "    Theta:\n"
+      << "        scattering angle:     " << scatteringAngles[eBoundTheta]
+      << "\n"
+      << "        aMatrix contribution: " << invCov << "\n"
+      << "        bVector contribution: "
+      << invCov * scatteringAngles[eBoundTheta] << "\n"
+      << "        chi2sum contribution: "
+      << invCov * scatteringAngles[eBoundTheta] * scatteringAngles[eBoundTheta]
+      << "\n");
+
+  return;
+}
+
+/// @brief Fill the GX2F system with data from a track
+///
+/// This function processes a track proxy and updates the aMatrix, bVector, and
+/// chi2 values for the GX2F fitting system. It considers material only if
+/// multiple scattering is enabled.
+///
+/// @tparam track_proxy_t The type of the track proxy
+///
+/// @param track A constant track proxy to inspect
+/// @param extendedSystem All parameters of the current equation system
+/// @param multipleScattering Flag to consider multiple scattering in the calculation
+/// @param scatteringMap Map of geometry identifiers to scattering properties,
+///        containing scattering angles and validation status
+/// @param geoIdVector A vector to store geometry identifiers for tracking processed elements
+/// @param logger A logger instance
+template <TrackProxyConcept track_proxy_t>
+void fillGx2fSystem(
+    const track_proxy_t track, Gx2fSystem& extendedSystem,
+    const bool multipleScattering,
+    const std::unordered_map<GeometryIdentifier, ScatteringProperties>&
+        scatteringMap,
+    std::vector<GeometryIdentifier>& geoIdVector, const Logger& logger) {
+  std::vector<BoundMatrix> jacobianFromStart;
+  jacobianFromStart.emplace_back(BoundMatrix::Identity());
+
+  for (const auto& trackState : track.trackStates()) {
+    // Get and store geoId for the current surface
+    const GeometryIdentifier geoId = trackState.referenceSurface().geometryId();
+    ACTS_DEBUG("Start to investigate trackState on surface " << geoId);
+    const auto typeFlags = trackState.typeFlags();
+    const bool stateHasMeasurement =
+        typeFlags.test(TrackStateFlag::MeasurementFlag);
+    const bool stateHasMaterial = typeFlags.test(TrackStateFlag::MaterialFlag);
+
+    // First we figure out, if we would need to look into material
+    // surfaces at all. Later, we also check, if the material slab is
+    // valid, otherwise we modify this flag to ignore the material
+    // completely.
+    bool doMaterial = multipleScattering && stateHasMaterial;
+    if (doMaterial) {
+      const auto scatteringMapId = scatteringMap.find(geoId);
+      assert(scatteringMapId != scatteringMap.end() &&
+             "No scattering angles found for material surface.");
+      doMaterial = doMaterial && scatteringMapId->second.materialIsValid();
+    }
+
+    // We only consider states with a measurement (and/or material)
+    if (!stateHasMeasurement && !doMaterial) {
+      ACTS_DEBUG("    Skip state.");
+      continue;
+    }
+
+    // update all Jacobians from start
+    for (auto& jac : jacobianFromStart) {
+      jac = trackState.jacobian() * jac;
+    }
+
+    // Handle measurement
+    if (stateHasMeasurement) {
+      ACTS_DEBUG("    Handle measurement.");
+
+      const auto measDim = trackState.calibratedSize();
+
+      if (measDim < 1 || 6 < measDim) {
+        ACTS_ERROR("Can not process state with measurement with "
+                   << measDim << " dimensions.");
+        throw std::domain_error(
+            "Found measurement with less than 1 or more than 6 dimension(s).");
+      }
+
+      extendedSystem.ndf() += measDim;
+
+      visit_measurement(measDim, [&](auto N) {
+        addMeasurementToGx2fSums<N>(extendedSystem, jacobianFromStart,
+                                    trackState, logger);
+      });
+    }
+
+    // Handle material
+    if (doMaterial) {
+      ACTS_DEBUG("    Handle material");
+      // Add for this material a new Jacobian, starting from this surface.
+      jacobianFromStart.emplace_back(BoundMatrix::Identity());
+
+      // Add the material contribution to the system
+      addMaterialToGx2fSums(extendedSystem, geoIdVector.size(), scatteringMap,
+                            trackState, logger);
+
+      geoIdVector.emplace_back(geoId);
+    }
+  }
+}
+
+/// @brief Count the valid material states in a track for scattering calculations.
+///
+/// This function counts the valid material surfaces encountered in a track
+/// by examining each track state. The count is based on the presence of
+/// material flags and the availability of scattering information for each
+/// surface.
+///
+/// @tparam track_proxy_t The type of the track proxy
+///
+/// @param track A constant track proxy to inspect
+/// @param scatteringMap Map of geometry identifiers to scattering properties,
+///        containing scattering angles and validation status
+/// @param logger A logger instance
+template <TrackProxyConcept track_proxy_t>
+std::size_t countMaterialStates(
+    const track_proxy_t track,
+    const std::unordered_map<GeometryIdentifier, ScatteringProperties>&
+        scatteringMap,
+    const Logger& logger) {
+  std::size_t nMaterialSurfaces = 0;
+  ACTS_DEBUG("Count the valid material surfaces.");
+  for (const auto& trackState : track.trackStates()) {
+    const auto typeFlags = trackState.typeFlags();
+    const bool stateHasMaterial = typeFlags.test(TrackStateFlag::MaterialFlag);
+
+    if (!stateHasMaterial) {
+      continue;
+    }
+
+    // Get and store geoId for the current material surface
+    const GeometryIdentifier geoId = trackState.referenceSurface().geometryId();
+
+    const auto scatteringMapId = scatteringMap.find(geoId);
+    assert(scatteringMapId != scatteringMap.end() &&
+           "No scattering angles found for material surface.");
+    if (!scatteringMapId->second.materialIsValid()) {
+      continue;
+    }
+
+    nMaterialSurfaces++;
   }
+
+  return nMaterialSurfaces;
 }
 
-/// calculateDeltaParams Function
-/// This function calculates the delta parameters for a given aMatrix and
-/// bVector, depending on the number of degrees of freedom of the system, by
-/// solving the equation
-///  [a] * delta = b
+/// @brief Update parameters (and scattering angles if applicable)
+///
+/// @param params Parameters to be updated
+/// @param deltaParamsExtended Delta parameters for bound parameter and scattering angles
+/// @param nMaterialSurfaces Number of material surfaces in the track
+/// @param scatteringMap Map of geometry identifiers to scattering properties,
+///        containing all scattering angles and covariances
+/// @param geoIdVector Vector of geometry identifiers corresponding to material surfaces
+void updateGx2fParams(
+    BoundTrackParameters& params, const Eigen::VectorXd& deltaParamsExtended,
+    const std::size_t nMaterialSurfaces,
+    std::unordered_map<GeometryIdentifier, ScatteringProperties>& scatteringMap,
+    const std::vector<GeometryIdentifier>& geoIdVector);
+
+/// @brief Calculate and update the covariance of the fitted parameters
 ///
-/// @param aMatrix The matrix containing the coefficients of the linear system.
-/// @param bVector The vector containing the right-hand side values of the linear system.
-/// @param ndfSystem The number of degrees of freedom, determining the size of the submatrix and subvector to be solved.
+/// This function calculates the covariance of the fitted parameters using
+/// cov = inv([a])
+/// It then updates the first square block of size ndfSystem. This ensures,
+/// that we only update the covariance for fitted parameters. (In case of
+/// no qop/time fit)
 ///
-/// @return deltaParams The calculated delta parameters.
-BoundVector calculateDeltaParams(const BoundMatrix& aMatrix,
-                                 const BoundVector& bVector,
-                                 const std::size_t ndfSystem);
+/// @param fullCovariancePredicted The covariance matrix to update
+/// @param extendedSystem All parameters of the current equation system
+void updateGx2fCovarianceParams(BoundMatrix& fullCovariancePredicted,
+                                Gx2fSystem& extendedSystem);
 
 /// Global Chi Square fitter (GX2F) implementation.
 ///
@@ -333,7 +733,7 @@ class Gx2Fitter {
 
   /// The navigator has DirectNavigator type or not
   static constexpr bool isDirectNavigator =
-      std::is_same<Gx2fNavigator, DirectNavigator>::value;
+      std::is_same_v<Gx2fNavigator, DirectNavigator>;
 
  public:
   Gx2Fitter(propagator_t pPropagator,
@@ -361,8 +761,8 @@ class Gx2Fitter {
   /// @tparam calibrator_t The type of calibrator
   /// @tparam outlier_finder_t Type of the outlier finder class
   ///
-  /// The GX2FnActor does not rely on the measurements to be
-  /// sorted along the track. /// TODO is this true?
+  /// The GX2F Actor does not rely on the measurements to be sorted along the
+  /// track.
   template <typename parameters_t>
   class Actor {
    public:
@@ -376,7 +776,7 @@ class Gx2Fitter {
     const std::map<GeometryIdentifier, SourceLink>* inputMeasurements = nullptr;
 
     /// Whether to consider multiple scattering.
-    bool multipleScattering = false;  /// TODO implement later
+    bool multipleScattering = false;
 
     /// Whether to consider energy loss.
     bool energyLoss = false;  /// TODO implement later
@@ -402,9 +802,13 @@ class Gx2Fitter {
     /// Calibration context for the fit
     const CalibrationContext* calibrationContext{nullptr};
 
-    /// Monitor which volume we start in. We do not allow to switch the start of
-    /// a following iteration in a different volume.
-    const TrackingVolume* startVolume = nullptr;
+    /// The particle hypothesis is needed for estimating scattering angles
+    const parameters_t* parametersWithHypothesis = nullptr;
+
+    /// The scatteringMap stores for each visited surface their scattering
+    /// properties
+    std::unordered_map<GeometryIdentifier, ScatteringProperties>*
+        scatteringMap = nullptr;
 
     /// @brief Gx2f actor operation
     ///
@@ -418,17 +822,17 @@ class Gx2Fitter {
     /// @param result is the mutable result state object
     template <typename propagator_state_t, typename stepper_t,
               typename navigator_t>
-    void operator()(propagator_state_t& state, const stepper_t& stepper,
-                    const navigator_t& navigator, result_type& result,
-                    const Logger& /*logger*/) const {
+    void act(propagator_state_t& state, const stepper_t& stepper,
+             const navigator_t& navigator, result_type& result,
+             const Logger& /*logger*/) const {
       assert(result.fittedStates && "No MultiTrajectory set");
 
       // Check if we can stop to propagate
       if (result.measurementStates == inputMeasurements->size()) {
-        ACTS_INFO("Actor: finish: All measurements have been found.");
+        ACTS_DEBUG("Actor: finish: All measurements have been found.");
         result.finished = true;
       } else if (state.navigation.navigationBreak) {
-        ACTS_INFO("Actor: finish: navigationBreak.");
+        ACTS_DEBUG("Actor: finish: navigationBreak.");
         result.finished = true;
       }
 
@@ -442,212 +846,342 @@ class Gx2Fitter {
         return;
       }
 
-      if (startVolume != nullptr &&
-          startVolume != state.navigation.startVolume) {
-        ACTS_INFO("The update pushed us to a new volume from '"
-                  << startVolume->volumeName() << "' to '"
-                  << state.navigation.startVolume->volumeName()
-                  << "'. Starting to abort.");
-        result.result = Result<void>(
-            Experimental::GlobalChiSquareFitterError::UpdatePushedToNewVolume);
-
+      // We are only interested in surfaces. If we are not on a surface, we
+      // continue the navigation
+      auto surface = navigator.currentSurface(state.navigation);
+      if (surface == nullptr) {
         return;
       }
-      result.startVolume = state.navigation.startVolume;
 
-      // Update:
-      // - Waiting for a current surface
-      auto surface = navigator.currentSurface(state.navigation);
-      if (surface != nullptr) {
-        ++result.surfaceCount;
-        const GeometryIdentifier geoId = surface->geometryId();
-        ACTS_DEBUG("Surface " << geoId << " detected.");
-
-        // Found material
-        if (surface->surfaceMaterial() != nullptr) {
-          ACTS_DEBUG("    The surface contains material.");
+      ++result.surfaceCount;
+      const GeometryIdentifier geoId = surface->geometryId();
+      ACTS_DEBUG("Surface " << geoId << " detected.");
+
+      const bool surfaceIsSensitive =
+          (surface->associatedDetectorElement() != nullptr);
+      const bool surfaceHasMaterial = (surface->surfaceMaterial() != nullptr);
+      // First we figure out, if we would need to look into material surfaces at
+      // all. Later, we also check, if the material slab is valid, otherwise we
+      // modify this flag to ignore the material completely.
+      bool doMaterial = multipleScattering && surfaceHasMaterial;
+
+      // Found material - add a scatteringAngles entry if not done yet.
+      // Handling will happen later
+      if (doMaterial) {
+        ACTS_DEBUG("    The surface contains material, ...");
+
+        auto scatteringMapId = scatteringMap->find(geoId);
+        if (scatteringMapId == scatteringMap->end()) {
+          ACTS_DEBUG("    ... create entry in scattering map.");
+
+          detail::PointwiseMaterialInteraction interaction(surface, state,
+                                                           stepper);
+          // We need to evaluate the material to create the correct slab
+          const bool slabIsValid = interaction.evaluateMaterialSlab(
+              state, navigator, MaterialUpdateStage::FullUpdate);
+          double invSigma2 = 0.;
+          if (slabIsValid) {
+            const auto& particle =
+                parametersWithHypothesis->particleHypothesis();
+
+            const double sigma =
+                static_cast<double>(Acts::computeMultipleScatteringTheta0(
+                    interaction.slab, particle.absolutePdg(), particle.mass(),
+                    static_cast<float>(
+                        parametersWithHypothesis->parameters()[eBoundQOverP]),
+                    particle.absoluteCharge()));
+            ACTS_VERBOSE(
+                "        The Highland formula gives sigma = " << sigma);
+            invSigma2 = 1. / std::pow(sigma, 2);
+          } else {
+            ACTS_VERBOSE("        Material slab is not valid.");
+          }
+
+          scatteringMap->emplace(
+              geoId, ScatteringProperties{BoundVector::Zero(), invSigma2,
+                                          slabIsValid});
+          scatteringMapId = scatteringMap->find(geoId);
+        } else {
+          ACTS_DEBUG("    ... found entry in scattering map.");
         }
 
-        // Check if we have a measurement surface
-        if (auto sourcelink_it = inputMeasurements->find(geoId);
-            sourcelink_it != inputMeasurements->end()) {
-          ACTS_DEBUG("    The surface contains a measurement.");
-
-          // Transport the covariance to the surface
-          stepper.transportCovarianceToBound(state.stepping, *surface,
-                                             freeToBoundCorrection);
-
-          // TODO generalize the update of the currentTrackIndex
-          auto& fittedStates = *result.fittedStates;
-
-          // Add a <trackStateMask> TrackState entry multi trajectory. This
-          // allocates storage for all components, which we will set later.
-          typename traj_t::TrackStateProxy trackStateProxy =
-              fittedStates.makeTrackState(Gx2fConstants::trackStateMask,
-                                          result.lastTrackIndex);
-          const std::size_t currentTrackIndex = trackStateProxy.index();
-
-          // Set the trackStateProxy components with the state from the ongoing
-          // propagation
-          {
-            trackStateProxy.setReferenceSurface(surface->getSharedPtr());
-            // Bind the transported state to the current surface
-            auto res = stepper.boundState(state.stepping, *surface, false,
-                                          freeToBoundCorrection);
-            if (!res.ok()) {
-              result.result = res.error();
-              return;
-            }
-            const auto& [boundParams, jacobian, pathLength] = *res;
-
-            // Fill the track state
-            trackStateProxy.predicted() = boundParams.parameters();
-            trackStateProxy.predictedCovariance() = state.stepping.cov;
-
-            trackStateProxy.jacobian() = jacobian;
-            trackStateProxy.pathLength() = pathLength;
+        doMaterial = doMaterial && scatteringMapId->second.materialIsValid();
+      }
+
+      // Here we handle all measurements
+      if (auto sourceLinkIt = inputMeasurements->find(geoId);
+          sourceLinkIt != inputMeasurements->end()) {
+        ACTS_DEBUG("    The surface contains a measurement.");
+
+        // Transport the covariance to the surface
+        stepper.transportCovarianceToBound(state.stepping, *surface,
+                                           freeToBoundCorrection);
+
+        // TODO generalize the update of the currentTrackIndex
+        auto& fittedStates = *result.fittedStates;
+
+        // Add a <trackStateMask> TrackState entry multi trajectory. This
+        // allocates storage for all components, which we will set later.
+        typename traj_t::TrackStateProxy trackStateProxy =
+            fittedStates.makeTrackState(Gx2fConstants::trackStateMask,
+                                        result.lastTrackIndex);
+        const std::size_t currentTrackIndex = trackStateProxy.index();
+
+        // Set the trackStateProxy components with the state from the ongoing
+        // propagation
+        {
+          trackStateProxy.setReferenceSurface(surface->getSharedPtr());
+          // Bind the transported state to the current surface
+          auto res = stepper.boundState(state.stepping, *surface, false,
+                                        freeToBoundCorrection);
+          if (!res.ok()) {
+            result.result = res.error();
+            return;
+          }
+          // Not const since, we might need to update with scattering angles
+          auto& [boundParams, jacobian, pathLength] = *res;
+
+          // For material surfaces, we also update the angles with the
+          // available scattering information
+          if (doMaterial) {
+            ACTS_DEBUG("    Update parameters with scattering angles.");
+            const auto scatteringMapId = scatteringMap->find(geoId);
+            ACTS_VERBOSE(
+                "        scatteringAngles: "
+                << scatteringMapId->second.scatteringAngles().transpose());
+            ACTS_VERBOSE("        boundParams before the update: "
+                         << boundParams.parameters().transpose());
+            boundParams.parameters() +=
+                scatteringMapId->second.scatteringAngles();
+            ACTS_VERBOSE("        boundParams after the update: "
+                         << boundParams.parameters().transpose());
           }
 
-          // We have predicted parameters, so calibrate the uncalibrated input
-          // measurement
-          extensions.calibrator(state.geoContext, *calibrationContext,
-                                sourcelink_it->second, trackStateProxy);
+          // Fill the track state
+          trackStateProxy.smoothed() = boundParams.parameters();
+          trackStateProxy.smoothedCovariance() = state.stepping.cov;
 
-          // Get and set the type flags
-          auto typeFlags = trackStateProxy.typeFlags();
-          typeFlags.set(TrackStateFlag::ParameterFlag);
-          if (surface->surfaceMaterial() != nullptr) {
-            typeFlags.set(TrackStateFlag::MaterialFlag);
-          }
+          trackStateProxy.jacobian() = jacobian;
+          trackStateProxy.pathLength() = pathLength;
 
-          // Set the measurement type flag
-          typeFlags.set(TrackStateFlag::MeasurementFlag);
-          // We count the processed measurement
-          ++result.processedMeasurements;
-
-          result.lastMeasurementIndex = currentTrackIndex;
-          result.lastTrackIndex = currentTrackIndex;
-
-          // TODO check for outlier first
-          // We count the state with measurement
-          ++result.measurementStates;
-
-          // We count the processed state
-          ++result.processedStates;
-
-          // Update the number of holes count only when encountering a
-          // measurement
-          result.measurementHoles = result.missedActiveSurfaces.size();
-        } else if (surface->associatedDetectorElement() != nullptr ||
-                   surface->surfaceMaterial() != nullptr) {
-          // Here we handle material and holes
-          // TODO add material handling
-          ACTS_VERBOSE("Non-Measurement surface " << surface->geometryId()
-                                                  << " detected.");
-
-          // We only create track states here if there is already a measurement
-          // detected (no holes before the first measurement)
-          if (result.measurementStates > 0) {
-            ACTS_DEBUG("    Handle hole.");
-
-            auto& fittedStates = *result.fittedStates;
-
-            // Add a <trackStateMask> TrackState entry multi trajectory. This
-            // allocates storage for all components, which we will set later.
-            typename traj_t::TrackStateProxy trackStateProxy =
-                fittedStates.makeTrackState(Gx2fConstants::trackStateMask,
-                                            result.lastTrackIndex);
-            const std::size_t currentTrackIndex = trackStateProxy.index();
-
-            {
-              // Set the trackStateProxy components with the state from the
-              // ongoing propagation
-              {
-                trackStateProxy.setReferenceSurface(surface->getSharedPtr());
-                // Bind the transported state to the current surface
-                auto res = stepper.boundState(state.stepping, *surface, false,
-                                              freeToBoundCorrection);
-                if (!res.ok()) {
-                  result.result = res.error();
-                  return;
-                }
-                const auto& [boundParams, jacobian, pathLength] = *res;
-
-                // Fill the track state
-                trackStateProxy.predicted() = boundParams.parameters();
-                trackStateProxy.predictedCovariance() = state.stepping.cov;
-
-                trackStateProxy.jacobian() = jacobian;
-                trackStateProxy.pathLength() = pathLength;
-              }
-
-              // Get and set the type flags
-              auto typeFlags = trackStateProxy.typeFlags();
-              typeFlags.set(TrackStateFlag::ParameterFlag);
-              if (surface->surfaceMaterial() != nullptr) {
-                typeFlags.set(TrackStateFlag::MaterialFlag);
-              }
-
-              // Set hole only, if we are on a sensitive surface
-              if (surface->associatedDetectorElement() != nullptr) {
-                ACTS_VERBOSE("Detected hole on " << surface->geometryId());
-                // If the surface is sensitive, set the hole type flag
-                typeFlags.set(TrackStateFlag::HoleFlag);
-              } else {
-                ACTS_VERBOSE("Detected in-sensitive surface "
-                             << surface->geometryId());
-              }
-            }
-
-            result.lastTrackIndex = currentTrackIndex;
-
-            if (trackStateProxy.typeFlags().test(TrackStateFlag::HoleFlag)) {
-              // Count the missed surface
-              result.missedActiveSurfaces.push_back(surface);
-            }
-
-            ++result.processedStates;
-          } else {
-            ACTS_DEBUG("    Ignoring hole, because no preceding measurements.");
+          if (doMaterial) {
+            stepper.update(state.stepping,
+                           transformBoundToFreeParameters(
+                               trackStateProxy.referenceSurface(),
+                               state.geoContext, trackStateProxy.smoothed()),
+                           trackStateProxy.smoothed(),
+                           trackStateProxy.smoothedCovariance(), *surface);
           }
+        }
 
-          if (surface->surfaceMaterial() != nullptr) {
-            // TODO write similar to KF?
-            // Update state and stepper with material effects
-            // materialInteractor(surface, state, stepper, navigator,
-            // MaterialUpdateStage::FullUpdate);
-          }
-        } else {
-          ACTS_INFO("Surface " << geoId
-                               << " has no measurement/material/hole.");
+        // We have smoothed parameters, so calibrate the uncalibrated input
+        // measurement
+        extensions.calibrator(state.geoContext, *calibrationContext,
+                              sourceLinkIt->second, trackStateProxy);
+
+        // Get and set the type flags
+        auto typeFlags = trackStateProxy.typeFlags();
+        typeFlags.set(TrackStateFlag::ParameterFlag);
+        if (surfaceHasMaterial) {
+          typeFlags.set(TrackStateFlag::MaterialFlag);
         }
+
+        // Set the measurement type flag
+        typeFlags.set(TrackStateFlag::MeasurementFlag);
+        // We count the processed measurement
+        ++result.processedMeasurements;
+
+        result.lastMeasurementIndex = currentTrackIndex;
+        result.lastTrackIndex = currentTrackIndex;
+
+        // TODO check for outlier first
+        // We count the state with measurement
+        ++result.measurementStates;
+
+        // We count the processed state
+        ++result.processedStates;
+
+        // Update the number of holes count only when encountering a
+        // measurement
+        result.measurementHoles = result.missedActiveSurfaces.size();
+
+        return;
       }
-      ACTS_VERBOSE("result.processedMeasurements: "
-                   << result.processedMeasurements << "\n"
-                   << "inputMeasurements.size(): "
-                   << inputMeasurements->size());
-      if (result.processedMeasurements >= inputMeasurements->size()) {
-        ACTS_INFO("Actor: finish: all measurements found.");
-        result.finished = true;
+
+      if (doMaterial) {
+        // Here we handle material for multipleScattering. If holes exist, we
+        // also handle them already. We create a full trackstate (unlike for
+        // simple holes), since we need to evaluate the material later
+        ACTS_DEBUG(
+            "    The surface contains no measurement, but material and maybe "
+            "a hole.");
+
+        // Transport the covariance to the surface
+        stepper.transportCovarianceToBound(state.stepping, *surface,
+                                           freeToBoundCorrection);
+
+        // TODO generalize the update of the currentTrackIndex
+        auto& fittedStates = *result.fittedStates;
+
+        // Add a <trackStateMask> TrackState entry multi trajectory. This
+        // allocates storage for all components, which we will set later.
+        typename traj_t::TrackStateProxy trackStateProxy =
+            fittedStates.makeTrackState(Gx2fConstants::trackStateMask,
+                                        result.lastTrackIndex);
+        const std::size_t currentTrackIndex = trackStateProxy.index();
+
+        // Set the trackStateProxy components with the state from the ongoing
+        // propagation
+        {
+          trackStateProxy.setReferenceSurface(surface->getSharedPtr());
+          // Bind the transported state to the current surface
+          auto res = stepper.boundState(state.stepping, *surface, false,
+                                        freeToBoundCorrection);
+          if (!res.ok()) {
+            result.result = res.error();
+            return;
+          }
+          // Not const since, we might need to update with scattering angles
+          auto& [boundParams, jacobian, pathLength] = *res;
+
+          // For material surfaces, we also update the angles with the
+          // available scattering information
+          // We can skip the if here, since we already know, that we do
+          // multipleScattering and have material
+          ACTS_DEBUG("    Update parameters with scattering angles.");
+          const auto scatteringMapId = scatteringMap->find(geoId);
+          ACTS_VERBOSE(
+              "        scatteringAngles: "
+              << scatteringMapId->second.scatteringAngles().transpose());
+          ACTS_VERBOSE("        boundParams before the update: "
+                       << boundParams.parameters().transpose());
+          boundParams.parameters() +=
+              scatteringMapId->second.scatteringAngles();
+          ACTS_VERBOSE("        boundParams after the update: "
+                       << boundParams.parameters().transpose());
+
+          // Fill the track state
+          trackStateProxy.smoothed() = boundParams.parameters();
+          trackStateProxy.smoothedCovariance() = state.stepping.cov;
+
+          trackStateProxy.jacobian() = jacobian;
+          trackStateProxy.pathLength() = pathLength;
+
+          stepper.update(state.stepping,
+                         transformBoundToFreeParameters(
+                             trackStateProxy.referenceSurface(),
+                             state.geoContext, trackStateProxy.smoothed()),
+                         trackStateProxy.smoothed(),
+                         trackStateProxy.smoothedCovariance(), *surface);
+        }
+
+        // Get and set the type flags
+        auto typeFlags = trackStateProxy.typeFlags();
+        typeFlags.set(TrackStateFlag::ParameterFlag);
+        typeFlags.set(TrackStateFlag::MaterialFlag);
+
+        // Set hole only, if we are on a sensitive surface and had
+        // measurements before (no holes before the first measurement)
+        const bool precedingMeasurementExists = (result.measurementStates > 0);
+        if (surfaceIsSensitive && precedingMeasurementExists) {
+          ACTS_DEBUG("    Surface is also sensitive. Marked as hole.");
+          typeFlags.set(TrackStateFlag::HoleFlag);
+
+          // Count the missed surface
+          result.missedActiveSurfaces.push_back(surface);
+        }
+
+        result.lastTrackIndex = currentTrackIndex;
+
+        ++result.processedStates;
+
+        return;
       }
 
-      if (result.surfaceCount > 900) {
-        ACTS_INFO("Actor: finish due to limit. Result might be garbage.");
-        result.finished = true;
+      if (surfaceIsSensitive || surfaceHasMaterial) {
+        // Here we handle holes. If material hasn't been handled before
+        // (because multipleScattering is turned off), we will also handle it
+        // here
+        if (multipleScattering) {
+          ACTS_DEBUG(
+              "    The surface contains no measurement, but maybe a hole.");
+        } else {
+          ACTS_DEBUG(
+              "    The surface contains no measurement, but maybe a hole "
+              "and/or material.");
+        }
+
+        // We only create track states here if there is already a measurement
+        // detected (no holes before the first measurement) or if we encounter
+        // material
+        const bool precedingMeasurementExists = (result.measurementStates > 0);
+        if (!precedingMeasurementExists && !surfaceHasMaterial) {
+          ACTS_DEBUG(
+              "    Ignoring hole, because there are no preceding "
+              "measurements.");
+          return;
+        }
+
+        auto& fittedStates = *result.fittedStates;
+
+        // Add a <trackStateMask> TrackState entry multi trajectory. This
+        // allocates storage for all components, which we will set later.
+        typename traj_t::TrackStateProxy trackStateProxy =
+            fittedStates.makeTrackState(Gx2fConstants::trackStateMask,
+                                        result.lastTrackIndex);
+        const std::size_t currentTrackIndex = trackStateProxy.index();
+
+        // Set the trackStateProxy components with the state from the
+        // ongoing propagation
+        {
+          trackStateProxy.setReferenceSurface(surface->getSharedPtr());
+          // Bind the transported state to the current surface
+          auto res = stepper.boundState(state.stepping, *surface, false,
+                                        freeToBoundCorrection);
+          if (!res.ok()) {
+            result.result = res.error();
+            return;
+          }
+          const auto& [boundParams, jacobian, pathLength] = *res;
+
+          // Fill the track state
+          trackStateProxy.smoothed() = boundParams.parameters();
+          trackStateProxy.smoothedCovariance() = state.stepping.cov;
+
+          trackStateProxy.jacobian() = jacobian;
+          trackStateProxy.pathLength() = pathLength;
+        }
+
+        // Get and set the type flags
+        auto typeFlags = trackStateProxy.typeFlags();
+        typeFlags.set(TrackStateFlag::ParameterFlag);
+        if (surfaceHasMaterial) {
+          ACTS_DEBUG("    It is material.");
+          typeFlags.set(TrackStateFlag::MaterialFlag);
+        }
+
+        // Set hole only, if we are on a sensitive surface
+        if (surfaceIsSensitive && precedingMeasurementExists) {
+          ACTS_DEBUG("    It is a hole.");
+          typeFlags.set(TrackStateFlag::HoleFlag);
+          // Count the missed surface
+          result.missedActiveSurfaces.push_back(surface);
+        }
+
+        result.lastTrackIndex = currentTrackIndex;
+
+        ++result.processedStates;
+
+        return;
       }
-    }
-  };
 
-  /// Aborter can stay like this probably
-  template <typename parameters_t>
-  class Aborter {
-   public:
-    /// Broadcast the result_type
-    using action_type = Actor<parameters_t>;
+      ACTS_DEBUG("    The surface contains no measurement/material/hole.");
+      return;
+    }
 
     template <typename propagator_state_t, typename stepper_t,
               typename navigator_t, typename result_t>
-    bool operator()(propagator_state_t& /*state*/, const stepper_t& /*stepper*/,
+    bool checkAbort(propagator_state_t& /*state*/, const stepper_t& /*stepper*/,
                     const navigator_t& /*navigator*/, const result_t& result,
                     const Logger& /*logger*/) const {
       if (!result.result.ok() || result.finished) {
@@ -678,17 +1212,16 @@ class Gx2Fitter {
   /// @return the output as an output track
   template <typename source_link_iterator_t, typename start_parameters_t,
             typename parameters_t = BoundTrackParameters,
-            typename track_container_t, template <typename> class holder_t,
-            bool _isdn = isDirectNavigator>
-  auto fit(source_link_iterator_t it, source_link_iterator_t end,
-           const start_parameters_t& sParameters,
-           const Gx2FitterOptions<traj_t>& gx2fOptions,
-           TrackContainer<track_container_t, traj_t, holder_t>& trackContainer)
-      const -> std::enable_if_t<
-                !_isdn, Result<typename TrackContainer<
-                            track_container_t, traj_t, holder_t>::TrackProxy>> {
+            TrackContainerFrontend track_container_t>
+  Result<typename track_container_t::TrackProxy> fit(
+      source_link_iterator_t it, source_link_iterator_t end,
+      const start_parameters_t& sParameters,
+      const Gx2FitterOptions<traj_t>& gx2fOptions,
+      track_container_t& trackContainer) const
+    requires(!isDirectNavigator)
+  {
     // Preprocess Measurements (SourceLinks -> map)
-    // To be able to find measurements later, we put them into a map
+    // To be able to find measurements later, we put them into a map.
     // We need to copy input SourceLinks anyway, so the map can own them.
     ACTS_VERBOSE("Preparing " << std::distance(it, end)
                               << " input measurements");
@@ -699,32 +1232,28 @@ class Gx2Fitter {
       auto geoId = gx2fOptions.extensions.surfaceAccessor(sl)->geometryId();
       inputMeasurements.emplace(geoId, std::move(sl));
     }
-    ACTS_VERBOSE("inputMeasurements.size() = " << inputMeasurements.size());
 
-    /// Fully understand Aborter, Actor, Result later
-    // Create the ActionList and AbortList
-    using GX2FAborter = Aborter<parameters_t>;
+    // Store, if we want to do multiple scattering. We still need to pass this
+    // option to the Actor.
+    const bool multipleScattering = gx2fOptions.multipleScattering;
+
+    // Create the ActorList
     using GX2FActor = Actor<parameters_t>;
 
     using GX2FResult = typename GX2FActor::result_type;
-    using Actors = Acts::ActionList<GX2FActor>;
-    using Aborters = Acts::AbortList<GX2FAborter>;
+    using Actors = Acts::ActorList<GX2FActor>;
 
-    using PropagatorOptions =
-        typename propagator_t::template Options<Actors, Aborters>;
+    using PropagatorOptions = typename propagator_t::template Options<Actors>;
 
     start_parameters_t params = sParameters;
-    BoundVector deltaParams = BoundVector::Zero();
     double chi2sum = 0;
     double oldChi2sum = std::numeric_limits<double>::max();
-    BoundMatrix aMatrix = BoundMatrix::Zero();
-    BoundVector bVector = BoundVector::Zero();
 
     // We need to create a temporary track container. We create several times a
     // new track and delete it after updating the parameters. However, if we
     // would work on the externally provided track container, it would be
     // difficult to remove the correct track, if it contains more than one.
-    track_container_t trackContainerTempBackend;
+    typename track_container_t::TrackContainerBackend trackContainerTempBackend;
     traj_t trajectoryTempBackend;
     TrackContainer trackContainerTemp{trackContainerTempBackend,
                                       trajectoryTempBackend};
@@ -734,30 +1263,25 @@ class Gx2Fitter {
     // and used for the final track
     std::size_t tipIndex = Acts::MultiTrajectoryTraits::kInvalid;
 
-    // Here we will store, the ndf of the system. It automatically deduces if we
-    // want to fit e.g. q/p and adjusts itself later.
-    std::size_t ndfSystem = std::numeric_limits<std::size_t>::max();
+    // The scatteringMap stores for each visited surface their scattering
+    // properties
+    std::unordered_map<GeometryIdentifier, ScatteringProperties> scatteringMap;
 
-    // Monitor which volume we start in. We do not allow to switch the start of
-    // a following iteration in a different volume.
-    const TrackingVolume* startVolume = nullptr;
+    // This will be filled during the updates with the final covariance of the
+    // track parameters.
+    BoundMatrix fullCovariancePredicted = BoundMatrix::Identity();
 
-    ACTS_VERBOSE("params:\n" << params);
+    ACTS_VERBOSE("Initial parameters: " << params.parameters().transpose());
 
     /// Actual Fitting /////////////////////////////////////////////////////////
     ACTS_DEBUG("Start to iterate");
 
     // Iterate the fit and improve result. Abort after n steps or after
-    // convergence
-    // nUpdate is initialized outside to save its state for the track
+    // convergence.
+    // nUpdate is initialized outside to save its state for the track.
     std::size_t nUpdate = 0;
     for (nUpdate = 0; nUpdate < gx2fOptions.nUpdateMax; nUpdate++) {
-      ACTS_VERBOSE("nUpdate = " << nUpdate + 1 << "/"
-                                << gx2fOptions.nUpdateMax);
-
-      // update params
-      params.parameters() += deltaParams;
-      ACTS_VERBOSE("updated params:\n" << params);
+      ACTS_DEBUG("nUpdate = " << nUpdate + 1 << "/" << gx2fOptions.nUpdateMax);
 
       // set up propagator and co
       Acts::GeometryContext geoCtx = gx2fOptions.geoContext;
@@ -771,12 +1295,14 @@ class Gx2Fitter {
         propagatorOptions.navigation.insertExternalSurface(surfaceId);
       }
 
-      auto& gx2fActor = propagatorOptions.actionList.template get<GX2FActor>();
+      auto& gx2fActor = propagatorOptions.actorList.template get<GX2FActor>();
       gx2fActor.inputMeasurements = &inputMeasurements;
+      gx2fActor.multipleScattering = false;
       gx2fActor.extensions = gx2fOptions.extensions;
       gx2fActor.calibrationContext = &gx2fOptions.calibrationContext.get();
       gx2fActor.actorLogger = m_actorLogger.get();
-      gx2fActor.startVolume = startVolume;
+      gx2fActor.scatteringMap = &scatteringMap;
+      gx2fActor.parametersWithHypothesis = &params;
 
       auto propagatorState = m_propagator.makeState(params, propagatorOptions);
 
@@ -787,12 +1313,12 @@ class Gx2Fitter {
       // existing states, but this needs some more thinking.
       trackContainerTemp.clear();
 
-      auto propagationResult = m_propagator.template propagate(propagatorState);
+      auto propagationResult = m_propagator.propagate(propagatorState);
 
       // Run the fitter
-      auto result = m_propagator.template makeResult(std::move(propagatorState),
-                                                     propagationResult,
-                                                     propagatorOptions, false);
+      auto result =
+          m_propagator.makeResult(std::move(propagatorState), propagationResult,
+                                  propagatorOptions, false);
 
       if (!result.ok()) {
         ACTS_ERROR("Propagation failed: " << result.error());
@@ -815,11 +1341,10 @@ class Gx2Fitter {
       tipIndex = gx2fResult.lastMeasurementIndex;
 
       // It could happen, that no measurements were found. Then the track would
-      // be empty and the following operations would be invalid.
-      // Usually, this only happens during the first iteration, due to bad
-      // initial parameters.
+      // be empty and the following operations would be invalid. Usually, this
+      // only happens during the first iteration, due to bad initial parameters.
       if (tipIndex == Acts::MultiTrajectoryTraits::kInvalid) {
-        ACTS_INFO("Did not find any measurements in nUpdate"
+        ACTS_INFO("Did not find any measurements in nUpdate "
                   << nUpdate + 1 << "/" << gx2fOptions.nUpdateMax);
         return Experimental::GlobalChiSquareFitterError::NotEnoughMeasurements;
       }
@@ -827,183 +1352,257 @@ class Gx2Fitter {
       track.tipIndex() = tipIndex;
       track.linkForward();
 
-      // This goes up for each measurement (for each dimension)
-      std::size_t countNdf = 0;
-
-      chi2sum = 0;
-      aMatrix = BoundMatrix::Zero();
-      bVector = BoundVector::Zero();
-
-      BoundMatrix jacobianFromStart = BoundMatrix::Identity();
-
-      for (const auto& trackState : track.trackStates()) {
-        auto typeFlags = trackState.typeFlags();
-        if (typeFlags.test(TrackStateFlag::MeasurementFlag)) {
-          // Handle measurement
-
-          auto measDim = trackState.calibratedSize();
-          countNdf += measDim;
-
-          jacobianFromStart = trackState.jacobian() * jacobianFromStart;
-
-          if (measDim == 1) {
-            addToGx2fSums<1>(aMatrix, bVector, chi2sum, jacobianFromStart,
-                             trackState, *m_addToSumLogger);
-          } else if (measDim == 2) {
-            addToGx2fSums<2>(aMatrix, bVector, chi2sum, jacobianFromStart,
-                             trackState, *m_addToSumLogger);
-          } else if (measDim == 3) {
-            addToGx2fSums<3>(aMatrix, bVector, chi2sum, jacobianFromStart,
-                             trackState, *m_addToSumLogger);
-          } else if (measDim == 4) {
-            addToGx2fSums<4>(aMatrix, bVector, chi2sum, jacobianFromStart,
-                             trackState, *m_addToSumLogger);
-          } else if (measDim == 5) {
-            addToGx2fSums<5>(aMatrix, bVector, chi2sum, jacobianFromStart,
-                             trackState, *m_addToSumLogger);
-          } else if (measDim == 6) {
-            addToGx2fSums<6>(aMatrix, bVector, chi2sum, jacobianFromStart,
-                             trackState, *m_addToSumLogger);
-          } else {
-            ACTS_ERROR("Can not process state with measurement with "
-                       << measDim << " dimensions.");
-            throw std::domain_error(
-                "Found measurement with less than 1 or more than 6 "
-                "dimension(s).");
-          }
-        } else if (typeFlags.test(TrackStateFlag::HoleFlag)) {
-          // Handle hole
-          // TODO: write hole handling
-          ACTS_VERBOSE("Placeholder: Handle hole.");
-        } else {
-          ACTS_WARNING("Unknown state encountered");
-        }
-        // TODO: Material handling. Should be there for hole and measurement
-      }
+      // Count the material surfaces, to set up the system. In the multiple
+      // scattering case, we need to extend our system.
+      const std::size_t nMaterialSurfaces = 0u;
 
-      // Get required number of degrees of freedom ndfSystem.
-      // We have only 3 cases, because we always have l0, l1, phi, theta
-      // 4: no magentic field -> q/p is empty
-      // 5: no time measurement -> time not fittable
-      // 6: full fit
-      if (aMatrix(4, 4) == 0) {
-        ndfSystem = 4;
-      } else if (aMatrix(5, 5) == 0) {
-        ndfSystem = 5;
-      } else {
-        ndfSystem = 6;
-      }
+      // We need 6 dimensions for the bound parameters and 2 * nMaterialSurfaces
+      // dimensions for the scattering angles.
+      const std::size_t dimsExtendedParams = eBoundSize + 2 * nMaterialSurfaces;
+
+      // System that we fill with the information gathered by the actor and
+      // evaluate later
+      Gx2fSystem extendedSystem{dimsExtendedParams};
+
+      // This vector stores the IDs for each visited material in order. We use
+      // it later for updating the scattering angles. We cannot use
+      // scatteringMap directly, since we cannot guarantee, that we will visit
+      // all stored material in each propagation.
+      std::vector<GeometryIdentifier> geoIdVector;
+
+      fillGx2fSystem(track, extendedSystem, false, scatteringMap, geoIdVector,
+                     *m_addToSumLogger);
+
+      chi2sum = extendedSystem.chi2();
 
       // This check takes into account the evaluated dimensions of the
-      // measurements. To fit, we need at least NDF+1 measurements. However,
-      // we count n-dimensional measurements for n measurements, reducing the
-      // effective number of needed measurements.
-      // We might encounter the case, where we cannot use some (parts of a)
-      // measurements, maybe if we do not support that kind of measurement. This
-      // is also taken into account here.
+      // measurements. To fit, we need at least NDF+1 measurements. However, we
+      // count n-dimensional measurements for n measurements, reducing the
+      // effective number of needed measurements. We might encounter the case,
+      // where we cannot use some (parts of a) measurements, maybe if we do not
+      // support that kind of measurement. This is also taken into account here.
       // We skip the check during the first iteration, since we cannot guarantee
       // to hit all/enough measurement surfaces with the initial parameter
       // guess.
-      if ((nUpdate > 0) && (ndfSystem + 1 > countNdf)) {
+      if ((nUpdate > 0) && !extendedSystem.isWellDefined()) {
         ACTS_INFO("Not enough measurements. Require "
-                  << ndfSystem + 1 << ", but only " << countNdf
-                  << " could be used.");
+                  << extendedSystem.findRequiredNdf() + 1 << ", but only "
+                  << extendedSystem.ndf() << " could be used.");
         return Experimental::GlobalChiSquareFitterError::NotEnoughMeasurements;
       }
 
       // calculate delta params [a] * delta = b
-      deltaParams = calculateDeltaParams(aMatrix, bVector, ndfSystem);
+      Eigen::VectorXd deltaParamsExtended =
+          extendedSystem.aMatrix().colPivHouseholderQr().solve(
+              extendedSystem.bVector());
 
       ACTS_VERBOSE("aMatrix:\n"
-                   << aMatrix << "\n"
+                   << extendedSystem.aMatrix() << "\n"
                    << "bVector:\n"
-                   << bVector << "\n"
-                   << "deltaParams:\n"
-                   << deltaParams << "\n"
+                   << extendedSystem.bVector() << "\n"
+                   << "deltaParamsExtended:\n"
+                   << deltaParamsExtended << "\n"
                    << "oldChi2sum = " << oldChi2sum << "\n"
-                   << "chi2sum = " << chi2sum);
+                   << "chi2sum = " << extendedSystem.chi2());
 
       if ((gx2fOptions.relChi2changeCutOff != 0) && (nUpdate > 0) &&
-          (std::abs(chi2sum / oldChi2sum - 1) <
+          (std::abs(extendedSystem.chi2() / oldChi2sum - 1) <
            gx2fOptions.relChi2changeCutOff)) {
-        ACTS_VERBOSE("Abort with relChi2changeCutOff after "
-                     << nUpdate + 1 << "/" << gx2fOptions.nUpdateMax
-                     << " iterations.");
+        ACTS_INFO("Abort with relChi2changeCutOff after "
+                  << nUpdate + 1 << "/" << gx2fOptions.nUpdateMax
+                  << " iterations.");
+        updateGx2fCovarianceParams(fullCovariancePredicted, extendedSystem);
         break;
       }
 
-      // TODO investigate further
-      if (chi2sum > oldChi2sum + 1e-5) {
-        ACTS_DEBUG("chi2 not converging monotonically");
+      if (extendedSystem.chi2() > oldChi2sum + 1e-5) {
+        ACTS_DEBUG("chi2 not converging monotonically in update " << nUpdate);
+      }
+
+      // If this is the final iteration, update the covariance and break.
+      // Otherwise, we would update the scattering angles too much.
+      if (nUpdate == gx2fOptions.nUpdateMax - 1) {
+        // Since currently most of our tracks converge in 4-5 updates, we want
+        // to set nUpdateMax higher than that to guarantee convergence for most
+        // tracks. In cases, where we set a smaller nUpdateMax, it's because we
+        // want to investigate the behaviour of the fitter before it converges,
+        // like in some unit-tests.
+        if (gx2fOptions.nUpdateMax > 5) {
+          ACTS_INFO("Did not converge in " << gx2fOptions.nUpdateMax
+                                           << " updates.");
+          return Experimental::GlobalChiSquareFitterError::DidNotConverge;
+        }
+
+        updateGx2fCovarianceParams(fullCovariancePredicted, extendedSystem);
+        break;
       }
 
-      oldChi2sum = chi2sum;
-      startVolume = gx2fResult.startVolume;
+      updateGx2fParams(params, deltaParamsExtended, nMaterialSurfaces,
+                       scatteringMap, geoIdVector);
+      ACTS_VERBOSE("Updated parameters: " << params.parameters().transpose());
+
+      oldChi2sum = extendedSystem.chi2();
     }
     ACTS_DEBUG("Finished to iterate");
-    ACTS_VERBOSE("final params:\n" << params);
+    ACTS_VERBOSE("Final parameters: " << params.parameters().transpose());
     /// Finish Fitting /////////////////////////////////////////////////////////
 
-    // Since currently most of our tracks converge in 4-5 updates, we want to
-    // set nUpdateMax higher than that to guarantee convergence for most tracks.
-    // In cases, where we set a smaller nUpdateMax, it's because we want to
-    // investigate the behaviour of the fitter before it converges, like in some
-    // unit-tests.
-    if (nUpdate == gx2fOptions.nUpdateMax && gx2fOptions.nUpdateMax > 5) {
-      ACTS_INFO("Did not converge in " << gx2fOptions.nUpdateMax
-                                       << " updates.");
-      return Experimental::GlobalChiSquareFitterError::DidNotConverge;
-    }
+    /// Actual MATERIAL Fitting ////////////////////////////////////////////////
+    ACTS_DEBUG("Start to evaluate material");
+    if (multipleScattering) {
+      // set up propagator and co
+      Acts::GeometryContext geoCtx = gx2fOptions.geoContext;
+      Acts::MagneticFieldContext magCtx = gx2fOptions.magFieldContext;
+      // Set options for propagator
+      PropagatorOptions propagatorOptions(geoCtx, magCtx);
 
-    // Calculate covariance of the fitted parameters with inverse of [a]
-    BoundMatrix fullCovariancePredicted = BoundMatrix::Identity();
-    bool aMatrixIsInvertible = false;
-    if (ndfSystem == 4) {
-      constexpr std::size_t reducedMatrixSize = 4;
-
-      auto safeReducedCovariance = safeInverse(
-          aMatrix.topLeftCorner<reducedMatrixSize, reducedMatrixSize>().eval());
-      if (safeReducedCovariance) {
-        aMatrixIsInvertible = true;
-        fullCovariancePredicted
-            .topLeftCorner<reducedMatrixSize, reducedMatrixSize>() =
-            *safeReducedCovariance;
+      // Add the measurement surface as external surface to the navigator.
+      // We will try to hit those surface by ignoring boundary checks.
+      for (const auto& [surfaceId, _] : inputMeasurements) {
+        propagatorOptions.navigation.insertExternalSurface(surfaceId);
+      }
+
+      auto& gx2fActor = propagatorOptions.actorList.template get<GX2FActor>();
+      gx2fActor.inputMeasurements = &inputMeasurements;
+      gx2fActor.multipleScattering = true;
+      gx2fActor.extensions = gx2fOptions.extensions;
+      gx2fActor.calibrationContext = &gx2fOptions.calibrationContext.get();
+      gx2fActor.actorLogger = m_actorLogger.get();
+      gx2fActor.scatteringMap = &scatteringMap;
+      gx2fActor.parametersWithHypothesis = &params;
+
+      auto propagatorState = m_propagator.makeState(params, propagatorOptions);
+
+      auto& r = propagatorState.template get<Gx2FitterResult<traj_t>>();
+      r.fittedStates = &trajectoryTempBackend;
+
+      // Clear the track container. It could be more performant to update the
+      // existing states, but this needs some more thinking.
+      trackContainerTemp.clear();
+
+      auto propagationResult = m_propagator.propagate(propagatorState);
+
+      // Run the fitter
+      auto result =
+          m_propagator.makeResult(std::move(propagatorState), propagationResult,
+                                  propagatorOptions, false);
+
+      if (!result.ok()) {
+        ACTS_ERROR("Propagation failed: " << result.error());
+        return result.error();
       }
-    } else if (ndfSystem == 5) {
-      constexpr std::size_t reducedMatrixSize = 5;
-
-      auto safeReducedCovariance = safeInverse(
-          aMatrix.topLeftCorner<reducedMatrixSize, reducedMatrixSize>().eval());
-      if (safeReducedCovariance) {
-        aMatrixIsInvertible = true;
-        fullCovariancePredicted
-            .topLeftCorner<reducedMatrixSize, reducedMatrixSize>() =
-            *safeReducedCovariance;
+
+      // TODO Improve Propagator + Actor [allocate before loop], rewrite
+      // makeMeasurements
+      auto& propRes = *result;
+      GX2FResult gx2fResult = std::move(propRes.template get<GX2FResult>());
+
+      if (!gx2fResult.result.ok()) {
+        ACTS_INFO("GlobalChiSquareFitter failed in actor: "
+                  << gx2fResult.result.error() << ", "
+                  << gx2fResult.result.error().message());
+        return gx2fResult.result.error();
       }
-    } else {
-      constexpr std::size_t reducedMatrixSize = 6;
-
-      auto safeReducedCovariance = safeInverse(
-          aMatrix.topLeftCorner<reducedMatrixSize, reducedMatrixSize>().eval());
-      if (safeReducedCovariance) {
-        aMatrixIsInvertible = true;
-        fullCovariancePredicted
-            .topLeftCorner<reducedMatrixSize, reducedMatrixSize>() =
-            *safeReducedCovariance;
+
+      auto track = trackContainerTemp.makeTrack();
+      tipIndex = gx2fResult.lastMeasurementIndex;
+
+      // It could happen, that no measurements were found. Then the track would
+      // be empty and the following operations would be invalid. Usually, this
+      // only happens during the first iteration, due to bad initial parameters.
+      if (tipIndex == Acts::MultiTrajectoryTraits::kInvalid) {
+        ACTS_INFO("Did not find any measurements in material fit.");
+        return Experimental::GlobalChiSquareFitterError::NotEnoughMeasurements;
       }
+
+      track.tipIndex() = tipIndex;
+      track.linkForward();
+
+      // Count the material surfaces, to set up the system. In the multiple
+      // scattering case, we need to extend our system.
+      const std::size_t nMaterialSurfaces =
+          countMaterialStates(track, scatteringMap, *m_addToSumLogger);
+
+      // We need 6 dimensions for the bound parameters and 2 * nMaterialSurfaces
+      // dimensions for the scattering angles.
+      const std::size_t dimsExtendedParams = eBoundSize + 2 * nMaterialSurfaces;
+
+      // System that we fill with the information gathered by the actor and
+      // evaluate later
+      Gx2fSystem extendedSystem{dimsExtendedParams};
+
+      // This vector stores the IDs for each visited material in order. We use
+      // it later for updating the scattering angles. We cannot use
+      // scatteringMap directly, since we cannot guarantee, that we will visit
+      // all stored material in each propagation.
+      std::vector<GeometryIdentifier> geoIdVector;
+
+      fillGx2fSystem(track, extendedSystem, true, scatteringMap, geoIdVector,
+                     *m_addToSumLogger);
+
+      chi2sum = extendedSystem.chi2();
+
+      // This check takes into account the evaluated dimensions of the
+      // measurements. To fit, we need at least NDF+1 measurements. However, we
+      // count n-dimensional measurements for n measurements, reducing the
+      // effective number of needed measurements. We might encounter the case,
+      // where we cannot use some (parts of a) measurements, maybe if we do not
+      // support that kind of measurement. This is also taken into account here.
+      // We skip the check during the first iteration, since we cannot guarantee
+      // to hit all/enough measurement surfaces with the initial parameter
+      // guess.
+      if ((nUpdate > 0) && !extendedSystem.isWellDefined()) {
+        ACTS_INFO("Not enough measurements. Require "
+                  << extendedSystem.findRequiredNdf() + 1 << ", but only "
+                  << extendedSystem.ndf() << " could be used.");
+        return Experimental::GlobalChiSquareFitterError::NotEnoughMeasurements;
+      }
+
+      // calculate delta params [a] * delta = b
+      Eigen::VectorXd deltaParamsExtended =
+          extendedSystem.aMatrix().colPivHouseholderQr().solve(
+              extendedSystem.bVector());
+
+      ACTS_VERBOSE("aMatrix:\n"
+                   << extendedSystem.aMatrix() << "\n"
+                   << "bVector:\n"
+                   << extendedSystem.bVector() << "\n"
+                   << "deltaParamsExtended:\n"
+                   << deltaParamsExtended << "\n"
+                   << "oldChi2sum = " << oldChi2sum << "\n"
+                   << "chi2sum = " << extendedSystem.chi2());
+
+      chi2sum = extendedSystem.chi2();
+
+      updateGx2fParams(params, deltaParamsExtended, nMaterialSurfaces,
+                       scatteringMap, geoIdVector);
+      ACTS_VERBOSE("Updated parameters: " << params.parameters().transpose());
+
+      updateGx2fCovarianceParams(fullCovariancePredicted, extendedSystem);
     }
+    ACTS_DEBUG("Finished to evaluate material");
+    ACTS_VERBOSE(
+        "Final parameters after material: " << params.parameters().transpose());
+    /// Finish MATERIAL Fitting ////////////////////////////////////////////////
 
-    if (!aMatrixIsInvertible && gx2fOptions.nUpdateMax > 0) {
-      ACTS_ERROR("aMatrix is not invertible.");
-      return Experimental::GlobalChiSquareFitterError::AIsNotInvertible;
+    ACTS_VERBOSE("Final scattering angles:");
+    for (const auto& [key, value] : scatteringMap) {
+      if (!value.materialIsValid()) {
+        continue;
+      }
+      const auto& angles = value.scatteringAngles();
+      ACTS_VERBOSE("    ( " << angles[eBoundTheta] << " | " << angles[eBoundPhi]
+                            << " )");
     }
 
-    ACTS_VERBOSE("final covariance:\n" << fullCovariancePredicted);
+    ACTS_VERBOSE("Final covariance:\n" << fullCovariancePredicted);
 
     // Propagate again with the final covariance matrix. This is necessary to
     // obtain the propagated covariance for each state.
+    // We also need to recheck the result and find the tipIndex, because at this
+    // step, we will not ignore the boundary checks for measurement surfaces. We
+    // want to create trackstates only on surfaces, that we actually hit.
     if (gx2fOptions.nUpdateMax > 0) {
-      ACTS_VERBOSE("final deltaParams:\n" << deltaParams);
       ACTS_VERBOSE("Propagate with the final covariance.");
       // update covariance
       params.covariance() = fullCovariancePredicted;
@@ -1013,18 +1612,47 @@ class Gx2Fitter {
       Acts::MagneticFieldContext magCtx = gx2fOptions.magFieldContext;
       // Set options for propagator
       PropagatorOptions propagatorOptions(geoCtx, magCtx);
-      auto& gx2fActor = propagatorOptions.actionList.template get<GX2FActor>();
+      auto& gx2fActor = propagatorOptions.actorList.template get<GX2FActor>();
       gx2fActor.inputMeasurements = &inputMeasurements;
+      gx2fActor.multipleScattering = multipleScattering;
       gx2fActor.extensions = gx2fOptions.extensions;
       gx2fActor.calibrationContext = &gx2fOptions.calibrationContext.get();
       gx2fActor.actorLogger = m_actorLogger.get();
+      gx2fActor.scatteringMap = &scatteringMap;
+      gx2fActor.parametersWithHypothesis = &params;
 
       auto propagatorState = m_propagator.makeState(params, propagatorOptions);
 
       auto& r = propagatorState.template get<Gx2FitterResult<traj_t>>();
       r.fittedStates = &trackContainer.trackStateContainer();
 
-      m_propagator.template propagate(propagatorState);
+      auto propagationResult = m_propagator.propagate(propagatorState);
+
+      // Run the fitter
+      auto result =
+          m_propagator.makeResult(std::move(propagatorState), propagationResult,
+                                  propagatorOptions, false);
+
+      if (!result.ok()) {
+        ACTS_ERROR("Propagation failed: " << result.error());
+        return result.error();
+      }
+
+      auto& propRes = *result;
+      GX2FResult gx2fResult = std::move(propRes.template get<GX2FResult>());
+
+      if (!gx2fResult.result.ok()) {
+        ACTS_INFO("GlobalChiSquareFitter failed in actor: "
+                  << gx2fResult.result.error() << ", "
+                  << gx2fResult.result.error().message());
+        return gx2fResult.result.error();
+      }
+
+      if (tipIndex != gx2fResult.lastMeasurementIndex) {
+        ACTS_INFO("Final fit used unreachable measurements.");
+        return Experimental::GlobalChiSquareFitterError::
+            UsedUnreachableMeasurements;
+      }
     }
 
     if (!trackContainer.hasColumn(
diff --git a/Core/include/Acts/TrackFitting/GlobalChiSquareFitterError.hpp b/Core/include/Acts/TrackFitting/GlobalChiSquareFitterError.hpp
index ac47142b07d..5bc4c55b3e2 100644
--- a/Core/include/Acts/TrackFitting/GlobalChiSquareFitterError.hpp
+++ b/Core/include/Acts/TrackFitting/GlobalChiSquareFitterError.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2023 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
@@ -19,6 +19,7 @@ enum class GlobalChiSquareFitterError {
   DidNotConverge = 2,
   NotEnoughMeasurements = 3,
   UpdatePushedToNewVolume = 4,
+  UsedUnreachableMeasurements = 5,
 };
 
 std::error_code make_error_code(
diff --git a/Core/include/Acts/TrackFitting/GsfError.hpp b/Core/include/Acts/TrackFitting/GsfError.hpp
index c2efce24611..28c714bf668 100644
--- a/Core/include/Acts/TrackFitting/GsfError.hpp
+++ b/Core/include/Acts/TrackFitting/GsfError.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2021 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
diff --git a/Core/include/Acts/TrackFitting/GsfMixtureReduction.hpp b/Core/include/Acts/TrackFitting/GsfMixtureReduction.hpp
index 5bb2e5c50b8..46e46c63883 100644
--- a/Core/include/Acts/TrackFitting/GsfMixtureReduction.hpp
+++ b/Core/include/Acts/TrackFitting/GsfMixtureReduction.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2021 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
diff --git a/Core/include/Acts/TrackFitting/GsfOptions.hpp b/Core/include/Acts/TrackFitting/GsfOptions.hpp
index c5a4a8c7662..4840b6b6184 100644
--- a/Core/include/Acts/TrackFitting/GsfOptions.hpp
+++ b/Core/include/Acts/TrackFitting/GsfOptions.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2022 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
diff --git a/Core/include/Acts/TrackFitting/KalmanFitter.hpp b/Core/include/Acts/TrackFitting/KalmanFitter.hpp
index 453d94b0ad1..12b70c8a562 100644
--- a/Core/include/Acts/TrackFitting/KalmanFitter.hpp
+++ b/Core/include/Acts/TrackFitting/KalmanFitter.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2016-2023 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
@@ -14,12 +14,12 @@
 #include "Acts/EventData/MultiTrajectory.hpp"
 #include "Acts/EventData/MultiTrajectoryHelpers.hpp"
 #include "Acts/EventData/SourceLink.hpp"
+#include "Acts/EventData/TrackContainerFrontendConcept.hpp"
 #include "Acts/EventData/TrackParameters.hpp"
 #include "Acts/EventData/VectorMultiTrajectory.hpp"
 #include "Acts/Geometry/GeometryContext.hpp"
 #include "Acts/MagneticField/MagneticFieldContext.hpp"
-#include "Acts/Propagator/AbortList.hpp"
-#include "Acts/Propagator/ActionList.hpp"
+#include "Acts/Propagator/ActorList.hpp"
 #include "Acts/Propagator/DirectNavigator.hpp"
 #include "Acts/Propagator/Propagator.hpp"
 #include "Acts/Propagator/StandardAborters.hpp"
@@ -37,6 +37,7 @@
 #include <limits>
 #include <map>
 #include <memory>
+#include <type_traits>
 
 namespace Acts {
 
@@ -264,7 +265,7 @@ class KalmanFitter {
 
   /// The navigator has DirectNavigator type or not
   static constexpr bool isDirectNavigator =
-      std::is_same<KalmanNavigator, DirectNavigator>::value;
+      std::is_same_v<KalmanNavigator, DirectNavigator>;
 
  public:
   KalmanFitter(propagator_t pPropagator,
@@ -350,9 +351,9 @@ class KalmanFitter {
     /// @param result is the mutable result state object
     template <typename propagator_state_t, typename stepper_t,
               typename navigator_t>
-    void operator()(propagator_state_t& state, const stepper_t& stepper,
-                    const navigator_t& navigator, result_type& result,
-                    const Logger& /*logger*/) const {
+    void act(propagator_state_t& state, const stepper_t& stepper,
+             const navigator_t& navigator, result_type& result,
+             const Logger& /*logger*/) const {
       assert(result.fittedStates && "No MultiTrajectory set");
 
       if (result.finished) {
@@ -463,7 +464,8 @@ class KalmanFitter {
             // Remember the track fitting is done
             result.finished = true;
           }
-        } else if (targetReached(state, stepper, navigator, logger())) {
+        } else if (targetReached.checkAbort(state, stepper, navigator,
+                                            logger())) {
           ACTS_VERBOSE("Completing with fitted track parameter");
           // Transport & bind the parameter to the final surface
           auto res = stepper.boundState(state.stepping, *targetReached.surface,
@@ -482,11 +484,8 @@ class KalmanFitter {
             result.fittedStates->applyBackwards(
                 result.lastMeasurementIndex, [&](auto trackState) {
                   auto fSurface = &trackState.referenceSurface();
-                  auto surface_it = std::find_if(
-                      result.passedAgainSurfaces.begin(),
-                      result.passedAgainSurfaces.end(),
-                      [=](const Surface* s) { return s == fSurface; });
-                  if (surface_it == result.passedAgainSurfaces.end()) {
+                  if (!rangeContainsValue(result.passedAgainSurfaces,
+                                          fSurface)) {
                     // If reversed filtering missed this surface, then there is
                     // no smoothed parameter
                     trackState.unset(TrackStatePropMask::Smoothed);
@@ -500,6 +499,14 @@ class KalmanFitter {
       }
     }
 
+    template <typename propagator_state_t, typename stepper_t,
+              typename navigator_t>
+    bool checkAbort(propagator_state_t& /*state*/, const stepper_t& /*stepper*/,
+                    const navigator_t& /*navigator*/, const result_type& result,
+                    const Logger& /*logger*/) const {
+      return (!result.result.ok() || result.finished);
+    }
+
     /// @brief Kalman actor operation: reverse direction
     ///
     /// @tparam propagator_state_t is the type of Propagator state
@@ -581,9 +588,14 @@ class KalmanFitter {
     Result<void> filter(const Surface* surface, propagator_state_t& state,
                         const stepper_t& stepper, const navigator_t& navigator,
                         result_type& result) const {
+      const bool precedingMeasurementExists = result.measurementStates > 0;
+      const bool surfaceIsSensitive =
+          surface->associatedDetectorElement() != nullptr;
+      const bool surfaceHasMaterial = surface->surfaceMaterial() != nullptr;
+
       // Try to find the surface in the measurement surfaces
-      auto sourcelink_it = inputMeasurements->find(surface->geometryId());
-      if (sourcelink_it != inputMeasurements->end()) {
+      auto sourceLinkIt = inputMeasurements->find(surface->geometryId());
+      if (sourceLinkIt != inputMeasurements->end()) {
         // Screen output message
         ACTS_VERBOSE("Measurement surface " << surface->geometryId()
                                             << " detected.");
@@ -599,7 +611,7 @@ class KalmanFitter {
         // point in performing globalToLocal correction)
         auto trackStateProxyRes = detail::kalmanHandleMeasurement(
             *calibrationContext, state, stepper, extensions, *surface,
-            sourcelink_it->second, *result.fittedStates, result.lastTrackIndex,
+            sourceLinkIt->second, *result.fittedStates, result.lastTrackIndex,
             false, logger());
 
         if (!trackStateProxyRes.ok()) {
@@ -637,36 +649,33 @@ class KalmanFitter {
         // the lastTrackIndex.
         result.lastMeasurementIndex = result.lastTrackIndex;
 
-      } else if (surface->associatedDetectorElement() != nullptr ||
-                 surface->surfaceMaterial() != nullptr) {
+      } else if ((precedingMeasurementExists && surfaceIsSensitive) ||
+                 surfaceHasMaterial) {
         // We only create track states here if there is already measurement
         // detected or if the surface has material (no holes before the first
         // measurement)
-        if (result.measurementStates > 0 ||
-            surface->surfaceMaterial() != nullptr) {
-          auto trackStateProxyRes = detail::kalmanHandleNoMeasurement(
-              state, stepper, *surface, *result.fittedStates,
-              result.lastTrackIndex, true, logger(), freeToBoundCorrection);
-
-          if (!trackStateProxyRes.ok()) {
-            return trackStateProxyRes.error();
-          }
+        auto trackStateProxyRes = detail::kalmanHandleNoMeasurement(
+            state, stepper, *surface, *result.fittedStates,
+            result.lastTrackIndex, true, logger(), precedingMeasurementExists,
+            freeToBoundCorrection);
 
-          const auto& trackStateProxy = *trackStateProxyRes;
-          result.lastTrackIndex = trackStateProxy.index();
+        if (!trackStateProxyRes.ok()) {
+          return trackStateProxyRes.error();
+        }
 
-          if (trackStateProxy.typeFlags().test(TrackStateFlag::HoleFlag)) {
-            // Count the missed surface
-            result.missedActiveSurfaces.push_back(surface);
-          }
+        const auto& trackStateProxy = *trackStateProxyRes;
+        result.lastTrackIndex = trackStateProxy.index();
 
-          ++result.processedStates;
-        }
-        if (surface->surfaceMaterial() != nullptr) {
-          // Update state and stepper with material effects
-          materialInteractor(surface, state, stepper, navigator,
-                             MaterialUpdateStage::FullUpdate);
+        if (trackStateProxy.typeFlags().test(TrackStateFlag::HoleFlag)) {
+          // Count the missed surface
+          result.missedActiveSurfaces.push_back(surface);
         }
+
+        ++result.processedStates;
+
+        // Update state and stepper with (possible) material effects
+        materialInteractor(surface, state, stepper, navigator,
+                           MaterialUpdateStage::FullUpdate);
       }
       return Result<void>::success();
     }
@@ -690,8 +699,8 @@ class KalmanFitter {
                                 const navigator_t& navigator,
                                 result_type& result) const {
       // Try to find the surface in the measurement surfaces
-      auto sourcelink_it = inputMeasurements->find(surface->geometryId());
-      if (sourcelink_it != inputMeasurements->end()) {
+      auto sourceLinkIt = inputMeasurements->find(surface->geometryId());
+      if (sourceLinkIt != inputMeasurements->end()) {
         // Screen output message
         ACTS_VERBOSE("Measurement surface "
                      << surface->geometryId()
@@ -752,7 +761,7 @@ class KalmanFitter {
         // We have predicted parameters, so calibrate the uncalibrated input
         // measurement
         extensions.calibrator(state.geoContext, *calibrationContext,
-                              sourcelink_it->second, trackStateProxy);
+                              sourceLinkIt->second, trackStateProxy);
 
         // If the update is successful, set covariance and
         auto updateRes =
@@ -1041,25 +1050,6 @@ class KalmanFitter {
     }
   };
 
-  template <typename parameters_t>
-  class Aborter {
-   public:
-    /// Broadcast the action type
-    using action_type = Actor<parameters_t>;
-
-    template <typename propagator_state_t, typename stepper_t,
-              typename navigator_t>
-    bool operator()(propagator_state_t& /*state*/, const stepper_t& /*stepper*/,
-                    const navigator_t& /*navigator*/,
-                    const typename action_type::result_type& result,
-                    const Logger& /*logger*/) const {
-      if (!result.result.ok() || result.finished) {
-        return true;
-      }
-      return false;
-    }
-  };
-
  public:
   /// Fit implementation of the forward filter, calls the
   /// the filter and smoother/reversed filter
@@ -1067,8 +1057,7 @@ class KalmanFitter {
   /// @tparam source_link_iterator_t Iterator type used to pass source links
   /// @tparam start_parameters_t Type of the initial parameters
   /// @tparam parameters_t Type of parameters used for local parameters
-  /// @tparam track_container_t Type of the track container backend
-  /// @tparam holder_t Type defining track container backend ownership
+  /// @tparam track_container_t Type of the track container
   ///
   /// @param it Begin iterator for the fittable uncalibrated measurements
   /// @param end End iterator for the fittable uncalibrated measurements
@@ -1082,21 +1071,20 @@ class KalmanFitter {
   /// @return the output as an output track
   template <typename source_link_iterator_t, typename start_parameters_t,
             typename parameters_t = BoundTrackParameters,
-            typename track_container_t, template <typename> class holder_t,
-            bool _isdn = isDirectNavigator>
-  auto fit(source_link_iterator_t it, source_link_iterator_t end,
-           const start_parameters_t& sParameters,
-           const KalmanFitterOptions<traj_t>& kfOptions,
-           TrackContainer<track_container_t, traj_t, holder_t>& trackContainer)
-      const -> std::enable_if_t<
-                !_isdn, Result<typename TrackContainer<
-                            track_container_t, traj_t, holder_t>::TrackProxy>> {
+            TrackContainerFrontend track_container_t>
+  Result<typename track_container_t::TrackProxy> fit(
+      source_link_iterator_t it, source_link_iterator_t end,
+      const start_parameters_t& sParameters,
+      const KalmanFitterOptions<traj_t>& kfOptions,
+      track_container_t& trackContainer) const
+    requires(!isDirectNavigator)
+  {
     // To be able to find measurements later, we put them into a map
     // We need to copy input SourceLinks anyway, so the map can own them.
     ACTS_VERBOSE("Preparing " << std::distance(it, end)
                               << " input measurements");
     std::map<GeometryIdentifier, SourceLink> inputMeasurements;
-    // for (const auto& sl : sourcelinks) {
+    // for (const auto& sl : sourceLinks) {
     for (; it != end; ++it) {
       SourceLink sl = *it;
       const Surface* surface = kfOptions.extensions.surfaceAccessor(sl);
@@ -1105,15 +1093,12 @@ class KalmanFitter {
       inputMeasurements.emplace(geoId, std::move(sl));
     }
 
-    // Create the ActionList and AbortList
-    using KalmanAborter = Aborter<parameters_t>;
+    // Create the ActorList
     using KalmanActor = Actor<parameters_t>;
 
     using KalmanResult = typename KalmanActor::result_type;
-    using Actors = ActionList<KalmanActor>;
-    using Aborters = AbortList<KalmanAborter>;
-    using PropagatorOptions =
-        typename propagator_t::template Options<Actors, Aborters>;
+    using Actors = ActorList<KalmanActor>;
+    using PropagatorOptions = typename propagator_t::template Options<Actors>;
 
     // Create relevant options for the propagation options
     PropagatorOptions propagatorOptions(kfOptions.geoContext,
@@ -1129,8 +1114,7 @@ class KalmanFitter {
     }
 
     // Catch the actor and set the measurements
-    auto& kalmanActor =
-        propagatorOptions.actionList.template get<KalmanActor>();
+    auto& kalmanActor = propagatorOptions.actorList.template get<KalmanActor>();
     kalmanActor.inputMeasurements = &inputMeasurements;
     kalmanActor.targetReached.surface = kfOptions.referenceSurface;
     kalmanActor.targetSurfaceStrategy = kfOptions.referenceSurfaceStrategy;
@@ -1145,8 +1129,8 @@ class KalmanFitter {
     kalmanActor.actorLogger = m_actorLogger.get();
 
     return fit_impl<start_parameters_t, PropagatorOptions, KalmanResult,
-                    track_container_t, holder_t>(sParameters, propagatorOptions,
-                                                 trackContainer);
+                    track_container_t>(sParameters, propagatorOptions,
+                                       trackContainer);
   }
 
   /// Fit implementation of the forward filter, calls the
@@ -1155,8 +1139,7 @@ class KalmanFitter {
   /// @tparam source_link_iterator_t Iterator type used to pass source links
   /// @tparam start_parameters_t Type of the initial parameters
   /// @tparam parameters_t Type of parameters used for local parameters
-  /// @tparam track_container_t Type of the track container backend
-  /// @tparam holder_t Type defining track container backend ownership
+  /// @tparam track_container_t Type of the track container
   ///
   /// @param it Begin iterator for the fittable uncalibrated measurements
   /// @param end End iterator for the fittable uncalibrated measurements
@@ -1172,16 +1155,15 @@ class KalmanFitter {
   /// @return the output as an output track
   template <typename source_link_iterator_t, typename start_parameters_t,
             typename parameters_t = BoundTrackParameters,
-            typename track_container_t, template <typename> class holder_t,
-            bool _isdn = isDirectNavigator>
-  auto fit(source_link_iterator_t it, source_link_iterator_t end,
-           const start_parameters_t& sParameters,
-           const KalmanFitterOptions<traj_t>& kfOptions,
-           const std::vector<const Surface*>& sSequence,
-           TrackContainer<track_container_t, traj_t, holder_t>& trackContainer)
-      const -> std::enable_if_t<
-                _isdn, Result<typename TrackContainer<track_container_t, traj_t,
-                                                      holder_t>::TrackProxy>> {
+            TrackContainerFrontend track_container_t>
+  Result<typename track_container_t::TrackProxy> fit(
+      source_link_iterator_t it, source_link_iterator_t end,
+      const start_parameters_t& sParameters,
+      const KalmanFitterOptions<traj_t>& kfOptions,
+      const std::vector<const Surface*>& sSequence,
+      track_container_t& trackContainer) const
+    requires(isDirectNavigator)
+  {
     // To be able to find measurements later, we put them into a map
     // We need to copy input SourceLinks anyway, so the map can own them.
     ACTS_VERBOSE("Preparing " << std::distance(it, end)
@@ -1195,15 +1177,12 @@ class KalmanFitter {
       inputMeasurements.emplace(geoId, std::move(sl));
     }
 
-    // Create the ActionList and AbortList
-    using KalmanAborter = Aborter<parameters_t>;
+    // Create the ActorList
     using KalmanActor = Actor<parameters_t>;
 
     using KalmanResult = typename KalmanActor::result_type;
-    using Actors = ActionList<KalmanActor>;
-    using Aborters = AbortList<KalmanAborter>;
-    using PropagatorOptions =
-        typename propagator_t::template Options<Actors, Aborters>;
+    using Actors = ActorList<KalmanActor>;
+    using PropagatorOptions = typename propagator_t::template Options<Actors>;
 
     // Create relevant options for the propagation options
     PropagatorOptions propagatorOptions(kfOptions.geoContext,
@@ -1213,8 +1192,7 @@ class KalmanFitter {
     propagatorOptions.setPlainOptions(kfOptions.propagatorPlainOptions);
 
     // Catch the actor and set the measurements
-    auto& kalmanActor =
-        propagatorOptions.actionList.template get<KalmanActor>();
+    auto& kalmanActor = propagatorOptions.actorList.template get<KalmanActor>();
     kalmanActor.inputMeasurements = &inputMeasurements;
     kalmanActor.targetReached.surface = kfOptions.referenceSurface;
     kalmanActor.targetSurfaceStrategy = kfOptions.referenceSurfaceStrategy;
@@ -1230,8 +1208,8 @@ class KalmanFitter {
     propagatorOptions.navigation.surfaces = sSequence;
 
     return fit_impl<start_parameters_t, PropagatorOptions, KalmanResult,
-                    track_container_t, holder_t>(sParameters, propagatorOptions,
-                                                 trackContainer);
+                    track_container_t>(sParameters, propagatorOptions,
+                                       trackContainer);
   }
 
  private:
@@ -1241,8 +1219,7 @@ class KalmanFitter {
   /// @tparam actor_list_t Type of the actor list
   /// @tparam aborter_list_t Type of the abort list
   /// @tparam kalman_result_t Type of the KF result
-  /// @tparam track_container_t Type of the track container backend
-  /// @tparam holder_t Type defining track container backend ownership
+  /// @tparam track_container_t Type of the track container
   ///
   /// @param sParameters The initial track parameters
   /// @param propagatorOptions The Propagator Options
@@ -1250,16 +1227,13 @@ class KalmanFitter {
   ///
   /// @return the output as an output track
   template <typename start_parameters_t, typename propagator_options_t,
-            typename kalman_result_t, typename track_container_t,
-            template <typename> class holder_t>
-  auto fit_impl(
-      const start_parameters_t& sParameters,
-      const propagator_options_t& propagatorOptions,
-      TrackContainer<track_container_t, traj_t, holder_t>& trackContainer) const
-      -> Result<typename TrackContainer<track_container_t, traj_t,
-                                        holder_t>::TrackProxy> {
+            typename kalman_result_t, TrackContainerFrontend track_container_t>
+  auto fit_impl(const start_parameters_t& sParameters,
+                const propagator_options_t& propagatorOptions,
+                track_container_t& trackContainer) const
+      -> Result<typename track_container_t::TrackProxy> {
     auto propagatorState =
-        m_propagator.template makeState(sParameters, propagatorOptions);
+        m_propagator.makeState(sParameters, propagatorOptions);
 
     auto& kalmanResult =
         propagatorState.template get<KalmanFitterResult<traj_t>>();
diff --git a/Core/include/Acts/TrackFitting/KalmanFitterError.hpp b/Core/include/Acts/TrackFitting/KalmanFitterError.hpp
index e8b3beabd25..fa0536c6932 100644
--- a/Core/include/Acts/TrackFitting/KalmanFitterError.hpp
+++ b/Core/include/Acts/TrackFitting/KalmanFitterError.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2019-2020 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
diff --git a/Core/include/Acts/TrackFitting/MbfSmoother.hpp b/Core/include/Acts/TrackFitting/MbfSmoother.hpp
index 61f28e1d7b4..02066a642e7 100644
--- a/Core/include/Acts/TrackFitting/MbfSmoother.hpp
+++ b/Core/include/Acts/TrackFitting/MbfSmoother.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2024 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
@@ -51,21 +51,21 @@ class MbfSmoother {
 
     using TrackStateProxy = typename traj_t::TrackStateProxy;
 
-    TrackStateProxy start_ts = trajectory.getTrackState(entryIndex);
+    TrackStateProxy startTs = trajectory.getTrackState(entryIndex);
 
     // Notation consistent with the Wikipedia article
     // https://en.wikipedia.org/wiki/Kalman_filter
-    BoundMatrix big_lambda_hat = BoundMatrix::Zero();
-    BoundVector small_lambda_hat = BoundVector::Zero();
+    BoundMatrix bigLambdaHat = BoundMatrix::Zero();
+    BoundVector smallLambdaHat = BoundVector::Zero();
 
-    trajectory.applyBackwards(start_ts.index(), [&](TrackStateProxy ts) {
+    trajectory.applyBackwards(startTs.index(), [&](TrackStateProxy ts) {
       // ensure the track state has a smoothed component
       ts.addComponents(TrackStatePropMask::Smoothed);
 
       InternalTrackState internalTrackState(ts);
 
       // Smoothe the current state
-      calculateSmoothed(internalTrackState, big_lambda_hat, small_lambda_hat);
+      calculateSmoothed(internalTrackState, bigLambdaHat, smallLambdaHat);
 
       // We smoothed the last state - no need to update the lambdas
       if (!ts.hasPrevious()) {
@@ -74,10 +74,9 @@ class MbfSmoother {
 
       // Update the lambdas depending on the type of track state
       if (ts.typeFlags().test(TrackStateFlag::MeasurementFlag)) {
-        visitMeasurement(internalTrackState, big_lambda_hat, small_lambda_hat);
+        visitMeasurement(internalTrackState, bigLambdaHat, smallLambdaHat);
       } else {
-        visitNonMeasurement(internalTrackState, big_lambda_hat,
-                            small_lambda_hat);
+        visitNonMeasurement(internalTrackState, bigLambdaHat, smallLambdaHat);
       }
     });
 
@@ -143,18 +142,17 @@ class MbfSmoother {
 
   /// Calculate the smoothed parameters and covariance.
   void calculateSmoothed(InternalTrackState& ts,
-                         const BoundMatrix& big_lambda_hat,
-                         const BoundVector& small_lambda_hat) const;
+                         const BoundMatrix& bigLambdaHat,
+                         const BoundVector& smallLambdaHat) const;
 
   /// Visit a non-measurement track state and update the lambdas.
   void visitNonMeasurement(const InternalTrackState& ts,
-                           BoundMatrix& big_lambda_hat,
-                           BoundVector& small_lambda_hat) const;
+                           BoundMatrix& bigLambdaHat,
+                           BoundVector& smallLambdaHat) const;
 
   /// Visit a measurement track state and update the lambdas.
-  void visitMeasurement(const InternalTrackState& ts,
-                        BoundMatrix& big_lambda_hat,
-                        BoundVector& small_lambda_hat) const;
+  void visitMeasurement(const InternalTrackState& ts, BoundMatrix& bigLambdaHat,
+                        BoundVector& smallLambdaHat) const;
 };
 
 }  // namespace Acts
diff --git a/Core/include/Acts/TrackFitting/detail/GainMatrixUpdaterImpl.hpp b/Core/include/Acts/TrackFitting/detail/GainMatrixUpdaterImpl.hpp
index 80b7729b835..0dce3c2ba21 100644
--- a/Core/include/Acts/TrackFitting/detail/GainMatrixUpdaterImpl.hpp
+++ b/Core/include/Acts/TrackFitting/detail/GainMatrixUpdaterImpl.hpp
@@ -1,13 +1,14 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2024 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
+#include "Acts/EventData/TrackParameterHelpers.hpp"
 #include "Acts/TrackFitting/GainMatrixUpdater.hpp"
 #include "Acts/Utilities/Logger.hpp"
 
@@ -34,9 +35,14 @@ std::tuple<double, std::error_code> GainMatrixUpdater::visitMeasurementImpl(
   ACTS_VERBOSE("Calibrated measurement: " << calibrated.transpose());
   ACTS_VERBOSE("Calibrated measurement covariance:\n" << calibratedCovariance);
 
-  const auto H = trackState.projector
-                     .template topLeftCorner<kMeasurementSize, eBoundSize>()
-                     .eval();
+  std::span<std::uint8_t, kMeasurementSize> validSubspaceIndices(
+      trackState.projector.begin(),
+      trackState.projector.begin() + kMeasurementSize);
+  FixedBoundSubspaceHelper<kMeasurementSize> subspaceHelper(
+      validSubspaceIndices);
+
+  // TODO use subspace helper for projection instead
+  const auto H = subspaceHelper.projector();
 
   ACTS_VERBOSE("Measurement projector H:\n" << H);
 
@@ -55,6 +61,8 @@ std::tuple<double, std::error_code> GainMatrixUpdater::visitMeasurementImpl(
 
   trackState.filtered =
       trackState.predicted + K * (calibrated - H * trackState.predicted);
+  // Normalize phi and theta
+  trackState.filtered = normalizeBoundParameters(trackState.filtered);
   trackState.filteredCovariance =
       (BoundSquareMatrix::Identity() - K * H) * trackState.predictedCovariance;
   ACTS_VERBOSE("Filtered parameters: " << trackState.filtered.transpose());
diff --git a/Core/include/Acts/TrackFitting/detail/GsfActor.hpp b/Core/include/Acts/TrackFitting/detail/GsfActor.hpp
index 56d6cecd262..92c5529d319 100644
--- a/Core/include/Acts/TrackFitting/detail/GsfActor.hpp
+++ b/Core/include/Acts/TrackFitting/detail/GsfActor.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2022 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
@@ -23,6 +23,7 @@
 #include "Acts/TrackFitting/detail/GsfComponentMerging.hpp"
 #include "Acts/TrackFitting/detail/GsfUtils.hpp"
 #include "Acts/TrackFitting/detail/KalmanUpdateHelpers.hpp"
+#include "Acts/Utilities/Helpers.hpp"
 #include "Acts/Utilities/Zip.hpp"
 
 #include <ios>
@@ -145,9 +146,9 @@ struct GsfActor {
   /// @param result is the mutable result state object
   template <typename propagator_state_t, typename stepper_t,
             typename navigator_t>
-  void operator()(propagator_state_t& state, const stepper_t& stepper,
-                  const navigator_t& navigator, result_type& result,
-                  const Logger& /*logger*/) const {
+  void act(propagator_state_t& state, const stepper_t& stepper,
+           const navigator_t& navigator, result_type& result,
+           const Logger& /*logger*/) const {
     assert(result.fittedStates && "No MultiTrajectory set");
 
     // Return is we found an error earlier
@@ -195,9 +196,7 @@ struct GsfActor {
 
     // Early return if we already were on this surface TODO why is this
     // necessary
-    const bool visited =
-        std::find(result.visitedSurfaces.begin(), result.visitedSurfaces.end(),
-                  &surface) != result.visitedSurfaces.end();
+    const bool visited = rangeContainsValue(result.visitedSurfaces, &surface);
 
     if (visited) {
       ACTS_VERBOSE("Already visited surface, return");
@@ -207,13 +206,13 @@ struct GsfActor {
     result.visitedSurfaces.push_back(&surface);
 
     // Check what we have on this surface
-    const auto found_source_link =
+    const auto foundSourceLink =
         m_cfg.inputMeasurements->find(surface.geometryId());
     const bool haveMaterial =
         navigator.currentSurface(state.navigation)->surfaceMaterial() &&
         !m_cfg.disableAllMaterialHandling;
     const bool haveMeasurement =
-        found_source_link != m_cfg.inputMeasurements->end();
+        foundSourceLink != m_cfg.inputMeasurements->end();
 
     ACTS_VERBOSE(std::boolalpha << "haveMaterial " << haveMaterial
                                 << ", haveMeasurement: " << haveMeasurement);
@@ -264,7 +263,7 @@ struct GsfActor {
       TemporaryStates tmpStates;
 
       auto res = kalmanUpdate(state, stepper, navigator, result, tmpStates,
-                              found_source_link->second);
+                              foundSourceLink->second);
 
       if (!res.ok()) {
         setErrorOrAbort(res.error());
@@ -282,7 +281,7 @@ struct GsfActor {
 
       if (haveMeasurement) {
         res = kalmanUpdate(state, stepper, navigator, result, tmpStates,
-                           found_source_link->second);
+                           foundSourceLink->second);
       } else {
         res = noMeasurementUpdate(state, stepper, navigator, result, tmpStates,
                                   false);
@@ -548,7 +547,7 @@ struct GsfActor {
   Result<void> kalmanUpdate(propagator_state_t& state, const stepper_t& stepper,
                             const navigator_t& navigator, result_type& result,
                             TemporaryStates& tmpStates,
-                            const SourceLink& source_link) const {
+                            const SourceLink& sourceLink) const {
     const auto& surface = *navigator.currentSurface(state.navigation);
 
     // Boolean flag, to distinguish measurement and outlier states. This flag
@@ -564,7 +563,7 @@ struct GsfActor {
 
       auto trackStateProxyRes = detail::kalmanHandleMeasurement(
           *m_cfg.calibrationContext, singleState, singleStepper,
-          m_cfg.extensions, surface, source_link, tmpStates.traj,
+          m_cfg.extensions, surface, sourceLink, tmpStates.traj,
           MultiTrajectoryTraits::kInvalid, false, logger());
 
       if (!trackStateProxyRes.ok()) {
@@ -635,9 +634,11 @@ struct GsfActor {
                                    bool doCovTransport) const {
     const auto& surface = *navigator.currentSurface(state.navigation);
 
+    const bool precedingMeasurementExists = result.processedStates > 0;
+
     // Initialize as true, so that any component can flip it. However, all
     // components should behave the same
-    bool is_hole = true;
+    bool isHole = true;
 
     auto cmps = stepper.componentIterable(state.stepping);
     for (auto cmp : cmps) {
@@ -648,7 +649,8 @@ struct GsfActor {
       // now until we measure this is significant
       auto trackStateProxyRes = detail::kalmanHandleNoMeasurement(
           singleState, singleStepper, surface, tmpStates.traj,
-          MultiTrajectoryTraits::kInvalid, doCovTransport, logger());
+          MultiTrajectoryTraits::kInvalid, doCovTransport, logger(),
+          precedingMeasurementExists);
 
       if (!trackStateProxyRes.ok()) {
         return trackStateProxyRes.error();
@@ -657,7 +659,7 @@ struct GsfActor {
       const auto& trackStateProxy = *trackStateProxyRes;
 
       if (!trackStateProxy.typeFlags().test(TrackStateFlag::HoleFlag)) {
-        is_hole = false;
+        isHole = false;
       }
 
       tmpStates.tips.push_back(trackStateProxy.index());
@@ -665,7 +667,7 @@ struct GsfActor {
     }
 
     // These things should only be done once for all components
-    if (is_hole) {
+    if (isHole) {
       ++result.measurementHoles;
     }
 
diff --git a/Core/include/Acts/TrackFitting/detail/GsfComponentMerging.hpp b/Core/include/Acts/TrackFitting/detail/GsfComponentMerging.hpp
index cf5bc4bf1b0..b7ea835e460 100644
--- a/Core/include/Acts/TrackFitting/detail/GsfComponentMerging.hpp
+++ b/Core/include/Acts/TrackFitting/detail/GsfComponentMerging.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2021 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
@@ -12,10 +12,10 @@
 #include "Acts/Definitions/TrackParametrization.hpp"
 #include "Acts/Surfaces/CylinderSurface.hpp"
 #include "Acts/TrackFitting/GsfOptions.hpp"
-#include "Acts/Utilities/Identity.hpp"
 #include "Acts/Utilities/detail/periodic.hpp"
 
 #include <cmath>
+#include <numbers>
 #include <optional>
 #include <tuple>
 
@@ -91,10 +91,10 @@ auto gaussianMixtureCov(const components_t components,
 
     // Apply corrections for cyclic coordinates
     auto handleCyclicCov = [&l = pars_l, &m = mean, &diff = diff](auto desc) {
-      diff[desc.idx] =
-          difference_periodic(l[desc.idx] / desc.constant,
-                              m[desc.idx] / desc.constant, 2 * M_PI) *
-          desc.constant;
+      diff[desc.idx] = difference_periodic(l[desc.idx] / desc.constant,
+                                           m[desc.idx] / desc.constant,
+                                           2 * std::numbers::pi) *
+                       desc.constant;
     };
 
     std::apply([&](auto... dsc) { (handleCyclicCov(dsc), ...); }, angleDesc);
@@ -123,7 +123,7 @@ auto gaussianMixtureCov(const components_t components,
 /// std::tuple< weight, mean, std::optional< cov > >
 /// @tparam angle_desc_t A angle description object which defines the cyclic
 /// angles in the bound parameters
-template <typename components_t, typename projector_t = Identity,
+template <typename components_t, typename projector_t = std::identity,
           typename angle_desc_t = AngleDescription<Surface::Plane>::Desc>
 auto gaussianMixtureMeanCov(const components_t components,
                             projector_t &&projector = projector_t{},
@@ -175,10 +175,10 @@ auto gaussianMixtureMeanCov(const components_t components,
                              &weight = weight_l, &mean = mean](auto desc) {
       const auto delta = (ref[desc.idx] - pars[desc.idx]) / desc.constant;
 
-      if (delta > M_PI) {
-        mean[desc.idx] += (2 * M_PI) * weight * desc.constant;
-      } else if (delta < -M_PI) {
-        mean[desc.idx] -= (2 * M_PI) * weight * desc.constant;
+      if (delta > std::numbers::pi) {
+        mean[desc.idx] += 2. * std::numbers::pi * weight * desc.constant;
+      } else if (delta < -std::numbers::pi) {
+        mean[desc.idx] -= 2. * std::numbers::pi * weight * desc.constant;
       }
     };
 
@@ -188,9 +188,9 @@ auto gaussianMixtureMeanCov(const components_t components,
   mean /= sumOfWeights;
 
   auto wrap = [&](auto desc) {
-    mean[desc.idx] =
-        wrap_periodic(mean[desc.idx] / desc.constant, -M_PI, 2 * M_PI) *
-        desc.constant;
+    mean[desc.idx] = wrap_periodic(mean[desc.idx] / desc.constant,
+                                   -std::numbers::pi, 2 * std::numbers::pi) *
+                     desc.constant;
   };
 
   std::apply([&](auto... dsc) { (wrap(dsc), ...); }, angleDesc);
@@ -212,7 +212,7 @@ auto gaussianMixtureMeanCov(const components_t components,
 /// like a std::tuple< double, BoundVector, BoundMatrix >
 ///
 /// @return parameters and covariance as std::tuple< BoundVector, BoundMatrix >
-template <typename mixture_t, typename projector_t = Acts::Identity>
+template <typename mixture_t, typename projector_t = std::identity>
 auto mergeGaussianMixture(const mixture_t &mixture, const Surface &surface,
                           ComponentMergeMethod method,
                           projector_t &&projector = projector_t{}) {
diff --git a/Core/include/Acts/TrackFitting/detail/GsfUtils.hpp b/Core/include/Acts/TrackFitting/detail/GsfUtils.hpp
index 49f61eed3f3..501208b7e09 100644
--- a/Core/include/Acts/TrackFitting/detail/GsfUtils.hpp
+++ b/Core/include/Acts/TrackFitting/detail/GsfUtils.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2021 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
diff --git a/Core/include/Acts/TrackFitting/detail/KalmanGlobalCovariance.hpp b/Core/include/Acts/TrackFitting/detail/KalmanGlobalCovariance.hpp
index 7daaa52e88f..cf9a3f36b01 100644
--- a/Core/include/Acts/TrackFitting/detail/KalmanGlobalCovariance.hpp
+++ b/Core/include/Acts/TrackFitting/detail/KalmanGlobalCovariance.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2020 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
diff --git a/Core/include/Acts/TrackFitting/detail/KalmanUpdateHelpers.hpp b/Core/include/Acts/TrackFitting/detail/KalmanUpdateHelpers.hpp
index 62e50edbeea..f4230e0e18d 100644
--- a/Core/include/Acts/TrackFitting/detail/KalmanUpdateHelpers.hpp
+++ b/Core/include/Acts/TrackFitting/detail/KalmanUpdateHelpers.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2021-2023 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
@@ -27,7 +27,7 @@ namespace Acts::detail {
 /// @param stepper The stepper
 /// @param extensions The extension used for the update
 /// @param surface The current surface
-/// @param source_link The source-link used for the update
+/// @param sourceLink The source link used for the update
 /// @param fittedStates The Multitrajectory to that we add the state
 /// @param lastTrackIndex The parent index for the new state in the MT
 /// @param doCovTransport Whether to perform a covariance transport when
@@ -38,7 +38,7 @@ template <typename propagator_state_t, typename stepper_t,
 auto kalmanHandleMeasurement(
     const CalibrationContext &calibrationContext, propagator_state_t &state,
     const stepper_t &stepper, const extensions_t &extensions,
-    const Surface &surface, const SourceLink &source_link, traj_t &fittedStates,
+    const Surface &surface, const SourceLink &sourceLink, traj_t &fittedStates,
     const std::size_t lastTrackIndex, bool doCovTransport, const Logger &logger,
     const FreeToBoundCorrection &freeToBoundCorrection = FreeToBoundCorrection(
         false)) -> Result<typename traj_t::TrackStateProxy> {
@@ -75,7 +75,7 @@ auto kalmanHandleMeasurement(
 
   // We have predicted parameters, so calibrate the uncalibrated input
   // measurement
-  extensions.calibrator(state.geoContext, calibrationContext, source_link,
+  extensions.calibrator(state.geoContext, calibrationContext, sourceLink,
                         trackStateProxy);
 
   // Get and set the type flags
@@ -135,7 +135,7 @@ template <typename propagator_state_t, typename stepper_t, typename traj_t>
 auto kalmanHandleNoMeasurement(
     propagator_state_t &state, const stepper_t &stepper, const Surface &surface,
     traj_t &fittedStates, const std::size_t lastTrackIndex, bool doCovTransport,
-    const Logger &logger,
+    const Logger &logger, const bool precedingMeasurementExists,
     const FreeToBoundCorrection &freeToBoundCorrection = FreeToBoundCorrection(
         false)) -> Result<typename traj_t::TrackStateProxy> {
   // Add a <mask> TrackState entry multi trajectory. This allocates storage for
@@ -172,16 +172,24 @@ auto kalmanHandleNoMeasurement(
   }
 
   // Set the track state flags
+  const bool surfaceHasMaterial = surface.surfaceMaterial() != nullptr;
+  const bool surfaceIsSensitive =
+      surface.associatedDetectorElement() != nullptr;
   auto typeFlags = trackStateProxy.typeFlags();
   typeFlags.set(TrackStateFlag::ParameterFlag);
-  if (surface.surfaceMaterial() != nullptr) {
+
+  if (surfaceHasMaterial) {
     typeFlags.set(TrackStateFlag::MaterialFlag);
   }
-  if (surface.associatedDetectorElement() != nullptr) {
+
+  if (surfaceIsSensitive && precedingMeasurementExists) {
     ACTS_VERBOSE("Detected hole on " << surface.geometryId());
     // If the surface is sensitive, set the hole type flag
     typeFlags.set(TrackStateFlag::HoleFlag);
-  } else if (surface.surfaceMaterial() != nullptr) {
+  } else if (surfaceIsSensitive) {
+    ACTS_VERBOSE("Skip hole (no preceding measurements) on surface "
+                 << surface.geometryId());
+  } else if (surfaceHasMaterial) {
     ACTS_VERBOSE("Detected in-sensitive surface " << surface.geometryId());
   }
 
diff --git a/Core/include/Acts/TrackFitting/detail/SymmetricKlDistanceMatrix.hpp b/Core/include/Acts/TrackFitting/detail/SymmetricKlDistanceMatrix.hpp
index a4ab04e4ffa..f7fcfbd871e 100644
--- a/Core/include/Acts/TrackFitting/detail/SymmetricKlDistanceMatrix.hpp
+++ b/Core/include/Acts/TrackFitting/detail/SymmetricKlDistanceMatrix.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2023 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
diff --git a/Core/include/Acts/TrackFitting/detail/VoidFitterComponents.hpp b/Core/include/Acts/TrackFitting/detail/VoidFitterComponents.hpp
index 198678cfa35..c350992cfa9 100644
--- a/Core/include/Acts/TrackFitting/detail/VoidFitterComponents.hpp
+++ b/Core/include/Acts/TrackFitting/detail/VoidFitterComponents.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2018-2020 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
@@ -15,7 +15,6 @@
 #include "Acts/Utilities/CalibrationContext.hpp"
 #include "Acts/Utilities/Logger.hpp"
 #include "Acts/Utilities/Result.hpp"
-#include "Acts/Utilities/TypeTraits.hpp"
 
 namespace Acts::detail {
 
diff --git a/Core/include/Acts/Utilities/AlgebraHelpers.hpp b/Core/include/Acts/Utilities/AlgebraHelpers.hpp
index ea5767f865b..06379ec3559 100644
--- a/Core/include/Acts/Utilities/AlgebraHelpers.hpp
+++ b/Core/include/Acts/Utilities/AlgebraHelpers.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2016-2023 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
diff --git a/Core/include/Acts/Utilities/AngleHelpers.hpp b/Core/include/Acts/Utilities/AngleHelpers.hpp
new file mode 100644
index 00000000000..8a38aeffc94
--- /dev/null
+++ b/Core/include/Acts/Utilities/AngleHelpers.hpp
@@ -0,0 +1,77 @@
+// This file is part of the ACTS project.
+//
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
+//
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
+
+#pragma once
+
+#include <cmath>
+#include <numbers>
+
+namespace Acts::AngleHelpers {
+
+template <typename Scalar>
+struct EtaThetaConversionTraits {};
+
+template <>
+struct EtaThetaConversionTraits<float> {
+  static constexpr float minTheta = 1e-6f;
+  static constexpr float maxTheta = std::numbers::pi_v<float> - minTheta;
+
+  static constexpr float maxEta = 80.0f;
+  static constexpr float minEta = -maxEta;
+};
+
+template <>
+struct EtaThetaConversionTraits<double> {
+  static constexpr double minTheta = 1e-12;
+  static constexpr double maxTheta = std::numbers::pi - minTheta;
+
+  static constexpr double maxEta = 700.0;
+  static constexpr double minEta = -maxEta;
+};
+
+/// Calculate the pseudorapidity from the polar angle theta.
+///
+/// This function aims to be FPE safe and returns infinity for theta values
+/// outside the floating point precision range.
+///
+/// @param theta is the polar angle in radian towards the z-axis.
+///
+/// @return the pseudorapidity towards the z-axis.
+template <typename Scalar>
+Scalar etaFromTheta(Scalar theta) {
+  if (theta <= EtaThetaConversionTraits<Scalar>::minTheta) {
+    return std::numeric_limits<Scalar>::infinity();
+  }
+  if (theta >= EtaThetaConversionTraits<Scalar>::maxTheta) {
+    return -std::numeric_limits<Scalar>::infinity();
+  }
+
+  return -std::log(std::tan(theta / 2));
+}
+
+/// Calculate the polar angle theta from the pseudorapidity.
+///
+/// This function aims to be FPE safe and returns 0/pi for eta values outside
+/// the floating point precision range.
+///
+/// @param eta is the pseudorapidity towards the z-axis.
+///
+/// @return the polar angle in radian towards the z-axis.
+template <typename Scalar>
+Scalar thetaFromEta(Scalar eta) {
+  if (eta <= EtaThetaConversionTraits<Scalar>::minEta) {
+    return std::numbers::pi_v<Scalar>;
+  }
+  if (eta >= EtaThetaConversionTraits<Scalar>::maxEta) {
+    return 0;
+  }
+
+  return 2 * std::atan(std::exp(-eta));
+}
+
+}  // namespace Acts::AngleHelpers
diff --git a/Core/include/Acts/Utilities/AnnealingUtility.hpp b/Core/include/Acts/Utilities/AnnealingUtility.hpp
index 204f6c59008..ce6fc9e7db3 100644
--- a/Core/include/Acts/Utilities/AnnealingUtility.hpp
+++ b/Core/include/Acts/Utilities/AnnealingUtility.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2019-2024 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
diff --git a/Core/include/Acts/Utilities/Any.hpp b/Core/include/Acts/Utilities/Any.hpp
index 3d80af0ee55..337dafb2c24 100644
--- a/Core/include/Acts/Utilities/Any.hpp
+++ b/Core/include/Acts/Utilities/Any.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2021 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
@@ -142,9 +142,9 @@ class AnyBase : public AnyBaseAll {
   AnyBase() = default;
 #endif
 
-  template <typename T, typename = std::enable_if_t<
-                            !std::is_same_v<std::decay_t<T>, AnyBase<SIZE>>>>
+  template <typename T>
   explicit AnyBase(T&& value)
+    requires(!std::same_as<std::decay_t<T>, AnyBase<SIZE>>)
       : AnyBase{std::in_place_type<T>, std::forward<T>(value)} {}
 
   template <typename T>
diff --git a/Core/include/Acts/Utilities/Axis.hpp b/Core/include/Acts/Utilities/Axis.hpp
index 037d8c37b8f..f843d0e7f92 100644
--- a/Core/include/Acts/Utilities/Axis.hpp
+++ b/Core/include/Acts/Utilities/Axis.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2017-2018 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
@@ -66,8 +66,6 @@ class NeighborHoodIndices {
       return (m_current == it.m_current) && (m_wrapped == it.m_wrapped);
     }
 
-    bool operator!=(const iterator& it) const { return !(*this == it); }
-
    private:
     std::size_t m_current = 0, m_end1 = 0, m_begin2 = 0;
     bool m_wrapped = false;
@@ -174,11 +172,11 @@ class Axis<AxisType::Equidistant, bdt> final : public IAxis {
   /// @note Open varies given bin and allows 0 and NBins+1 (underflow,
   /// overflow)
   ///       as neighbors
-  template <AxisBoundaryType T = bdt,
-            std::enable_if_t<T == AxisBoundaryType::Open, int> = 0>
   NeighborHoodIndices neighborHoodIndices(std::size_t idx,
-                                          std::pair<int, int> sizes = {
-                                              -1, 1}) const {
+                                          std::pair<int, int> sizes = {-1,
+                                                                       1}) const
+    requires(bdt == AxisBoundaryType::Open)
+  {
     constexpr int min = 0;
     const int max = getNBins() + 1;
     const int itmin = std::clamp(static_cast<int>(idx + sizes.first), min, max);
@@ -196,11 +194,11 @@ class Axis<AxisType::Equidistant, bdt> final : public IAxis {
   /// @return Set of neighboring bin indices (global)
   /// @note Bound varies given bin and allows 1 and NBins (regular bins)
   ///       as neighbors
-  template <AxisBoundaryType T = bdt,
-            std::enable_if_t<T == AxisBoundaryType::Bound, int> = 0>
   NeighborHoodIndices neighborHoodIndices(std::size_t idx,
-                                          std::pair<int, int> sizes = {
-                                              -1, 1}) const {
+                                          std::pair<int, int> sizes = {-1,
+                                                                       1}) const
+    requires(bdt == AxisBoundaryType::Bound)
+  {
     if (idx <= 0 || idx >= (getNBins() + 1)) {
       return NeighborHoodIndices();
     }
@@ -221,11 +219,11 @@ class Axis<AxisType::Equidistant, bdt> final : public IAxis {
   /// @return Set of neighboring bin indices (global)
   /// @note Closed varies given bin and allows bins on the opposite
   ///       side of the axis as neighbors. (excludes underflow / overflow)
-  template <AxisBoundaryType T = bdt,
-            std::enable_if_t<T == AxisBoundaryType::Closed, int> = 0>
   NeighborHoodIndices neighborHoodIndices(std::size_t idx,
-                                          std::pair<int, int> sizes = {
-                                              -1, 1}) const {
+                                          std::pair<int, int> sizes = {-1,
+                                                                       1}) const
+    requires(bdt == AxisBoundaryType::Closed)
+  {
     // Handle invalid indices
     if (idx <= 0 || idx >= (getNBins() + 1)) {
       return NeighborHoodIndices();
@@ -266,9 +264,9 @@ class Axis<AxisType::Equidistant, bdt> final : public IAxis {
   ///
   /// @param [in] bin The bin to wrap
   /// @return valid bin index
-  template <AxisBoundaryType T = bdt,
-            std::enable_if_t<T == AxisBoundaryType::Open, int> = 0>
-  std::size_t wrapBin(int bin) const {
+  std::size_t wrapBin(int bin) const
+    requires(bdt == AxisBoundaryType::Open)
+  {
     return std::max(std::min(bin, static_cast<int>(getNBins()) + 1), 0);
   }
 
@@ -278,9 +276,9 @@ class Axis<AxisType::Equidistant, bdt> final : public IAxis {
   ///
   /// @param [in] bin The bin to wrap
   /// @return valid bin index
-  template <AxisBoundaryType T = bdt,
-            std::enable_if_t<T == AxisBoundaryType::Bound, int> = 0>
-  std::size_t wrapBin(int bin) const {
+  std::size_t wrapBin(int bin) const
+    requires(bdt == AxisBoundaryType::Bound)
+  {
     return std::max(std::min(bin, static_cast<int>(getNBins())), 1);
   }
 
@@ -290,9 +288,9 @@ class Axis<AxisType::Equidistant, bdt> final : public IAxis {
   ///
   /// @param [in] bin The bin to wrap
   /// @return valid bin index
-  template <AxisBoundaryType T = bdt,
-            std::enable_if_t<T == AxisBoundaryType::Closed, int> = 0>
-  std::size_t wrapBin(int bin) const {
+  std::size_t wrapBin(int bin) const
+    requires(bdt == AxisBoundaryType::Closed)
+  {
     const int w = getNBins();
     return 1 + (w + ((bin - 1) % w)) % w;
     // return int(bin<1)*w - int(bin>w)*w + bin;
@@ -488,11 +486,11 @@ class Axis<AxisType::Variable, bdt> final : public IAxis {
   /// @note Open varies given bin and allows 0 and NBins+1 (underflow,
   /// overflow)
   ///       as neighbors
-  template <AxisBoundaryType T = bdt,
-            std::enable_if_t<T == AxisBoundaryType::Open, int> = 0>
   NeighborHoodIndices neighborHoodIndices(std::size_t idx,
-                                          std::pair<int, int> sizes = {
-                                              -1, 1}) const {
+                                          std::pair<int, int> sizes = {-1,
+                                                                       1}) const
+    requires(bdt == AxisBoundaryType::Open)
+  {
     constexpr int min = 0;
     const int max = getNBins() + 1;
     const int itmin = std::max(min, static_cast<int>(idx) + sizes.first);
@@ -509,11 +507,11 @@ class Axis<AxisType::Variable, bdt> final : public IAxis {
   /// @return Set of neighboring bin indices (global)
   /// @note Bound varies given bin and allows 1 and NBins (regular bins)
   ///       as neighbors
-  template <AxisBoundaryType T = bdt,
-            std::enable_if_t<T == AxisBoundaryType::Bound, int> = 0>
   NeighborHoodIndices neighborHoodIndices(std::size_t idx,
-                                          std::pair<int, int> sizes = {
-                                              -1, 1}) const {
+                                          std::pair<int, int> sizes = {-1,
+                                                                       1}) const
+    requires(bdt == AxisBoundaryType::Bound)
+  {
     if (idx <= 0 || idx >= (getNBins() + 1)) {
       return NeighborHoodIndices();
     }
@@ -533,11 +531,11 @@ class Axis<AxisType::Variable, bdt> final : public IAxis {
   /// @return Set of neighboring bin indices (global)
   /// @note Closed varies given bin and allows bins on the opposite
   ///       side of the axis as neighbors. (excludes underflow / overflow)
-  template <AxisBoundaryType T = bdt,
-            std::enable_if_t<T == AxisBoundaryType::Closed, int> = 0>
   NeighborHoodIndices neighborHoodIndices(std::size_t idx,
-                                          std::pair<int, int> sizes = {
-                                              -1, 1}) const {
+                                          std::pair<int, int> sizes = {-1,
+                                                                       1}) const
+    requires(bdt == AxisBoundaryType::Closed)
+  {
     // Handle invalid indices
     if (idx <= 0 || idx >= (getNBins() + 1)) {
       return NeighborHoodIndices();
@@ -578,9 +576,9 @@ class Axis<AxisType::Variable, bdt> final : public IAxis {
   ///
   /// @param [in] bin The bin to wrap
   /// @return valid bin index
-  template <AxisBoundaryType T = bdt,
-            std::enable_if_t<T == AxisBoundaryType::Open, int> = 0>
-  std::size_t wrapBin(int bin) const {
+  std::size_t wrapBin(int bin) const
+    requires(bdt == AxisBoundaryType::Open)
+  {
     return std::max(std::min(bin, static_cast<int>(getNBins()) + 1), 0);
   }
 
@@ -590,9 +588,9 @@ class Axis<AxisType::Variable, bdt> final : public IAxis {
   ///
   /// @param [in] bin The bin to wrap
   /// @return valid bin index
-  template <AxisBoundaryType T = bdt,
-            std::enable_if_t<T == AxisBoundaryType::Bound, int> = 0>
-  std::size_t wrapBin(int bin) const {
+  std::size_t wrapBin(int bin) const
+    requires(bdt == AxisBoundaryType::Bound)
+  {
     return std::max(std::min(bin, static_cast<int>(getNBins())), 1);
   }
 
@@ -602,9 +600,9 @@ class Axis<AxisType::Variable, bdt> final : public IAxis {
   ///
   /// @param [in] bin The bin to wrap
   /// @return valid bin index
-  template <AxisBoundaryType T = bdt,
-            std::enable_if_t<T == AxisBoundaryType::Closed, int> = 0>
-  std::size_t wrapBin(int bin) const {
+  std::size_t wrapBin(int bin) const
+    requires(bdt == AxisBoundaryType::Closed)
+  {
     const int w = getNBins();
     return 1 + (w + ((bin - 1) % w)) % w;
     // return int(bin<1)*w - int(bin>w)*w + bin;
diff --git a/Core/include/Acts/Utilities/AxisFwd.hpp b/Core/include/Acts/Utilities/AxisFwd.hpp
index 3f5dc538fa1..fefa980cbfd 100644
--- a/Core/include/Acts/Utilities/AxisFwd.hpp
+++ b/Core/include/Acts/Utilities/AxisFwd.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2019 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
diff --git a/Core/include/Acts/Utilities/BinAdjustment.hpp b/Core/include/Acts/Utilities/BinAdjustment.hpp
index 7b4a90eb630..6424276c5cf 100644
--- a/Core/include/Acts/Utilities/BinAdjustment.hpp
+++ b/Core/include/Acts/Utilities/BinAdjustment.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2019 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 ///////////////////////////////////////////////////////////////////
 // BinAdjustment.hpp, Acts project
diff --git a/Core/include/Acts/Utilities/BinAdjustmentVolume.hpp b/Core/include/Acts/Utilities/BinAdjustmentVolume.hpp
index 7dfa6b77724..bef7bff3e83 100644
--- a/Core/include/Acts/Utilities/BinAdjustmentVolume.hpp
+++ b/Core/include/Acts/Utilities/BinAdjustmentVolume.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2019 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 ///////////////////////////////////////////////////////////////////
 // BinAdjustment.hpp, Acts project
@@ -19,6 +19,7 @@
 #include "Acts/Geometry/Volume.hpp"
 #include "Acts/Utilities/BinUtility.hpp"
 
+#include <numbers>
 #include <stdexcept>
 
 namespace Acts {
@@ -94,8 +95,8 @@ BinUtility adjustBinUtility(const BinUtility& bu,
   // The parameters from the cutout cylinder bounds
   double minR = cBounds.get(CutoutCylinderVolumeBounds::eMinR);
   double maxR = cBounds.get(CutoutCylinderVolumeBounds::eMaxR);
-  double minPhi = -M_PI;
-  double maxPhi = M_PI;
+  double minPhi = -std::numbers::pi;
+  double maxPhi = std::numbers::pi;
   double minZ = -cBounds.get(CutoutCylinderVolumeBounds::eHalfLengthZ);
   double maxZ = cBounds.get(CutoutCylinderVolumeBounds::eHalfLengthZ);
   // Retrieve the binning data
diff --git a/Core/include/Acts/Utilities/BinUtility.hpp b/Core/include/Acts/Utilities/BinUtility.hpp
index 59a736dae68..a1213ddd8ec 100644
--- a/Core/include/Acts/Utilities/BinUtility.hpp
+++ b/Core/include/Acts/Utilities/BinUtility.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2016-2018 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
@@ -47,7 +47,7 @@ class BinUtility {
   /// Constructor with only a Transform3
   ///
   /// @param tForm is the local to global transform
-  BinUtility(const Transform3& tForm)
+  explicit BinUtility(const Transform3& tForm)
       : m_binningData(), m_transform(tForm), m_itransform(tForm.inverse()) {
     m_binningData.reserve(3);
   }
@@ -317,13 +317,15 @@ class BinUtility {
     return ss.str();
   }
 
+  /// Overload of << operator for std::ostream for debug output
+  friend std::ostream& operator<<(std::ostream& sl, const BinUtility& bgen) {
+    return bgen.toStream(sl);
+  }
+
  private:
   std::vector<BinningData> m_binningData;  /// vector of BinningData
   Transform3 m_transform;                  /// shared transform
   Transform3 m_itransform;                 /// unique inverse transform
 };
 
-/// Overload of << operator for std::ostream for debug output
-std::ostream& operator<<(std::ostream& sl, const BinUtility& bgen);
-
 }  // namespace Acts
diff --git a/Core/include/Acts/Utilities/BinnedArray.hpp b/Core/include/Acts/Utilities/BinnedArray.hpp
index c735b53e4ab..bde26fa67b6 100644
--- a/Core/include/Acts/Utilities/BinnedArray.hpp
+++ b/Core/include/Acts/Utilities/BinnedArray.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2016-2018 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 ///////////////////////////////////////////////////////////////////
 // BinnedArray.h, Acts project
diff --git a/Core/include/Acts/Utilities/BinnedArrayXD.hpp b/Core/include/Acts/Utilities/BinnedArrayXD.hpp
index 4b78b1026bc..97748802d31 100644
--- a/Core/include/Acts/Utilities/BinnedArrayXD.hpp
+++ b/Core/include/Acts/Utilities/BinnedArrayXD.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2016-2018 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 ///////////////////////////////////////////////////////////////////
 // BinnedArrayXD.h, Acts project
@@ -13,6 +13,7 @@
 #pragma once
 #include "Acts/Utilities/BinUtility.hpp"
 #include "Acts/Utilities/BinnedArray.hpp"
+#include "Acts/Utilities/Helpers.hpp"
 
 #include <array>
 #include <iostream>
@@ -74,8 +75,7 @@ class BinnedArrayXD : public BinnedArray<T> {
         /// fill the data
         m_objectGrid[bins[2]][bins[1]][bins[0]] = tap.first;
         /// fill the unique m_arrayObjects
-        if (std::find(m_arrayObjects.begin(), m_arrayObjects.end(),
-                      tap.first) == m_arrayObjects.end()) {
+        if (!rangeContainsValue(m_arrayObjects, tap.first)) {
           m_arrayObjects.push_back(tap.first);
         }
       }
@@ -103,8 +103,7 @@ class BinnedArrayXD : public BinnedArray<T> {
         for (auto& o0 : o1) {
           if (o0) {
             /// fill the unique m_arrayObjects
-            if (std::find(m_arrayObjects.begin(), m_arrayObjects.end(), o0) ==
-                m_arrayObjects.end()) {
+            if (!rangeContainsValue(m_arrayObjects, o0)) {
               m_arrayObjects.push_back(o0);
             }
           }
diff --git a/Core/include/Acts/Utilities/BinningData.hpp b/Core/include/Acts/Utilities/BinningData.hpp
index 9b674109853..553ab10b2a9 100644
--- a/Core/include/Acts/Utilities/BinningData.hpp
+++ b/Core/include/Acts/Utilities/BinningData.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2016-2018 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
@@ -481,7 +481,7 @@ class BinningData {
         }
       }
       // sort the total boundary vector
-      std::sort(m_totalBoundaries.begin(), m_totalBoundaries.end());
+      std::ranges::sort(m_totalBoundaries);
     }
   }
 
@@ -531,9 +531,9 @@ class BinningData {
   /// String screen output method
   /// @param indent the current indentation
   /// @return a string containing the screen information
-  std::string toString(const std::string& indent) const {
+  std::string toString(const std::string& indent = "") const {
     std::stringstream sl;
-    sl << indent << "BinngingData object:" << '\n';
+    sl << indent << "BinningData object:" << '\n';
     sl << indent << "  - type       : " << static_cast<std::size_t>(type)
        << '\n';
     sl << indent << "  - option     : " << static_cast<std::size_t>(option)
diff --git a/Core/include/Acts/Utilities/BinningType.hpp b/Core/include/Acts/Utilities/BinningType.hpp
index 4ed8c35bbb4..f3570d27f98 100644
--- a/Core/include/Acts/Utilities/BinningType.hpp
+++ b/Core/include/Acts/Utilities/BinningType.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2016-2024 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 #include <string>
diff --git a/Core/include/Acts/Utilities/BoundingBox.hpp b/Core/include/Acts/Utilities/BoundingBox.hpp
index f0824f9100c..3c6f450a1b3 100644
--- a/Core/include/Acts/Utilities/BoundingBox.hpp
+++ b/Core/include/Acts/Utilities/BoundingBox.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2018-2019 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
@@ -20,22 +20,16 @@
 
 namespace Acts {
 
-/**
- * Implementation of an Axis Aligned Bounding Box. This type is compatible
- * with 2D and 3D boxes
- */
+/// Implementation of an Axis Aligned Bounding Box. This type is compatible
+/// with 2D and 3D boxes
 template <typename entity_t, typename value_t, std::size_t DIM>
 class AxisAlignedBoundingBox {
  private:
-  /**
-   * Private self type to capture template parameters
-   */
+  /// Private self type to capture template parameters
   using self_t = AxisAlignedBoundingBox<entity_t, value_t, DIM>;
 
-  /**
-   * Strong type helper, not public
-   * This is only used to provide sensible tag-dispatch below.
-   */
+  /// Strong type helper, not public
+  /// This is only used to provide sensible tag-dispatch below.
   template <typename T, typename P>
   class NamedType {
    public:
@@ -48,278 +42,208 @@ class AxisAlignedBoundingBox {
     T m_value;
   };
 
-  /**
-   * SizeParameter Tag
-   */
+  /// SizeParameter Tag
   struct SizeParameter {};
 
  public:
-  /**
-   * The value type used by this class
-   */
-
+  /// The value type used by this class
   using value_type = value_t;
-  /**
-   * Re-export vertex type based on value type given
-   */
 
+  /// Re-export vertex type based on value type given
   using VertexType = Eigen::Matrix<value_t, DIM, 1>;
-  /**
-   * Associated array value to `VertexType`
-   */
 
+  /// Associated array value to `VertexType`
   using vertex_array_type = Eigen::Array<value_t, DIM, 1>;
 
-  /**
-   * Type of stored entity
-   */
+  /// Type of stored entity
   using entity_type = entity_t;
 
-  /**
-   * The transform type based on the `value_type`
-   */
+  /// The transform type based on the `value_type`
   using transform_type = Eigen::Transform<value_type, DIM, Eigen::Affine>;
 
-  /**
-   * Strong type to select the correct constructor
-   */
+  /// Strong type to select the correct constructor
   using Size = NamedType<VertexType, struct SizeParameter>;
 
-  /**
-   * Re-export dimension from template parameter
-   */
+  /// Re-export dimension from template parameter
   static const std::size_t dim = DIM;
 
-  /**
-   * Copy constructor from other bounding box.
-   * @param other The other AABB
-   */
+  /// Copy constructor from other bounding box.
   AxisAlignedBoundingBox(const self_t& other) = default;
 
-  /**
-   * Copy assignment operator from other bounding box.
-   * @param other The other AABB
-   */
+  /// Copy assignment operator from other bounding box.
+  /// @param other The other AABB
   AxisAlignedBoundingBox& operator=(const self_t& other) = default;
 
-  /**
-   * Constructor from an entity pointer, and the min and max vertices.
-   * @param entity The entity to store
-   * @param vmin The minimum vertex.
-   * @param vmax The maximum vertex.
-   */
+  /// Constructor from an entity pointer, and the min and max vertices.
+  /// @param entity The entity to store
+  /// @param vmin The minimum vertex.
+  /// @param vmax The maximum vertex.
   AxisAlignedBoundingBox(const entity_t* entity, const VertexType& vmin,
                          const VertexType& vmax);
 
-  /**
-   * Constructor from a center position, and a width and height.
-   * @param entity The entity to store
-   * @param center The center position
-   * @param size The size (width and height) of the box.
-   * @note The special type @c size is required to disambiguate this constructor
-   * from the other one above. It is a wrapper around a simple @c Vector3.
-   */
+  /// Constructor from a center position, and a width and height.
+  /// @param entity The entity to store
+  /// @param center The center position
+  /// @param size The size (width and height) of the box.
+  /// @note The special type @c size is required to disambiguate this constructor
+  /// from the other one above. It is a wrapper around a simple @c Vector3.
   AxisAlignedBoundingBox(const entity_t* entity, const VertexType& center,
                          const Size& size);
 
-  /**
-   * Constructor from a list of child boxes. This box will wrap around all boxes
-   * contained in @p boxes, and additional envelope can be given.
-   * @param boxes Vector of child boxes to store in this bounding box.
-   * @param envelope Envelope that will be added/subtracted to the dimension.
-   */
+  /// Constructor from a list of child boxes. This box will wrap around all
+  /// boxes
+  /// contained in @p boxes, and additional envelope can be given.
+  /// @param boxes Vector of child boxes to store in this bounding box.
+  /// @param envelope Envelope that will be added/subtracted to the dimension.
   AxisAlignedBoundingBox(
       const std::vector<self_t*>& boxes,
       vertex_array_type envelope = vertex_array_type::Zero());
 
-  /**
-   * Helper function to calculate the size of a bounding box enclosing @p boxes.
-   * @param boxes The boxes to wrap (const pointers)
-   * @param envelope Optional envelop to add/subtract to dimension.
-   * @return Pair of vertices: min and max.
-   */
+  /// Helper function to calculate the size of a bounding box enclosing @p boxes.
+  /// @param boxes The boxes to wrap (const pointers)
+  /// @param envelope Optional envelop to add/subtract to dimension.
+  /// @return Pair of vertices: min and max.
   static std::pair<VertexType, VertexType> wrap(
       const std::vector<const self_t*>& boxes,
       vertex_array_type envelope = vertex_array_type::Zero());
 
-  /**
-   * Helper function to calculate the size of a bounding box enclosing @p boxes.
-   * Overload which accepts non-const boxes in @p boxes.
-   * @param boxes The boxes to wrap (non-const pointers)
-   * @param envelope Optional envelop to add/subtract to dimension.
-   * @return Pair of vertices: min and max.
-   */
+  /// Helper function to calculate the size of a bounding box enclosing @p boxes.
+  /// Overload which accepts non-const boxes in @p boxes.
+  /// @param boxes The boxes to wrap (non-const pointers)
+  /// @param envelope Optional envelop to add/subtract to dimension.
+  /// @return Pair of vertices: min and max.
   static std::pair<VertexType, VertexType> wrap(
       const std::vector<self_t*>& boxes,
       vertex_array_type envelope = vertex_array_type::Zero());
 
-  /**
-   * Helper function to calculate the size of a bounding box enclosing @p boxes.
-   * Overload which accepts a vector in @p boxes which owns the instances
-   * @param boxes The boxes to wrap (by-value vector)
-   * @param envelope Optional envelop to add/subtract to dimension.
-   * @return Pair of vertices: min and max.
-   */
+  /// Helper function to calculate the size of a bounding box enclosing @p boxes.
+  /// Overload which accepts a vector in @p boxes which owns the instances
+  /// @param boxes The boxes to wrap (by-value vector)
+  /// @param envelope Optional envelop to add/subtract to dimension.
+  /// @return Pair of vertices: min and max.
   static std::pair<VertexType, VertexType> wrap(
       const std::vector<self_t>& boxes,
       vertex_array_type envelope = vertex_array_type::Zero());
 
-  /**
-   * Calculate whether a point is inside this box.
-   * @param point The point to test.
-   * @return Whether the point is inside or not.
-   */
+  /// Calculate whether a point is inside this box.
+  /// @param point The point to test.
+  /// @return Whether the point is inside or not.
   bool intersect(const VertexType& point) const;
 
-  /**
-   * @brief Implements the slab method for Ray/AABB intersections.
-   *
-   * See https://tavianator.com/fast-branchless-raybounding-box-intersections/,
-   * https://tavianator.com/fast-branchless-raybounding-box-intersections-part-2-nans/,
-   * https://medium.com/@bromanz/another-view-on-the-classic-ray-aabb-intersection-algorithm-for-bvh-traversal-41125138b525
-   * The original algorithms is described in "Graphics Gems (1990)" [1]
-   * (https://doi.org/10.1016/B978-0-08-050753-8.50084-X)
-   *
-   * @note This implementation may treat parallel rays on any of the slabs
-   *       as **outside** due to how @c NaNs are handled by Eigen.
-   *       See https://eigen.tuxfamily.org/bz/show_bug.cgi?id=564
-   * @param ray The ray to intersect with
-   * @return Whether the ray intersects this AABB
-   */
+  /// @brief Implements the slab method for Ray/AABB intersections.
+  ///
+  /// See https://tavianator.com/fast-branchless-raybounding-box-intersections/,
+  /// https://tavianator.com/fast-branchless-raybounding-box-intersections-part-2-nans/,
+  /// https://medium.com/@bromanz/another-view-on-the-classic-ray-aabb-intersection-algorithm-for-bvh-traversal-41125138b525
+  /// The original algorithms is described in "Graphics Gems (1990)" [1]
+  /// (https://doi.org/10.1016/B978-0-08-050753-8.50084-X)
+  ///
+  /// @note This implementation may treat parallel rays on any of the slabs
+  ///       as **outside** due to how @c NaNs are handled by Eigen.
+  ///       See https://eigen.tuxfamily.org/bz/show_bug.cgi?id=564
+  /// @param ray The ray to intersect with
+  /// @return Whether the ray intersects this AABB
   bool intersect(const Ray<value_type, DIM>& ray) const;
 
-  /**
-   * Check if a frustum intersects with this bounding box.
-   *
-   * This method implements an algorithm similar to the one described in
-   * "Optimized View Frustum Culling Algorithms for Bounding Boxes (2012)" [2]
-   * (https://doi.org/10.1080/10867651.2000.10487517), but drops some of the
-   * more sophisticated optimization.
-   *
-   * @param fr The frustum
-   * @return Whether the frustum intersects this AABB
-   */
+  /// Check if a frustum intersects with this bounding box.
+  ///
+  /// This method implements an algorithm similar to the one described in
+  /// "Optimized View Frustum Culling Algorithms for Bounding Boxes (2012)" [2]
+  /// (https://doi.org/10.1080/10867651.2000.10487517), but drops some of the
+  /// more sophisticated optimization.
+  ///
+  /// @param fr The frustum
+  /// @return Whether the frustum intersects this AABB
   template <std::size_t sides>
   bool intersect(const Frustum<value_type, DIM, sides>& fr) const;
 
-  /**
-   * Set the skip node (bounding box)
-   * @param skip The target skip node pointer
-   */
+  /// Set the skip node (bounding box)
+  /// @param skip The target skip node pointer
   void setSkip(self_t* skip);
 
-  /**
-   * Get the skip node for this box
-   * @return The skip node pointer
-   */
+  /// Get the skip node for this box
+  /// @return The skip node pointer
   const self_t* getSkip() const;
 
-  /**
-   * Get the left child (i.e. the first of the children that are inside this
-   * bounding box).
-   * @return The lest most child.
-   */
+  /// Get the left child (i.e. the first of the children that are inside this
+  /// bounding box).
+  /// @return The lest most child.
   const self_t* getLeftChild() const;
 
-  /**
-   * Check whether this node as an associated entity. If it does not have one,
-   * this is a purely abstract container box.
-   * @return Whether the box has an entity attached.
-   */
+  /// Check whether this node as an associated entity. If it does not have one,
+  /// this is a purely abstract container box.
+  /// @return Whether the box has an entity attached.
   bool hasEntity() const;
 
-  /**
-   * Return the entity associated with this box. This might be nullptr if there
-   * is no entity attached.
-   * @return The entity pointer, might be nullptr
-   */
+  /// Return the entity associated with this box. This might be nullptr if there
+  /// is no entity attached.
+  /// @return The entity pointer, might be nullptr
   const entity_t* entity() const;
 
-  /**
-   * Set the entity associated with with this box.
-   * @param entity The entity
-   */
+  /// Set the entity associated with with this box.
+  /// @param entity The entity
   void setEntity(const entity_t* entity);
 
-  /**
-   * Get the center position of this bounding box.
-   * @return The center position
-   */
+  /// Get the center position of this bounding box.
+  /// @return The center position
   const VertexType& center() const;
 
-  /**
-   * Get the minimum vertex
-   * @return The minimum vertex
-   */
+  /// Get the minimum vertex
+  /// @return The minimum vertex
   const VertexType& min() const;
 
-  /**
-   * Get the maximum vertex
-   * @return The maximum vertex
-   */
+  /// Get the maximum vertex
+  /// @return The maximum vertex
   const VertexType& max() const;
 
-  /**
-   * Write information about this bounding box to a stream.
-   * @param os The output stream.
-   * @return The stream given as an argument.
-   */
+  /// Write information about this bounding box to a stream.
+  /// @param os The output stream.
+  /// @return The stream given as an argument.
   std::ostream& toStream(std::ostream& os) const;
 
-  /**
-   * Transforms this bounding box using the given transform. This method
-   * modifies the box it is called on.
-   * @param trf The transform
-   */
+  /// Transforms this bounding box using the given transform. This method
+  /// modifies the box it is called on.
+  /// @param trf The transform
   void transform(const transform_type& trf);
 
-  /**
-   * Transforms this bounding box using the given transform. This method returns
-   * a copy of this box, with the transformation applied, and leaves this
-   * instance unchanged.
-   * @param trf The transform
-   * @return The transformed bounding box
-   */
+  /// Transforms this bounding box using the given transform. This method
+  /// returns a copy of this box, with the transformation applied, and leaves
+  /// this instance unchanged.
+  /// @param trf The transform
+  /// @return The transformed bounding box
   self_t transformed(const transform_type& trf) const;
 
-  /**
-   * Draw this bounding box using the given visualization helper. This method is
-   * only available for the 3D case.
-   * @tparam D (used for SFINAE)
-   * @param helper The visualization helper to write to
-   * @param color The color to use for drawing
-   * @param trf An optional transform to apply first.
-   */
-  template <std::size_t D = DIM, std::enable_if_t<D == 3, int> = 0>
-  void draw(IVisualization3D& helper,
-            std::array<int, 3> color = {120, 120, 120},
-            const transform_type& trf = transform_type::Identity()) const;
-
-  /**
-   * Draw this bounding box as SVG. This method is only available for the 2D
-   * case.
-   * @tparam D (used for SFINAE)
-   * @param os The output stream to write to
-   * @param w The width of the output SVG.
-   * @param h The height of the output SVG.
-   * @param unit A scale factor to apply before drawing
-   * @param label A label to put next to the box.
-   * @param fillcolor Color to fill the box with.
-   * @return The outstream given in @p os.
-   */
-  template <std::size_t D = DIM, std::enable_if_t<D == 2, int> = 0>
+  /// Draw this bounding box using the given visualization helper. This method
+  /// is only available for the 3D case.
+  /// @param helper The visualization helper to write to
+  /// @param color The color to use for drawing
+  /// @param trf An optional transform to apply first.
+  void draw(IVisualization3D& helper, Color color = {120, 120, 120},
+            const transform_type& trf = transform_type::Identity()) const
+    requires(DIM == 3);
+
+  /// Draw this bounding box as SVG. This method is only available for the 2D
+  /// case.
+  /// @param os The output stream to write to
+  /// @param w The width of the output SVG.
+  /// @param h The height of the output SVG.
+  /// @param unit A scale factor to apply before drawing
+  /// @param label A label to put next to the box.
+  /// @param fillcolor Color to fill the box with.
+  /// @return The outstream given in @p os.
   std::ostream& svg(std::ostream& os, value_type w, value_type h,
                     value_type unit = 10, const std::string& label = "",
-                    const std::string& fillcolor = "grey") const;
+                    const std::string& fillcolor = "grey") const
+    requires(DIM == 2);
 
  private:
-  template <std::size_t D = DIM, std::enable_if_t<D == 2, int> = 0>
   std::pair<VertexType, VertexType> transformVertices(
-      const transform_type& trf) const;
+      const transform_type& trf) const
+    requires(DIM == 2);
 
-  template <std::size_t D = DIM, std::enable_if_t<D == 3, int> = 0>
   std::pair<VertexType, VertexType> transformVertices(
-      const transform_type& trf) const;
+      const transform_type& trf) const
+    requires(DIM == 3);
 
   const entity_t* m_entity;
   VertexType m_vmin;
@@ -333,32 +257,28 @@ class AxisAlignedBoundingBox {
   self_t* m_skip{nullptr};
 };
 
-/**
- * Build an octree from a list of bounding boxes.
- * @note @p store and @p prims do not need to contain the same objects. @p store
- * is only used to pass ownership back to the caller while preserving memory
- * location.
- * @tparam box_t Works will all box types.
- * @param store Owns the created boxes by means of `std::unique_ptr`.
- * @param prims Boxes to store. This is a read only vector.
- * @param max_depth No subdivisions beyond this level.
- * @param envelope1 Envelope to add/subtract to dimensions in all directions.
- * @return Pointer to the top most bounding box, containing the entire octree
- */
+/// Build an octree from a list of bounding boxes.
+/// @note @p store and @p prims do not need to contain the same objects. @p store
+/// is only used to pass ownership back to the caller while preserving memory
+/// location.
+/// @tparam box_t Works will all box types.
+/// @param store Owns the created boxes by means of `std::unique_ptr`.
+/// @param prims Boxes to store. This is a read only vector.
+/// @param max_depth No subdivisions beyond this level.
+/// @param envelope1 Envelope to add/subtract to dimensions in all directions.
+/// @return Pointer to the top most bounding box, containing the entire octree
 template <typename box_t>
 box_t* make_octree(std::vector<std::unique_ptr<box_t>>& store,
                    const std::vector<box_t*>& prims, std::size_t max_depth = 1,
                    typename box_t::value_type envelope1 = 0);
 
-/**
- * Overload of the << operator for bounding boxes.
- * @tparam T entity type
- * @tparam U value type
- * @tparam V dimension
- * @param os The output stream
- * @param box The bounding box
- * @return The given output stream.
- */
+/// Overload of the << operator for bounding boxes.
+/// @tparam T entity type
+/// @tparam U value type
+/// @tparam V dimension
+/// @param os The output stream
+/// @param box The bounding box
+/// @return The given output stream.
 template <typename T, typename U, std::size_t V>
 std::ostream& operator<<(std::ostream& os,
                          const AxisAlignedBoundingBox<T, U, V>& box);
diff --git a/Core/include/Acts/Utilities/BoundingBox.ipp b/Core/include/Acts/Utilities/BoundingBox.ipp
index 086e288e338..d989507fa85 100644
--- a/Core/include/Acts/Utilities/BoundingBox.ipp
+++ b/Core/include/Acts/Utilities/BoundingBox.ipp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2018-2019 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 template <typename entity_t, typename value_t, std::size_t DIM>
 Acts::AxisAlignedBoundingBox<entity_t, value_t, DIM>::AxisAlignedBoundingBox(
@@ -275,12 +275,13 @@ std::ostream& Acts::AxisAlignedBoundingBox<entity_t, value_t, DIM>::toStream(
 }
 
 template <typename entity_t, typename value_t, std::size_t DIM>
-template <std::size_t D, std::enable_if_t<D == 3, int>>
 std::pair<
     typename Acts::AxisAlignedBoundingBox<entity_t, value_t, DIM>::VertexType,
     typename Acts::AxisAlignedBoundingBox<entity_t, value_t, DIM>::VertexType>
 Acts::AxisAlignedBoundingBox<entity_t, value_t, DIM>::transformVertices(
-    const transform_type& trf) const {
+    const transform_type& trf) const
+  requires(DIM == 3)
+{
   // we need to enumerate all the vertices, transform,
   // and then recalculate min and max
 
@@ -308,12 +309,13 @@ Acts::AxisAlignedBoundingBox<entity_t, value_t, DIM>::transformVertices(
 }
 
 template <typename entity_t, typename value_t, std::size_t DIM>
-template <std::size_t D, std::enable_if_t<D == 2, int>>
 std::pair<
     typename Acts::AxisAlignedBoundingBox<entity_t, value_t, DIM>::VertexType,
     typename Acts::AxisAlignedBoundingBox<entity_t, value_t, DIM>::VertexType>
 Acts::AxisAlignedBoundingBox<entity_t, value_t, DIM>::transformVertices(
-    const transform_type& trf) const {
+    const transform_type& trf) const
+  requires(DIM == 2)
+{
   // we need to enumerate all the vertices, transform,
   // and then recalculate min and max
 
@@ -344,16 +346,15 @@ template <typename entity_t, typename value_t, std::size_t DIM>
 Acts::AxisAlignedBoundingBox<entity_t, value_t, DIM>
 Acts::AxisAlignedBoundingBox<entity_t, value_t, DIM>::transformed(
     const transform_type& trf) const {
-  VertexType vmin, vmax;
-  std::tie(vmin, vmax) = transformVertices(trf);
+  const auto [vmin, vmax] = transformVertices(trf);
   return self_t(m_entity, vmin, vmax);
 }
 
 template <typename entity_t, typename value_t, std::size_t DIM>
-template <std::size_t D, std::enable_if_t<D == 3, int>>
 void Acts::AxisAlignedBoundingBox<entity_t, value_t, DIM>::draw(
-    IVisualization3D& helper, std::array<int, 3> color,
-    const transform_type& trf) const {
+    IVisualization3D& helper, Color color, const transform_type& trf) const
+  requires(DIM == 3)
+{
   static_assert(DIM == 3, "PLY output only supported in 3D");
 
   const VertexType& vmin = m_vmin;
@@ -385,10 +386,11 @@ void Acts::AxisAlignedBoundingBox<entity_t, value_t, DIM>::draw(
 }
 
 template <typename entity_t, typename value_t, std::size_t DIM>
-template <std::size_t D, std::enable_if_t<D == 2, int>>
 std::ostream& Acts::AxisAlignedBoundingBox<entity_t, value_t, DIM>::svg(
     std::ostream& os, value_type w, value_type h, value_type unit,
-    const std::string& label, const std::string& fillcolor) const {
+    const std::string& label, const std::string& fillcolor) const
+  requires(DIM == 2)
+{
   static_assert(DIM == 2, "SVG is only supported in 2D");
 
   VertexType mid(w / 2., h / 2.);
@@ -460,8 +462,7 @@ box_t* octree_inner(std::vector<std::unique_ptr<box_t>>& store,
 
   std::array<std::vector<box_t*>, 8> octants;
   // calc center of boxes
-  VertexType vmin, vmax;
-  std::tie(vmin, vmax) = box_t::wrap(lprims);
+  const auto [vmin, vmax] = box_t::wrap(lprims);
   VertexType glob_ctr = (vmin + vmax) / 2.;
 
   for (auto* box : lprims) {
diff --git a/Core/include/Acts/Utilities/CalibrationContext.hpp b/Core/include/Acts/Utilities/CalibrationContext.hpp
index 1a2a16ec86e..a33142555ed 100644
--- a/Core/include/Acts/Utilities/CalibrationContext.hpp
+++ b/Core/include/Acts/Utilities/CalibrationContext.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2019 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
diff --git a/Core/include/Acts/Utilities/Concepts.hpp b/Core/include/Acts/Utilities/Concepts.hpp
new file mode 100644
index 00000000000..2aafdd40320
--- /dev/null
+++ b/Core/include/Acts/Utilities/Concepts.hpp
@@ -0,0 +1,40 @@
+// This file is part of the ACTS project.
+//
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
+//
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
+
+#pragma once
+
+#include <concepts>
+#include <functional>
+#include <type_traits>
+
+namespace Acts::Concepts {
+/// @brief Concept that is true if T is the same as any of Ts.
+template <typename T, typename... Ts>
+concept same_as_any_of = (std::same_as<T, Ts> || ...);
+
+/// @brief Concept that is equivalent to `is_nothrow_move_constructible`.
+/// @todo Convert this to a "real" concept.
+template <typename T>
+concept nothrow_move_constructible = std::is_nothrow_move_constructible_v<T>;
+
+/// @brief Concept that is true if T is an arithmetic type.
+template <typename T>
+concept arithmetic = std::integral<T> || std::floating_point<T>;
+
+/// @brief Concept that is satisfied iff both of its arguments decay to the
+/// same type.
+template <typename T1, typename T2>
+concept decayed_same_as = std::same_as<std::decay_t<T1>, std::decay_t<T2> >;
+
+/// @brief Concept that is satisfied iff type T is callable with arguments
+/// Args... and returns type U
+template <auto Callable, typename U, typename... Args>
+concept invocable_and_returns = requires(Args... args) {
+  { std::invoke(Callable, args...) } -> std::same_as<U>;
+};
+}  // namespace Acts::Concepts
diff --git a/Core/include/Acts/Utilities/DBScan.hpp b/Core/include/Acts/Utilities/DBScan.hpp
index 79f862ce573..9436a4e4b2e 100644
--- a/Core/include/Acts/Utilities/DBScan.hpp
+++ b/Core/include/Acts/Utilities/DBScan.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2024 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
diff --git a/Core/include/Acts/Utilities/Delegate.hpp b/Core/include/Acts/Utilities/Delegate.hpp
index 29f1a3d4f20..a0ef2cf7252 100644
--- a/Core/include/Acts/Utilities/Delegate.hpp
+++ b/Core/include/Acts/Utilities/Delegate.hpp
@@ -1,14 +1,14 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2021 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
-#include "Acts/Utilities/TypeTraits.hpp"
+#include "Acts/Utilities/Concepts.hpp"
 
 #include <cassert>
 #include <functional>
@@ -16,7 +16,6 @@
 #include <type_traits>
 
 namespace Acts {
-
 /// Ownership enum for @c Delegate
 enum class DelegateType { Owning, NonOwning };
 
@@ -45,6 +44,7 @@ class Delegate;
 ///
 template <typename R, typename H, DelegateType O, typename... Args>
 class Delegate<R(Args...), H, O> {
+ public:
   static constexpr DelegateType kOwnership = O;
 
   /// Alias of the return type
@@ -52,11 +52,12 @@ class Delegate<R(Args...), H, O> {
   using holder_type = H;
   /// Alias to the function pointer type this class will store
   using function_type = return_type (*)(const holder_type *, Args...);
-
   using function_ptr_type = return_type (*)(Args...);
+  using signature_type = R(Args...);
 
   using deleter_type = void (*)(const holder_type *);
 
+ private:
   template <typename T, typename C>
   using isSignatureCompatible =
       decltype(std::declval<T &>() = std::declval<C>());
@@ -65,11 +66,12 @@ class Delegate<R(Args...), H, O> {
       Delegate<R(Args...), holder_type, DelegateType::Owning>;
   using NonOwningDelegate =
       Delegate<R(Args...), holder_type, DelegateType::NonOwning>;
+
   template <typename T>
-  using isNoFunPtr =
-      std::enable_if_t<!std::is_convertible_v<std::decay_t<T>, function_type> &&
-                       !std::is_same_v<std::decay_t<T>, OwningDelegate> &&
-                       !std::is_same_v<std::decay_t<T>, NonOwningDelegate>>;
+  using isNoFunPtr = std::conjunction<
+      std::negation<std::is_convertible<std::decay_t<T>, function_type>>,
+      std::negation<std::is_same<std::decay_t<T>, OwningDelegate>>,
+      std::negation<std::is_same<std::decay_t<T>, NonOwningDelegate>>>;
 
  public:
   Delegate() = default;
@@ -91,8 +93,10 @@ class Delegate<R(Args...), H, O> {
   /// @param callable The callable (function object or lambda)
   /// @note @c Delegate does not assume owner ship over @p callable. You need to ensure
   ///       it's lifetime is longer than that of @c Delegate.
-  template <typename Callable, typename = isNoFunPtr<Callable>>
-  explicit Delegate(Callable &callable) {
+  template <typename Callable>
+  explicit Delegate(Callable &callable)
+    requires(isNoFunPtr<Callable>::value)
+  {
     connect(callable);
   }
 
@@ -110,16 +114,20 @@ class Delegate<R(Args...), H, O> {
   /// @param instance The instance on which the member function pointer should be called on
   /// @note @c Delegate does not assume owner ship over @p instance.
   /// @note @c DelegateFuncTag is used to communicate the callable type
-  template <auto Callable, typename Type, DelegateType T = kOwnership,
-            typename = std::enable_if_t<T == DelegateType::NonOwning>>
-  Delegate(DelegateFuncTag<Callable> /*tag*/, const Type *instance) {
+  template <auto Callable, typename Type>
+
+  Delegate(DelegateFuncTag<Callable> /*tag*/, const Type *instance)
+    requires(kOwnership == DelegateType::NonOwning)
+  {
     connect<Callable>(instance);
   }
 
   /// Constructor from rvalue reference is deleted, should catch construction
   /// with temporary objects and thus invalid pointers
-  template <typename Callable, typename = isNoFunPtr<Callable>>
-  Delegate(Callable &&) = delete;
+  template <typename Callable>
+  Delegate(Callable &&)
+    requires(isNoFunPtr<Callable>::value)
+  = delete;
 
   /// Assignment operator with an explicit runtime callable
   /// @param callable The runtime value of the callable
@@ -133,26 +141,32 @@ class Delegate<R(Args...), H, O> {
   /// @param callable The callable (function object or lambda)
   /// @note @c Delegate does not assume owner ship over @p callable. You need to ensure
   ///       it's lifetime is longer than that of @c Delegate.
-  template <typename Callable, typename = isNoFunPtr<Callable>>
-  void operator=(Callable &callable) {
+  template <typename Callable>
+  void operator=(Callable &callable)
+    requires(isNoFunPtr<Callable>::value)
+  {
     connect(callable);
   }
 
   /// Assignment operator from rvalue reference is deleted, should catch
   /// assignment from temporary objects and thus invalid pointers
-  template <typename Callable, typename = isNoFunPtr<Callable>>
-  void operator=(Callable &&) = delete;
+  template <typename Callable>
+  void operator=(Callable &&)
+    requires(isNoFunPtr<Callable>::value)
+  = delete;
 
   /// Connect a free function pointer.
   /// @note The function pointer must be ``constexpr`` for @c Delegate to accept it
   /// @tparam Callable The compile-time free function pointer
   template <auto Callable>
-  void connect() {
+  void connect()
+    requires(
+        Concepts::invocable_and_returns<Callable, return_type, Args && ...>)
+  {
     m_payload.payload = nullptr;
 
     static_assert(
-        Concepts::is_detected<isSignatureCompatible, function_ptr_type,
-                              decltype(Callable)>::value,
+        Concepts::invocable_and_returns<Callable, return_type, Args &&...>,
         "Callable given does not correspond exactly to required call "
         "signature");
 
@@ -167,15 +181,19 @@ class Delegate<R(Args...), H, O> {
   /// @param callable The callable (function object or lambda)
   /// @note @c Delegate does not assume owner ship over @p callable. You need to ensure
   ///       it's lifetime is longer than that of @c Delegate.
-  template <typename Callable, typename = isNoFunPtr<Callable>>
-  void connect(Callable &callable) {
+  template <typename Callable>
+  void connect(Callable &callable)
+    requires(isNoFunPtr<Callable>::value)
+  {
     connect<&Callable::operator(), Callable>(&callable);
   }
 
   /// Connection with rvalue reference is deleted, should catch assignment
   /// from temporary objects and thus invalid pointers
-  template <typename Callable, typename = isNoFunPtr<Callable>>
-  void connect(Callable &&) = delete;
+  template <typename Callable>
+  void connect(Callable &&)
+    requires(isNoFunPtr<Callable>::value)
+  = delete;
 
   /// Connect anything that is assignable to the function pointer
   /// @param callable The runtime value of the callable
@@ -189,22 +207,27 @@ class Delegate<R(Args...), H, O> {
     m_function = callable;
   }
 
+  template <typename Type>
+  void connect(function_type callable, const Type *instance)
+    requires(kOwnership == DelegateType::NonOwning)
+  {
+    m_payload.payload = instance;
+    m_function = callable;
+  }
+
   /// Connect a member function to be called on an instance
   /// @tparam Callable The compile-time member function pointer
   /// @tparam Type The type of the instance the member function should be called on
   /// @param instance The instance on which the member function pointer should be called on
   /// @note @c Delegate does not assume owner ship over @p instance. You need to ensure
   ///       it's lifetime is longer than that of @c Delegate.
-  template <auto Callable, typename Type, DelegateType T = kOwnership,
-            typename = std::enable_if_t<T == DelegateType::NonOwning>>
-  void connect(const Type *instance) {
-    using member_ptr_type = return_type (Type::*)(Args...) const;
-
-    static_assert(Concepts::is_detected<isSignatureCompatible, member_ptr_type,
-                                        decltype(Callable)>::value,
-                  "Callable given does not correspond exactly to required call "
-                  "signature");
+  template <auto Callable, typename Type>
+  void connect(const Type *instance)
+    requires(kOwnership == DelegateType::NonOwning &&
+             Concepts::invocable_and_returns<Callable, return_type, Type,
+                                             Args && ...>)
 
+  {
     m_payload.payload = instance;
 
     m_function = [](const holder_type *payload, Args... args) -> return_type {
@@ -220,15 +243,12 @@ class Delegate<R(Args...), H, O> {
   /// @tparam Type The type of the instance the member function should be called on
   /// @param instance The instance on which the member function pointer should be called on
   /// @note @c Delegate assumes owner ship over @p instance.
-  template <auto Callable, typename Type, DelegateType T = kOwnership,
-            typename = std::enable_if_t<T == DelegateType::Owning>>
-  void connect(std::unique_ptr<const Type> instance) {
-    using member_ptr_type = return_type (Type::*)(Args &&...) const;
-    static_assert(Concepts::is_detected<isSignatureCompatible, member_ptr_type,
-                                        decltype(Callable)>::value,
-                  "Callable given does not correspond exactly to required call "
-                  "signature");
-
+  template <auto Callable, typename Type>
+  void connect(std::unique_ptr<const Type> instance)
+    requires(kOwnership == DelegateType::Owning &&
+             Concepts::invocable_and_returns<Callable, return_type, Type,
+                                             Args && ...>)
+  {
     m_payload.payload = std::unique_ptr<const holder_type, deleter_type>(
         instance.release(), [](const holder_type *payload) {
           const auto *concretePayload = static_cast<const Type *>(payload);
@@ -247,7 +267,9 @@ class Delegate<R(Args...), H, O> {
   /// @param args The arguments to call the contained function with
   /// @return Return value of the contained function
   template <typename... Ts>
-  return_type operator()(Ts &&...args) const {
+  return_type operator()(Ts &&...args) const
+    requires(std::is_invocable_v<function_type, const holder_type *, Ts...>)
+  {
     assert(connected() && "Delegate is not connected");
     return std::invoke(m_function, m_payload.ptr(), std::forward<Ts>(args)...);
   }
@@ -266,9 +288,9 @@ class Delegate<R(Args...), H, O> {
     m_function = nullptr;
   }
 
-  template <typename holder_t = holder_type,
-            typename = std::enable_if_t<!std::is_same_v<holder_t, void>>>
-  const holder_type *instance() const {
+  const holder_type *instance() const
+    requires(!std::same_as<holder_type, void>)
+  {
     return m_payload.ptr();
   }
 
@@ -316,6 +338,11 @@ class OwningDelegate;
 /// Alias for an owning delegate
 template <typename R, typename H, typename... Args>
 class OwningDelegate<R(Args...), H>
-    : public Delegate<R(Args...), H, DelegateType::Owning> {};
+    : public Delegate<R(Args...), H, DelegateType::Owning> {
+ public:
+  OwningDelegate() = default;
+  OwningDelegate(Delegate<R(Args...), H, DelegateType::Owning> &&delegate)
+      : Delegate<R(Args...), H, DelegateType::Owning>(std::move(delegate)) {}
+};
 
 }  // namespace Acts
diff --git a/Core/include/Acts/Utilities/DelegateChainBuilder.hpp b/Core/include/Acts/Utilities/DelegateChainBuilder.hpp
new file mode 100644
index 00000000000..a24ab98ddb8
--- /dev/null
+++ b/Core/include/Acts/Utilities/DelegateChainBuilder.hpp
@@ -0,0 +1,159 @@
+// This file is part of the ACTS project.
+//
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
+//
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
+
+#pragma once
+
+#include "Acts/Utilities/Delegate.hpp"
+#include "Acts/Utilities/TypeList.hpp"
+
+#include <tuple>
+#include <type_traits>
+#include <utility>
+
+namespace Acts {
+
+template <typename Fn, typename payload_types = TypeList<>, auto... Callables>
+class DelegateChainBuilder;
+
+template <typename R, typename... payload_types, auto... callables,
+          typename... callable_args>
+class DelegateChainBuilder<R(callable_args...), TypeList<payload_types...>,
+                           callables...> {
+  using return_type =
+      std::conditional_t<std::is_same_v<R, void>, void,
+                         std::array<R, sizeof...(payload_types)>>;
+  using delegate_type =
+      Delegate<return_type(callable_args...), void, DelegateType::Owning>;
+  using tuple_type = std::tuple<payload_types...>;
+
+ public:
+  template <typename, typename Ps, auto... Cs>
+  friend class DelegateChainBuilder;
+
+  DelegateChainBuilder() = default;
+
+  template <typename D>
+  DelegateChainBuilder(const D& /*unused*/) {}
+
+  template <auto Callable, typename payload_type>
+  constexpr auto add(payload_type payload)
+    requires(std::is_pointer_v<payload_type>)
+  {
+    std::tuple<payload_types..., payload_type> payloads =
+        std::tuple_cat(m_payloads, std::make_tuple(payload));
+
+    return DelegateChainBuilder<R(callable_args...),
+                                TypeList<payload_types..., payload_type>,
+                                callables..., Callable>{payloads};
+  }
+
+  template <auto Callable>
+  constexpr auto add() {
+    std::tuple<payload_types..., std::nullptr_t> payloads =
+        std::tuple_cat(m_payloads, std::make_tuple(std::nullptr_t{}));
+
+    return DelegateChainBuilder<R(callable_args...),
+                                TypeList<payload_types..., std::nullptr_t>,
+                                callables..., Callable>{payloads};
+  }
+
+  delegate_type build()
+    requires(sizeof...(callables) > 0)
+  {
+    auto block = std::make_unique<const DispatchBlock>(m_payloads);
+    delegate_type delegate;
+    delegate.template connect<&DispatchBlock::dispatch>(std::move(block));
+    return delegate;
+  }
+
+  void store(delegate_type& delegate)
+    requires(sizeof...(callables) > 0)
+  {
+    auto block = std::make_unique<const DispatchBlock>(m_payloads);
+    delegate.template connect<&DispatchBlock::dispatch>(std::move(block));
+  }
+
+  void store(Delegate<R(callable_args...)>& delegate)
+    requires(sizeof...(callables) == 1)
+  {
+    constexpr auto callable =
+        DispatchBlock::template findCallable<0, 0, callables...>();
+    delegate.template connect<callable>(std::get<0>(m_payloads));
+  }
+
+ private:
+  DelegateChainBuilder(std::tuple<payload_types...> payloads)
+      : m_payloads(payloads) {}
+
+  struct DispatchBlock {
+    template <std::size_t I, std::size_t J, auto head, auto... tail>
+    static constexpr auto findCallable() {
+      if constexpr (I == J) {
+        return head;
+      } else {
+        return findCallable<I, J + 1, tail...>();
+      }
+    }
+
+    template <std::size_t I = 0, typename result_ptr>
+    static constexpr auto invoke(result_ptr result, const tuple_type* payloads,
+                                 callable_args&&... args) {
+      const auto& callable = findCallable<I, 0, callables...>();
+
+      if constexpr (!std::is_same_v<std::tuple_element_t<I, tuple_type>,
+                                    std::nullptr_t>) {
+        auto payload = std::get<I>(*payloads);
+
+        if constexpr (!std::is_same_v<result_ptr, std::nullptr_t>) {
+          std::get<I>(*result) = std::invoke(
+              callable, payload, std::forward<callable_args>(args)...);
+        } else {
+          std::invoke(callable, payload, std::forward<callable_args>(args)...);
+        }
+
+      } else {
+        if constexpr (!std::is_same_v<result_ptr, std::nullptr_t>) {
+          std::get<I>(*result) =
+              std::invoke(callable, std::forward<callable_args>(args)...);
+        } else {
+          std::invoke(callable, std::forward<callable_args>(args)...);
+        }
+      }
+
+      if constexpr (I < sizeof...(payload_types) - 1) {
+        invoke<I + 1>(result, payloads, std::forward<callable_args>(args)...);
+      }
+    }
+
+    DispatchBlock(tuple_type payloads) : m_payloads(std::move(payloads)) {}
+
+    tuple_type m_payloads{};
+
+    auto dispatch(callable_args&&... args) const {
+      if constexpr (std::is_same_v<R, void>) {
+        invoke(nullptr, &m_payloads, std::forward<callable_args>(args)...);
+      } else {
+        static_assert(
+            std::is_same_v<R, void> || std::is_default_constructible_v<R>,
+            "Delegate chain return type must be void or default constructible");
+        return_type result{};
+        invoke(&result, &m_payloads, std::forward<callable_args>(args)...);
+        return result;
+      }
+    }
+  };
+
+ private:
+  tuple_type m_payloads{};
+};
+
+template <typename D>
+DelegateChainBuilder(const D& /*unused*/)
+    -> DelegateChainBuilder<typename D::signature_type>;
+
+}  // namespace Acts
diff --git a/Core/include/Acts/Utilities/EnumBitwiseOperators.hpp b/Core/include/Acts/Utilities/EnumBitwiseOperators.hpp
index f664b4c6fc8..bcc93d9e6b5 100644
--- a/Core/include/Acts/Utilities/EnumBitwiseOperators.hpp
+++ b/Core/include/Acts/Utilities/EnumBitwiseOperators.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2021 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
diff --git a/Core/include/Acts/Utilities/Enumerate.hpp b/Core/include/Acts/Utilities/Enumerate.hpp
index 130fec7405a..cdfb9bb2bdb 100644
--- a/Core/include/Acts/Utilities/Enumerate.hpp
+++ b/Core/include/Acts/Utilities/Enumerate.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2022 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
diff --git a/Core/include/Acts/Utilities/FiniteStateMachine.hpp b/Core/include/Acts/Utilities/FiniteStateMachine.hpp
index 9c170ede36e..1171b91d30a 100644
--- a/Core/include/Acts/Utilities/FiniteStateMachine.hpp
+++ b/Core/include/Acts/Utilities/FiniteStateMachine.hpp
@@ -1,15 +1,13 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2019 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
-#include "Acts/Utilities/TypeTraits.hpp"
-
 #include <optional>
 #include <string_view>
 #include <variant>
@@ -121,8 +119,7 @@ class FiniteStateMachine {
   /// Default constructor. The default state is taken to be the first in the
   /// `States` template arguments
   FiniteStateMachine()
-      : m_state(typename std::tuple_element<0, std::tuple<States...>>::type{}) {
-  }
+      : m_state(typename std::tuple_element_t<0, std::tuple<States...>>{}) {}
 
   /// Constructor from an explicit state. The FSM is initialized to this state.
   /// @param state Initial state for the FSM.
diff --git a/Core/include/Acts/Utilities/Frustum.hpp b/Core/include/Acts/Utilities/Frustum.hpp
index 007e3fc8b25..f51c1432930 100644
--- a/Core/include/Acts/Utilities/Frustum.hpp
+++ b/Core/include/Acts/Utilities/Frustum.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2018-2019 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
@@ -51,9 +51,9 @@ class Frustum {
   /// @param opening_angle The opening angle
   /// @note The @p opening_angle is defined as the angle between opposing side
   /// planes. The opening angle needs to be < pi.
-  template <std::size_t D = DIM, std::enable_if_t<D == 2, int> = 0>
   Frustum(const VertexType& origin, const VertexType& dir,
-          value_type opening_angle);
+          value_type opening_angle)
+    requires(DIM == 2);
 
   /// Constructor for the 3D case.
   /// @param origin The origin of the frustum
@@ -61,17 +61,17 @@ class Frustum {
   /// @param opening_angle The opening angle
   /// @note The @p opening_angle is defined as the angle between opposing side
   /// planes. The opening angle needs to be < pi.
-  template <std::size_t D = DIM, std::enable_if_t<D == 3, int> = 0>
   Frustum(const VertexType& origin, const VertexType& dir,
-          value_type opening_angle);
+          value_type opening_angle)
+    requires(DIM == 3);
 
   /// Draw a representation of this frustum using a visualization helper
   /// @note This is only available for the 3D case.
   /// @param helper The visualization helper
   /// @param far_distance The distance to the virtual "far plane" at which point
   /// the side planes terminate visually.
-  template <std::size_t D = DIM, std::enable_if_t<D == 3, int> = 0>
-  void draw(IVisualization3D& helper, value_type far_distance = 10) const;
+  void draw(IVisualization3D& helper, value_type far_distance = 10) const
+    requires(DIM == 3);
 
   /// Draw a representation of this frustum as an SVG string to an outstream
   /// @note This is only available for the 2D case.
@@ -81,9 +81,9 @@ class Frustum {
   /// @param far_distance The distance to the virtual "far line" at which point
   /// the side lines terminate visually.
   /// @param unit Multiplicative factor to apply to internal distances
-  template <std::size_t D = DIM, std::enable_if_t<D == 2, int> = 0>
   std::ostream& svg(std::ostream& os, value_type w, value_type h,
-                    value_type far_distance = 1, value_type unit = 20.) const;
+                    value_type far_distance = 1, value_type unit = 20.) const
+    requires(DIM == 2);
 
   /// Getter for the oriogin of the frustum
   /// @return The origin of the frustum
diff --git a/Core/include/Acts/Utilities/Frustum.ipp b/Core/include/Acts/Utilities/Frustum.ipp
index 75dbb3377ad..bca40c35464 100644
--- a/Core/include/Acts/Utilities/Frustum.ipp
+++ b/Core/include/Acts/Utilities/Frustum.ipp
@@ -1,29 +1,31 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2018-2019 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include "Acts/Utilities/VectorHelpers.hpp"
 
+#include <numbers>
+
 template <typename value_t, std::size_t DIM, std::size_t SIDES>
-template <std::size_t D, std::enable_if_t<D == 2, int>>
 Acts::Frustum<value_t, DIM, SIDES>::Frustum(const VertexType& origin,
                                             const VertexType& dir,
                                             value_type opening_angle)
+  requires(DIM == 2)
     : m_origin(origin) {
   using rotation_t = Eigen::Rotation2D<value_type>;
 
   static_assert(SIDES == 2, "2D frustum can only have 2 sides");
-  assert(opening_angle < M_PI);
+  assert(opening_angle < std::numbers::pi_v<value_type>);
 
   translation_t translation(origin);
   value_type angle = VectorHelpers::phi(dir);
   Eigen::Rotation2D<value_type> rot(angle);
 
-  value_type normal_angle = 0.5 * M_PI - 0.5 * opening_angle;
+  value_type normal_angle = std::numbers::pi / 2. - opening_angle / 2.;
   VertexType normal1 = rotation_t(normal_angle) * VertexType::UnitX();
   VertexType normal2 = rotation_t(-normal_angle) * VertexType::UnitX();
 
@@ -31,13 +33,13 @@ Acts::Frustum<value_t, DIM, SIDES>::Frustum(const VertexType& origin,
 }
 
 template <typename value_t, std::size_t DIM, std::size_t SIDES>
-template <std::size_t D, std::enable_if_t<D == 3, int>>
 Acts::Frustum<value_t, DIM, SIDES>::Frustum(const VertexType& origin,
                                             const VertexType& dir,
                                             value_type opening_angle)
+  requires(DIM == 3)
     : m_origin(origin) {
   static_assert(SIDES > 2, "3D frustum must have 3 or more sides");
-  assert(opening_angle < M_PI);
+  assert(opening_angle < std::numbers::pi_v<value_type>);
   using angle_axis_t = Eigen::AngleAxis<value_type>;
 
   const VertexType ldir = VertexType::UnitZ();
@@ -48,7 +50,7 @@ Acts::Frustum<value_t, DIM, SIDES>::Frustum(const VertexType& origin,
 
   m_normals[0] = ldir;
 
-  const value_type phi_sep = 2 * M_PI / sides;
+  const value_type phi_sep = 2. * std::numbers::pi_v<value_type> / sides;
   transform_type rot;
   rot = angle_axis_t(phi_sep, ldir);
 
@@ -74,9 +76,10 @@ Acts::Frustum<value_t, DIM, SIDES>::Frustum(const VertexType& origin,
 }
 
 template <typename value_t, std::size_t DIM, std::size_t SIDES>
-template <std::size_t D, std::enable_if_t<D == 3, int>>
 void Acts::Frustum<value_t, DIM, SIDES>::draw(IVisualization3D& helper,
-                                              value_type far_distance) const {
+                                              value_type far_distance) const
+  requires(DIM == 3)
+{
   static_assert(DIM == 3, "Drawing is only supported in 3D");
 
   // Iterate around normals, calculate cross with "far" plane
@@ -126,12 +129,13 @@ void Acts::Frustum<value_t, DIM, SIDES>::draw(IVisualization3D& helper,
 }
 
 template <typename value_t, std::size_t DIM, std::size_t SIDES>
-template <std::size_t D, std::enable_if_t<D == 2, int>>
 std::ostream& Acts::Frustum<value_t, DIM, SIDES>::svg(std::ostream& os,
                                                       value_type w,
                                                       value_type h,
                                                       value_type far_distance,
-                                                      value_type unit) const {
+                                                      value_type unit) const
+  requires(DIM == 2)
+{
   static_assert(DIM == 2, "SVG is only supported in 2D");
 
   VertexType mid(w / 2., h / 2.);
diff --git a/Core/include/Acts/Utilities/GraphViz.hpp b/Core/include/Acts/Utilities/GraphViz.hpp
new file mode 100644
index 00000000000..8716fca7d00
--- /dev/null
+++ b/Core/include/Acts/Utilities/GraphViz.hpp
@@ -0,0 +1,110 @@
+// This file is part of the ACTS project.
+//
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
+//
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
+
+#pragma once
+
+#include <ostream>
+#include <vector>
+
+namespace Acts::GraphViz {
+
+enum class Shape {
+  Box,
+  Polygon,
+  Ellipse,
+  Oval,
+  Circle,
+  Point,
+  Egg,
+  Triangle,
+  Plaintext,
+  Plain,
+  Diamond,
+  Trapezium,
+  Parallelogram,
+  House,
+  Pentagon,
+  Hexagon,
+  Septagon,
+  Octagon,
+  DoubleCircle,
+  DoubleOctagon,
+  TripleOctagon,
+  InvTriangle,
+  InvTrapezium,
+  InvHouse,
+  Mdiamond,
+  Msquare,
+  Mcircle,
+  Rect,
+  Rectangle,
+  Square,
+  Star,
+  None,
+  Underline,
+  Cylinder,
+  Note,
+  Tab,
+  Folder,
+  Box3d,
+  Component,
+  Promoter,
+  Cds,
+  Terminator,
+  Utr,
+  PrimerSite,
+  RestrictionSite,
+  FivePOverhang,
+  ThreePOverhang,
+  NOverhang,
+  Assembly,
+  Signature,
+  Insulator,
+  Ribosite,
+  RNAStab,
+  ProteaseSite,
+  ProteinStab,
+  RPromoter,
+  RArrow,
+  LArrow,
+  LPromoter
+};
+
+std::ostream& operator<<(std::ostream& os, const Shape& shape);
+
+enum class Style {
+  Filled,
+  Invisible,
+  Diagonals,
+  Rounded,
+  Dashed,
+  Dotted,
+  Solid,
+  Bold
+};
+
+std::ostream& operator<<(std::ostream& os, const Style& style);
+
+struct Node {
+  std::string id;
+  std::string label = "";
+  Shape shape = Shape::Ellipse;
+  std::vector<Style> style = {Style::Solid};
+};
+
+std::ostream& operator<<(std::ostream& os, const Node& node);
+
+struct Edge {
+  Node from;
+  Node to;
+  Style style = Style::Solid;
+};
+
+std::ostream& operator<<(std::ostream& os, const Edge& node);
+
+}  // namespace Acts::GraphViz
diff --git a/Core/include/Acts/Utilities/Grid.hpp b/Core/include/Acts/Utilities/Grid.hpp
index 66069820fdb..f6c5f9ddaf9 100644
--- a/Core/include/Acts/Utilities/Grid.hpp
+++ b/Core/include/Acts/Utilities/Grid.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2017-2023 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
@@ -420,11 +420,11 @@ class Grid final : public IGrid {
   /// indices must start at 0.
   /// @note Bin values are interpreted as being the field values at the
   /// lower-left corner of the corresponding hyper-box.
-  template <class Point, typename U = T,
-            typename = std::enable_if_t<
-                detail::can_interpolate<Point, std::array<ActsScalar, DIM>,
-                                        std::array<ActsScalar, DIM>, U>::value>>
-  T interpolate(const Point& point) const {
+  template <class Point>
+  T interpolate(const Point& point) const
+    requires(Concepts::interpolatable<T, Point, std::array<ActsScalar, DIM>,
+                                      std::array<ActsScalar, DIM>>)
+  {
     // there are 2^DIM corner points used during the interpolation
     constexpr std::size_t nCorners = 1 << DIM;
 
diff --git a/Core/include/Acts/Utilities/GridAccessHelpers.hpp b/Core/include/Acts/Utilities/GridAccessHelpers.hpp
index 0a34b5519be..20755d01ff6 100644
--- a/Core/include/Acts/Utilities/GridAccessHelpers.hpp
+++ b/Core/include/Acts/Utilities/GridAccessHelpers.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2024 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
diff --git a/Core/include/Acts/Utilities/GridAxisGenerators.hpp b/Core/include/Acts/Utilities/GridAxisGenerators.hpp
index cea146252ac..18e6a1cdd2e 100644
--- a/Core/include/Acts/Utilities/GridAxisGenerators.hpp
+++ b/Core/include/Acts/Utilities/GridAxisGenerators.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2023 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
@@ -110,7 +110,7 @@ struct EqEq {
                                                        nBins0);
     Acts::Axis<Acts::AxisType::Equidistant, bType> bEq(range1[0u], range1[1u],
                                                        nBins1);
-    return std::tie(aEq, bEq);
+    return {aEq, bEq};
   }
 };
 
@@ -160,7 +160,7 @@ struct EqVar {
     Acts::Axis<Acts::AxisType::Equidistant, aType> eqA(range[0u], range[1u],
                                                        nBins);
     Acts::Axis<Acts::AxisType::Variable, bType> varB(edges);
-    return std::tie(eqA, varB);
+    return {eqA, varB};
   }
 };
 
@@ -210,7 +210,7 @@ struct VarEq {
     Acts::Axis<Acts::AxisType::Variable, aType> varA(edges);
     Acts::Axis<Acts::AxisType::Equidistant, bType> eqB(range[0u], range[1u],
                                                        nBins);
-    return std::tie(varA, eqB);
+    return {varA, eqB};
   }
 };
 
@@ -257,7 +257,7 @@ struct VarVar {
   return_type operator()() const {
     Acts::Axis<Acts::AxisType::Variable, aType> varA(edges0);
     Acts::Axis<Acts::AxisType::Variable, bType> varB(edges1);
-    return std::tie(varA, varB);
+    return {varA, varB};
   }
 };
 
diff --git a/Core/include/Acts/Utilities/GridBinFinder.hpp b/Core/include/Acts/Utilities/GridBinFinder.hpp
index da2f9ecbfde..acd11f865d2 100644
--- a/Core/include/Acts/Utilities/GridBinFinder.hpp
+++ b/Core/include/Acts/Utilities/GridBinFinder.hpp
@@ -1,13 +1,14 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2024 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
+#include "Acts/Utilities/Concepts.hpp"
 #include "Acts/Utilities/Grid.hpp"
 #include "Acts/Utilities/Holders.hpp"
 #include "Acts/Utilities/detail/grid_helper.hpp"
@@ -38,15 +39,14 @@ class GridBinFinder {
   /// @pre The provided paramers must be of type 'int', 'std::pair<int, int>' or 'std::vector<std::pair<int, int>>'
   /// no other type is allowed. The order of these parameters must correspond to
   /// the same ordering of the axes in the grid
-  template <typename... args,
-            typename = std::enable_if_t<
-                sizeof...(args) == DIM &&
-                std::conjunction_v<std::disjunction<
-                    std::is_same<int, std::decay_t<args>>,
-                    std::is_same<std::pair<int, int>, std::decay_t<args>>,
-                    std::is_same<std::vector<std::pair<int, int>>,
-                                 std::decay_t<args>>>...>>>
-  explicit GridBinFinder(args&&... vals) {
+  template <typename... args>
+  explicit GridBinFinder(args&&... vals)
+    requires(
+        sizeof...(args) == DIM &&
+        (Concepts::same_as_any_of<std::decay_t<args>, int, std::pair<int, int>,
+                                  std::vector<std::pair<int, int>>> &&
+         ...))
+  {
     storeValue(std::forward<args>(vals)...);
   }
 
diff --git a/Core/include/Acts/Utilities/GridBinFinder.ipp b/Core/include/Acts/Utilities/GridBinFinder.ipp
index 344ef07137c..8b06748ffec 100644
--- a/Core/include/Acts/Utilities/GridBinFinder.ipp
+++ b/Core/include/Acts/Utilities/GridBinFinder.ipp
@@ -1,10 +1,12 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2024 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
+
+#include <type_traits>
 
 template <std::size_t DIM>
 template <typename first_value_t, typename... vals>
@@ -13,13 +15,12 @@ void Acts::GridBinFinder<DIM>::storeValue(first_value_t&& fv,
   constexpr std::size_t N = sizeof...(vals);
   static_assert(N < DIM);
   /// Check the fist value is reasonable
-  using decayed_value_t = typename std::decay<first_value_t>::type;
-  if constexpr (std::is_same<int, decayed_value_t>::value) {
+  using decayed_value_t = typename std::decay_t<first_value_t>;
+  if constexpr (std::is_same_v<int, decayed_value_t>) {
     /// if int -> value is positive
     assert(fv >= 0);
     m_values[DIM - N - 1ul] = fv;
-  } else if constexpr (std::is_same<std::pair<int, int>,
-                                    decayed_value_t>::value) {
+  } else if constexpr (std::is_same_v<std::pair<int, int>, decayed_value_t>) {
     m_values[DIM - N - 1ul] = fv;
   } else {
     /// If vector of pairs -> also allow for empty vectors
@@ -41,12 +42,11 @@ std::array<std::pair<int, int>, DIM> Acts::GridBinFinder<DIM>::getSizePerAxis(
   for (std::size_t i(0ul); i < DIM; ++i) {
     output[i] = std::visit(
         [&locPosition, i](const auto& val) -> std::pair<int, int> {
-          using value_t = typename std::decay<decltype(val)>::type;
-          if constexpr (std::is_same<int, value_t>::value) {
+          using value_t = typename std::decay_t<decltype(val)>;
+          if constexpr (std::is_same_v<int, value_t>) {
             assert(val >= 0);
             return std::make_pair(-val, val);
-          } else if constexpr (std::is_same<std::pair<int, int>,
-                                            value_t>::value) {
+          } else if constexpr (std::is_same_v<std::pair<int, int>, value_t>) {
             return std::make_pair(-val.first, val.second);
           } else {
             assert(locPosition.size() > i);
@@ -82,9 +82,9 @@ bool Acts::GridBinFinder<DIM>::isGridCompatible(
     std::size_t nBins = nLocBins[i];
     bool isCompabile = std::visit(
         [nBins](const auto& val) -> bool {
-          using value_t = typename std::decay<decltype(val)>::type;
-          if constexpr (std::is_same<int, value_t>::value ||
-                        std::is_same<std::pair<int, int>, value_t>::value) {
+          using value_t = typename std::decay_t<decltype(val)>;
+          if constexpr (std::is_same_v<int, value_t> ||
+                        std::is_same_v<std::pair<int, int>, value_t>) {
             return true;
           } else {
             return val.size() == nBins;
diff --git a/Core/include/Acts/Utilities/GridIterator.hpp b/Core/include/Acts/Utilities/GridIterator.hpp
index f70c02785a0..cc4ba96c8a0 100644
--- a/Core/include/Acts/Utilities/GridIterator.hpp
+++ b/Core/include/Acts/Utilities/GridIterator.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2016-2024 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
@@ -73,27 +73,10 @@ class GridGlobalIterator {
   /// @param [in] other The other GridGlobalIterator to be compared against this one
   /// @return The result of the comparison
   bool operator==(const GridGlobalIterator<T, Axes...>& other) const;
-  /// @brief (In-)Equality operator
+  /// @brief Comparison (<=>) operator
   /// @param [in] other The other GridGlobalIterator to be compared against this one
   /// @return The result of the comparison
-  bool operator!=(const GridGlobalIterator<T, Axes...>& other) const;
-
-  /// @brief Comparison (<) opetator
-  /// @param [in] other The other GridGlobalIterator to be compared against this one
-  /// @return The result of the comparison
-  bool operator<(const GridGlobalIterator<T, Axes...>& other) const;
-  /// @brief Comparison (>) opetator
-  /// @param [in] other The other GridGlobalIterator to be compared against this one
-  /// @return The result of the comparison
-  bool operator>(const GridGlobalIterator<T, Axes...>& other) const;
-  /// @brief Comparison (<=) opetator
-  /// @param [in] other The other GridGlobalIterator to be compared against this one
-  /// @return The result of the comparison
-  bool operator<=(const GridGlobalIterator<T, Axes...>& other) const;
-  /// @brief Comparison (>=) opetator
-  /// @param [in] other The other GridGlobalIterator to be compared against this one
-  /// @return The result of the comparison
-  bool operator>=(const GridGlobalIterator<T, Axes...>& other) const;
+  auto operator<=>(const GridGlobalIterator<T, Axes...>& other) const;
 
   /// @brief Increment this iterator with an offset
   /// @param [in] offset The increment value
@@ -238,10 +221,6 @@ class GridLocalIterator {
   /// @param [in] other The other GridLocalIterator to be compared against this one
   /// @return The result of the comparison
   bool operator==(const Acts::GridLocalIterator<T, Axes...>& other) const;
-  /// @brief (In-)Equality operator
-  /// @param [in] other The other GridLocalIterator to be compared against this one
-  /// @return The result of the comparison
-  bool operator!=(const Acts::GridLocalIterator<T, Axes...>& other) const;
 
   /// @brief Return stored value at given local position
   /// @return The stored value in the grid from that given local position
diff --git a/Core/include/Acts/Utilities/GridIterator.ipp b/Core/include/Acts/Utilities/GridIterator.ipp
index f4fc9d325f9..3524081a23c 100644
--- a/Core/include/Acts/Utilities/GridIterator.ipp
+++ b/Core/include/Acts/Utilities/GridIterator.ipp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2016-2024 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 namespace Acts {
 // Global Iterator
@@ -37,39 +37,12 @@ bool GridGlobalIterator<T, Axes...>::operator==(
 }
 
 template <typename T, class... Axes>
-bool GridGlobalIterator<T, Axes...>::operator!=(
-    const GridGlobalIterator<T, Axes...>& other) const {
-  return !(*this == other);
-}
-
-template <typename T, class... Axes>
-bool GridGlobalIterator<T, Axes...>::operator<(
-    const GridGlobalIterator<T, Axes...>& other) const {
-  // This operator only makes sense if the two iterators we are comparing
-  // are using the same grid
-  assert(m_grid.ptr == other.m_grid.ptr);
-  return m_idx < other.m_idx;
-}
-
-template <typename T, class... Axes>
-bool GridGlobalIterator<T, Axes...>::operator>(
+auto GridGlobalIterator<T, Axes...>::operator<=>(
     const GridGlobalIterator<T, Axes...>& other) const {
   // This operator only makes sense if the two iterators we are comparing
   // are using the same grid
   assert(m_grid.ptr == other.m_grid.ptr);
-  return m_idx > other.m_idx;
-}
-
-template <typename T, class... Axes>
-bool GridGlobalIterator<T, Axes...>::operator<=(
-    const GridGlobalIterator<T, Axes...>& other) const {
-  return !(*this > other);
-}
-
-template <typename T, class... Axes>
-bool GridGlobalIterator<T, Axes...>::operator>=(
-    const GridGlobalIterator<T, Axes...>& other) const {
-  return !(*this < other);
+  return m_idx <=> other.m_idx;
 }
 
 template <typename T, class... Axes>
@@ -222,12 +195,6 @@ bool Acts::GridLocalIterator<T, Axes...>::operator==(
   return true;
 }
 
-template <typename T, class... Axes>
-bool Acts::GridLocalIterator<T, Axes...>::operator!=(
-    const Acts::GridLocalIterator<T, Axes...>& other) const {
-  return !(*this == other);
-}
-
 template <typename T, class... Axes>
 const typename Acts::GridLocalIterator<T, Axes...>::value_type&
 Acts::GridLocalIterator<T, Axes...>::operator*() const {
diff --git a/Core/include/Acts/Utilities/HashedString.hpp b/Core/include/Acts/Utilities/HashedString.hpp
index b89c11b8ecc..6cdbe9d21e6 100644
--- a/Core/include/Acts/Utilities/HashedString.hpp
+++ b/Core/include/Acts/Utilities/HashedString.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2022 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
diff --git a/Core/include/Acts/Utilities/Helpers.hpp b/Core/include/Acts/Utilities/Helpers.hpp
index 5d9d2ab22eb..4bf9d1c89c3 100644
--- a/Core/include/Acts/Utilities/Helpers.hpp
+++ b/Core/include/Acts/Utilities/Helpers.hpp
@@ -1,16 +1,17 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2016-2018 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
 #include "Acts/Definitions/Algebra.hpp"
 
 #include <algorithm>
+#include <array>
 #include <iostream>
 #include <limits>
 #include <memory>
@@ -71,22 +72,24 @@ std::vector<const T*> unpack_shared_const_vector(
   return rawPtrs;
 }
 
-/// This can be abandoned with C++20 to use the std::to_array method
+/// @brief Converts a vector to a fixed-size array with truncating or padding.
 ///
-/// @note only the first kDIM elements will obviously be filled, if the
-/// vector tends to be longer, it is truncated
+/// This function copies elements from the input vector into a fixed-size array.
+/// If the vector contains more than `kDIM` elements, the array is truncated to
+/// fit. If the vector contains fewer elements than `kDIM`, the remaining array
+/// elements are value-initialized (default-initialized, i.e., filled with zero
+/// or default values).
 ///
-/// @param vecvals the vector of bound values to be converted
-/// @return an array with the filled values
-template <std::size_t kDIM, typename value_type>
-std::array<value_type, kDIM> to_array(const std::vector<value_type>& vecvals) {
-  std::array<value_type, kDIM> rarray = {};
-  for (const auto [iv, v] : enumerate(vecvals)) {
-    if (iv < kDIM) {
-      rarray[iv] = v;
-    }
-  }
-  return rarray;
+/// @tparam kDIM The size of the resulting array.
+/// @tparam value_t The type of elements in the vector and the array.
+/// @param vecvals The input vector to be converted to an array.
+///
+/// @return An array containing the first `kDIM` elements of the vector.
+template <std::size_t kDIM, typename value_t>
+std::array<value_t, kDIM> toArray(const std::vector<value_t>& vecvals) {
+  std::array<value_t, kDIM> arr = {};
+  std::copy_n(vecvals.begin(), std::min(vecvals.size(), kDIM), arr.begin());
+  return arr;
 }
 
 /// @brief Dispatch a call based on a runtime value on a function taking the
@@ -164,21 +167,7 @@ T clampValue(U value) {
                     static_cast<U>(std::numeric_limits<T>::max()));
 }
 
-/// Return min/max from a (optionally) sorted series, obsolete with C++20
-/// (ranges)
-///
-/// @tparam T a numeric series
-///
-/// @param tseries is the number series
-///
-/// @return [ min, max ] in an array of length 2
-template <typename T>
-std::array<typename T::value_type, 2u> min_max(const T& tseries) {
-  return {*std::min_element(tseries.begin(), tseries.end()),
-          *std::max_element(tseries.begin(), tseries.end())};
-}
-
-/// Return range and medium of a sorted numeric series
+/// Return range and medium of an unsorted numeric series
 ///
 /// @tparam T a numeric series
 ///
@@ -187,10 +176,10 @@ std::array<typename T::value_type, 2u> min_max(const T& tseries) {
 /// @return [ range, medium ] in an tuple
 template <typename T>
 std::tuple<typename T::value_type, ActsScalar> range_medium(const T& tseries) {
-  auto [min, max] = min_max(tseries);
-  typename T::value_type range = (max - min);
-  ActsScalar medium = static_cast<ActsScalar>((max + min) * 0.5);
-  return std::tie(range, medium);
+  auto [minIt, maxIt] = std::ranges::minmax_element(tseries);
+  typename T::value_type range = (*maxIt - *minIt);
+  ActsScalar medium = static_cast<ActsScalar>((*maxIt + *minIt) * 0.5);
+  return {range, medium};
 }
 
 template <typename enum_t>
@@ -198,4 +187,21 @@ constexpr std::underlying_type_t<enum_t> toUnderlying(enum_t value) {
   return static_cast<std::underlying_type_t<enum_t>>(value);
 }
 
+/// This can be replaced with C++23 to use the std::ranges::contains method
+///
+/// This function searches through the given range for a specified value
+/// and returns `true` if the value is found, or `false` otherwise.
+///
+/// @tparam R The type of the range (e.g., vector, list, array).
+/// @tparam T The type of the value to search for within the range.
+///
+/// @param range The range to search within. This can be any range-compatible container.
+/// @param value The value to search for in the range.
+///
+/// @return `true` if the value is found within the range, `false` otherwise.
+template <typename R, typename T>
+bool rangeContainsValue(const R& range, const T& value) {
+  return std::ranges::find(range, value) != std::ranges::end(range);
+}
+
 }  // namespace Acts
diff --git a/Core/include/Acts/Utilities/Holders.hpp b/Core/include/Acts/Utilities/Holders.hpp
index dbedcc8567f..110b241451b 100644
--- a/Core/include/Acts/Utilities/Holders.hpp
+++ b/Core/include/Acts/Utilities/Holders.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2023 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
diff --git a/Core/include/Acts/Utilities/IAxis.hpp b/Core/include/Acts/Utilities/IAxis.hpp
index f61e3310d3b..e279b83ed1a 100644
--- a/Core/include/Acts/Utilities/IAxis.hpp
+++ b/Core/include/Acts/Utilities/IAxis.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2018 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
@@ -75,6 +75,8 @@ class IAxis {
             case Variable:
               return callable(
                   dynamic_cast<const Axis<AxisType::Variable, bdt>&>(*this));
+            default:
+              throw std::logic_error("Unknown axis type");
           }
         };
 
@@ -86,6 +88,8 @@ class IAxis {
         return switchOnType(AxisBound);
       case Closed:
         return switchOnType(AxisClosed);
+      default:
+        throw std::logic_error("Unknown axis type");
     }
   }
 
diff --git a/Core/include/Acts/Utilities/Identity.hpp b/Core/include/Acts/Utilities/Identity.hpp
deleted file mode 100644
index 2d5c759b595..00000000000
--- a/Core/include/Acts/Utilities/Identity.hpp
+++ /dev/null
@@ -1,36 +0,0 @@
-// This file is part of the Acts project.
-//
-// Copyright (C) 2021 CERN for the benefit of the Acts project
-//
-// This Source Code Form is subject to the terms of the Mozilla Public
-// License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-#pragma once
-
-#if __cplusplus >= 202002L
-
-#include <functional>
-
-namespace Acts {
-using Identity = std::identity;
-}
-
-#else
-
-#include <utility>
-
-namespace Acts {
-
-/// @brief Function object which maps a value to itself by perfect forwarding
-/// This is a backport of C++20's std::identity
-struct Identity {
-  template <typename T>
-  constexpr auto operator()(T &&v) const {
-    return std::forward<T>(v);
-  }
-};
-
-}  // namespace Acts
-
-#endif
diff --git a/Core/include/Acts/Utilities/Interpolation.hpp b/Core/include/Acts/Utilities/Interpolation.hpp
index 368104e21b5..27b71e10358 100644
--- a/Core/include/Acts/Utilities/Interpolation.hpp
+++ b/Core/include/Acts/Utilities/Interpolation.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2017-2018 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
@@ -72,12 +72,11 @@ namespace Acts {
 ///    - (4,5,3): 110 = 6
 ///    - (4,5,6): 111 = 7
 template <typename T, std::size_t N, class Point1, class Point2 = Point1,
-          class Point3 = Point2,
-          typename = std::enable_if_t<
-              detail::can_interpolate<Point1, Point2, Point3, T>::value>>
+          class Point3 = Point2>
 inline T interpolate(const Point1& position, const Point2& lowerCorner,
-                     const Point3& upperCorner,
-                     const std::array<T, N>& values) {
+                     const Point3& upperCorner, const std::array<T, N>& values)
+  requires(Concepts::interpolatable<T, Point1, Point2, Point3>)
+{
   return detail::interpolate_impl<T, Point1, Point2, Point3,
                                   detail::get_dimension<N>::value - 1,
                                   N>::run(position, lowerCorner, upperCorner,
diff --git a/Core/include/Acts/Utilities/Intersection.hpp b/Core/include/Acts/Utilities/Intersection.hpp
index 49dc23517b7..6276538ed5e 100644
--- a/Core/include/Acts/Utilities/Intersection.hpp
+++ b/Core/include/Acts/Utilities/Intersection.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2016-2024 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
@@ -59,22 +59,19 @@ class Intersection {
                          Status status)
       : m_position(position), m_pathLength(pathLength), m_status(status) {}
 
-  /// Returns whether the intersection was successful or not
-  /// @deprecated
-  [[deprecated("Use isValid() instead")]] constexpr explicit operator bool()
-      const {
-    return isValid();
-  }
-
   /// Returns whether the intersection was successful or not
   constexpr bool isValid() const { return m_status != Status::missed; }
 
+  /// Returns the position of the interseciton
   constexpr const Position& position() const { return m_position; }
 
+  /// Returns the path length to the interseciton
   constexpr ActsScalar pathLength() const { return m_pathLength; }
 
+  /// Returns the intersection status enum
   constexpr Status status() const { return m_status; }
 
+  /// Static factory to creae an invalid instesection
   constexpr static Intersection invalid() { return Intersection(); }
 
   /// Comparison function for path length order i.e. intersection closest to
@@ -145,37 +142,38 @@ class ObjectIntersection {
                                const object_t* object, std::uint8_t index = 0)
       : m_intersection(intersection), m_object(object), m_index(index) {}
 
-  /// Returns whether the intersection was successful or not
-  /// @deprecated
-  [[deprecated("Use isValid() instead")]] constexpr explicit operator bool()
-      const {
-    return isValid();
-  }
-
   /// Returns whether the intersection was successful or not
   constexpr bool isValid() const { return m_intersection.isValid(); }
 
+  /// Returns the intersection
   constexpr const Intersection3D& intersection() const {
     return m_intersection;
   }
 
+  /// Returns the position of the interseciton
   constexpr const Intersection3D::Position& position() const {
     return m_intersection.position();
   }
 
+  /// Returns the path length to the interseciton
   constexpr ActsScalar pathLength() const {
     return m_intersection.pathLength();
   }
 
+  /// Returns the status of the interseciton
   constexpr Intersection3D::Status status() const {
     return m_intersection.status();
   }
 
+  /// Returns the object that has been intersected
   constexpr const object_t* object() const { return m_object; }
 
   constexpr std::uint8_t index() const { return m_index; }
 
-  constexpr static ObjectIntersection invalid() { return ObjectIntersection(); }
+  constexpr static ObjectIntersection invalid(
+      const object_t* object = nullptr) {
+    return ObjectIntersection(Intersection3D::invalid(), object);
+  }
 
   constexpr static bool pathLengthOrder(
       const ObjectIntersection& aIntersection,
diff --git a/Core/include/Acts/Utilities/Iterator.hpp b/Core/include/Acts/Utilities/Iterator.hpp
new file mode 100644
index 00000000000..a69e6c77faa
--- /dev/null
+++ b/Core/include/Acts/Utilities/Iterator.hpp
@@ -0,0 +1,132 @@
+// This file is part of the ACTS project.
+//
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
+//
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
+
+#pragma once
+
+#include <compare>
+#include <cstddef>
+#include <iterator>
+#include <type_traits>
+
+namespace Acts {
+template <typename _Container, typename Value, bool Const>
+class ContainerIndexIterator {
+ public:
+  using value_type = Value;
+  using iterator_category = std::random_access_iterator_tag;
+  using container_type =
+      std::conditional_t<Const, const _Container, _Container>;
+  using difference_type = std::ptrdiff_t;
+  using pointer = void;
+  using reference = void;
+
+  ContainerIndexIterator() : m_container(nullptr), m_index(0) {}
+
+  ContainerIndexIterator(container_type& container, std::size_t index)
+      : m_container(&container), m_index(index) {}
+
+  template <typename OtherValue, bool OtherConst>
+  explicit ContainerIndexIterator(
+      const ContainerIndexIterator<_Container, OtherValue, OtherConst>& o)
+    requires(!OtherConst || Const)
+      : m_container(o.m_container), m_index(o.m_index) {}
+
+  value_type operator*() const {
+    assert(m_container != nullptr);
+    return m_container->at(m_index);
+  }
+
+  template <typename OtherValue, bool OtherConst>
+  ContainerIndexIterator& operator=(
+      const ContainerIndexIterator<_Container, OtherValue, OtherConst>& o)
+    requires(!OtherConst || Const)
+  {
+    m_container = o.m_container;
+    m_index = o.m_index;
+    return *this;
+  }
+
+  ContainerIndexIterator& operator++() {
+    ++m_index;
+    return *this;
+  }
+
+  ContainerIndexIterator operator++(int) {
+    auto copy = *this;
+    ++*this;
+    return copy;
+  }
+
+  ContainerIndexIterator& operator+=(const difference_type& i) {
+    m_index += i;
+    return *this;
+  }
+
+  friend ContainerIndexIterator operator+(const ContainerIndexIterator& t,
+                                          const difference_type& i) {
+    return ContainerIndexIterator(*t.m_container, t.m_index + i);
+  }
+
+  friend ContainerIndexIterator operator+(const difference_type& i,
+                                          const ContainerIndexIterator& t) {
+    return t + i;
+  }
+
+  ContainerIndexIterator& operator--() {
+    --m_index;
+    return *this;
+  }
+
+  ContainerIndexIterator operator--(int) {
+    auto copy = *this;
+    --*this;
+    return copy;
+  }
+
+  ContainerIndexIterator& operator-=(const difference_type& i) {
+    m_index -= i;
+    return *this;
+  }
+
+  friend ContainerIndexIterator operator-(const ContainerIndexIterator& t,
+                                          const difference_type& i) {
+    return ContainerIndexIterator(*t.m_container, t.m_index - i);
+  }
+
+  template <typename OtherValue, bool OtherConst>
+  friend difference_type operator-(
+      const ContainerIndexIterator& t,
+      const ContainerIndexIterator<_Container, OtherValue, OtherConst>& o) {
+    assert(t.m_container == o.m_container);
+    return t.m_index - o.m_index;
+  }
+
+  value_type operator[](const difference_type& i) const { return *(*this + i); }
+
+  template <typename OtherValue, bool OtherConst>
+  std::strong_ordering operator<=>(
+      const ContainerIndexIterator<_Container, OtherValue, OtherConst>& o)
+      const {
+    if (m_container == o.m_container) {
+      return m_index <=> o.m_index;
+    } else {
+      return m_container <=> o.m_container;
+    }
+  }
+
+  template <typename OtherValue, bool OtherConst>
+  bool operator==(const ContainerIndexIterator<_Container, OtherValue,
+                                               OtherConst>& other) const {
+    return m_container == other.m_container && m_index == other.m_index;
+  }
+
+ private:
+  container_type* m_container;
+  typename container_type::size_type m_index;
+};
+}  // namespace Acts
diff --git a/Core/include/Acts/Utilities/JacobianHelpers.hpp b/Core/include/Acts/Utilities/JacobianHelpers.hpp
index be56e5f1759..b3b51b510fa 100644
--- a/Core/include/Acts/Utilities/JacobianHelpers.hpp
+++ b/Core/include/Acts/Utilities/JacobianHelpers.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2023 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
diff --git a/Core/include/Acts/Utilities/KDTree.hpp b/Core/include/Acts/Utilities/KDTree.hpp
index a3ff86a43fb..dc8f9f9b844 100644
--- a/Core/include/Acts/Utilities/KDTree.hpp
+++ b/Core/include/Acts/Utilities/KDTree.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2021 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
diff --git a/Core/include/Acts/Utilities/Logger.hpp b/Core/include/Acts/Utilities/Logger.hpp
index 2f833fd5916..48cadb49ec4 100644
--- a/Core/include/Acts/Utilities/Logger.hpp
+++ b/Core/include/Acts/Utilities/Logger.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2016-2018 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 // STL include(s)
diff --git a/Core/include/Acts/Utilities/MathHelpers.hpp b/Core/include/Acts/Utilities/MathHelpers.hpp
new file mode 100644
index 00000000000..d4489935d32
--- /dev/null
+++ b/Core/include/Acts/Utilities/MathHelpers.hpp
@@ -0,0 +1,30 @@
+// This file is part of the ACTS project.
+//
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
+//
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
+
+#pragma once
+
+#include <cmath>
+
+namespace Acts {
+
+template <typename T>
+constexpr auto square(T x) {
+  return x * x;
+}
+
+template <typename... T>
+constexpr auto hypotSquare(T... args) {
+  return (square(args) + ...);
+}
+
+template <typename... T>
+constexpr auto fastHypot(T... args) {
+  return std::sqrt(hypotSquare(args...));
+}
+
+}  // namespace Acts
diff --git a/Core/include/Acts/Utilities/MultiIndex.hpp b/Core/include/Acts/Utilities/MultiIndex.hpp
index 06babe66438..f809771fd60 100644
--- a/Core/include/Acts/Utilities/MultiIndex.hpp
+++ b/Core/include/Acts/Utilities/MultiIndex.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2019 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
@@ -139,12 +139,11 @@ class MultiIndex {
   friend constexpr bool operator<(MultiIndex lhs, MultiIndex rhs) {
     return lhs.m_value < rhs.m_value;
   }
+
   friend constexpr bool operator==(MultiIndex lhs, MultiIndex rhs) {
     return lhs.m_value == rhs.m_value;
   }
-  friend constexpr bool operator!=(MultiIndex lhs, MultiIndex rhs) {
-    return lhs.m_value != rhs.m_value;
-  }
+
   friend inline std::ostream& operator<<(std::ostream& os, MultiIndex idx) {
     // one level is always defined
     os << idx.level(0u);
diff --git a/Core/include/Acts/Utilities/QuickMath.hpp b/Core/include/Acts/Utilities/QuickMath.hpp
deleted file mode 100644
index ef09d22485d..00000000000
--- a/Core/include/Acts/Utilities/QuickMath.hpp
+++ /dev/null
@@ -1,90 +0,0 @@
-// This file is part of the Acts project.
-//
-// Copyright (C) 2024 CERN for the benefit of the Acts project
-//
-// This Source Code Form is subject to the terms of the Mozilla Public
-// License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-#pragma once
-
-#include <cmath>
-#include <cstdint>
-#include <limits>
-#include <type_traits>
-
-namespace Acts {
-
-/// @brief Fast inverse square root function
-/// Taken from https://en.wikipedia.org/wiki/Fast_inverse_square_root
-/// @param x the number to calculate the inverse square root of
-/// @param iterations the number of newton iterations to perform
-template <typename T>
-constexpr T fastInverseSqrt(T x, int iterations = 1) noexcept {
-  static_assert(std::numeric_limits<T>::is_iec559 &&
-                "Only IEEE 754 is supported");
-  static_assert(std::is_same_v<T, float> || std::is_same_v<T, double>,
-                "Only float and double are supported");
-  using I = std::conditional_t<std::is_same_v<T, float>, std::uint32_t,
-                               std::uint64_t>;
-
-  constexpr I magic =
-      std::is_same_v<T, float> ? 0x5f3759df : 0x5fe6eb50c7b537a9;
-
-  union {
-    T f;
-    I i;
-  } u = {x};
-
-  u.i = magic - (u.i >> 1);
-
-  for (int i = 0; i < iterations; ++i) {
-    u.f *= 1.5f - 0.5f * x * u.f * u.f;
-  }
-
-  return u.f;
-}
-
-/// @brief Fast power function @see `std::pow`
-/// Taken from
-/// https://martin.ankerl.com/2012/01/25/optimized-approximative-pow-in-c-and-cpp
-/// @param a the base
-/// @param b the exponent
-constexpr double fastPow(double a, double b) {
-  // enable only on IEEE 754
-  static_assert(std::numeric_limits<double>::is_iec559);
-
-  constexpr std::int64_t magic = 0x3FEF127F00000000;
-
-  union {
-    double f;
-    std::int64_t i;
-  } u = {a};
-
-  u.i = static_cast<std::int64_t>(b * (u.i - magic) + magic);
-
-  return u.f;
-}
-
-/// @brief Fast power function more precise than @see `fastPow`
-/// Taken from
-/// https://martin.ankerl.com/2012/01/25/optimized-approximative-pow-in-c-and-cpp
-/// @param a the base
-/// @param b the exponent
-constexpr double fastPowMorePrecise(double a, double b) {
-  // binary exponentiation
-  double r = 1.0;
-  int exp = std::abs(static_cast<int>(b));
-  double base = b > 0 ? a : 1 / a;
-  while (exp != 0) {
-    if ((exp & 1) != 0) {
-      r *= base;
-    }
-    base *= base;
-    exp >>= 1;
-  }
-
-  return r * fastPow(a, b - static_cast<int>(b));
-}
-
-}  // namespace Acts
diff --git a/Core/include/Acts/Utilities/RangeXD.hpp b/Core/include/Acts/Utilities/RangeXD.hpp
index d614004234e..19f82245460 100644
--- a/Core/include/Acts/Utilities/RangeXD.hpp
+++ b/Core/include/Acts/Utilities/RangeXD.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2021 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
@@ -60,15 +60,15 @@ class RangeXD {
   /// @note Only available for one-dimensional ranges
   /// @param minimum The minimum value of the range
   /// @param maximum The maximum value of the range
-  template <std::size_t I = Dims, typename = std::enable_if_t<I == 1>>
   RangeXD(Type minimum, Type maximum)
+    requires(Dims == 1)
       : m_minima({minimum}), m_maxima({maximum}) {}
 
   /// @brief Construct a range from a pair of minimum and maximum values
   /// @note Only available for one-dimensional ranges
   /// @param p The pair of minimum and maximum values
-  template <std::size_t I = Dims, typename = std::enable_if_t<I == 1>>
   RangeXD(const std::pair<Type, Type>& p)
+    requires(Dims == 1)
       : m_minima({p.first}), m_maxima({p.second}) {}
 
   /// @brief Determine whether this range is degenerate
@@ -430,8 +430,9 @@ class RangeXD {
   /// range would be smaller than the current range), this is a no-op.
   ///
   /// @param v The proposed new minimum for the range
-  template <std::size_t I = Dims, typename = std::enable_if_t<I == 1>>
-  void expandMin(const Type& v) {
+  void expandMin(const Type& v)
+    requires(Dims == 1)
+  {
     min() = std::min(min(), v);
   }
 
@@ -442,8 +443,9 @@ class RangeXD {
   /// range would be smaller than the current range), this is a no-op.
   ///
   /// @param v The proposed new maximum for the range
-  template <std::size_t I = Dims, typename = std::enable_if_t<I == 1>>
-  void expandMax(const Type& v) {
+  void expandMax(const Type& v)
+    requires(Dims == 1)
+  {
     max() = std::max(max(), v);
   }
 
@@ -459,8 +461,9 @@ class RangeXD {
   ///
   /// @param min The proposed new minimum for the range
   /// @param max The proposed new maximum for the range
-  template <std::size_t I = Dims, typename = std::enable_if_t<I == 1>>
-  void expand(const Type& min, const Type& max) {
+  void expand(const Type& min, const Type& max)
+    requires(Dims == 1)
+  {
     expandMin(min);
     expandMax(max);
   }
@@ -472,8 +475,9 @@ class RangeXD {
   /// range would be larger than the current range), this is a no-op.
   ///
   /// @param v The proposed new minimum for the range
-  template <std::size_t I = Dims, typename = std::enable_if_t<I == 1>>
-  void shrinkMin(const Type& v) {
+  void shrinkMin(const Type& v)
+    requires(Dims == 1)
+  {
     min() = std::max(min(), v);
   }
 
@@ -484,8 +488,9 @@ class RangeXD {
   /// range would be larger than the current range), this is a no-op.
   ///
   /// @param v The proposed new maximum for the range
-  template <std::size_t I = Dims, typename = std::enable_if_t<I == 1>>
-  void shrinkMax(const Type& v) {
+  void shrinkMax(const Type& v)
+    requires(Dims == 1)
+  {
     max() = std::min(max(), v);
   }
 
@@ -501,8 +506,9 @@ class RangeXD {
   ///
   /// @param min The proposed new minimum for the range
   /// @param max The proposed new maximum for the range
-  template <std::size_t I = Dims, typename = std::enable_if_t<I == 1>>
-  void shrink(const Type& min, const Type& max) {
+  void shrink(const Type& min, const Type& max)
+    requires(Dims == 1)
+  {
     shrinkMin(min);
     shrinkMax(max);
   }
@@ -516,8 +522,9 @@ class RangeXD {
   /// expand methods.
   ///
   /// @param v The value to use as the new minimum
-  template <std::size_t I = Dims, typename = std::enable_if_t<I == 1>>
-  void setMin(const Type& v) {
+  void setMin(const Type& v)
+    requires(Dims == 1)
+  {
     min() = v;
   }
 
@@ -530,8 +537,9 @@ class RangeXD {
   /// expand methods.
   ///
   /// @param v The value to use as the new maximum
-  template <std::size_t I = Dims, typename = std::enable_if_t<I == 1>>
-  void setMax(const Type& v) {
+  void setMax(const Type& v)
+    requires(Dims == 1)
+  {
     max() = v;
   }
 
@@ -548,33 +556,38 @@ class RangeXD {
   ///
   /// @param min The new minimum value of the range
   /// @param max The new maximum value of the range
-  template <std::size_t I = Dims, typename = std::enable_if_t<I == 1>>
-  void set(const Type& min, const Type& max) {
+  void set(const Type& min, const Type& max)
+    requires(Dims == 1)
+  {
     setMin(min);
     setMax(max);
   }
 
   /// @brief Return the minimum value of the range (inclusive)
-  template <std::size_t I = Dims, typename = std::enable_if_t<I == 1>>
-  Type min() const {
+  Type min() const
+    requires(Dims == 1)
+  {
     return min(0);
   }
 
   /// @brief Return the minimum value of the range (inclusive)
-  template <std::size_t I = Dims, typename = std::enable_if_t<I == 1>>
-  Type& min() {
+  Type& min()
+    requires(Dims == 1)
+  {
     return min(0);
   }
 
   /// @brief Return the maximum value of the range (inclusive)
-  template <std::size_t I = Dims, typename = std::enable_if_t<I == 1>>
-  Type max() const {
+  Type max() const
+    requires(Dims == 1)
+  {
     return max(0);
   }
 
   /// @brief Return the maximum value of the range (inclusive)
-  template <std::size_t I = Dims, typename = std::enable_if_t<I == 1>>
-  Type& max() {
+  Type& max()
+    requires(Dims == 1)
+  {
     return max(0);
   }
 
@@ -590,8 +603,9 @@ class RangeXD {
   /// this can be awkward when working with integers.
   ///
   /// @return The size of the range
-  template <std::size_t I = Dims, typename = std::enable_if_t<I == 1>>
-  Type size() const {
+  Type size() const
+    requires(Dims == 1)
+  {
     return std::max(static_cast<Type>(0), max() - min());
   }
 
@@ -604,8 +618,9 @@ class RangeXD {
   ///
   /// @return true The value is inside the range
   /// @return false The value is not inside the range
-  template <std::size_t I = Dims, typename = std::enable_if_t<I == 1>>
-  bool contains(const Type& v) const {
+  bool contains(const Type& v) const
+    requires(Dims == 1)
+  {
     return min() <= v && v < max();
   }
 
diff --git a/Core/include/Acts/Utilities/Ray.hpp b/Core/include/Acts/Utilities/Ray.hpp
index f3f7635569d..3ec972847ff 100644
--- a/Core/include/Acts/Utilities/Ray.hpp
+++ b/Core/include/Acts/Utilities/Ray.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2018-2019 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
@@ -59,8 +59,8 @@ class Ray {
   /// Helper to draw this ray using a given visualization helper.
   /// @param helper The visualization helper
   /// @param far_distance The "length" of the drawn line representing the ray
-  template <std::size_t D = DIM, std::enable_if_t<D == 3, int> = 0>
-  void draw(IVisualization3D& helper, value_type far_distance = 10) const;
+  void draw(IVisualization3D& helper, value_type far_distance = 10) const
+    requires(DIM == 3);
 
  private:
   VertexType m_origin;
diff --git a/Core/include/Acts/Utilities/Ray.ipp b/Core/include/Acts/Utilities/Ray.ipp
index 5d7279f7796..deb2ea0feb3 100644
--- a/Core/include/Acts/Utilities/Ray.ipp
+++ b/Core/include/Acts/Utilities/Ray.ipp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2018-2019 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include "Acts/Definitions/Algebra.hpp"
 template <typename value_t, std::size_t DIM>
@@ -38,9 +38,10 @@ Acts::Ray<value_t, DIM> Acts::Ray<value_t, DIM>::transformed(
 }
 
 template <typename value_t, std::size_t DIM>
-template <std::size_t D, std::enable_if_t<D == 3, int>>
 void Acts::Ray<value_t, DIM>::draw(IVisualization3D& helper,
-                                   value_type far_distance) const {
+                                   value_type far_distance) const
+  requires(DIM == 3)
+{
   static_assert(DIM == 3, "OBJ is only supported in 3D");
 
   helper.line(m_origin, (m_origin + m_dir * far_distance).eval());
diff --git a/Core/include/Acts/Utilities/Result.hpp b/Core/include/Acts/Utilities/Result.hpp
index f865ee1e64c..9410fa0edfe 100644
--- a/Core/include/Acts/Utilities/Result.hpp
+++ b/Core/include/Acts/Utilities/Result.hpp
@@ -1,13 +1,14 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2019 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
+#include <concepts>
 #include <optional>
 #include <sstream>
 #include <system_error>
@@ -61,15 +62,13 @@ class Result {
   /// @tparam T2 Type of the potential assignment
   /// @param value The potential value, could be an actual valid value or an
   /// error.
-  template <
-      typename T2, typename _E = E, typename _T = T,
-      typename = std::enable_if_t<
-          (!std::is_same_v<_T, _E> && !std::is_constructible_v<_T, _E> &&
-           !std::is_convertible_v<_T, _E> && !std::is_constructible_v<_E, _T> &&
-           !std::is_convertible_v<_E, _T> &&
-           !(std::is_convertible_v<T2, _T> && std::is_convertible_v<T2, _E>))>>
+  template <typename T2>
   Result(T2 value) noexcept
-      : m_var(std::conditional_t<std::is_convertible_v<T2, _T>, T, E>{
+    requires(!std::same_as<T, E> && !std::constructible_from<T, E> &&
+             !std::convertible_to<T, E> && !std::constructible_from<E, T> &&
+             !std::convertible_to<E, T> &&
+             !(std::convertible_to<T2, T> && std::convertible_to<T2, E>))
+      : m_var(std::conditional_t<std::is_convertible_v<T2, T>, T, E>{
             std::move(value)}) {}
 
   /// @brief Assignment operator from arbitrary value
@@ -79,15 +78,14 @@ class Result {
   /// @param value The potential value, could be an actual valid value or an
   /// error.
   /// @return The assigned instance
-  template <
-      typename T2, typename _E = E, typename _T = T,
-      typename = std::enable_if_t<
-          (!std::is_same_v<_T, _E> && !std::is_constructible_v<_T, _E> &&
-           !std::is_convertible_v<_T, _E> && !std::is_constructible_v<_E, _T> &&
-           !std::is_convertible_v<_E, _T> &&
-           !(std::is_convertible_v<T2, _T> && std::is_convertible_v<T2, _E>))>>
-  Result<T, E>& operator=(T2 value) noexcept {
-    m_var = std::move(std::conditional_t<std::is_convertible_v<T2, _T>, T, E>{
+  template <typename T2>
+  Result<T, E>& operator=(T2 value) noexcept
+    requires(!std::same_as<T, E> && !std::constructible_from<T, E> &&
+             !std::convertible_to<T, E> && !std::constructible_from<E, T> &&
+             !std::convertible_to<E, T> &&
+             !(std::convertible_to<T2, T> && std::convertible_to<T2, E>))
+  {
+    m_var = std::move(std::conditional_t<std::is_convertible_v<T2, T>, T, E>{
         std::move(value)});
     return *this;
   }
diff --git a/Core/include/Acts/Utilities/SpacePointUtility.hpp b/Core/include/Acts/Utilities/SpacePointUtility.hpp
index 7c1c81ec328..c995bfd3c36 100644
--- a/Core/include/Acts/Utilities/SpacePointUtility.hpp
+++ b/Core/include/Acts/Utilities/SpacePointUtility.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2022 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
diff --git a/Core/include/Acts/Utilities/StringHelpers.hpp b/Core/include/Acts/Utilities/StringHelpers.hpp
index 86be7c49df7..e77b317eb0d 100644
--- a/Core/include/Acts/Utilities/StringHelpers.hpp
+++ b/Core/include/Acts/Utilities/StringHelpers.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2016-2023 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
diff --git a/Core/include/Acts/Utilities/ThrowAssert.hpp b/Core/include/Acts/Utilities/ThrowAssert.hpp
index bb408a93dde..2cc768daccf 100644
--- a/Core/include/Acts/Utilities/ThrowAssert.hpp
+++ b/Core/include/Acts/Utilities/ThrowAssert.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2018 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 #include <exception>
diff --git a/Core/include/Acts/Utilities/TrackHelpers.hpp b/Core/include/Acts/Utilities/TrackHelpers.hpp
index 2fe845f6c39..20cc1be8621 100644
--- a/Core/include/Acts/Utilities/TrackHelpers.hpp
+++ b/Core/include/Acts/Utilities/TrackHelpers.hpp
@@ -1,16 +1,18 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2024 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
 #include "Acts/Definitions/Tolerance.hpp"
 #include "Acts/EventData/MultiTrajectoryHelpers.hpp"
+#include "Acts/EventData/TrackContainerFrontendConcept.hpp"
 #include "Acts/EventData/TrackParameters.hpp"
+#include "Acts/EventData/TrackProxyConcept.hpp"
 #include "Acts/EventData/TrackStateType.hpp"
 #include "Acts/Geometry/GeometryContext.hpp"
 #include "Acts/Propagator/StandardAborters.hpp"
@@ -40,7 +42,7 @@ enum class TrackExtrapolationError {
 
 std::error_code make_error_code(TrackExtrapolationError e);
 
-template <typename track_proxy_t>
+template <TrackProxyConcept track_proxy_t>
 Result<typename track_proxy_t::ConstTrackStateProxy> findFirstMeasurementState(
     const track_proxy_t &track) {
   using TrackStateProxy = typename track_proxy_t::ConstTrackStateProxy;
@@ -63,7 +65,7 @@ Result<typename track_proxy_t::ConstTrackStateProxy> findFirstMeasurementState(
   return result;
 }
 
-template <typename track_proxy_t>
+template <TrackProxyConcept track_proxy_t>
 Result<typename track_proxy_t::ConstTrackStateProxy> findLastMeasurementState(
     const track_proxy_t &track) {
   using TrackStateProxy = typename track_proxy_t::ConstTrackStateProxy;
@@ -93,7 +95,8 @@ Result<typename track_proxy_t::ConstTrackStateProxy> findLastMeasurementState(
 /// @param smoother The smoother
 ///
 /// @return The result of the smoothing
-template <typename track_proxy_t, typename smoother_t = GainMatrixSmoother>
+template <TrackProxyConcept track_proxy_t,
+          typename smoother_t = GainMatrixSmoother>
 Result<void> smoothTrack(
     const GeometryContext &geoContext, track_proxy_t &track,
     const Logger &logger = *getDefaultLogger("TrackSmoother", Logging::INFO),
@@ -128,7 +131,7 @@ Result<void> smoothTrack(
 /// @param logger The logger
 ///
 /// @return The result of the smoothing
-template <typename track_container_t>
+template <TrackContainerFrontend track_container_t>
 Result<void> smoothTracks(
     const GeometryContext &geoContext, const track_container_t &trackContainer,
     const Logger &logger = *getDefaultLogger("TrackSmoother", Logging::INFO)) {
@@ -158,7 +161,7 @@ Result<void> smoothTracks(
 ///
 /// @return The result of the search containing the track state
 ///         and the distance to the reference surface
-template <typename track_proxy_t>
+template <TrackProxyConcept track_proxy_t>
 Result<std::pair<typename track_proxy_t::ConstTrackStateProxy, double>>
 findTrackStateForExtrapolation(
     const GeometryContext &geoContext, const track_proxy_t &track,
@@ -283,7 +286,7 @@ findTrackStateForExtrapolation(
 /// @param logger The logger
 ///
 /// @return The result of the extrapolation
-template <typename track_proxy_t, typename propagator_t,
+template <TrackProxyConcept track_proxy_t, typename propagator_t,
           typename propagator_options_t>
 Result<void> extrapolateTrackToReferenceSurface(
     track_proxy_t &track, const Surface &referenceSurface,
@@ -340,7 +343,7 @@ Result<void> extrapolateTrackToReferenceSurface(
 /// @param logger The logger
 ///
 /// @return The result of the extrapolation
-template <typename track_container_t, typename propagator_t,
+template <TrackContainerFrontend track_container_t, typename propagator_t,
           typename propagator_options_t>
 Result<void> extrapolateTracksToReferenceSurface(
     const track_container_t &trackContainer, const Surface &referenceSurface,
@@ -365,17 +368,14 @@ Result<void> extrapolateTracksToReferenceSurface(
 
 /// Helper function to calculate a number of track level quantities and store
 /// them on the track itself
-/// @note The input track needs to be mutable, so @c ReadOnly=false
-/// @tparam track_container_t the track container backend
-/// @tparam track_state_container_t the track state container backend
-/// @tparam holder_t the holder type for the track container backends
+/// @tparam track_proxy_t The track proxy type
 /// @param track A mutable track proxy to operate on
-template <typename track_container_t, typename track_state_container_t,
-          template <typename> class holder_t>
-void calculateTrackQuantities(
-    Acts::TrackProxy<track_container_t, track_state_container_t, holder_t,
-                     false>
-        track) {
+template <TrackProxyConcept track_proxy_t>
+void calculateTrackQuantities(track_proxy_t track)
+  requires(!track_proxy_t::ReadOnly)
+{
+  using ConstTrackStateProxy = typename track_proxy_t::ConstTrackStateProxy;
+
   track.chi2() = 0;
   track.nDoF() = 0;
 
@@ -384,8 +384,8 @@ void calculateTrackQuantities(
   track.nSharedHits() = 0;
   track.nOutliers() = 0;
 
-  for (const auto &trackState : track.trackStatesReversed()) {
-    auto typeFlags = trackState.typeFlags();
+  for (ConstTrackStateProxy trackState : track.trackStatesReversed()) {
+    ConstTrackStateType typeFlags = trackState.typeFlags();
 
     if (typeFlags.test(Acts::TrackStateFlag::HoleFlag)) {
       track.nHoles()++;
@@ -402,6 +402,97 @@ void calculateTrackQuantities(
   }
 }
 
+/// Helper function to trim track states from the front of a track
+/// @tparam track_proxy_t the track proxy type
+/// @param track the track to trim
+/// @param trimHoles whether to trim holes
+/// @param trimOutliers whether to trim outliers
+/// @param trimMaterial whether to trim pure material states
+template <TrackProxyConcept track_proxy_t>
+void trimTrackFront(track_proxy_t track, bool trimHoles, bool trimOutliers,
+                    bool trimMaterial)
+  requires(!track_proxy_t::ReadOnly)
+{
+  using TrackStateProxy = typename track_proxy_t::TrackStateProxy;
+
+  // TODO specialize if track is forward linked
+
+  std::optional<TrackStateProxy> front;
+
+  for (TrackStateProxy trackState : track.trackStatesReversed()) {
+    TrackStateType typeFlags = trackState.typeFlags();
+    if (trimHoles && typeFlags.test(TrackStateFlag::HoleFlag)) {
+      continue;
+    }
+    if (trimOutliers && typeFlags.test(TrackStateFlag::OutlierFlag)) {
+      continue;
+    }
+    if (trimMaterial && typeFlags.test(TrackStateFlag::MaterialFlag) &&
+        !typeFlags.test(TrackStateFlag::MeasurementFlag)) {
+      continue;
+    }
+
+    front = trackState;
+  }
+
+  if (front.has_value()) {
+    front.value().previous() = TrackStateProxy::kInvalid;
+  }
+}
+
+/// Helper function to trim track states from the back of a track
+/// @tparam track_proxy_t the track proxy type
+/// @param track the track to trim
+/// @param trimHoles whether to trim holes
+/// @param trimOutliers whether to trim outliers
+/// @param trimMaterial whether to trim pure material states
+template <TrackProxyConcept track_proxy_t>
+void trimTrackBack(track_proxy_t track, bool trimHoles, bool trimOutliers,
+                   bool trimMaterial)
+  requires(!track_proxy_t::ReadOnly)
+{
+  using TrackStateProxy = typename track_proxy_t::TrackStateProxy;
+
+  std::optional<TrackStateProxy> back;
+
+  for (TrackStateProxy trackState : track.trackStatesReversed()) {
+    back = trackState;
+
+    TrackStateType typeFlags = trackState.typeFlags();
+    if (trimHoles && typeFlags.test(TrackStateFlag::HoleFlag)) {
+      continue;
+    }
+    if (trimOutliers && typeFlags.test(TrackStateFlag::OutlierFlag)) {
+      continue;
+    }
+    if (trimMaterial && typeFlags.test(TrackStateFlag::MaterialFlag) &&
+        !typeFlags.test(TrackStateFlag::MeasurementFlag)) {
+      continue;
+    }
+
+    break;
+  }
+
+  if (back.has_value()) {
+    track.tipIndex() = back.value().index();
+  }
+}
+
+/// Helper function to trim track states from the front and back of a track
+/// @tparam track_proxy_t the track proxy type
+/// @param track the track to trim
+/// @param trimHoles whether to trim holes
+/// @param trimOutliers whether to trim outliers
+/// @param trimMaterial whether to trim pure material states
+template <TrackProxyConcept track_proxy_t>
+void trimTrack(track_proxy_t track, bool trimHoles, bool trimOutliers,
+               bool trimMaterial)
+  requires(!track_proxy_t::ReadOnly)
+{
+  trimTrackFront(track, trimHoles, trimOutliers, trimMaterial);
+  trimTrackBack(track, trimHoles, trimOutliers, trimMaterial);
+}
+
 }  // namespace Acts
 
 namespace std {
diff --git a/Core/include/Acts/Utilities/TransformRange.hpp b/Core/include/Acts/Utilities/TransformRange.hpp
index 1ff8bcad6da..4c7653c49e2 100644
--- a/Core/include/Acts/Utilities/TransformRange.hpp
+++ b/Core/include/Acts/Utilities/TransformRange.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2024 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
@@ -148,8 +148,7 @@ struct TransformRange {
 template <typename Callable, typename iterator_t, bool force_const>
 struct TransformRangeIterator {
  private:
-  using internal_value_type =
-      typename std::iterator_traits<iterator_t>::value_type;
+  using internal_value_type = typename std::iter_value_t<iterator_t>;
 
   using raw_value_type = std::remove_reference_t<decltype(Callable::apply(
       std::declval<internal_value_type>()))>;
@@ -162,8 +161,7 @@ struct TransformRangeIterator {
       std::conditional_t<force_const, std::add_const_t<raw_value_type>,
                          raw_value_type>;
 
-  using difference_type =
-      typename std::iterator_traits<iterator_t>::difference_type;
+  using difference_type = typename std::iter_difference_t<iterator_t>;
   using pointer = std::remove_reference_t<value_type>*;
   using reference = value_type&;
   using iterator_category = std::forward_iterator_tag;
@@ -192,12 +190,6 @@ struct TransformRangeIterator {
     return m_iterator == other.m_iterator;
   }
 
-  /// Compare two iterators for inequality
-  /// @param other The other iterator to compare to
-  bool operator!=(const TransformRangeIterator& other) const {
-    return m_iterator != other.m_iterator;
-  }
-
  private:
   iterator_t m_iterator;
 };
diff --git a/Core/include/Acts/Utilities/TypeList.hpp b/Core/include/Acts/Utilities/TypeList.hpp
index 7c700223d5b..b4eabe7e930 100644
--- a/Core/include/Acts/Utilities/TypeList.hpp
+++ b/Core/include/Acts/Utilities/TypeList.hpp
@@ -1,13 +1,14 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2023 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
+#include <concepts>
 #include <cstddef>
 #include <type_traits>
 
@@ -30,7 +31,7 @@ struct getSize<TypeList<Ts...>>
     : std::integral_constant<std::size_t, sizeof...(Ts)> {};
 
 template <typename L>
-constexpr inline std::size_t size{getSize<L>()};
+constexpr std::size_t size{getSize<L>()};
 /// @}
 
 /// Access the first type
@@ -93,5 +94,65 @@ template <typename L, typename N>
 using push_front = typename doPushFront<N, L>::type;
 /// @}
 
+/// Filter a list of types
+/// @{
+template <template <typename> typename Pred, typename... Ts>
+struct filter {};
+
+template <template <typename> typename Pred>
+struct filter<Pred> {
+  using type = TypeList<>;
+};
+
+template <typename T, typename... Ts, template <typename> typename Pred>
+struct filter<Pred, T, Ts...> {
+  using _next_type = typename filter<Pred, Ts...>::type;
+  using type =
+      std::conditional_t<Pred<T>::value, push_front<_next_type, T>, _next_type>;
+};
+/// @}
+
+/// Apply a typelist to a type function
+/// @{
+template <template <typename...> typename F, typename T>
+struct apply {};
+
+template <template <typename...> typename F, typename... Ts>
+struct apply<F, TypeList<Ts...>> {
+  using type = F<Ts...>;
+};
+/// @}
+
+/// Apply a mapping function to a type list
+/// @{
+template <template <typename> typename F, typename T>
+struct map {};
+
+template <template <typename> typename F, typename... Ts>
+struct map<F, TypeList<Ts...>> {
+  using type = TypeList<typename F<Ts>::type...>;
+};
+/// @}
+
+/// Count the number of times a type occurs in a type list
+/// @{
+template <typename T, typename L>
+struct count {};
+
+template <typename T>
+struct count<T, TypeList<>> {
+  static constexpr std::size_t value = 0;
+};
+
+template <typename T, typename U, typename... Us>
+struct count<T, TypeList<U, Us...>> {
+  static constexpr std::size_t value =
+      std::conditional_t<std::is_same_v<T, U>,
+                         std::integral_constant<std::size_t, 1>,
+                         std::integral_constant<std::size_t, 0>>::value +
+      count<T, TypeList<Us...>>::value;
+};
+/// @}
+
 }  // namespace Types
 }  // namespace Acts
diff --git a/Core/include/Acts/Utilities/TypeTag.hpp b/Core/include/Acts/Utilities/TypeTag.hpp
index f8704a80a95..42be118413d 100644
--- a/Core/include/Acts/Utilities/TypeTag.hpp
+++ b/Core/include/Acts/Utilities/TypeTag.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2024 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
diff --git a/Core/include/Acts/Utilities/TypeTraits.hpp b/Core/include/Acts/Utilities/TypeTraits.hpp
index 0f0a775b717..a3c4aaccdcb 100644
--- a/Core/include/Acts/Utilities/TypeTraits.hpp
+++ b/Core/include/Acts/Utilities/TypeTraits.hpp
@@ -1,399 +1,16 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2019 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
-#include <functional>
-#include <string>
 #include <type_traits>
 
 namespace Acts {
-
-namespace detail {
-
-/// This file contains an implementation of the detection idiom in C++.
-/// It's not currently in the standard, but can be implemented using
-/// standard features. This implementation is largely taken from the C++
-/// [technical specifications, library fundamentals
-/// v2](https://en.cppreference.com/w/cpp/experimental/is_detected)
-///
-/// The detector pattern works like this: there is a default type, that
-/// accepts an "operation" that can be basically anything. It also accepts
-/// variadic arguments for that operation. The default type
-/// has a member type that is std::false_type to indicate success or
-/// failure. It also has a member type "type" which captures a type result.
-/// Then there is a specialization which attempts to instantiate the operation
-/// with the given parameters, and tries to assign it into std::void_t. If the
-/// operation fails to instantiate (say, the checked for type does not exist),
-/// the specialization will not be instantiated, and the compiler falls back to
-/// the default type which contains std::false_type. Since it happens inside
-/// while the compiler tries to find a better matching template specialization
-/// than the default one (so basically overload resolution), a compile error
-/// inside the operation is handled as a substitution failure, and is not an
-/// error. If the instantiation succeeds, the specialization contains a
-/// std::true_type, and an alias to the result of the operation.
-///
-/// Essentially, it provides a convenient way to "lift" operations into this
-/// overload resolution, allowing testing expressions and evaluating them into
-/// compile time booleans (instead of compilation failures).
-
-/// Helper struct which cannot be constructed (or destroyed) at all.
-struct nonesuch {
-  ~nonesuch() = delete;
-  nonesuch(nonesuch const&) = delete;
-  void operator=(nonesuch const&) = delete;
-};
-
-/// This is the default specialization.
-/// It does not attempt to instantiate ``Op<Args...>`` at all.
-/// @tparam Default The default type to set
-/// @tparam AlwaysVoid Helper type that accepts the void instantiation
-/// @tparam Op The operation to test
-/// @tparam Args Arguments to the operation
-template <class Default, class AlwaysVoid, template <class...> class Op,
-          class... Args>
-struct detector {
-  using value_t = std::false_type;
-  using type = Default;
-};
-
-/// This is the specialization which attempts to instantiate ``Op<Args...``.
-/// @tparam Default Default type to set if substitution fails
-/// @tparam Op The operation to test
-/// @tparam Args Arguments to the operation
-template <class Default, template <class...> class Op, class... Args>
-struct detector<Default, std::void_t<Op<Args...>>, Op, Args...> {
-  // Note that std::void_t is a C++17 feature
-  using value_t = std::true_type;
-  using type = Op<Args...>;
-};
-
-}  // namespace detail
-
-namespace Concepts {
-
-/// This type ties together the detection idiom. It instantiates the
-/// ``detector`` template with the ``Op`` and ``Args`` and resolves to the exact
-/// value type. In essence, if ``Op<Args...>`` succeeds, this will evaluate to
-/// ``std::true_type``, and if not, it will evaluate to ``std::false_type``.
-/// @tparam Op The operation to test
-/// @tparam Args The arguments to the operation
-template <template <class...> class Op, class... Args>
-using is_detected =
-    typename detail::detector<detail::nonesuch, void, Op, Args...>::value_t;
-
-/// This type calls into the detector (same as ``is_detected``) but it extracts
-/// the return type of ``Op<Args...>``.
-/// @tparam Op The operation
-/// @tparam Args The arguments to the operation
-template <template <class...> class Op, class... Args>
-using detected_t =
-    typename detail::detector<detail::nonesuch, void, Op, Args...>::type;
-
-/// This invokes ``detected_t``, and checks whether its result matches
-/// ``Expected``.
-/// @tparam Expected The expected result of the operation.
-/// @tparam Op The operation
-/// @tparam Args The arguments to the operation
-template <class Expected, template <class...> class Op, class... Args>
-using is_detected_exact = std::is_same<Expected, detected_t<Op, Args...>>;
-
-/// This evaluates ``Op`` inside the detector, and checks whether the resolved
-/// type
-/// is convertible to ``To``.
-/// @tparam To The type to check convertibility to.
-/// @tparam Op The operation
-/// @tparam Args The arguments to the operation
-template <class To, template <class...> class Op, class... Args>
-using is_detected_convertible =
-    std::is_convertible<detected_t<Op, Args...>, To>;
-
-/// Helper which invokes the detector with a default type, and resolves to the
-/// type.
-/// @tparam Default The type to resolve to if ``Op<Args...>`` does not resolve.
-/// @tparam Op The operation
-/// @tparam Args The argument to the operation
-template <class Default, template <class...> class Op, class... Args>
-using detected_or = detail::detector<Default, void, Op, Args...>;
-
-/// Define some sort of "Domain Specific Language" to declare concepts a little
-/// more naturally. These are taken from
-/// https://izzys.casa/2016/09/implementing-concepts-in-cxx/
-
-/// Helper which combines a set of predicates (constexpr bools) with a logical
-/// AND. Converts to ``std::bool_constant``.
-/// @tparam Bs The booleans to combine
-template <bool... Bs>
-constexpr bool require = std::conjunction<std::bool_constant<Bs>...>::value;
-
-/// Helper which forms the logical OR of its arguments.
-/// Converts to ``std::bool_constant``.
-/// @tparam Bs The booleans to combine.
-template <bool... Bs>
-constexpr bool either = std::disjunction<std::bool_constant<Bs>...>::value;
-
-/// Alias for the negation of a ``require``. This is essentially a NOT ANY test.
-/// @tparam Bs The booleans.
-template <bool... Bs>
-constexpr bool disallow = !require<Bs...>;
-
-/// Alias to ``is_detected`` which unpacks the constexpr boolean value.
-/// @tparam Op The operation
-/// @tparam Args The arguments to the operation.
-template <template <class...> class Op, class... Args>
-constexpr bool exists = is_detected<Op, Args...>::value;
-
-/// Alias to conversion check, which also extracts the constexpr boolean value.
-/// @tparam To The type to check convertibility to.
-/// @tparam Op The operation
-/// @tparam Args The arguments to the operation.
-template <class To, template <class...> class Op, class... Args>
-constexpr bool converts_to = is_detected_convertible<To, Op, Args...>::value;
-
-/// Unpacks the constexpr boolean value from ``is_detected_exact``
-/// @tparam Exact The type to check identity against
-/// @tparam Op The operation
-/// @tparam Args The arguments to the operation.
-template <class Exact, template <class...> class Op, class... Args>
-constexpr bool identical_to = is_detected_exact<Exact, Op, Args...>::value;
-
-/// Helper which evaluates whether the type ``T`` has a method with a given
-/// signature.
-/// @tparam T The type to check on. This can contain a const qualifier if you
-/// want to check on that.
-/// @tparam R The return type
-/// @tparam M The method trait, as generated by METHOD_TRAIT
-/// @tparam Arguments The argument types that make up the signature.
-template <typename T, typename R, template <class...> class M,
-          typename... Arguments>
-constexpr bool has_method = M<T, R, Arguments...>::template tv<T>::value;
-
-/// Helper to assert if a member of a given type exists. Basically only calls
-/// into ``identical_to`` but is nicer to read.
-/// @tparam T The type to check existence of member on.
-/// @tparam M The member type trait
-/// @tparam V The type that the member is supposed to have.
-template <typename T, template <class...> class M, typename V>
-constexpr bool has_member = identical_to<V, M, T>;
-
-/// Have a look at ``TypeTraitsTest.cpp`` to see most of this in action.
-}  // namespace Concepts
+template <bool C, typename T>
+using const_if_t = std::conditional_t<C, const T, T>;
 }  // namespace Acts
-
-/// These helpers allow writing checks. The missing piece is something that you
-/// can put into these. This is the point where this turns into type checking.
-/// ``Op`` from above can be anything. For instance, we can write an expression,
-/// and have the compiler try to calculate that expression's resulting type,
-/// like so:
-///
-/// .. code-block:: cpp
-///
-///    decltype(std::declval<T>().member_a)
-///
-/// ``std::declval<T>()`` constructs a **pseudo-value** of type ``T`` which
-/// works even if ``T`` is not actually constructible like this. Then we access
-/// a member called ``member_a`` inside and instruct the compiler to calculate
-/// the resulting type using ``decltype``. This will only work if the expression
-/// is valid. If not, this would normally cause a compilation error. If we wrap
-/// it into the
-/// **detection idiom**, however, we can turn that compilation error into a
-/// simple constexpr false!
-///
-/// To do that, we need to put that expression above into a **metafunction**. If
-/// we simply wrote
-///
-/// .. code-block:: cpp
-///
-///    is_detected<decltype(std::declval<T>().member_a)>
-///
-/// where ``decltype(std::declval<T>().member_a)`` is ``Op``, and ``Args`` is
-/// empty, we still get a compilation error. This is because the compiler
-/// evaluates the first argument before even passing it into ``is_detected``,
-/// and that means
-/// **outside** the overload resolution context. This is why we need to pass a
-/// metafunction around the expression as ``Op``, and the concrete type ``T`` as
-/// ``Args`` so that the actual evaluation of the expression happens **inside
-/// the overload resolution context**. Luckily, writing a metafunction around
-/// the expression is as easy as
-///
-/// .. code-block:: cpp
-///
-///    template <typename T>
-///    using member_a_t = decltype(std::declval<T>().member_a>);
-///
-/// and we can then use it like ``is_detected<member_a_t, T>``.
-///
-/// Basically, what you have to do to write type assertions using this pattern
-/// is metafunctions like the one described above. Those can be member checks,
-/// like shown before, nested type checks like
-///
-/// .. code-block:: cpp
-///
-///    template <typename T>
-///    using nested_a_t = typename T::NestedA;
-///
-/// and checks for contained templates like
-///
-/// .. code-block:: cpp
-///
-///    template <typename T>
-///    using meta_t = typename T::template meta<void, void>;
-///
-/// but also arbitrary expressions, like operators, or even operators between
-/// types. For instance, say we have two types ``U`` and ``V``. We can then
-/// write a metafunction that attempts to instantiate a binary operation between
-/// the two:
-///
-/// .. code-block:: cpp
-///
-///    template <typename U, typename V>
-///    using binary_op_t = decltype(std::declval<U>() + std::declval<V>());
-///
-/// and simply takes both ``U`` and ``V`` as meta-arguments.
-/// Invoked like ``is_detected<binary_op_t, TypeA, TypeB>`` on some types
-/// ``TypeA`` and ``TypeB``, this will tell you whether you can call that binary
-/// operation on values of those types.
-///
-/// Implementing method checks is a little more involved. A simple method check
-/// can be written like
-///
-/// .. code-block:: cpp
-///
-///    template <typename T>
-///    using foo_method_t = decltype(std::declval<T>().foo(double, int)>);
-///
-/// This only checks if the given expression is valid. That means this
-/// will evaluate to true even if the actual arguments of that function are
-/// references, as the compiler will figure that out behind the scenes and still
-/// allow you to call it. That can be fine, if you're really only interested if
-/// that specific call is allowed. Remember
-/// that ``decltype`` calculates the type of the expression. In this context, it
-/// will evaluate to **the return type** of the called function. Using
-/// ``identical_to`` you can therefore assert the return type to be a given
-/// value.
-///
-/// You might, however, want to constrain the *exact* types of the arguments,
-/// and the method's const qualifier. This is less straightforward. To achieve
-/// this, a macro is provided below, which will generate the required code for a
-/// trait predicate. You *cannot* use the result of this macro directly with the
-/// helpers defined above. What the macro provides is a metafunction, which
-/// still takes the type, the return type and the arguments as metaarguments. So
-/// the result of the macro only encodes the name of the method, not the rest of
-/// its signature. That means you can use the same method trait to check for any
-/// signature involving the same method name. Say you generated
-///
-/// .. code-block:: cpp
-///
-///    // foo_method_t is the name of the struct generated by this macro,
-///    // foo is the name of the method you want to check for.
-///    METHOD_TRAIT(foo_method_t, foo);
-///
-/// An additional helper ``has_method`` is provided,
-/// which wraps a little boilerplate to check a specific signature.
-/// You can then write
-///
-/// .. code-block:: cpp
-///
-///    has_method<T, R, foo_method_t, bool, const int&>
-///
-/// to check for a signature of the form
-///
-/// .. code-block:: cpp
-///
-///    R T::foo(bool, const int&)
-///
-/// If you want to check for a const method you can modify this to
-///
-/// .. code-block:: cpp
-///
-///    has_method<const T, R, foo_method_t, bool, const int&>
-///
-/// Note that both will only evaluate to true if the const qualifier matches
-/// what you gave exactly. If you want to check for a method of a given
-/// specifier and you don't care if the method is const or not, you have to
-/// write out both variants explicitly, and combine them with ``either``.
-
-/// @cond
-
-/// This macro generates some boilerplate code that is necessary to correctly
-/// implement a method type trait that evaluates to constexpr bools correctly
-/// @param trait_name The resulting name of the trait.
-/// @param method_name The name of the method the trait shall check.
-#define METHOD_TRAIT(trait_name, method_name)                                  \
-  template <class T, typename R, typename... Arguments>                        \
-  struct trait_name {                                                          \
-    /* Meta function to check if a type has a const qualifier*/                \
-    /* (by stripping it and seeing if something changed */                     \
-    template <typename T_>                                                     \
-    static constexpr bool is_const =                                           \
-        !std::is_same_v<std::remove_const_t<T_>, T_>;                          \
-                                                                               \
-    /*These following meta-functions basically to this: they check whether or  \
-     * not the actual function pointer extracted through ``&T::method_name``   \
-     * can                                                                     \
-     * be assigned to a prepared function pointer type with the given          \
-     * signature. This checks the exact signature, and not just callability    \
-     * and validity of the expression. */                                      \
-                                                                               \
-    /* Meta function which constructs the right type to check a function       \
-     * pointer, non-const version*/                                            \
-    template <typename T_, typename = int>                                     \
-    struct fptr_meta {                                                         \
-      template <typename... Arguments_>                                        \
-      using type = typename std::integral_constant<                            \
-          decltype(std::declval<T_>().method_name(                             \
-              std::declval<Arguments_>()...)) (T_::*)(Arguments_...),          \
-          &T_::method_name>::value_type;                                       \
-    };                                                                         \
-                                                                               \
-    /* Meta function which constructs the right type to check a function       \
-     * pointer, const version*/                                                \
-    /* The ``const`` needs to be put in there in one specific spot, that's why \
-     * the metafunction is needed*/                                            \
-    template <typename T_>                                                     \
-    struct fptr_meta<T_, std::enable_if_t<is_const<T_>, int>> {                \
-      template <typename... Arguments_>                                        \
-      using type = typename std::integral_constant<                            \
-          decltype(std::declval<T_>().method_name(                             \
-              std::declval<Arguments_>()...)) (T_::*)(Arguments_...) const,    \
-          &T_::method_name>::value_type;                                       \
-    };                                                                         \
-                                                                               \
-    /* Helper on top of the function pointer metafunction */                   \
-    template <typename T_, typename... Arguments_>                             \
-    using fptr_meta_t = typename fptr_meta<T_>::template type<Arguments_...>;  \
-                                                                               \
-    /* Trait check for the qualifier and the return type of the function */    \
-    /* This does not check the const qualifier at all */                       \
-    template <typename T_, typename... Arguments_>                             \
-    using qual_ret = decltype(std::declval<T_>().method_name(                  \
-        std::declval<Arguments_>()...));                                       \
-                                                                               \
-    /* The problem is this: while the above is fine with and without const,    \
-     * and with and without exact argument type match, the assignment to the   \
-     * function pointer fails hard if there is no method at all with the given \
-     * name. That is undesirable. The following first uses the expression      \
-     * validity check to assert that there is in fact a method of the given    \
-     * name, and only if that is the case, try to compile the function pointer \
-     * based signature check. That way, there is no hard failures, only        \
-     * substitution failures and we're happy. */                               \
-    template <typename T_, typename = int>                                     \
-    struct tv {                                                                \
-      static constexpr bool value = false;                                     \
-    };                                                                         \
-    template <typename T_>                                                     \
-    struct tv<T_, std::enable_if_t<Acts::Concepts::is_detected_exact<          \
-                                       R, qual_ret, T_, Arguments...>::value,  \
-                                   int>> {                                     \
-      /* This is only ever evaluate if the method exists!*/                    \
-      static constexpr bool value =                                            \
-          Acts::Concepts::is_detected<fptr_meta_t, T, Arguments...>::value;    \
-    };                                                                         \
-  }
-
-/// @endcond
diff --git a/Core/include/Acts/Utilities/UnitVectors.hpp b/Core/include/Acts/Utilities/UnitVectors.hpp
index 33352c63866..15aa5dc335e 100644
--- a/Core/include/Acts/Utilities/UnitVectors.hpp
+++ b/Core/include/Acts/Utilities/UnitVectors.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2020 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
diff --git a/Core/include/Acts/Utilities/VectorHelpers.hpp b/Core/include/Acts/Utilities/VectorHelpers.hpp
index ee0b04d87c8..8f09a6d0591 100644
--- a/Core/include/Acts/Utilities/VectorHelpers.hpp
+++ b/Core/include/Acts/Utilities/VectorHelpers.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2016-2023 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
@@ -12,7 +12,6 @@
 #include "Acts/Definitions/Common.hpp"
 #include "Acts/Definitions/TrackParametrization.hpp"
 #include "Acts/Utilities/BinningType.hpp"
-#include "Acts/Utilities/TypeTraits.hpp"
 
 #include <array>
 #include <limits>
@@ -21,14 +20,6 @@
 
 namespace Acts::VectorHelpers {
 
-namespace detail {
-template <class T>
-using phi_method_t = decltype(std::declval<const T>().phi());
-
-template <class T>
-using has_phi_method = Concepts::is_detected<phi_method_t, T>;
-}  // namespace detail
-
 /// Calculate phi (transverse plane angle) from compatible Eigen types
 /// @tparam Derived Eigen derived concrete type
 /// @param v Any vector like Eigen type, static or dynamic
@@ -55,9 +46,12 @@ double phi(const Eigen::MatrixBase<Derived>& v) noexcept {
 /// @tparam T anything that has a phi method
 /// @param v Any type that implements a phi method
 /// @return The phi value
-template <typename T,
-          std::enable_if_t<detail::has_phi_method<T>::value, int> = 0>
-double phi(const T& v) noexcept {
+template <typename T>
+double phi(const T& v) noexcept
+  requires requires {
+    { v.phi() } -> std::floating_point;
+  }
+{
   return v.phi();
 }
 
@@ -79,7 +73,7 @@ double perp(const Eigen::MatrixBase<Derived>& v) noexcept {
     assert(v.rows() >= 2 &&
            "Perp function not valid for vectors not at least 2D");
   }
-  return std::hypot(v[0], v[1]);
+  return v.template head<2>().norm();
 }
 
 /// Calculate the theta angle (longitudinal w.r.t. z axis) of a vector
diff --git a/Core/include/Acts/Utilities/Zip.hpp b/Core/include/Acts/Utilities/Zip.hpp
index 3c2c470a880..639c1e8c629 100644
--- a/Core/include/Acts/Utilities/Zip.hpp
+++ b/Core/include/Acts/Utilities/Zip.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2022 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
diff --git a/Core/include/Acts/Utilities/detail/ContextType.hpp b/Core/include/Acts/Utilities/detail/ContextType.hpp
index 486e07d425d..8ccadd77c4d 100644
--- a/Core/include/Acts/Utilities/detail/ContextType.hpp
+++ b/Core/include/Acts/Utilities/detail/ContextType.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2021 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
@@ -79,6 +79,28 @@ class ContextType {
     return std::any_cast<const std::decay_t<T>&>(m_data);
   }
 
+  /// Retrieve a pointer to the contained type
+  ///
+  /// @note Returns `nullptr` if @p is not the contained type.
+  ///
+  /// @tparam T The type to attempt to retrieve the value as
+  /// @return Pointer to the contained value, may be null
+  template <typename T>
+  std::decay_t<T>* maybeGet() {
+    return std::any_cast<std::decay_t<T>>(&m_data);
+  }
+
+  /// Retrieve a pointer to the contained type
+  ///
+  /// @note Returns `nullptr` if @p is not the contained type.
+  ///
+  /// @tparam T The type to attempt to retrieve the value as
+  /// @return Pointer to the contained value, may be null
+  template <typename T>
+  const std::decay_t<T>* maybeGet() const {
+    return std::any_cast<const std::decay_t<T>>(&m_data);
+  }
+
   /// Check if the contained type is initialized.
   /// @return Boolean indicating whether a type is present
   bool hasValue() const { return m_data.has_value(); }
diff --git a/Core/include/Acts/Utilities/detail/Extendable.hpp b/Core/include/Acts/Utilities/detail/Extendable.hpp
index 66ce1c79579..9c6c520eaf0 100644
--- a/Core/include/Acts/Utilities/detail/Extendable.hpp
+++ b/Core/include/Acts/Utilities/detail/Extendable.hpp
@@ -1,15 +1,13 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2016-2024 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
-#include "Acts/Utilities/detail/MPL/all_of.hpp"
-
 #include <tuple>
 #include <type_traits>
 
@@ -26,11 +24,11 @@ namespace Acts::detail {
 template <typename... extensions_t>
 struct Extendable {
   // clang-format off
-    static_assert(detail::all_of_v<std::is_default_constructible<extensions_t>::value...>,
+    static_assert((std::is_default_constructible_v<extensions_t> && ...),
                   "all extensions must be default constructible");
-    static_assert(detail::all_of_v<std::is_copy_constructible<extensions_t>::value...>,
+    static_assert((std::is_copy_constructible_v<extensions_t> && ...),
                   "all extensions must be copy constructible");
-    static_assert(detail::all_of_v<std::is_move_constructible<extensions_t>::value...>,
+    static_assert((std::is_move_constructible_v<extensions_t> && ...),
                   "all extensions must be move constructible");
   // clang-format on
 
diff --git a/Core/include/Acts/Utilities/detail/MPL/all_of.hpp b/Core/include/Acts/Utilities/detail/MPL/all_of.hpp
deleted file mode 100644
index 1553cb4f3f3..00000000000
--- a/Core/include/Acts/Utilities/detail/MPL/all_of.hpp
+++ /dev/null
@@ -1,29 +0,0 @@
-// This file is part of the Acts project.
-//
-// Copyright (C) 2016-2018 CERN for the benefit of the Acts project
-//
-// This Source Code Form is subject to the terms of the Mozilla Public
-// License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-#pragma once
-#include <type_traits>
-
-namespace Acts::detail {
-
-namespace {
-// clang-format off
-    template <bool... values>
-    struct all_of : std::true_type {};
-
-    template <bool... others>
-    struct all_of<false, others...> : public std::false_type {};
-
-    template <bool... others>
-    struct all_of<true, others...> : public all_of<others...> {};
-// clang-format on
-}  // end of anonymous namespace
-
-template <bool... values>
-constexpr bool all_of_v = all_of<values...>::value;
-}  // namespace Acts::detail
diff --git a/Core/include/Acts/Utilities/detail/MPL/any_of.hpp b/Core/include/Acts/Utilities/detail/MPL/any_of.hpp
deleted file mode 100644
index f56a669cfef..00000000000
--- a/Core/include/Acts/Utilities/detail/MPL/any_of.hpp
+++ /dev/null
@@ -1,29 +0,0 @@
-// This file is part of the Acts project.
-//
-// Copyright (C) 2016-2018 CERN for the benefit of the Acts project
-//
-// This Source Code Form is subject to the terms of the Mozilla Public
-// License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-#pragma once
-#include <type_traits>
-
-namespace Acts::detail {
-
-namespace {
-// clang-format off
-    template <bool... values>
-    struct any_of : std::false_type {};
-
-    template <bool... others>
-    struct any_of<true, others...> : public std::true_type {};
-
-    template <bool... others>
-    struct any_of<false, others...> : public any_of<others...> {};
-// clang-format on
-}  // namespace
-
-template <bool... values>
-constexpr bool any_of_v = any_of<values...>::value;
-}  // namespace Acts::detail
diff --git a/Core/include/Acts/Utilities/detail/MPL/are_sorted.hpp b/Core/include/Acts/Utilities/detail/MPL/are_sorted.hpp
deleted file mode 100644
index e45cea4d3e5..00000000000
--- a/Core/include/Acts/Utilities/detail/MPL/are_sorted.hpp
+++ /dev/null
@@ -1,61 +0,0 @@
-// This file is part of the Acts project.
-//
-// Copyright (C) 2016-2018 CERN for the benefit of the Acts project
-//
-// This Source Code Form is subject to the terms of the Mozilla Public
-// License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-#pragma once
-namespace Acts::detail {
-/**
- * @brief check whether integral values are sorted
- *
- * @tparam ascending boolean flag to check for ascending order (@c true) or
- * descending order (@c false)
- * @tparam strict boolean flag whether strict ordering is required
- * @tparam T integral type of values whose order should be checked
- * @tparam values template parameter pack containing the list of values
- *
- * @test Unit tests are implemented \link
- * Acts::Test::BOOST_AUTO_TEST_CASE(are_sorted_helper_tests) here\endlink.
- *
- * @return `are_sorted<asc,strict,T,values...>::value` is @c true if the given
- * values are properly sorted,
- *         otherwise @c false
- */
-template <bool ascending, bool strict, typename T, T... values>
-struct are_sorted;
-
-/// @cond
-// one value is always sorted
-template <bool ascending, bool strict, typename T, T v>
-struct are_sorted<ascending, strict, T, v> {
-  enum { value = true };
-};
-
-// strict, ascending ordering
-template <typename T, T a, T b, T... N>
-struct are_sorted<true, true, T, a, b, N...> {
-  enum { value = ((a < b) && are_sorted<true, true, T, b, N...>::value) };
-};
-
-// weak, ascending ordering
-template <typename T, T a, T b, T... N>
-struct are_sorted<true, false, T, a, b, N...> {
-  enum { value = (a <= b && are_sorted<true, false, T, b, N...>::value) };
-};
-
-// strict, descending ordering
-template <typename T, T a, T b, T... N>
-struct are_sorted<false, true, T, a, b, N...> {
-  enum { value = (a > b && are_sorted<false, true, T, b, N...>::value) };
-};
-
-// weak, descending ordering
-template <typename T, T a, T b, T... N>
-struct are_sorted<false, false, T, a, b, N...> {
-  enum { value = (a >= b && are_sorted<false, false, T, b, N...>::value) };
-};
-/// @endcond
-}  // namespace Acts::detail
diff --git a/Core/include/Acts/Utilities/detail/MPL/are_within.hpp b/Core/include/Acts/Utilities/detail/MPL/are_within.hpp
deleted file mode 100644
index ab01b96d259..00000000000
--- a/Core/include/Acts/Utilities/detail/MPL/are_within.hpp
+++ /dev/null
@@ -1,45 +0,0 @@
-// This file is part of the Acts project.
-//
-// Copyright (C) 2016-2018 CERN for the benefit of the Acts project
-//
-// This Source Code Form is subject to the terms of the Mozilla Public
-// License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-#pragma once
-namespace Acts::detail {
-/**
- * @brief check whether integral values are within a given range
- *
- * @tparam T integral type of values whose range should be checked
- * @tparam MIN lower accepted bound of values (inclusive)
- * @tparam MAX upper accepted bound of values (exclusive)
- * @tparam values template parameter pack containing the list of values
- *
- * @test Unit tests are implemented \link
- * Acts::Test::BOOST_AUTO_TEST_CASE(are_within_helper_tests) here\endlink.
- *
- * @return `are_within<T,MIN,MAX,values...>::value` is @c true if all given
- * values are within the
- *          interval [MIN,MAX), otherwise @c false
- */
-template <typename T, T MIN, T MAX, T... values>
-struct are_within;
-
-/// @cond
-// check last parameter
-template <typename T, T MIN, T MAX, T a>
-struct are_within<T, MIN, MAX, a> {
-  enum { value = (a >= MIN && a < MAX) };
-};
-
-// recursive check
-template <typename T, T MIN, T MAX, T a, T... others>
-struct are_within<T, MIN, MAX, a, others...> {
-  enum {
-    value =
-        ((a >= MIN) && (a < MAX) && are_within<T, MIN, MAX, others...>::value)
-  };
-};
-/// @endcond
-}  // namespace Acts::detail
diff --git a/Core/include/Acts/Utilities/detail/MPL/at_index.hpp b/Core/include/Acts/Utilities/detail/MPL/at_index.hpp
deleted file mode 100644
index c1e88111bb3..00000000000
--- a/Core/include/Acts/Utilities/detail/MPL/at_index.hpp
+++ /dev/null
@@ -1,36 +0,0 @@
-// This file is part of the Acts project.
-//
-// Copyright (C) 2016-2018 CERN for the benefit of the Acts project
-//
-// This Source Code Form is subject to the terms of the Mozilla Public
-// License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-#pragma once
-namespace Acts::detail {
-/**
- * @brief return integral constant at position in template parameter pack
- *
- * @tparam T integral type of the values to be investigated
- * @tparam index position in the template parameter pack
- * @tparam values template parameter pack containing the list of values
- *
- * @return `at_index<T,index,values...>::type` yields the integral constant
- *         at the given position in `values` if 0 &le; `index` <
- *         sizeof...(values). Otherwise, a compile-time error is generated.
- */
-template <typename T, std::size_t index, T... values>
-struct at_index;
-
-/// @cond
-template <typename T, std::size_t index, T next, T... others>
-struct at_index<T, index, next, others...> {
-  static constexpr T value = at_index<T, index - 1, others...>::value;
-};
-
-template <typename T, T next, T... others>
-struct at_index<T, 0, next, others...> {
-  static constexpr T value = next;
-};
-/// @endcond
-}  // namespace Acts::detail
diff --git a/Core/include/Acts/Utilities/detail/MPL/has_duplicates.hpp b/Core/include/Acts/Utilities/detail/MPL/has_duplicates.hpp
deleted file mode 100644
index 41b4b80d876..00000000000
--- a/Core/include/Acts/Utilities/detail/MPL/has_duplicates.hpp
+++ /dev/null
@@ -1,44 +0,0 @@
-// This file is part of the Acts project.
-//
-// Copyright (C) 2016-2018 CERN for the benefit of the Acts project
-//
-// This Source Code Form is subject to the terms of the Mozilla Public
-// License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-#pragma once
-namespace Acts::detail {
-
-namespace {
-template <typename... Args>
-struct has_duplicates;
-
-template <>
-struct has_duplicates<> {
-  static constexpr bool value = false;
-};
-
-template <typename last>
-struct has_duplicates<last> {
-  static constexpr bool value = false;
-};
-
-template <typename first, typename second, typename... others>
-struct has_duplicates<first, second, others...> {
- private:
-  static constexpr bool _first = has_duplicates<first, others...>::value;
-  static constexpr bool _second = has_duplicates<second, others...>::value;
-
- public:
-  static constexpr bool value = _first || _second;
-};
-
-template <typename first, typename... others>
-struct has_duplicates<first, first, others...> {
-  static constexpr bool value = true;
-};
-}  // namespace
-
-template <typename... Args>
-constexpr bool has_duplicates_v = has_duplicates<Args...>::value;
-}  // namespace Acts::detail
diff --git a/Core/include/Acts/Utilities/detail/MPL/type_collector.hpp b/Core/include/Acts/Utilities/detail/MPL/type_collector.hpp
deleted file mode 100644
index 28c380d3bbc..00000000000
--- a/Core/include/Acts/Utilities/detail/MPL/type_collector.hpp
+++ /dev/null
@@ -1,105 +0,0 @@
-// This file is part of the Acts project.
-//
-// Copyright (C) 2016-2018 CERN for the benefit of the Acts project
-//
-// This Source Code Form is subject to the terms of the Mozilla Public
-// License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-#pragma once
-#include <boost/hana/filter.hpp>
-#include <boost/hana/set.hpp>
-#include <boost/hana/type.hpp>
-
-namespace Acts::detail {
-namespace hana = boost::hana;
-
-/**
- * Struct which extracts the result type from an actor.
- * This is used as an argument to `type_collector`.
- */
-struct result_type_extractor {
-  // Checks whether the type even has a result type
-  static constexpr auto predicate = hana::is_valid(
-      [](auto t) -> hana::type<typename decltype(t)::type::result_type> {});
-  // meta function to extract the result type
-  template <typename T>
-  using extractor_impl = typename T::result_type;
-  // embed meta function in hana
-  static constexpr auto extractor = hana::template_<extractor_impl>;
-};
-
-/**
- * Struct which extracts the action type from an aborter.
- * This is used as an argument to `type_collector`.
- */
-struct action_type_extractor {
-  // Checks if aborter even has action type
-  static constexpr auto predicate = hana::is_valid(
-      [](auto t) -> hana::type<typename decltype(t)::type::action_type> {});
-  // meta function to extract the action type
-  template <typename T>
-  using extractor_impl = typename T::action_type;
-  // converted to hana
-  static constexpr auto extractor = hana::template_<extractor_impl>;
-};
-
-/**
- * The main type collector. This loops over the given tuple of actions or
- * aborters,
- * filters by predicate and uses extractor to construct a resulting output
- * set.
- */
-constexpr auto type_collector = [](auto t_, auto predicate, auto extractor) {
-  // filtered list using predicate
-  constexpr auto have_result =
-      hana::filter(t_, [&](auto t) { return predicate(t); });
-  // convert to set to remove duplicates, and transform to unpacked type
-  // using extractor.
-  constexpr auto result_types =
-      hana::to_set(hana::transform(have_result, extractor));
-  return result_types;
-};
-
-/**
- * Helper around type_collector which constructrs a hana tuple input from
- * variadic
- * template args, and pre-unpacks the predicate and extractor from the helper
- * type
- * @tparam helper Either result_type_extractor or action_type_extractor
- * @tparam items The items to filter / collect from.
- */
-template <typename helper, typename... items>
-constexpr auto type_collector_t = type_collector(
-    hana::tuple_t<items...>, helper::predicate, helper::extractor);
-
-/**
- * Meta function which returns a compile time bool
- * @tparam T the type to check
- */
-template <typename T>
-constexpr bool has_result_type_v =
-    decltype(result_type_extractor::predicate(hana::type_c<T>))::value;
-
-/**
- * Meta function which gets the result type from an action
- * @tparam T The type to extract from
- */
-template <typename T>
-using result_type_t = typename result_type_extractor::extractor_impl<T>;
-
-/**
- * Meta function which returns a compile time bool
- * @tparam T the type to check
- */
-template <typename T>
-constexpr bool has_action_type_v =
-    decltype(action_type_extractor::predicate(hana::type_c<T>))::value;
-
-/**
- * Meta function which gets the action for an aborter
- * @tparam T The type to extract from
- */
-template <typename T>
-using action_type_t = typename action_type_extractor::extractor_impl<T>;
-}  // namespace Acts::detail
diff --git a/Core/include/Acts/Utilities/detail/RealQuadraticEquation.hpp b/Core/include/Acts/Utilities/detail/RealQuadraticEquation.hpp
index c401d8f1549..c208a4a1d98 100644
--- a/Core/include/Acts/Utilities/detail/RealQuadraticEquation.hpp
+++ b/Core/include/Acts/Utilities/detail/RealQuadraticEquation.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2017-2018 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 ///////////////////////////////////////////////////////////////////
 // RealQuadraticEquation.h, Acts project
diff --git a/Core/include/Acts/Utilities/detail/ReferenceWrapperAnyCompat.hpp b/Core/include/Acts/Utilities/detail/ReferenceWrapperAnyCompat.hpp
index ecba9039256..29c1aa23adc 100644
--- a/Core/include/Acts/Utilities/detail/ReferenceWrapperAnyCompat.hpp
+++ b/Core/include/Acts/Utilities/detail/ReferenceWrapperAnyCompat.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2020 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
diff --git a/Core/include/Acts/Utilities/detail/Subspace.hpp b/Core/include/Acts/Utilities/detail/Subspace.hpp
deleted file mode 100644
index fe355b44edb..00000000000
--- a/Core/include/Acts/Utilities/detail/Subspace.hpp
+++ /dev/null
@@ -1,327 +0,0 @@
-// This file is part of the Acts project.
-//
-// Copyright (C) 2020 CERN for the benefit of the Acts project
-//
-// This Source Code Form is subject to the terms of the Mozilla Public
-// License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-#pragma once
-
-#include "Acts/Definitions/Algebra.hpp"
-
-#include <array>
-#include <cassert>
-#include <cstddef>
-#include <cstdint>
-
-namespace Acts::detail {
-
-/// @defgroup subspace Linear subspace definitions
-///
-/// All types in this group define a linear subspace of a larger vector space
-/// with the following properties: the subspace is defined by a set of axis
-/// indices in the full space, i.e. there is no need for a non-trivial
-/// projection matrix, all subspace axis indices are unique and there are no
-/// duplicated ones, and the set of axis indices must be ordered, i.e. the axis
-/// order in the subspace is the same as in the full space. The last requirement
-/// is not strictly required by the implementation, but is still added to
-/// simplify reasoning.
-///
-/// Only the size of the subspace are defined by the types at compile time.
-/// Which axes comprise the subspace is defined at runtime. This allows to use
-/// fixed-size computations (selected at compile time) but avoids the
-/// combinatorial explosion of also having to handle all possible combination of
-/// axes at compile time. This was tried previously and resulted in sizable
-/// resource consumption at compile time without runtime benefits.
-///
-/// All types are intentionally using `std::size_t` as their template values,
-/// instead of the more specific index enums, to reduce the number of templates.
-/// This is fully compatible as the index enums are required to be convertible
-/// to `std::size_t`.
-///
-/// All types intentionally only define the subspace but not how vectors
-/// and matrices are stored to avoid unnecessary coupling between components,
-/// i.e here between the pure definition and the storage.
-///
-/// All types provide `.projectVector(...)` and `.exandVector(...)` methods to
-/// convert to/from the subspace. They also provide `.projector()` and
-/// `.expander()` methods to create projection and expansion matrices if they
-/// are required explicitly. For the specific subspace requirements listed
-/// above, the projection and expansion matrices are transpose to each other. In
-/// the general case, this does not have to be the case and users are encouraged
-/// to use `.projector()` and `.expander()` instead of e.g.
-/// `.projector().transpose()`.
-///
-/// @{
-
-/// Fixed-size subspace representation.
-///
-/// @tparam kFullSize Size of the full vector space
-/// @tparam kSize Size of the subspace
-template <std::size_t kFullSize, std::size_t kSize>
-class FixedSizeSubspace {
-  static_assert(kFullSize <= static_cast<std::size_t>(
-                                 std::numeric_limits<std::uint8_t>::max()),
-                "Full vector space size is larger than the supported range");
-  static_assert(1u <= kSize, "Subspace size must be at least 1");
-  static_assert(kSize <= kFullSize,
-                "Subspace can only be as large as the full space");
-
-  template <typename source_t>
-  using SubspaceVectorFor = Eigen::Matrix<typename source_t::Scalar, kSize, 1>;
-  template <typename source_t>
-  using FullspaceVectorFor =
-      Eigen::Matrix<typename source_t::Scalar, kFullSize, 1>;
-  template <typename scalar_t>
-  using ProjectionMatrix = Eigen::Matrix<scalar_t, kSize, kFullSize>;
-  template <typename scalar_t>
-  using ExpansionMatrix = Eigen::Matrix<scalar_t, kFullSize, kSize>;
-
-  // the functionality could also be implemented using a std::bitset where each
-  // bit corresponds to an axis in the fullspace and set bits indicate which
-  // bits make up the subspace. this would be a more compact representation but
-  // complicates the implementation since we can not easily iterate over the
-  // indices of the subspace. storing the subspace indices directly requires a
-  // bit more memory but is easier to work with. for our typical use cases with
-  // n<=8, this still takes only 64bit of memory.
-  std::array<std::uint8_t, kSize> m_axes;
-
- public:
-  /// Construct from a container of axis indices.
-  ///
-  /// @tparam index_t Input index type, must be convertible to std::uint8_t
-  /// @param indices Unique, ordered indices
-  template <typename index_t>
-  constexpr explicit FixedSizeSubspace(
-      const std::array<index_t, kSize>& indices) {
-    for (std::size_t i = 0u; i < kSize; ++i) {
-      assert((indices[i] < kFullSize) &&
-             "Axis indices must be within the full space");
-      if (0u < i) {
-        assert((indices[i - 1u] < indices[i]) &&
-               "Axis indices must be unique and ordered");
-      }
-    }
-    for (std::size_t i = 0; i < kSize; ++i) {
-      m_axes[i] = static_cast<std::uint8_t>(indices[i]);
-    }
-  }
-
-  /// Size of the subspace.
-  static constexpr std::size_t size() { return kSize; }
-  /// Size of the full vector space.
-  static constexpr std::size_t fullSize() { return kFullSize; }
-
-  /// Access axis index by position.
-  ///
-  /// @param i Position in the subspace
-  /// @return Axis index in the full space
-  constexpr std::size_t operator[](std::size_t i) const { return m_axes[i]; }
-
-  std::size_t indexOf(std::size_t axis) const {
-    for (std::size_t i = 0; i < kSize; ++i) {
-      if (m_axes[i] == axis) {
-        return i;
-      }
-    }
-    return kSize;
-  }
-
-  /// Axis indices that comprise the subspace.
-  ///
-  /// The specific container and index type should be considered an
-  /// implementation detail. Users should treat the return type as a generic
-  /// container whose elements are convertible to `std::size_t`.
-  constexpr const std::array<std::uint8_t, kSize>& indices() const {
-    return m_axes;
-  }
-
-  /// Check if the given axis index in the full space is part of the subspace.
-  constexpr bool contains(std::size_t index) const {
-    bool isContained = false;
-    // always iterate over all elements to avoid branching and hope the compiler
-    // can optimise this for us.
-    for (std::uint8_t a : m_axes) {
-      isContained = isContained || (a == index);
-    }
-    return isContained;
-  }
-
-  /// Project a full vector into the subspace.
-  ///
-  /// @tparam fullspace_vector_t Vector type in the full space
-  /// @param full Vector in the full space
-  /// @return Subspace vector w/ just the configured axis components
-  ///
-  /// @note Always returns a column vector regardless of the input
-  template <typename fullspace_vector_t>
-  SubspaceVectorFor<fullspace_vector_t> projectVector(
-      const Eigen::MatrixBase<fullspace_vector_t>& full) const {
-    EIGEN_STATIC_ASSERT_VECTOR_SPECIFIC_SIZE(fullspace_vector_t, kFullSize);
-
-    SubspaceVectorFor<fullspace_vector_t> sub;
-    for (std::size_t i = 0u; i < kSize; ++i) {
-      sub[i] = full[m_axes[i]];
-    }
-    return sub;
-  }
-
-  /// Expand a subspace vector into the full space.
-  ///
-  /// @tparam subspace_vector_t Subspace vector type
-  /// @param sub Subspace vector
-  /// @return Vector in the full space w/ zeros for non-subspace components
-  ///
-  /// @note Always returns a column vector regardless of the input
-  template <typename subspace_vector_t>
-  FullspaceVectorFor<subspace_vector_t> expandVector(
-      const Eigen::MatrixBase<subspace_vector_t>& sub) const {
-    EIGEN_STATIC_ASSERT_VECTOR_SPECIFIC_SIZE(subspace_vector_t, kSize);
-
-    FullspaceVectorFor<subspace_vector_t> full;
-    full.setZero();
-    for (std::size_t i = 0u; i < kSize; ++i) {
-      full[m_axes[i]] = sub[i];
-    }
-    return full;
-  }
-
-  /// Projection matrix that maps from the full space into the subspace.
-  ///
-  /// @tparam scalar_t Scalar type for the projection matrix
-  template <typename scalar_t>
-  ProjectionMatrix<scalar_t> projector() const {
-    ProjectionMatrix<scalar_t> proj;
-    proj.setZero();
-    for (std::size_t i = 0u; i < kSize; ++i) {
-      proj(i, m_axes[i]) = 1;
-    }
-    return proj;
-  }
-
-  /// Expansion matrix that maps from the subspace into the full space.
-  ///
-  /// @tparam scalar_t Scalar type of the generated expansion matrix
-  template <typename scalar_t>
-  ExpansionMatrix<scalar_t> expander() const {
-    ExpansionMatrix<scalar_t> expn;
-    expn.setZero();
-    for (std::size_t i = 0u; i < kSize; ++i) {
-      expn(m_axes[i], i) = 1;
-    }
-    return expn;
-  }
-};
-
-/// Variable-size subspace representation.
-///
-/// @tparam kFullSize Size of the full vector space
-/// @tparam kSize Size of the subspace
-template <std::size_t kFullSize>
-class VariableSizeSubspace {
-  static_assert(kFullSize <= static_cast<std::size_t>(UINT8_MAX),
-                "Full vector space size is larger than the supported range");
-
-  template <typename scalar_t>
-  using FullProjectionMatrix = Eigen::Matrix<scalar_t, kFullSize, kFullSize>;
-  template <typename scalar_t>
-  using FullExpansionMatrix = Eigen::Matrix<scalar_t, kFullSize, kFullSize>;
-
-  std::size_t m_size{};
-
-  // the functionality could also be implemented using a std::bitset where each
-  // bit corresponds to an axis in the fullspace and set bits indicate which
-  // bits make up the subspace. this would be a more compact representation but
-  // complicates the implementation since we can not easily iterate over the
-  // indices of the subspace. storing the subspace indices directly requires a
-  // bit more memory but is easier to work with. for our typical use cases with
-  // n<=8, this still takes only 64bit of memory.
-  std::array<std::uint8_t, kFullSize> m_axes{};
-
- public:
-  /// Construct from a container of axis indices.
-  ///
-  /// @tparam index_t Input index type, must be convertible to std::uint8_t
-  /// @param indices Unique, ordered indices
-  template <typename index_t, std::size_t kSize>
-  constexpr explicit VariableSizeSubspace(
-      const std::array<index_t, kSize>& indices) {
-    m_size = kSize;
-    for (std::size_t i = 0u; i < kSize; ++i) {
-      assert((indices[i] < kFullSize) &&
-             "Axis indices must be within the full space");
-      if (0u < i) {
-        assert((indices[i - 1u] < indices[i]) &&
-               "Axis indices must be unique and ordered");
-      }
-    }
-    for (std::size_t i = 0; i < kSize; ++i) {
-      m_axes[i] = static_cast<std::uint8_t>(indices[i]);
-    }
-  }
-
-  /// Size of the subspace.
-  constexpr std::size_t size() const { return m_size; }
-  /// Size of the full vector space.
-  static constexpr std::size_t fullSize() { return kFullSize; }
-
-  /// Access axis index by position.
-  ///
-  /// @param i Position in the subspace
-  /// @return Axis index in the full space
-  constexpr std::size_t operator[](std::size_t i) const {
-    assert(i < m_size);
-    return m_axes[i];
-  }
-
-  std::size_t indexOf(std::size_t axis) const {
-    for (std::size_t i = 0; i < m_size; ++i) {
-      if (m_axes[i] == axis) {
-        return i;
-      }
-    }
-    return m_size;
-  }
-
-  /// Check if the given axis index in the full space is part of the subspace.
-  constexpr bool contains(std::size_t index) const {
-    bool isContained = false;
-    // always iterate over all elements to avoid branching and hope the compiler
-    // can optimise this for us.
-    for (std::size_t i = 0; i < kFullSize; ++i) {
-      isContained = isContained || ((i < m_size) && (m_axes[i] == index));
-    }
-    return isContained;
-  }
-
-  /// Projection matrix that maps from the full space into the subspace.
-  ///
-  /// @tparam scalar_t Scalar type for the projection matrix
-  template <typename scalar_t>
-  FullProjectionMatrix<scalar_t> fullProjector() const {
-    FullProjectionMatrix<scalar_t> proj;
-    proj.setZero();
-    for (std::size_t i = 0u; i < m_size; ++i) {
-      proj(i, m_axes[i]) = 1;
-    }
-    return proj;
-  }
-
-  /// Expansion matrix that maps from the subspace into the full space.
-  ///
-  /// @tparam scalar_t Scalar type of the generated expansion matrix
-  template <typename scalar_t>
-  FullExpansionMatrix<scalar_t> fullExpander() const {
-    FullExpansionMatrix<scalar_t> expn;
-    expn.setZero();
-    for (std::size_t i = 0u; i < m_size; ++i) {
-      expn(m_axes[i], i) = 1;
-    }
-    return expn;
-  }
-};
-
-/// @}
-
-}  // namespace Acts::detail
diff --git a/Core/include/Acts/Utilities/detail/grid_helper.hpp b/Core/include/Acts/Utilities/detail/grid_helper.hpp
index 10e2db679d9..efc0f0a70cf 100644
--- a/Core/include/Acts/Utilities/detail/grid_helper.hpp
+++ b/Core/include/Acts/Utilities/detail/grid_helper.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2017-2018 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
@@ -95,8 +95,6 @@ class GlobalNeighborHoodIndices {
       return *this;
     }
 
-    bool operator!=(const iterator& it) { return !(*this == it); }
-
     bool isEqual(const iterator& b) const {
       if (b.m_parent == nullptr) {
         return m_localIndicesIter[0] == m_parent->m_localIndices[0].end();
diff --git a/Core/include/Acts/Utilities/detail/interpolation_impl.hpp b/Core/include/Acts/Utilities/detail/interpolation_impl.hpp
index 701c1659e26..717d75b8ffe 100644
--- a/Core/include/Acts/Utilities/detail/interpolation_impl.hpp
+++ b/Core/include/Acts/Utilities/detail/interpolation_impl.hpp
@@ -1,17 +1,16 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2017-2018 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
 #include <array>
 
-namespace Acts::detail {
-
+namespace Acts::Concepts {
 /// @brief check types for requirements needed by interpolation
 ///
 /// @tparam Point1 type for specifying geometric positions
@@ -29,8 +28,7 @@ namespace Acts::detail {
 ///
 /// is @c true if all @c Point types and @c Value fulfill the type
 /// requirements for being used in the interpolation function, otherwise it is
-/// @c false. This expression can be employed in @c std::enable_if_t to use
-/// SFINAE patterns to enable/disable (member) functions.
+/// @c false.
 template <typename Point1, typename Point2, typename Point3, typename Value>
 struct can_interpolate {
   template <typename C>
@@ -48,16 +46,25 @@ struct can_interpolate {
   static std::false_type point_type_test(...);
 
   static const bool value =
-      std::is_same<std::true_type,
-                   decltype(value_type_test<Value>(nullptr))>::value &&
-      std::is_same<std::true_type,
-                   decltype(point_type_test<Point1>(nullptr))>::value &&
-      std::is_same<std::true_type,
-                   decltype(point_type_test<Point2>(nullptr))>::value &&
-      std::is_same<std::true_type,
-                   decltype(point_type_test<Point3>(nullptr))>::value;
+      std::is_same_v<std::true_type,
+                     decltype(value_type_test<Value>(nullptr))> &&
+      std::is_same_v<std::true_type,
+                     decltype(point_type_test<Point1>(nullptr))> &&
+      std::is_same_v<std::true_type,
+                     decltype(point_type_test<Point2>(nullptr))> &&
+      std::is_same_v<std::true_type,
+                     decltype(point_type_test<Point3>(nullptr))>;
 };
 
+/// @brief concept equivalent to `can_interpolate`
+/// @todo this is a concept based on a traditional type trait, meaning it won't
+/// have nice errors; should be rewritten as a real concept!
+template <typename T, typename P1, typename P2, typename P3>
+concept interpolatable = can_interpolate<P1, P2, P3, T>::value;
+}  // namespace Acts::Concepts
+
+namespace Acts::detail {
+
 /// @brief determine number of dimension from power of 2
 ///
 /// @tparam N power of 2
diff --git a/Core/include/Acts/Utilities/detail/periodic.hpp b/Core/include/Acts/Utilities/detail/periodic.hpp
index 2c27314c388..a2fdd823b48 100644
--- a/Core/include/Acts/Utilities/detail/periodic.hpp
+++ b/Core/include/Acts/Utilities/detail/periodic.hpp
@@ -1,14 +1,15 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2016-2020 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
 #include <cmath>
+#include <numbers>
 
 namespace Acts::detail {
 
@@ -49,13 +50,13 @@ inline T difference_periodic(T lhs, T rhs, T range) {
 /// Calculate the equivalent angle in the [0, 2*pi) range.
 template <typename T>
 inline T radian_pos(T x) {
-  return wrap_periodic<T>(x, T{0}, T{2 * M_PI});
+  return wrap_periodic<T>(x, T{0}, T{2 * std::numbers::pi});
 }
 
 /// Calculate the equivalent angle in the [-pi, pi) range.
 template <typename T>
 inline T radian_sym(T x) {
-  return wrap_periodic<T>(x, T{-M_PI}, T{2 * M_PI});
+  return wrap_periodic<T>(x, -std::numbers::pi_v<T>, T{2 * std::numbers::pi});
 }
 
 /// Ensure both phi and theta direction angles are within the allowed range.
@@ -81,11 +82,11 @@ inline std::pair<T, T> normalizePhiTheta(T phi, T theta) {
   // moving it first to the periodic range simplifies further steps as the
   // possible range of theta becomes fixed.
   theta = radian_pos(theta);
-  if (M_PI < theta) {
+  if (std::numbers::pi_v<T> < theta) {
     // theta is in the second half of the great circle and outside its nominal
     // range. need to change both phi and theta to be within range.
-    phi += M_PI;
-    theta = 2 * M_PI - theta;
+    phi += std::numbers::pi_v<T>;
+    theta = T{2 * std::numbers::pi} - theta;
   }
   return {radian_sym(phi), theta};
 }
diff --git a/Core/include/Acts/Vertexing/AMVFInfo.hpp b/Core/include/Acts/Vertexing/AMVFInfo.hpp
index 988c3f6b99e..f2012961c27 100644
--- a/Core/include/Acts/Vertexing/AMVFInfo.hpp
+++ b/Core/include/Acts/Vertexing/AMVFInfo.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2019-2023 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
diff --git a/Core/include/Acts/Vertexing/AdaptiveGridDensityVertexFinder.hpp b/Core/include/Acts/Vertexing/AdaptiveGridDensityVertexFinder.hpp
index 49f9ae93ce2..91c2bfd7409 100644
--- a/Core/include/Acts/Vertexing/AdaptiveGridDensityVertexFinder.hpp
+++ b/Core/include/Acts/Vertexing/AdaptiveGridDensityVertexFinder.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2020-2023 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
diff --git a/Core/include/Acts/Vertexing/AdaptiveGridTrackDensity.hpp b/Core/include/Acts/Vertexing/AdaptiveGridTrackDensity.hpp
index 9677a2826d1..a5e276674eb 100644
--- a/Core/include/Acts/Vertexing/AdaptiveGridTrackDensity.hpp
+++ b/Core/include/Acts/Vertexing/AdaptiveGridTrackDensity.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2020-2023 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 #include "Acts/Definitions/Algebra.hpp"
diff --git a/Core/include/Acts/Vertexing/AdaptiveMultiVertexFinder.hpp b/Core/include/Acts/Vertexing/AdaptiveMultiVertexFinder.hpp
index 818d2c363be..4d1ac3ad4fd 100644
--- a/Core/include/Acts/Vertexing/AdaptiveMultiVertexFinder.hpp
+++ b/Core/include/Acts/Vertexing/AdaptiveMultiVertexFinder.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2020-2024 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
diff --git a/Core/include/Acts/Vertexing/AdaptiveMultiVertexFitter.hpp b/Core/include/Acts/Vertexing/AdaptiveMultiVertexFitter.hpp
index 2bd3827faa7..91f18618673 100644
--- a/Core/include/Acts/Vertexing/AdaptiveMultiVertexFitter.hpp
+++ b/Core/include/Acts/Vertexing/AdaptiveMultiVertexFitter.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2019-2023 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
@@ -22,6 +22,7 @@
 #include "Acts/Vertexing/VertexingError.hpp"
 #include "Acts/Vertexing/VertexingOptions.hpp"
 
+#include <algorithm>
 #include <functional>
 
 namespace Acts {
@@ -81,8 +82,7 @@ class AdaptiveMultiVertexFitter {
 
     Result<void> removeVertexFromCollection(Vertex& vtxToRemove,
                                             const Logger& logger) {
-      auto it = std::find(vertexCollection.begin(), vertexCollection.end(),
-                          &vtxToRemove);
+      auto it = std::ranges::find(vertexCollection, &vtxToRemove);
       // Check if the value was found before erasing
       if (it == vertexCollection.end()) {
         ACTS_ERROR("vtxToRemove is not part of vertexCollection.");
diff --git a/Core/include/Acts/Vertexing/DummyVertexFitter.hpp b/Core/include/Acts/Vertexing/DummyVertexFitter.hpp
index 545ac17f1f1..ca2c0c06455 100644
--- a/Core/include/Acts/Vertexing/DummyVertexFitter.hpp
+++ b/Core/include/Acts/Vertexing/DummyVertexFitter.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2020 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
diff --git a/Core/include/Acts/Vertexing/FsmwMode1dFinder.hpp b/Core/include/Acts/Vertexing/FsmwMode1dFinder.hpp
index e93325c625e..df7d1a4c3fd 100644
--- a/Core/include/Acts/Vertexing/FsmwMode1dFinder.hpp
+++ b/Core/include/Acts/Vertexing/FsmwMode1dFinder.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2019 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
diff --git a/Core/include/Acts/Vertexing/FullBilloirVertexFitter.hpp b/Core/include/Acts/Vertexing/FullBilloirVertexFitter.hpp
index 78e1d70c201..16433d88825 100644
--- a/Core/include/Acts/Vertexing/FullBilloirVertexFitter.hpp
+++ b/Core/include/Acts/Vertexing/FullBilloirVertexFitter.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2019 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
diff --git a/Core/include/Acts/Vertexing/GaussianGridTrackDensity.hpp b/Core/include/Acts/Vertexing/GaussianGridTrackDensity.hpp
index 66b7136d501..0a4a19d3165 100644
--- a/Core/include/Acts/Vertexing/GaussianGridTrackDensity.hpp
+++ b/Core/include/Acts/Vertexing/GaussianGridTrackDensity.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2020 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 #include "Acts/Definitions/Algebra.hpp"
diff --git a/Core/include/Acts/Vertexing/GaussianTrackDensity.hpp b/Core/include/Acts/Vertexing/GaussianTrackDensity.hpp
index 748e63dbdb7..60853f46646 100644
--- a/Core/include/Acts/Vertexing/GaussianTrackDensity.hpp
+++ b/Core/include/Acts/Vertexing/GaussianTrackDensity.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2020 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
diff --git a/Core/include/Acts/Vertexing/GridDensityVertexFinder.hpp b/Core/include/Acts/Vertexing/GridDensityVertexFinder.hpp
index fd198ad7784..9d6c0ee9686 100644
--- a/Core/include/Acts/Vertexing/GridDensityVertexFinder.hpp
+++ b/Core/include/Acts/Vertexing/GridDensityVertexFinder.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2020 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
diff --git a/Core/include/Acts/Vertexing/HelicalTrackLinearizer.hpp b/Core/include/Acts/Vertexing/HelicalTrackLinearizer.hpp
index 4f6015db549..fa1eef6d50a 100644
--- a/Core/include/Acts/Vertexing/HelicalTrackLinearizer.hpp
+++ b/Core/include/Acts/Vertexing/HelicalTrackLinearizer.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2019-2023 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
diff --git a/Core/include/Acts/Vertexing/IVertexFinder.hpp b/Core/include/Acts/Vertexing/IVertexFinder.hpp
index 56c79d8f036..faee1e930c4 100644
--- a/Core/include/Acts/Vertexing/IVertexFinder.hpp
+++ b/Core/include/Acts/Vertexing/IVertexFinder.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2023 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
diff --git a/Core/include/Acts/Vertexing/ImpactPointEstimator.hpp b/Core/include/Acts/Vertexing/ImpactPointEstimator.hpp
index 40f3bf4208e..80968e9a320 100644
--- a/Core/include/Acts/Vertexing/ImpactPointEstimator.hpp
+++ b/Core/include/Acts/Vertexing/ImpactPointEstimator.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2019-2023 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
diff --git a/Core/include/Acts/Vertexing/IterativeVertexFinder.hpp b/Core/include/Acts/Vertexing/IterativeVertexFinder.hpp
index a1804e1aaff..1ca9c026f41 100644
--- a/Core/include/Acts/Vertexing/IterativeVertexFinder.hpp
+++ b/Core/include/Acts/Vertexing/IterativeVertexFinder.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2019 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
diff --git a/Core/include/Acts/Vertexing/KalmanVertexUpdater.hpp b/Core/include/Acts/Vertexing/KalmanVertexUpdater.hpp
index 77d5a8bf37e..c1698c2d21f 100644
--- a/Core/include/Acts/Vertexing/KalmanVertexUpdater.hpp
+++ b/Core/include/Acts/Vertexing/KalmanVertexUpdater.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2019-2024 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
diff --git a/Core/include/Acts/Vertexing/LinearizedTrack.hpp b/Core/include/Acts/Vertexing/LinearizedTrack.hpp
index c57f850318a..aa34f9d7809 100644
--- a/Core/include/Acts/Vertexing/LinearizedTrack.hpp
+++ b/Core/include/Acts/Vertexing/LinearizedTrack.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2019 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
diff --git a/Core/include/Acts/Vertexing/LinearizerTrackParameters.hpp b/Core/include/Acts/Vertexing/LinearizerTrackParameters.hpp
index b4b665152fa..d0d2bd69f2e 100644
--- a/Core/include/Acts/Vertexing/LinearizerTrackParameters.hpp
+++ b/Core/include/Acts/Vertexing/LinearizerTrackParameters.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2023 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
diff --git a/Core/include/Acts/Vertexing/NumericalTrackLinearizer.hpp b/Core/include/Acts/Vertexing/NumericalTrackLinearizer.hpp
index 1eddcd3908e..00d5cddf989 100644
--- a/Core/include/Acts/Vertexing/NumericalTrackLinearizer.hpp
+++ b/Core/include/Acts/Vertexing/NumericalTrackLinearizer.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2023 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
diff --git a/Core/include/Acts/Vertexing/SingleSeedVertexFinder.hpp b/Core/include/Acts/Vertexing/SingleSeedVertexFinder.hpp
index ea3e7c42859..cc5bdf20289 100644
--- a/Core/include/Acts/Vertexing/SingleSeedVertexFinder.hpp
+++ b/Core/include/Acts/Vertexing/SingleSeedVertexFinder.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2023 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
diff --git a/Core/include/Acts/Vertexing/SingleSeedVertexFinder.ipp b/Core/include/Acts/Vertexing/SingleSeedVertexFinder.ipp
index 1206528cd5c..83b13d37d57 100644
--- a/Core/include/Acts/Vertexing/SingleSeedVertexFinder.ipp
+++ b/Core/include/Acts/Vertexing/SingleSeedVertexFinder.ipp
@@ -1,12 +1,14 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2023 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
+#include <algorithm>
 #include <cmath>
+#include <numbers>
 #include <system_error>
 
 #include <Eigen/Eigenvalues>
@@ -84,8 +86,8 @@ Acts::SingleSeedVertexFinder<spacepoint_t>::sortSpacepoints(
   for (const auto& sp : spacepoints) {
     // phi will be saved for later
     Acts::ActsScalar phi = detail::radian_pos(std::atan2(sp.y(), sp.x()));
-    std::uint32_t phislice =
-        static_cast<std::uint32_t>(phi / (2 * M_PI) * m_cfg.numPhiSlices);
+    std::uint32_t phislice = static_cast<std::uint32_t>(
+        phi / (2 * std::numbers::pi) * m_cfg.numPhiSlices);
     if (phislice >= m_cfg.numPhiSlices) {
       phislice = 0;
     }
@@ -133,7 +135,7 @@ Acts::SingleSeedVertexFinder<spacepoint_t>::findTriplets(
 
   std::uint32_t phiStep =
       static_cast<std::uint32_t>(m_cfg.maxPhideviation /
-                                 (2 * M_PI / m_cfg.numPhiSlices)) +
+                                 (2 * std::numbers::pi / m_cfg.numPhiSlices)) +
       1;
 
   // calculate limits for middle spacepoints
@@ -193,7 +195,7 @@ Acts::SingleSeedVertexFinder<spacepoint_t>::findTriplets(
     Acts::ActsScalar angleZfrom =
         std::atan2(rMiddle[isLessFrom], deltaZfrom) + m_cfg.maxXYZdeviation;
     std::uint32_t nearZFrom = 0;
-    if (angleZfrom < M_PI) {
+    if (angleZfrom < std::numbers::pi_v<Acts::ActsScalar>) {
       Acts::ActsScalar new_deltaZfrom =
           rMiddle[isLessFrom] / std::tan(angleZfrom) / zBinLength;
       nearZFrom = static_cast<std::uint32_t>(std::max(
@@ -216,8 +218,8 @@ Acts::SingleSeedVertexFinder<spacepoint_t>::findTriplets(
     }
 
     for (std::uint32_t nearZ = nearZFrom; nearZ < nearZTo; ++nearZ) {
-      // calculate limits for far spacepoits, assuming middle and near
-      // spacepoits are within some boundaries
+      // calculate limits for far spacepoints, assuming middle and near
+      // spacepoints are within some boundaries
       bool isMiddleLess = (middleZ <= nearZ);
 
       Acts::ActsScalar delta2Zfrom = (middleZ - nearZ - 1) * zBinLength;
@@ -225,7 +227,7 @@ Acts::SingleSeedVertexFinder<spacepoint_t>::findTriplets(
           std::atan2(rFarDelta[isMiddleLess], delta2Zfrom) +
           m_cfg.maxXYZdeviation;
       std::uint32_t farZFrom = 0;
-      if (angle2Zfrom < M_PI) {
+      if (angle2Zfrom < std::numbers::pi_v<Acts::ActsScalar>) {
         farZFrom = static_cast<std::uint32_t>(std::max(
             (rFarDelta[isMiddleLess] / std::tan(angle2Zfrom) / zBinLength) +
                 middleZ,
@@ -286,8 +288,8 @@ Acts::SingleSeedVertexFinder<spacepoint_t>::findTriplets(
                 for (const auto& middleSP :
                      sortedSpacepoints.getSP(1, middlePhi, middleZ)) {
                   Acts::ActsScalar phiB = middleSP.second;
-                  Acts::ActsScalar deltaPhiAB =
-                      detail::difference_periodic(phiA, phiB, 2 * M_PI);
+                  Acts::ActsScalar deltaPhiAB = detail::difference_periodic(
+                      phiA, phiB, 2 * std::numbers::pi);
                   if (std::abs(deltaPhiAB) > m_cfg.maxPhideviation) {
                     continue;
                   }
@@ -296,8 +298,9 @@ Acts::SingleSeedVertexFinder<spacepoint_t>::findTriplets(
                   for (const auto& farSP :
                        sortedSpacepoints.getSP(2, farPhi, farZ)) {
                     Acts::ActsScalar phiC = farSP.second;
-                    Acts::ActsScalar deltaPhiBC =
-                        detail::difference_periodic(phiB, phiC, 2 * M_PI);
+                    Acts::ActsScalar deltaPhiBC = detail::difference_periodic(
+                        phiB, phiC,
+                        static_cast<Acts::ActsScalar>(2 * std::numbers::pi));
                     if (std::abs(deltaPhiBC) > m_cfg.maxPhideviation) {
                       continue;
                     }
@@ -331,8 +334,8 @@ bool Acts::SingleSeedVertexFinder<spacepoint_t>::tripletValidationAndUpdate(
   Acts::ActsScalar alpha2 =
       std::atan2(triplet.b.y() - triplet.c.y(), triplet.b.x() - triplet.c.x());
   // these two slopes shouldn't be too different
-  Acts::ActsScalar deltaAlpha =
-      detail::difference_periodic(alpha1, alpha2, 2 * M_PI);
+  Acts::ActsScalar deltaAlpha = detail::difference_periodic(
+      alpha1, alpha2, static_cast<Acts::ActsScalar>(2 * std::numbers::pi));
   if (std::abs(deltaAlpha) > m_cfg.maxXYdeviation) {
     return false;
   }
@@ -463,10 +466,8 @@ Acts::SingleSeedVertexFinder<spacepoint_t>::findClosestPointFromPlanes(
         triplet.second = distance;
       }
 
-      std::sort(tripletsWithPlanes.begin(), tripletsWithPlanes.end(),
-                [](const auto& lhs, const auto& rhs) {
-                  return lhs.second < rhs.second;
-                });
+      std::ranges::sort(tripletsWithPlanes, {},
+                        [](const auto& t) { return t.second; });
 
       std::uint32_t threshold = static_cast<std::uint32_t>(
           tripletsWithPlanes.size() * (1. - m_cfg.removeFraction));
@@ -571,10 +572,8 @@ Acts::SingleSeedVertexFinder<spacepoint_t>::findClosestPointFromRays(
         triplet.second = distance;
       }
 
-      std::sort(tripletsWithRays.begin(), tripletsWithRays.end(),
-                [](const auto& lhs, const auto& rhs) {
-                  return lhs.second < rhs.second;
-                });
+      std::ranges::sort(tripletsWithRays, {},
+                        [](const auto& t) { return t.second; });
 
       std::uint32_t threshold = static_cast<std::uint32_t>(
           tripletsWithRays.size() * (1. - m_cfg.removeFraction));
diff --git a/Core/include/Acts/Vertexing/TrackAtVertex.hpp b/Core/include/Acts/Vertexing/TrackAtVertex.hpp
index 7072ab422d0..fb57c02ec60 100644
--- a/Core/include/Acts/Vertexing/TrackAtVertex.hpp
+++ b/Core/include/Acts/Vertexing/TrackAtVertex.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2019 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
@@ -38,6 +38,8 @@ struct InputTrack {
     return m_ptr == other;
   }
 
+  bool operator<(const InputTrack& other) const { return m_ptr < other.m_ptr; }
+
   template <typename T>
   const T* as() const {
     using ptr_t = const T*;
@@ -52,10 +54,6 @@ struct InputTrack {
     return os;
   }
 
-  friend bool operator<(const InputTrack& lhs, const InputTrack& rhs) {
-    return lhs.m_ptr < rhs.m_ptr;
-  }
-
   friend struct std::hash<Acts::InputTrack>;
 
   static BoundTrackParameters extractParameters(const InputTrack& track) {
diff --git a/Core/include/Acts/Vertexing/TrackDensityVertexFinder.hpp b/Core/include/Acts/Vertexing/TrackDensityVertexFinder.hpp
index 6468717db43..e940292a7f0 100644
--- a/Core/include/Acts/Vertexing/TrackDensityVertexFinder.hpp
+++ b/Core/include/Acts/Vertexing/TrackDensityVertexFinder.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2020 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
diff --git a/Core/include/Acts/Vertexing/TrackLinearizer.hpp b/Core/include/Acts/Vertexing/TrackLinearizer.hpp
index 3734cc1687a..b0fbbb2c657 100644
--- a/Core/include/Acts/Vertexing/TrackLinearizer.hpp
+++ b/Core/include/Acts/Vertexing/TrackLinearizer.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2023 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
diff --git a/Core/include/Acts/Vertexing/Vertex.hpp b/Core/include/Acts/Vertexing/Vertex.hpp
index 1ce6e0ae7c5..d656c7a199f 100644
--- a/Core/include/Acts/Vertexing/Vertex.hpp
+++ b/Core/include/Acts/Vertexing/Vertex.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2019 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
@@ -78,15 +78,6 @@ class Vertex {
   /// @param position Vertex position
   void setPosition(const Vector3& position);
 
-  /// @brief Set position and time
-  ///
-  /// @deprecated Use setFullPosition instead
-  ///
-  /// @param position Vertex position
-  /// @param time The time
-  [[deprecated("Use setFullPosition instead")]] void setPosition(
-      const Vector3& position, ActsScalar time);
-
   /// @brief Set position and time
   ///
   /// @param fullPosition Vertex position and time
diff --git a/Core/include/Acts/Vertexing/VertexingError.hpp b/Core/include/Acts/Vertexing/VertexingError.hpp
index 3e4931a12ad..80e98ce75d9 100644
--- a/Core/include/Acts/Vertexing/VertexingError.hpp
+++ b/Core/include/Acts/Vertexing/VertexingError.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2019-2020 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
diff --git a/Core/include/Acts/Vertexing/VertexingOptions.hpp b/Core/include/Acts/Vertexing/VertexingOptions.hpp
index 41cdd91f51f..9f18d0a60f2 100644
--- a/Core/include/Acts/Vertexing/VertexingOptions.hpp
+++ b/Core/include/Acts/Vertexing/VertexingOptions.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2019-2023 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
diff --git a/Core/include/Acts/Vertexing/ZScanVertexFinder.hpp b/Core/include/Acts/Vertexing/ZScanVertexFinder.hpp
index 432036c1007..83477ed7db8 100644
--- a/Core/include/Acts/Vertexing/ZScanVertexFinder.hpp
+++ b/Core/include/Acts/Vertexing/ZScanVertexFinder.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2019 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
diff --git a/Core/include/Acts/Vertexing/detail/KalmanVertexUpdaterImpl.hpp b/Core/include/Acts/Vertexing/detail/KalmanVertexUpdaterImpl.hpp
index ecfdcda2715..f8f99b98f20 100644
--- a/Core/include/Acts/Vertexing/detail/KalmanVertexUpdaterImpl.hpp
+++ b/Core/include/Acts/Vertexing/detail/KalmanVertexUpdaterImpl.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2024 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
@@ -254,9 +254,7 @@ void updateVertexWithTrackImpl(Vertex& vtx, TrackAtVertex& trk, int sign) {
   calculateUpdate(vtx, trk.linearizedState, trackWeight, sign, cache);
 
   // Get fit quality parameters wrt to old vertex
-  double chi2 = 0.;
-  double ndf = 0.;
-  std::tie(chi2, ndf) = vtx.fitQuality();
+  auto [chi2, ndf] = vtx.fitQuality();
 
   // Chi2 of the track parameters
   double trkChi2 = trackParametersChi2(trk.linearizedState, cache);
diff --git a/Core/include/Acts/Visualization/EventDataView3D.hpp b/Core/include/Acts/Visualization/EventDataView3D.hpp
index d7de8e94eda..3d8282bb255 100644
--- a/Core/include/Acts/Visualization/EventDataView3D.hpp
+++ b/Core/include/Acts/Visualization/EventDataView3D.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2020-2023 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
@@ -26,17 +26,18 @@
 #include <array>
 #include <cmath>
 #include <cstddef>
+#include <numbers>
 #include <optional>
 #include <vector>
 
 namespace Acts {
 class IVisualization3D;
 
-static ViewConfig s_viewParameter = ViewConfig({0, 0, 255});
-static ViewConfig s_viewMeasurement = ViewConfig({255, 102, 0});
-static ViewConfig s_viewPredicted = ViewConfig({51, 204, 51});
-static ViewConfig s_viewFiltered = ViewConfig({255, 255, 0});
-static ViewConfig s_viewSmoothed = ViewConfig({0, 102, 255});
+static ViewConfig s_viewParameter = {.color = {0, 0, 255}};
+static ViewConfig s_viewMeasurement = {.color = {255, 102, 0}};
+static ViewConfig s_viewPredicted = {.color = {51, 204, 51}};
+static ViewConfig s_viewFiltered = {.color = {255, 255, 0}};
+static ViewConfig s_viewSmoothed = {.color = {0, 102, 25}};
 
 struct EventDataView3D {
   /// Helper to find the eigen values and corr angle
@@ -81,9 +82,9 @@ struct EventDataView3D {
     // Now generate the ellipse points
     std::vector<Vector3> ellipse;
     ellipse.reserve(lseg);
-    double thetaStep = 2 * M_PI / lseg;
+    double thetaStep = 2 * std::numbers::pi / lseg;
     for (std::size_t it = 0; it < lseg; ++it) {
-      double phi = -M_PI + it * thetaStep;
+      double phi = -std::numbers::pi + it * thetaStep;
       double cphi = std::cos(phi);
       double sphi = std::sin(phi);
       double x = lposition.x() + (l1sq * ctheta * cphi - l2sq * stheta * sphi);
@@ -277,7 +278,7 @@ struct EventDataView3D {
                                  state.predicted(), state.predictedCovariance(),
                                  particleHypothesis),
             gctx, momentumScale, locErrorScale, angularErrorScale,
-            predictedConfig, predictedConfig, ViewConfig(false));
+            predictedConfig, predictedConfig, {.visible = false});
       }
       // (b) filtered track parameters
       if (filteredConfig.visible && state.hasFiltered()) {
@@ -287,7 +288,7 @@ struct EventDataView3D {
                                  state.filtered(), state.filteredCovariance(),
                                  particleHypothesis),
             gctx, momentumScale, locErrorScale, angularErrorScale,
-            filteredConfig, filteredConfig, ViewConfig(false));
+            filteredConfig, filteredConfig, {.visible = false});
       }
       // (c) smoothed track parameters
       if (smoothedConfig.visible && state.hasSmoothed()) {
@@ -297,7 +298,7 @@ struct EventDataView3D {
                                  state.smoothed(), state.smoothedCovariance(),
                                  particleHypothesis),
             gctx, momentumScale, locErrorScale, angularErrorScale,
-            smoothedConfig, smoothedConfig, ViewConfig(false));
+            smoothedConfig, smoothedConfig, {.visible = false});
       }
       return true;
     });
diff --git a/Core/include/Acts/Visualization/GeometryView3D.hpp b/Core/include/Acts/Visualization/GeometryView3D.hpp
index 0243e8e58ad..fed07697a87 100644
--- a/Core/include/Acts/Visualization/GeometryView3D.hpp
+++ b/Core/include/Acts/Visualization/GeometryView3D.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2020 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
@@ -14,6 +14,7 @@
 #include "Acts/Visualization/IVisualization3D.hpp"
 #include "Acts/Visualization/ViewConfig.hpp"
 
+#include <filesystem>
 #include <string>
 
 namespace Acts {
@@ -30,12 +31,6 @@ class DetectorVolume;
 class Portal;
 }  // namespace Experimental
 
-static const ViewConfig s_viewSensitive;
-static const ViewConfig s_viewPassive;
-static const ViewConfig s_viewVolume;
-static const ViewConfig s_viewGrid;
-static const ViewConfig s_viewLine;
-
 struct GeometryView3D {
   /// Helper method to draw Polyhedron objects
   ///
@@ -75,7 +70,7 @@ struct GeometryView3D {
       const ViewConfig& sensitiveConfig = s_viewSensitive,
       const ViewConfig& passiveConfig = s_viewPassive,
       const ViewConfig& gridConfig = s_viewGrid,
-      const std::string& outputDir = ".");
+      const std::filesystem::path& outputDir = std::filesystem::path("."));
 
   /// Helper method to draw Volume objects
   ///
@@ -101,9 +96,9 @@ struct GeometryView3D {
                          const Experimental::Portal& portal,
                          const GeometryContext& gctx,
                          const Transform3& transform = Transform3::Identity(),
-                         const ViewConfig& connected = ViewConfig({0, 255, 0}),
-                         const ViewConfig& disconnected = ViewConfig({255, 0,
-                                                                      0}));
+                         const ViewConfig& connected = {.color = {0, 255, 0}},
+                         const ViewConfig& disconnected = {
+                             .color = {255, 0, 0}});
 
   /// Helper method to draw DetectorVolume objects
   ///
@@ -119,8 +114,8 @@ struct GeometryView3D {
       const Acts::Experimental::DetectorVolume& volume,
       const GeometryContext& gctx,
       const Transform3& transform = Transform3::Identity(),
-      const ViewConfig& connected = ViewConfig({0, 255, 0}),
-      const ViewConfig& unconnected = ViewConfig({255, 0, 0}),
+      const ViewConfig& connected = {.color = {0, 255, 0}},
+      const ViewConfig& unconnected = {.color = {255, 0, 0}},
       const ViewConfig& viewConfig = s_viewSensitive);
 
   /// Helper method to draw Layer objects
@@ -132,12 +127,12 @@ struct GeometryView3D {
   /// @param sensitiveConfig The drawing configuration for sensitive surfaces
   /// @param gridConfig The drawing configuration for grid display
   /// @param outputDir Directory to write to
-  static void drawLayer(IVisualization3D& helper, const Layer& layer,
-                        const GeometryContext& gctx,
-                        const ViewConfig& layerConfig = s_viewPassive,
-                        const ViewConfig& sensitiveConfig = s_viewSensitive,
-                        const ViewConfig& gridConfig = s_viewGrid,
-                        const std::string& outputDir = ".");
+  static void drawLayer(
+      IVisualization3D& helper, const Layer& layer, const GeometryContext& gctx,
+      const ViewConfig& layerConfig = s_viewPassive,
+      const ViewConfig& sensitiveConfig = s_viewSensitive,
+      const ViewConfig& gridConfig = s_viewGrid,
+      const std::filesystem::path& outputDir = std::filesystem::path("."));
 
   /// Helper method to draw TrackingVolume objects
   ///
@@ -161,7 +156,8 @@ struct GeometryView3D {
       const ViewConfig& layerView = s_viewPassive,
       const ViewConfig& sensitiveView = s_viewSensitive,
       const ViewConfig& gridView = s_viewGrid, bool writeIt = true,
-      const std::string& tag = "", const std::string& outputDir = ".");
+      const std::string& tag = "",
+      const std::filesystem::path& outputDir = std::filesystem::path("."));
 
   /// Helper method to draw lines - base for all lines
   ///
diff --git a/Core/include/Acts/Visualization/IVisualization3D.hpp b/Core/include/Acts/Visualization/IVisualization3D.hpp
index 6daf34c4e2f..be8c5b96226 100644
--- a/Core/include/Acts/Visualization/IVisualization3D.hpp
+++ b/Core/include/Acts/Visualization/IVisualization3D.hpp
@@ -1,20 +1,18 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2019 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
 #include "Acts/Definitions/Algebra.hpp"
 #include "Acts/Visualization/ViewConfig.hpp"
 
-#include <array>
 #include <cstddef>
-#include <fstream>
-#include <string>
+#include <filesystem>
 #include <vector>
 
 namespace Acts {
@@ -26,11 +24,13 @@ class IVisualization3D {
  public:
   using FaceType = std::vector<std::size_t>;
 
+  static constexpr Color s_defaultColor = {120, 120, 120};
+
   /// Draw a vertex at a given location and a color.
   /// @param vtx The vertex position
   /// @param color The color
   ///
-  virtual void vertex(const Vector3& vtx, ColorRGB color = {120, 120, 120}) = 0;
+  virtual void vertex(const Vector3& vtx, Color color = s_defaultColor) = 0;
 
   /// Draw a face that connects a list of vertices.
   /// @note Depending on the helper implementation, out of plane vertices might
@@ -39,7 +39,7 @@ class IVisualization3D {
   /// @param color The color of the face
   ///
   virtual void face(const std::vector<Vector3>& vtxs,
-                    ColorRGB color = {120, 120, 120}) = 0;
+                    Color color = s_defaultColor) = 0;
 
   /// Draw a faces that connects a list of vertices - expert only
   ///
@@ -51,7 +51,7 @@ class IVisualization3D {
   ///
   virtual void faces(const std::vector<Vector3>& vtxs,
                      const std::vector<FaceType>& faces,
-                     ColorRGB color = {120, 120, 120}) = 0;
+                     Color color = s_defaultColor) = 0;
 
   /// Draw a line from a vertex to another
   /// @param a The start vertex
@@ -59,7 +59,7 @@ class IVisualization3D {
   /// @param color The color of the line
   ///
   virtual void line(const Vector3& a, const Vector3& b,
-                    ColorRGB color = {120, 120, 120}) = 0;
+                    Color color = s_defaultColor) = 0;
 
   /// Write the content of the helper to an outstream.
   /// @param os The output stream for file
@@ -67,28 +67,17 @@ class IVisualization3D {
 
   /// Write the content of the helper to an outstream.
   /// @param path is the file system path for writing the file
-  /// @note will change to std::filesystem::path once gcc9 is standard
-  virtual void write(const std::string& path) const = 0;
+  virtual void write(const std::filesystem::path& path) const = 0;
 
   /// Remove all contents of this helper
   ///
   virtual void clear() = 0;
 
- protected:
-  /// Helper: check for extension
-  ///
-  /// @note this is a placeholder for std::filesystem::has_extension
-  /// which needs special linking until gcc9
-  /// @param path the path to be checked
-  bool hasExtension(const std::string& path) const;
+  virtual ~IVisualization3D() = default;
 
-  /// Helper: replace the extension
-  ///
-  /// @note this is a placeholder for std::filesystem::replace_extension
-  /// which needs special linking until gcc9
-  /// @param path [in,out] the path to be changed
-  /// @param suffix the extension to be added
-  void replaceExtension(std::string& path, const std::string& suffix) const;
+  /// Start a new object context
+  /// @param name The name of the object
+  virtual void object(const std::string& name) = 0;
 };
 
 /// Overload of the << operator to facilitate writing to streams.
diff --git a/Core/include/Acts/Visualization/ObjVisualization3D.hpp b/Core/include/Acts/Visualization/ObjVisualization3D.hpp
index a915ecadee8..a9f496ce304 100644
--- a/Core/include/Acts/Visualization/ObjVisualization3D.hpp
+++ b/Core/include/Acts/Visualization/ObjVisualization3D.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2019 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
@@ -12,11 +12,8 @@
 #include "Acts/Visualization/IVisualization3D.hpp"
 #include "Acts/Visualization/ViewConfig.hpp"
 
-#include <array>
-#include <fstream>
-#include <iomanip>
+#include <filesystem>
 #include <map>
-#include <sstream>
 #include <string>
 #include <vector>
 
@@ -25,14 +22,10 @@ namespace Acts {
 /// This helper produces output in the OBJ format. Note that colors are not
 /// supported in this implementation.
 ///
-template <typename T = double>
 class ObjVisualization3D : public IVisualization3D {
  public:
-  static_assert(std::is_same_v<T, double> || std::is_same_v<T, float>,
-                "Use either double or float");
-
   /// Stored value type, should be double or float
-  using ValueType = T;
+  using ValueType = double;
 
   /// Type of a vertex based on the value type
   using VertexType = Eigen::Matrix<ValueType, 3, 1>;
@@ -47,22 +40,23 @@ class ObjVisualization3D : public IVisualization3D {
       : m_outputPrecision(prec), m_outputScalor(scale) {}
 
   /// @copydoc Acts::IVisualization3D::vertex()
-  void vertex(const Vector3& vtx, ColorRGB color = {0, 0, 0}) final;
+  void vertex(const Vector3& vtx, Color color = s_defaultColor) final;
 
   /// @copydoc Acts::IVisualization3D::line()
   void line(const Vector3& a, const Vector3& b,
-            ColorRGB color = {0, 0, 0}) final;
+            Color color = s_defaultColor) final;
 
   /// @copydoc Acts::IVisualization3D::face()
-  void face(const std::vector<Vector3>& vtxs, ColorRGB color = {0, 0, 0}) final;
+  void face(const std::vector<Vector3>& vtxs,
+            Color color = s_defaultColor) final;
 
   /// @copydoc Acts::IVisualization3D::faces()
   void faces(const std::vector<Vector3>& vtxs,
              const std::vector<FaceType>& faces,
-             ColorRGB color = {0, 0, 0}) final;
+             Color color = s_defaultColor) final;
 
-  /// @copydoc Acts::IVisualization3D::write(const std::string&) const
-  void write(const std::string& path) const final;
+  /// @copydoc Acts::IVisualization3D::write(const std::filesystem::path&) const
+  void write(const std::filesystem::path& path) const final;
 
   /// @copydoc Acts::IVisualization3D::write(std::ostream&) const
   void write(std::ostream& os) const final;
@@ -75,22 +69,32 @@ class ObjVisualization3D : public IVisualization3D {
   ///  @copydoc Acts::IVisualization3D::clear()
   void clear() final;
 
+  /// Start a new object context with a name
+  /// @param name The name of the object
+  void object(const std::string& name) final;
+
  private:
+  struct Object {
+    std::string name;
+    std::vector<VertexType> vertices{};
+    std::vector<FaceType> faces{};
+    std::vector<LineType> lines{};
+
+    /// The object data to be written
+    /// Map of colors to be written at given index position
+    std::map<std::size_t, Color> lineColors{};
+    std::map<std::size_t, Color> vertexColors{};
+    std::map<std::size_t, Color> faceColors{};
+  };
+
+  Object& object();
+  const Object& object() const;
+
   /// The output parameters
   unsigned int m_outputPrecision = 4;
   double m_outputScalor = 1.;
-  /// The object data to be written
-  std::vector<VertexType> m_vertices;
-  std::vector<FaceType> m_faces;
-  std::vector<LineType> m_lines;
-  /// Map of colors to be written at given index position
-  std::map<std::size_t, ColorRGB> m_lineColors;
-  std::map<std::size_t, ColorRGB> m_vertexColors;
-  std::map<std::size_t, ColorRGB> m_faceColors;
-};
 
-#ifndef DOXYGEN
-#include "detail/ObjVisualization3D.ipp"
-#endif
+  std::vector<Object> m_objects;
+};
 
 }  // namespace Acts
diff --git a/Core/include/Acts/Visualization/PlyVisualization3D.hpp b/Core/include/Acts/Visualization/PlyVisualization3D.hpp
index b28783a0bcd..a4367dc7e02 100644
--- a/Core/include/Acts/Visualization/PlyVisualization3D.hpp
+++ b/Core/include/Acts/Visualization/PlyVisualization3D.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2019 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
@@ -13,6 +13,7 @@
 #include "Acts/Visualization/ViewConfig.hpp"
 
 #include <array>
+#include <filesystem>
 #include <fstream>
 #include <string>
 #include <utility>
@@ -35,23 +36,23 @@ class PlyVisualization3D : public IVisualization3D {
   using VertexType = Eigen::Matrix<ValueType, 3, 1>;
 
   /// @copydoc Acts::IVisualization3D::vertex()
-  void vertex(const Vector3& vtx, ColorRGB color = {120, 120, 120}) final;
+  void vertex(const Vector3& vtx, Color color = {120, 120, 120}) final;
 
   /// @copydoc Acts::IVisualization3D::face()
   void face(const std::vector<Vector3>& vtxs,
-            ColorRGB color = {120, 120, 120}) final;
+            Color color = {120, 120, 120}) final;
 
   /// @copydoc Acts::IVisualization3D::faces()
   void faces(const std::vector<Vector3>& vtxs,
              const std::vector<FaceType>& faces,
-             ColorRGB color = {120, 120, 120}) final;
+             Color color = {120, 120, 120}) final;
 
   /// @copydoc Acts::IVisualization3D::line()
   void line(const Vector3& a, const Vector3& b,
-            ColorRGB color = {120, 120, 120}) final;
+            Color color = {120, 120, 120}) final;
 
-  /// @copydoc Acts::IVisualization3D::write(const std::string&) const
-  void write(const std::string& path) const final;
+  /// @copydoc Acts::IVisualization3D::write(const std::filesystem::path&) const
+  void write(const std::filesystem::path& path) const final;
 
   /// @copydoc Acts::IVisualization3D::write(std::ostream&) const
   void write(std::ostream& os) const final;
@@ -59,10 +60,14 @@ class PlyVisualization3D : public IVisualization3D {
   /// @copydoc Acts::IVisualization3D::clear()
   void clear() final;
 
+  void object(const std::string& /*name*/) final {
+    // Unimplemented
+  }
+
  private:
-  std::vector<std::pair<VertexType, ColorRGB>> m_vertices;
+  std::vector<std::pair<VertexType, Color>> m_vertices;
   std::vector<FaceType> m_faces;
-  std::vector<std::pair<std::pair<std::size_t, std::size_t>, ColorRGB>> m_edges;
+  std::vector<std::pair<std::pair<std::size_t, std::size_t>, Color>> m_edges;
 };
 
 #ifndef DOXYGEN
diff --git a/Core/include/Acts/Visualization/ViewConfig.hpp b/Core/include/Acts/Visualization/ViewConfig.hpp
index 06c4f7a675b..e2cf7b80618 100644
--- a/Core/include/Acts/Visualization/ViewConfig.hpp
+++ b/Core/include/Acts/Visualization/ViewConfig.hpp
@@ -1,48 +1,148 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2020 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
 #include <array>
-#include <string>
+#include <filesystem>
+#include <string_view>
 
 namespace Acts {
 
-/// The color typedef. It's an array of three numbers [0, 255]
-/// representing the RGB color values.
-///
-using ColorRGB = std::array<int, 3>;
+/// Struct describing a color. Internally, the color is represented using a
+/// triplet of integers between 0 and 255 corresponding to red green and blue.
+struct Color {
+  // Copy and move constructors are defaulted
+  Color() = default;
+  Color(const Color&) = default;
+  Color(Color&&) = default;
+  Color& operator=(const Color&) = default;
+  Color& operator=(Color&&) = default;
+
+  /// Constructor from raw integer rgb values [0, 255]
+  /// @param r The red component
+  /// @param g The green component
+  /// @param b The blue component
+  constexpr Color(int r, int g, int b) : rgb{r, g, b} {}
+
+  /// Constructor from array of integer rgb values [0, 255]
+  /// @param values The rgb values
+  constexpr explicit Color(std::array<int, 3> values) : rgb(values) {}
+
+  /// Constructor from array of double rgb values [0, 1]
+  /// @param values The rgb values
+  constexpr explicit Color(std::array<double, 3> values) {
+    rgb[0] = static_cast<int>(values[0] * 255);
+    rgb[1] = static_cast<int>(values[1] * 255);
+    rgb[2] = static_cast<int>(values[2] * 255);
+  }
+
+  /// Constructor from raw double dgb values [0, 1]
+  /// @param r The red component
+  /// @param g The green component
+  /// @param b The blue component
+  constexpr Color(double r, double g, double b)
+      : Color{std::array<double, 3>{r, g, b}} {}
+
+ private:
+  constexpr static int hexToInt(std::string_view hex) {
+    constexpr auto hexCharToInt = [](char c) {
+      if (c >= '0' && c <= '9') {
+        return c - '0';
+      } else if (c >= 'a' && c <= 'f') {
+        return c - 'a' + 10;
+      } else if (c >= 'A' && c <= 'F') {
+        return c - 'A' + 10;
+      } else {
+        throw std::invalid_argument("Invalid hex character");
+      }
+    };
+
+    int value = 0;
+    for (char c : hex) {
+      value = (value << 4) + hexCharToInt(c);
+    }
+    return value;
+  };
+
+ public:
+  /// Constructor from hex string. The expected format is `#RRGGBB`
+  /// @param hex The hex string
+  constexpr explicit Color(std::string_view hex) {
+    if (hex[0] == '#' && hex.size() == 7) {
+      rgb[0] = hexToInt(hex.substr(1, 2));  // Extract R component
+      rgb[1] = hexToInt(hex.substr(3, 2));  // Extract G component
+      rgb[2] = hexToInt(hex.substr(5, 2));  // Extract B component
+    } else {
+      throw std::invalid_argument{
+          "Invalid hex color format. Expected format: #RRGGBB"};
+    }
+  }
+
+  /// Operator to access the color components
+  /// @param i The index of the component
+  /// @return The color component
+  int operator[](unsigned int i) const { return rgb.at(i); }
+
+  /// Operator to access the color components
+  /// @param i The index of the component
+  /// @return The color component
+  int& operator[](unsigned int i) { return rgb.at(i); }
+
+  /// Operator to compare two colors
+  /// @param lhs The first color
+  /// @param rhs The second color
+  /// @return True if the colors are equal
+  friend bool operator==(const Color& lhs, const Color& rhs) = default;
+  /// Output stream operator
+  /// @param os The output stream
+  /// @param color The color to be printed
+  /// @return The output stream
+  friend std::ostream& operator<<(std::ostream& os, const Color& color) {
+    os << "[" << color.rgb[0] << ", " << color.rgb[1] << ", " << color.rgb[2]
+       << "]";
+    return os;
+  }
+
+  std::array<int, 3> rgb{};
+};
+
+constexpr Color s_defaultSurfaceColor{"#0000aa"};
+constexpr Color s_defaultPortalColor{"#308c48"};
+constexpr Color s_defaultVolumColor{"#ffaa00"};
 
 /// @brief Struct to concentrate all visualization configurations
 /// in order to harmonize visualization interfaces
 struct ViewConfig {
-  /// Constructor to switch visibility off
-  ViewConfig(bool vis = true) : visible(vis) {}
-
-  /// Constructor for color settings only
-  ViewConfig(const ColorRGB& rgb) : color(rgb) {}
-
   /// Visible flag
   bool visible = true;
-  /// The RGB color for this object
-  ColorRGB color = {250, 0, 0};
+  /// The color for this object
+  Color color = {250, 0, 0};
   /// Out of plane drawing parameter for objects
   double offset = 0.1;
   /// The visual line thickness for this object
   double lineThickness = 0.15;
   /// The visual surface thickness for this object
   double surfaceThickness = 0.15;
-  /// The number of segments to approximate full 2pi
-  unsigned int nSegments = 72;
+  /// The number of segments to approximate a quarter of the circle
+  unsigned int quarterSegments = 72;
   /// Whether to triangulate or not
   bool triangulate = false;
   /// Write name - non-empty string indicates writing
-  std::string outputName = "";
+  std::filesystem::path outputName = std::filesystem::path("");
 };
 
+static const ViewConfig s_viewSurface = {.color = {170, 170, 170}};
+static const ViewConfig s_viewPortal = {.color = Color{"#308c48"}};
+static const ViewConfig s_viewSensitive = {.color = {0, 180, 240}};
+static const ViewConfig s_viewPassive = {.color = {240, 280, 0}};
+static const ViewConfig s_viewVolume = {.color = {220, 220, 0}};
+static const ViewConfig s_viewGrid = {.color = {220, 0, 0}};
+static const ViewConfig s_viewLine = {.color = {0, 0, 220}};
+
 }  // namespace Acts
diff --git a/Core/include/Acts/Visualization/detail/ObjVisualization3D.ipp b/Core/include/Acts/Visualization/detail/ObjVisualization3D.ipp
deleted file mode 100644
index 51a0854b85e..00000000000
--- a/Core/include/Acts/Visualization/detail/ObjVisualization3D.ipp
+++ /dev/null
@@ -1,176 +0,0 @@
-// This file is part of the Acts project.
-//
-// Copyright (C) 2020 CERN for the benefit of the Acts project
-//
-// This Source Code Form is subject to the terms of the Mozilla Public
-// License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-template <typename T>
-void ObjVisualization3D<T>::vertex(const Vector3& vtx, ColorRGB color) {
-  m_vertexColors[m_vertices.size()] = color;
-  m_vertices.push_back(vtx.template cast<ValueType>());
-}
-
-template <typename T>
-void ObjVisualization3D<T>::line(const Vector3& a, const Vector3& b,
-                                 ColorRGB color) {
-  if (color != ColorRGB{0, 0, 0}) {
-    m_lineColors[m_lines.size()] = color;
-  }
-  // not implemented
-  vertex(a, color);
-  vertex(b, color);
-  m_lines.push_back({m_vertices.size() - 2, m_vertices.size() - 1});
-}
-
-template <typename T>
-void ObjVisualization3D<T>::face(const std::vector<Vector3>& vtxs,
-                                 ColorRGB color) {
-  if (color != ColorRGB{0, 0, 0}) {
-    m_faceColors[m_faces.size()] = color;
-  }
-  FaceType idxs;
-  idxs.reserve(vtxs.size());
-  for (const auto& vtx : vtxs) {
-    vertex(vtx, color);
-    idxs.push_back(m_vertices.size() - 1);
-  }
-  m_faces.push_back(std::move(idxs));
-}
-
-template <typename T>
-void ObjVisualization3D<T>::faces(const std::vector<Vector3>& vtxs,
-                                  const std::vector<FaceType>& faces,
-                                  ColorRGB color) {
-  // No faces given - call the face() method
-  if (faces.empty()) {
-    face(vtxs, color);
-  } else {
-    if (color != ColorRGB{0, 0, 0}) {
-      m_faceColors[m_faces.size()] = color;
-    }
-    auto vtxoffs = m_vertices.size();
-    if (color != ColorRGB{0, 0, 0}) {
-      m_vertexColors[m_vertices.size()] = color;
-    }
-    m_vertices.insert(m_vertices.end(), vtxs.begin(), vtxs.end());
-    for (const auto& face : faces) {
-      if (face.size() == 2) {
-        m_lines.push_back({face[0] + vtxoffs, face[2] + vtxoffs});
-      } else {
-        FaceType rawFace = face;
-        std::transform(rawFace.begin(), rawFace.end(), rawFace.begin(),
-                       [&](std::size_t& iv) { return (iv + vtxoffs); });
-        m_faces.push_back(rawFace);
-      }
-    }
-  }
-}
-
-template <typename T>
-void ObjVisualization3D<T>::write(const std::string& path) const {
-  std::ofstream os;
-  std::string objectpath = path;
-  if (!IVisualization3D::hasExtension(objectpath)) {
-    objectpath += std::string(".obj");
-  }
-  os.open(objectpath);
-  std::string mtlpath = objectpath;
-  IVisualization3D::replaceExtension(mtlpath, ".mtl");
-  os << "mtllib " << mtlpath << "\n";
-  std::ofstream mtlos;
-  mtlos.open(mtlpath);
-  write(os, mtlos);
-  os.close();
-  mtlos.close();
-}
-
-template <typename T>
-void ObjVisualization3D<T>::write(std::ostream& os) const {
-  std::stringstream sterile;
-  write(os, sterile);
-}
-
-template <typename T>
-void ObjVisualization3D<T>::write(std::ostream& os, std::ostream& mos) const {
-  std::map<std::string, bool> materials;
-
-  auto mixColor = [&](const ColorRGB& color) -> std::string {
-    std::string materialName;
-    materialName = "material_";
-    materialName += std::to_string(color[0]) + std::string("_");
-    materialName += std::to_string(color[1]) + std::string("_");
-    materialName += std::to_string(color[2]);
-
-    if (materials.find(materialName) == materials.end()) {
-      mos << "newmtl " << materialName << "\n";
-      std::vector<std::string> shadings = {"Ka", "Kd", "Ks"};
-      for (const auto& shd : shadings) {
-        mos << shd << " " << std::to_string(color[0] / 256.) << " ";
-        mos << std::to_string(color[1] / 256.) << " ";
-        mos << std::to_string(color[2] / 256.) << " "
-            << "\n";
-      }
-      mos << "\n";
-    }
-    return std::string("usemtl ") + materialName;
-  };
-
-  std::size_t iv = 0;
-  ColorRGB lastVertexColor = {0, 0, 0};
-  for (const VertexType& vtx : m_vertices) {
-    if (m_vertexColors.find(iv) != m_vertexColors.end()) {
-      auto color = m_vertexColors.find(iv)->second;
-      if (color != lastVertexColor) {
-        os << mixColor(color) << "\n";
-        lastVertexColor = color;
-      }
-    }
-
-    os << "v " << std::setprecision(m_outputPrecision)
-       << m_outputScalor * vtx.x() << " " << m_outputScalor * vtx.y() << " "
-       << m_outputScalor * vtx.z() << "\n";
-    ++iv;
-  }
-  std::size_t il = 0;
-  ColorRGB lastLineColor = {0, 0, 0};
-  for (const LineType& ln : m_lines) {
-    if (m_lineColors.find(il) != m_lineColors.end()) {
-      auto color = m_lineColors.find(il)->second;
-      if (color != lastLineColor) {
-        os << mixColor(color) << "\n";
-        lastLineColor = color;
-      }
-    }
-    os << "l " << ln.first + 1 << " " << ln.second + 1 << "\n";
-    ++il;
-  }
-  std::size_t is = 0;
-  ColorRGB lastFaceColor = {0, 0, 0};
-  for (const FaceType& fc : m_faces) {
-    if (m_faceColors.find(is) != m_faceColors.end()) {
-      auto color = m_faceColors.find(is)->second;
-      if (color != lastFaceColor) {
-        os << mixColor(color) << "\n";
-        lastFaceColor = color;
-      }
-    }
-    os << "f";
-    for (std::size_t i = 0; i < fc.size(); i++) {
-      os << " " << fc[i] + 1;
-    }
-    os << "\n";
-    ++is;
-  }
-}
-
-template <typename T>
-void ObjVisualization3D<T>::clear() {
-  m_vertices.clear();
-  m_faces.clear();
-  m_lines.clear();
-  m_lineColors.clear();
-  m_vertexColors.clear();
-  m_faceColors.clear();
-}
diff --git a/Core/include/Acts/Visualization/detail/PlyVisualization3D.ipp b/Core/include/Acts/Visualization/detail/PlyVisualization3D.ipp
index b97dbde0fc9..6641dc37fea 100644
--- a/Core/include/Acts/Visualization/detail/PlyVisualization3D.ipp
+++ b/Core/include/Acts/Visualization/detail/PlyVisualization3D.ipp
@@ -1,19 +1,19 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2020 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 template <typename T>
-void PlyVisualization3D<T>::vertex(const Vector3& vtx, ColorRGB color) {
+void PlyVisualization3D<T>::vertex(const Vector3& vtx, Color color) {
   m_vertices.emplace_back(vtx.template cast<ValueType>(), color);
 }
 
 template <typename T>
 void PlyVisualization3D<T>::face(const std::vector<Vector3>& vtxs,
-                                 ColorRGB color) {
+                                 Color color) {
   FaceType idxs;
   idxs.reserve(vtxs.size());
   for (const auto& vtx : vtxs) {
@@ -26,13 +26,13 @@ void PlyVisualization3D<T>::face(const std::vector<Vector3>& vtxs,
 template <typename T>
 void PlyVisualization3D<T>::faces(const std::vector<Vector3>& vtxs,
                                   const std::vector<FaceType>& /*faces*/,
-                                  ColorRGB color) {
+                                  Color color) {
   face(vtxs, color);
 }
 
 template <typename T>
 void PlyVisualization3D<T>::line(const Vector3& a, const Vector3& b,
-                                 ColorRGB color) {
+                                 Color color) {
   vertex(a, color);
   std::size_t idx_a = m_vertices.size() - 1;
   vertex(b, color);
@@ -41,13 +41,13 @@ void PlyVisualization3D<T>::line(const Vector3& a, const Vector3& b,
 }
 
 template <typename T>
-void PlyVisualization3D<T>::write(const std::string& path) const {
+void PlyVisualization3D<T>::write(const std::filesystem::path& path) const {
   std::ofstream os;
-  std::string objectpath = path;
-  if (!IVisualization3D::hasExtension(path)) {
-    objectpath += std::string(".ply");
+  std::filesystem::path objectpath = path;
+  if (!objectpath.has_extension()) {
+    objectpath.replace_extension(std::filesystem::path("ply"));
   }
-  os.open(objectpath);
+  os.open(std::filesystem::absolute(objectpath).string());
   write(os);
   os.close();
 }
@@ -73,7 +73,7 @@ void PlyVisualization3D<T>::write(std::ostream& os) const {
   os << "property uchar blue\n";
   os << "end_header\n";
 
-  for (const std::pair<VertexType, ColorRGB>& vtx : m_vertices) {
+  for (const std::pair<VertexType, Color>& vtx : m_vertices) {
     os << vtx.first.x() << " " << vtx.first.y() << " " << vtx.first.z() << " ";
     os << vtx.second[0] << " " << vtx.second[1] << " " << vtx.second[2] << "\n";
   }
@@ -86,7 +86,7 @@ void PlyVisualization3D<T>::write(std::ostream& os) const {
     os << "\n";
   }
 
-  for (const std::pair<std::pair<std::size_t, std::size_t>, ColorRGB>& edge :
+  for (const std::pair<std::pair<std::size_t, std::size_t>, Color>& edge :
        m_edges) {
     std::pair<std::size_t, std::size_t> idxs = edge.first;
     os << idxs.first << " " << idxs.second << " ";
diff --git a/Core/src/ActsVersion.cpp b/Core/src/ActsVersion.cpp
index dffaef6d0cd..464dcedf07c 100644
--- a/Core/src/ActsVersion.cpp
+++ b/Core/src/ActsVersion.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2023 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include "Acts/ActsVersion.hpp"
 
diff --git a/Core/src/AmbiguityResolution/GreedyAmbiguityResolution.cpp b/Core/src/AmbiguityResolution/GreedyAmbiguityResolution.cpp
index 73a94da94a2..9038c00bc42 100644
--- a/Core/src/AmbiguityResolution/GreedyAmbiguityResolution.cpp
+++ b/Core/src/AmbiguityResolution/GreedyAmbiguityResolution.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2023-2024 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include "Acts/AmbiguityResolution/GreedyAmbiguityResolution.hpp"
 
diff --git a/Core/src/AmbiguityResolution/ScoreBasedAmbiguityResolution.cpp b/Core/src/AmbiguityResolution/ScoreBasedAmbiguityResolution.cpp
index 9936df2e9cc..4dcbb5071d4 100644
--- a/Core/src/AmbiguityResolution/ScoreBasedAmbiguityResolution.cpp
+++ b/Core/src/AmbiguityResolution/ScoreBasedAmbiguityResolution.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2024 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include "Acts/AmbiguityResolution/ScoreBasedAmbiguityResolution.hpp"
 
diff --git a/Core/src/Definitions/Common.cpp b/Core/src/Definitions/Common.cpp
index 79488ca3d42..7f0d030d301 100644
--- a/Core/src/Definitions/Common.cpp
+++ b/Core/src/Definitions/Common.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2022-2023 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include "Acts/Definitions/Common.hpp"
 
diff --git a/Core/src/Definitions/Direction.cpp b/Core/src/Definitions/Direction.cpp
index 94ad0c1cea5..974df19da92 100644
--- a/Core/src/Definitions/Direction.cpp
+++ b/Core/src/Definitions/Direction.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2023 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include "Acts/Definitions/Direction.hpp"
 
diff --git a/Core/src/Definitions/ParticleData.cpp b/Core/src/Definitions/ParticleData.cpp
index 7254dd11dfe..3fad8925896 100644
--- a/Core/src/Definitions/ParticleData.cpp
+++ b/Core/src/Definitions/ParticleData.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2018-2023 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include "Acts/Definitions/ParticleData.hpp"
 
@@ -51,12 +51,12 @@ static inline auto findByPdg(std::int32_t pdg, const ColumnContainer& column)
   return column[*index];
 }
 
-static constexpr inline float extractCharge(float value) {
+static constexpr float extractCharge(float value) {
   // convert three charge to regular charge in native units
   return (value / 3.0f) * Acts::UnitConstants::e;
 }
 
-static constexpr inline float extractMass(float value) {
+static constexpr float extractMass(float value) {
   return value * Acts::UnitConstants::MeV;
 }
 
diff --git a/Core/src/Definitions/ParticleDataTable.hpp b/Core/src/Definitions/ParticleDataTable.hpp
index 366ecdd6124..a030f3ed82f 100644
--- a/Core/src/Definitions/ParticleDataTable.hpp
+++ b/Core/src/Definitions/ParticleDataTable.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2024 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 // The entries within this file have been automatically created using the
 // particle data files from the 2019 edition of the Review of Particle Physics
diff --git a/Core/src/Detector/CuboidalContainerBuilder.cpp b/Core/src/Detector/CuboidalContainerBuilder.cpp
index 5714cba8d0c..47533bc4a11 100644
--- a/Core/src/Detector/CuboidalContainerBuilder.cpp
+++ b/Core/src/Detector/CuboidalContainerBuilder.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2023 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include "Acts/Detector/CuboidalContainerBuilder.hpp"
 
diff --git a/Core/src/Detector/CylindricalContainerBuilder.cpp b/Core/src/Detector/CylindricalContainerBuilder.cpp
index 18528d2c877..8441dc93762 100644
--- a/Core/src/Detector/CylindricalContainerBuilder.cpp
+++ b/Core/src/Detector/CylindricalContainerBuilder.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2023 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include "Acts/Detector/CylindricalContainerBuilder.hpp"
 
@@ -260,7 +260,7 @@ Acts::Experimental::CylindricalContainerBuilder::construct(
   // Assign the proto material
   // Material assignment from configuration
   for (const auto& [ip, bDescription] : m_cfg.portalMaterialBinning) {
-    if (portalContainer.find(ip) != portalContainer.end()) {
+    if (portalContainer.contains(ip)) {
       auto bd = detail::ProtoMaterialHelper::attachProtoMaterial(
           gctx, portalContainer[ip]->surface(), bDescription);
       ACTS_VERBOSE("-> Assigning proto material to portal " << ip << " with "
diff --git a/Core/src/Detector/Detector.cpp b/Core/src/Detector/Detector.cpp
index c63fe1e8802..2b57add3509 100644
--- a/Core/src/Detector/Detector.cpp
+++ b/Core/src/Detector/Detector.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2022-2023 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include "Acts/Detector/Detector.hpp"
 
@@ -64,7 +64,7 @@ Acts::Experimental::Detector::Detector(
     v->closePortals();
     // Store the name
     const std::string vName = v->name();
-    if (m_volumeNameIndex.find(vName) != m_volumeNameIndex.end()) {
+    if (m_volumeNameIndex.contains(vName)) {
       throw std::invalid_argument("Detector: duplicate volume name " + vName +
                                   " detected.");
     }
@@ -79,7 +79,7 @@ Acts::Experimental::Detector::Detector(
                                   "' with undefined geometry id detected" +
                                   ". Make sure a GeometryIdGenerator is used.");
     }
-    if (volumeGeoIdMap.find(vgeoID) != volumeGeoIdMap.end()) {
+    if (volumeGeoIdMap.contains(vgeoID)) {
       std::stringstream ss;
       ss << vgeoID;
       throw std::invalid_argument("Detector: duplicate volume geometry id '" +
@@ -104,7 +104,7 @@ Acts::Experimental::Detector::Detector(
       }
       // ---------------------------------------------------------------
 
-      if (surfaceGeoIdMap.find(sgeoID) != surfaceGeoIdMap.end()) {
+      if (surfaceGeoIdMap.contains(sgeoID)) {
         std::stringstream ss;
         ss << sgeoID;
         throw std::invalid_argument(
diff --git a/Core/src/Detector/DetectorBuilder.cpp b/Core/src/Detector/DetectorBuilder.cpp
index 3a1a2bff6e8..3b7ca942087 100644
--- a/Core/src/Detector/DetectorBuilder.cpp
+++ b/Core/src/Detector/DetectorBuilder.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2023 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include "Acts/Detector/DetectorBuilder.hpp"
 
diff --git a/Core/src/Detector/DetectorVolume.cpp b/Core/src/Detector/DetectorVolume.cpp
index 8d5d6d88d6f..6cd8d189298 100644
--- a/Core/src/Detector/DetectorVolume.cpp
+++ b/Core/src/Detector/DetectorVolume.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2022-2023 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include "Acts/Detector/DetectorVolume.hpp"
 
diff --git a/Core/src/Detector/DetectorVolumeBuilder.cpp b/Core/src/Detector/DetectorVolumeBuilder.cpp
index f15d96926d5..d52162e5f07 100644
--- a/Core/src/Detector/DetectorVolumeBuilder.cpp
+++ b/Core/src/Detector/DetectorVolumeBuilder.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2023 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include "Acts/Detector/DetectorVolumeBuilder.hpp"
 
@@ -93,7 +93,7 @@ Acts::Experimental::DetectorVolumeBuilder::construct(
 
   // Assign the proto material if configured to do so
   for (const auto& [ip, bDescription] : m_cfg.portalMaterialBinning) {
-    if (portalContainer.find(ip) != portalContainer.end()) {
+    if (portalContainer.contains(ip)) {
       auto bd = detail::ProtoMaterialHelper::attachProtoMaterial(
           gctx, portalContainer[ip]->surface(), bDescription);
       ACTS_VERBOSE("-> Assigning proto material to portal " << ip << " with "
diff --git a/Core/src/Detector/GeometryIdGenerator.cpp b/Core/src/Detector/GeometryIdGenerator.cpp
index a19db61fd1d..f0d15f0d3b6 100644
--- a/Core/src/Detector/GeometryIdGenerator.cpp
+++ b/Core/src/Detector/GeometryIdGenerator.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2023 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include "Acts/Detector/GeometryIdGenerator.hpp"
 
diff --git a/Core/src/Detector/IndexedRootVolumeFinderBuilder.cpp b/Core/src/Detector/IndexedRootVolumeFinderBuilder.cpp
index c6005b5c142..0493750b9a3 100644
--- a/Core/src/Detector/IndexedRootVolumeFinderBuilder.cpp
+++ b/Core/src/Detector/IndexedRootVolumeFinderBuilder.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2023 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include "Acts/Detector/IndexedRootVolumeFinderBuilder.hpp"
 
diff --git a/Core/src/Detector/LayerStructureBuilder.cpp b/Core/src/Detector/LayerStructureBuilder.cpp
index 6a421671cf1..94766a80d0d 100644
--- a/Core/src/Detector/LayerStructureBuilder.cpp
+++ b/Core/src/Detector/LayerStructureBuilder.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2023 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include "Acts/Detector/LayerStructureBuilder.hpp"
 
@@ -23,7 +23,9 @@
 #include "Acts/Utilities/Enumerate.hpp"
 #include "Acts/Utilities/Grid.hpp"
 #include "Acts/Utilities/GridAxisGenerators.hpp"
+#include "Acts/Utilities/Helpers.hpp"
 
+#include <algorithm>
 #include <cmath>
 #include <cstddef>
 #include <ostream>
@@ -242,9 +244,7 @@ Acts::Experimental::LayerStructureBuilder::construct(
       // the binning value that are not constrained by the internal surfaces
       for (const auto& bv : allBinningValues()) {
         if (support.volumeExtent.constrains(bv) &&
-            std::find(support.internalConstraints.begin(),
-                      support.internalConstraints.end(),
-                      bv) == support.internalConstraints.end()) {
+            !rangeContainsValue(support.internalConstraints, bv)) {
           ACTS_VERBOSE("  Support surface is constrained by volume extent in "
                        << binningValueName(bv));
           supportExtent.set(bv, support.volumeExtent.min(bv),
@@ -256,7 +256,8 @@ Acts::Experimental::LayerStructureBuilder::construct(
       if (!support.internalConstraints.empty()) {
         // Estimate the extent from the surfaces
         for (const auto& s : internalSurfaces) {
-          auto sPolyhedron = s->polyhedronRepresentation(gctx, m_cfg.nSegments);
+          auto sPolyhedron =
+              s->polyhedronRepresentation(gctx, m_cfg.quarterSegments);
           supportExtent.extend(sPolyhedron.extent(),
                                support.internalConstraints);
         }
@@ -339,10 +340,7 @@ Acts::Experimental::LayerStructureBuilder::construct(
         adaptBinningRange(binnings, m_cfg.extent.value());
       }
       // Sort the binning for conventions
-      std::sort(binnings.begin(), binnings.end(),
-                [](const ProtoBinning& a, const ProtoBinning& b) {
-                  return a.binValue < b.binValue;
-                });
+      std::ranges::sort(binnings, {}, [](const auto& b) { return b.binValue; });
 
       ACTS_DEBUG("- 2-dimensional surface binning detected.");
       // Capture the binnings
diff --git a/Core/src/Detector/MultiWireStructureBuilder.cpp b/Core/src/Detector/MultiWireStructureBuilder.cpp
index 5069797a28c..59f87a7e3c8 100644
--- a/Core/src/Detector/MultiWireStructureBuilder.cpp
+++ b/Core/src/Detector/MultiWireStructureBuilder.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2022-2023 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include "Acts/Detector/MultiWireStructureBuilder.hpp"
 
diff --git a/Core/src/Detector/Portal.cpp b/Core/src/Detector/Portal.cpp
index 72519d2b0e9..e3caa8c7c06 100644
--- a/Core/src/Detector/Portal.cpp
+++ b/Core/src/Detector/Portal.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2022-2023 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include "Acts/Detector/Portal.hpp"
 
diff --git a/Core/src/Detector/PortalGenerators.cpp b/Core/src/Detector/PortalGenerators.cpp
index 0136c087b9d..f0875ad65ab 100644
--- a/Core/src/Detector/PortalGenerators.cpp
+++ b/Core/src/Detector/PortalGenerators.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2023 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include "Acts/Detector/PortalGenerators.hpp"
 
diff --git a/Core/src/Detector/ProtoDetector.cpp b/Core/src/Detector/ProtoDetector.cpp
index 20db1689882..e305dc9052c 100644
--- a/Core/src/Detector/ProtoDetector.cpp
+++ b/Core/src/Detector/ProtoDetector.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2022-2023 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include "Acts/Detector/ProtoDetector.hpp"
 
diff --git a/Core/src/Detector/VolumeStructureBuilder.cpp b/Core/src/Detector/VolumeStructureBuilder.cpp
index 49dba260a52..e63a13d5039 100644
--- a/Core/src/Detector/VolumeStructureBuilder.cpp
+++ b/Core/src/Detector/VolumeStructureBuilder.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2023 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include "Acts/Detector/VolumeStructureBuilder.hpp"
 
@@ -19,6 +19,8 @@
 #include "Acts/Utilities/Helpers.hpp"
 #include "Acts/Utilities/StringHelpers.hpp"
 
+#include <numbers>
+
 Acts::Experimental::VolumeStructureBuilder::VolumeStructureBuilder(
     const Acts::Experimental::VolumeStructureBuilder::Config& cfg,
     std::unique_ptr<const Acts::Logger> mlogger)
@@ -62,7 +64,7 @@ Acts::Experimental::VolumeStructureBuilder::construct(
             "object. It needs at least 5 parameters, while " +
             std::to_string(boundValues.size()) + " where given");
       }
-      auto bArray = to_array<ConeVolumeBounds::BoundValues::eSize, ActsScalar>(
+      auto bArray = toArray<ConeVolumeBounds::BoundValues::eSize, ActsScalar>(
           boundValues);
       volumeBounds = std::make_unique<ConeVolumeBounds>(bArray);
     } break;
@@ -94,7 +96,7 @@ Acts::Experimental::VolumeStructureBuilder::construct(
             std::to_string(boundValues.size()) + " where given");
       }
       auto bArray =
-          to_array<CuboidVolumeBounds::BoundValues::eSize>(boundValues);
+          toArray<CuboidVolumeBounds::BoundValues::eSize>(boundValues);
       volumeBounds = std::make_unique<CuboidVolumeBounds>(bArray);
     } break;
     case VolumeBounds::BoundsType::eCutoutCylinder: {
@@ -108,7 +110,7 @@ Acts::Experimental::VolumeStructureBuilder::construct(
             std::to_string(boundValues.size()) + " where given");
       }
       auto bArray =
-          to_array<CutoutCylinderVolumeBounds::BoundValues::eSize>(boundValues);
+          toArray<CutoutCylinderVolumeBounds::BoundValues::eSize>(boundValues);
       volumeBounds = std::make_unique<CutoutCylinderVolumeBounds>(bArray);
     } break;
     case VolumeBounds::BoundsType::eCylinder: {
@@ -142,7 +144,7 @@ Acts::Experimental::VolumeStructureBuilder::construct(
       }
       // Check if phi has been constraint, otherwise fill it with full coverage
       if (boundValues.size() == 3u) {
-        boundValues.push_back(M_PI);
+        boundValues.push_back(std::numbers::pi_v<ActsScalar>);
         boundValues.push_back(0.);
       }
       ACTS_VERBOSE(" - cylindrical shape with [iR, oR, hZ, sPhi, mPhi] = "
@@ -150,7 +152,7 @@ Acts::Experimental::VolumeStructureBuilder::construct(
                    << boundValues[2] << ", " << boundValues[3] << ", "
                    << boundValues[4]);
       auto bArray =
-          to_array<CylinderVolumeBounds::BoundValues::eSize>(boundValues);
+          toArray<CylinderVolumeBounds::BoundValues::eSize>(boundValues);
       volumeBounds = std::make_unique<CylinderVolumeBounds>(bArray);
     } break;
     case VolumeBounds::BoundsType::eGenericCuboid: {
@@ -164,7 +166,7 @@ Acts::Experimental::VolumeStructureBuilder::construct(
             std::to_string(boundValues.size()) + " where given");
       }
       auto bArray =
-          to_array<GenericCuboidVolumeBounds::BoundValues::eSize>(boundValues);
+          toArray<GenericCuboidVolumeBounds::BoundValues::eSize>(boundValues);
       volumeBounds = std::make_unique<GenericCuboidVolumeBounds>(bArray);
     } break;
     case VolumeBounds::BoundsType::eTrapezoid: {
@@ -178,7 +180,7 @@ Acts::Experimental::VolumeStructureBuilder::construct(
             std::to_string(boundValues.size()) + " where given");
       }
       auto bArray =
-          to_array<TrapezoidVolumeBounds::BoundValues::eSize>(boundValues);
+          toArray<TrapezoidVolumeBounds::BoundValues::eSize>(boundValues);
       volumeBounds = std::make_unique<TrapezoidVolumeBounds>(bArray);
     } break;
     default:
diff --git a/Core/src/Detector/detail/BlueprintDrawer.cpp b/Core/src/Detector/detail/BlueprintDrawer.cpp
index 7d76c9614eb..b518266dc4d 100644
--- a/Core/src/Detector/detail/BlueprintDrawer.cpp
+++ b/Core/src/Detector/detail/BlueprintDrawer.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2023 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include "Acts/Detector/detail/BlueprintDrawer.hpp"
 
@@ -57,56 +57,65 @@ std::string labelStr(
 void Acts::Experimental::detail::BlueprintDrawer::dotStream(
     std::ostream& ss, const Acts::Experimental::Blueprint::Node& node,
     const Options& options) {
+  // Replace the "/" in node names
+  std::string nodeName = node.name;
+  std::replace(nodeName.begin(), nodeName.end(), '/', '_');
+
   // Root / leaf or branch
   if (node.isRoot()) {
     ss << "digraph " << options.graphName << " {" << '\n';
-    ss << node.name << " " << labelStr(options.root, node.name, node.auxiliary)
+    ss << nodeName << " " << labelStr(options.root, nodeName, node.auxiliary)
        << '\n';
-    ss << node.name << " " << shapeStr(options.root) << '\n';
+    ss << nodeName << " " << shapeStr(options.root) << '\n';
 
   } else if (node.isLeaf()) {
-    ss << node.name << " " << labelStr(options.leaf, node.name, node.auxiliary)
+    ss << nodeName << " " << labelStr(options.leaf, nodeName, node.auxiliary)
        << '\n';
-    ss << node.name << " "
+    ss << nodeName << " "
        << ((node.internalsBuilder != nullptr) ? shapeStr(options.leaf)
                                               : shapeStr(options.gap))
        << '\n';
   } else {
-    ss << node.name << " "
-       << labelStr(options.branch, node.name, node.auxiliary) << '\n';
-    ss << node.name << " " << shapeStr(options.branch) << '\n';
+    ss << nodeName << " " << labelStr(options.branch, nodeName, node.auxiliary)
+       << '\n';
+    ss << nodeName << " " << shapeStr(options.branch) << '\n';
   }
   // Recursive for children
   for (const auto& c : node.children) {
-    ss << node.name << " -> " << c->name << ";" << '\n';
+    // Replace the "/" in node names
+    std::string childName = c->name;
+    std::replace(childName.begin(), childName.end(), '/', '_');
+    ss << nodeName << " -> " << childName << ";" << '\n';
     dotStream(ss, *c, options);
   }
 
   // Shape
   Options::Node shape = node.isLeaf() ? options.shape : options.virtualShape;
-  ss << node.name + "_shape " << shapeStr(shape) << '\n';
-  ss << node.name + "_shape "
-     << labelStr(shape, VolumeBounds::s_boundsTypeNames[node.boundsType],
+  std::stringstream bts;
+  bts << node.boundsType;
+  ss << nodeName + "_shape " << shapeStr(shape) << '\n';
+  ss << nodeName + "_shape "
+     << labelStr(shape, bts.str(),
                  {"t = " + toString(node.transform.translation(), 1),
                   "b = " + toString(node.boundaryValues, 1)})
      << '\n';
-  ss << node.name << " -> " << node.name + "_shape [ arrowhead = \"none\" ];"
+  ss << nodeName << " -> " << nodeName + "_shape [ arrowhead = \"none\" ];"
      << '\n';
 
   // Sub node detection
   if (node.internalsBuilder != nullptr) {
-    ss << node.name + "_int " << shapeStr(options.internals) << '\n';
-    ss << node.name << " -> " << node.name + "_int;" << '\n';
+    ss << nodeName + "_int " << shapeStr(options.internals) << '\n';
+    ss << nodeName << " -> " << nodeName + "_int;" << '\n';
   }
 
   if (node.geoIdGenerator != nullptr) {
-    ss << node.name + "_geoID " << shapeStr(options.geoID) << '\n';
-    ss << node.name << " -> " << node.name + "_geoID;" << '\n';
+    ss << nodeName + "_geoID " << shapeStr(options.geoID) << '\n';
+    ss << nodeName << " -> " << nodeName + "_geoID;" << '\n';
   }
 
   if (node.rootVolumeFinderBuilder != nullptr) {
-    ss << node.name + "_roots " << shapeStr(options.roots) << '\n';
-    ss << node.name << " -> " << node.name + "_roots;" << '\n';
+    ss << nodeName + "_roots " << shapeStr(options.roots) << '\n';
+    ss << nodeName << " -> " << nodeName + "_roots;" << '\n';
   }
 
   if (node.isRoot()) {
diff --git a/Core/src/Detector/detail/BlueprintHelper.cpp b/Core/src/Detector/detail/BlueprintHelper.cpp
index 305cd58f349..bf440c61acc 100644
--- a/Core/src/Detector/detail/BlueprintHelper.cpp
+++ b/Core/src/Detector/detail/BlueprintHelper.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2023 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include "Acts/Detector/detail/BlueprintHelper.hpp"
 
@@ -12,6 +12,7 @@
 #include "Acts/Definitions/Tolerance.hpp"
 #include "Acts/Geometry/VolumeBounds.hpp"
 
+#include <algorithm>
 #include <array>
 
 namespace {
@@ -55,19 +56,14 @@ void Acts::Experimental::detail::BlueprintHelper::sort(Blueprint::Node& node,
         bVal == BinningValue::binZ) {
       Vector3 nodeCenter = node.transform.translation();
       Vector3 nodeSortAxis = node.transform.rotation().col(toUnderlying(bVal));
-      std::sort(
-          node.children.begin(), node.children.end(),
-          [&](const auto& a, const auto& b) {
-            return (a->transform.translation() - nodeCenter).dot(nodeSortAxis) <
-                   (b->transform.translation() - nodeCenter).dot(nodeSortAxis);
-          });
+      std::ranges::sort(node.children, {}, [&](const auto& c) {
+        return (c->transform.translation() - nodeCenter).dot(nodeSortAxis);
+      });
     } else if (bVal == BinningValue::binR &&
                node.boundsType == VolumeBounds::eCylinder) {
-      std::sort(node.children.begin(), node.children.end(),
-                [](const auto& a, const auto& b) {
-                  return 0.5 * (a->boundaryValues[0] + a->boundaryValues[1]) <
-                         0.5 * (b->boundaryValues[0] + b->boundaryValues[1]);
-                });
+      std::ranges::sort(node.children, {}, [](const auto& c) {
+        return c->boundaryValues[0] + c->boundaryValues[1];
+      });
     }
   }
 
diff --git a/Core/src/Detector/detail/CuboidalDetectorHelper.cpp b/Core/src/Detector/detail/CuboidalDetectorHelper.cpp
index 4bf7edbabd2..ac2acd2482a 100644
--- a/Core/src/Detector/detail/CuboidalDetectorHelper.cpp
+++ b/Core/src/Detector/detail/CuboidalDetectorHelper.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2023 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include "Acts/Detector/detail/CuboidalDetectorHelper.hpp"
 
@@ -19,6 +19,7 @@
 #include "Acts/Surfaces/Surface.hpp"
 #include "Acts/Utilities/BinningData.hpp"
 #include "Acts/Utilities/Enumerate.hpp"
+#include "Acts/Utilities/Helpers.hpp"
 #include "Acts/Utilities/StringHelpers.hpp"
 
 #include <algorithm>
@@ -190,9 +191,7 @@ Acts::Experimental::detail::CuboidalDetectorHelper::connect(
 
     for (auto [is, index] : enumerate(portalSets[toUnderlying(mergeValue)])) {
       // Check if you need to skip due to selections
-      if (!selectedOnly.empty() &&
-          std::find(selectedOnly.begin(), selectedOnly.end(), index) ==
-              selectedOnly.end()) {
+      if (!selectedOnly.empty() && !rangeContainsValue(selectedOnly, index)) {
         continue;
       }
 
@@ -271,12 +270,12 @@ Acts::Experimental::detail::CuboidalDetectorHelper::connect(
     auto& formerContainer = containers[ic - 1];
     auto& currentContainer = containers[ic];
     // Check and throw exception
-    if (formerContainer.find(startIndex) == formerContainer.end()) {
+    if (!formerContainer.contains(startIndex)) {
       throw std::invalid_argument(
           "CuboidalDetectorHelper: proto container has no fuse portal at index "
           "of former container.");
     }
-    if (currentContainer.find(endIndex) == currentContainer.end()) {
+    if (!currentContainer.contains(endIndex)) {
       throw std::invalid_argument(
           "CuboidalDetectorHelper: proto container has no fuse portal at index "
           "of current container.");
@@ -344,11 +343,8 @@ Acts::Experimental::detail::CuboidalDetectorHelper::xyzBoundaries(
   auto fillMap = [&](std::map<ActsScalar, std::size_t>& map,
                      const std::array<ActsScalar, 2u>& values) {
     for (auto v : values) {
-      if (map.find(v) != map.end()) {
-        ++map[v];
-      } else {
-        map[v] = 1u;
-      }
+      // This will insert v with a value of 0 if it doesn't exist
+      ++map[v];
     }
   };
 
@@ -377,10 +373,10 @@ Acts::Experimental::detail::CuboidalDetectorHelper::xyzBoundaries(
   }
 
   for (auto [im, map] : enumerate(valueMaps)) {
-    for (auto [key, value] : map) {
+    for (auto [key, _] : map) {
       boundaries[im].push_back(key);
     }
-    std::sort(boundaries[im].begin(), boundaries[im].end());
+    std::ranges::sort(boundaries[im]);
   }
 
   ACTS_VERBOSE("- did yield " << boundaries[0u].size() << " boundaries in X.");
diff --git a/Core/src/Detector/detail/CylindricalDetectorHelper.cpp b/Core/src/Detector/detail/CylindricalDetectorHelper.cpp
index 1a15d527765..499d28c0785 100644
--- a/Core/src/Detector/detail/CylindricalDetectorHelper.cpp
+++ b/Core/src/Detector/detail/CylindricalDetectorHelper.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2023 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include "Acts/Detector/detail/CylindricalDetectorHelper.hpp"
 
@@ -36,6 +36,7 @@
 #include <cstddef>
 #include <iterator>
 #include <map>
+#include <numbers>
 #include <ostream>
 #include <stdexcept>
 #include <string>
@@ -88,12 +89,12 @@ Acts::Experimental::PortalReplacement createDiscReplacement(
                                        ? Acts::BinningValue::binR
                                        : Acts::BinningValue::binPhi;
   // Estimate ranges
-  auto [minR, maxR] = Acts::min_max(rBoundaries);
+  auto [minRit, maxRit] = std::ranges::minmax_element(rBoundaries);
   auto [sectorPhi, avgPhi] = Acts::range_medium(phiBoundaries);
 
   // Transform and bounds
-  auto bounds =
-      std::make_unique<Acts::RadialBounds>(minR, maxR, 0.5 * sectorPhi, avgPhi);
+  auto bounds = std::make_unique<Acts::RadialBounds>(*minRit, *maxRit,
+                                                     0.5 * sectorPhi, avgPhi);
   // A new surface on the negative side over the full range
   auto surface = Acts::Surface::makeShared<Acts::DiscSurface>(
       transform, std::move(bounds));
@@ -325,9 +326,7 @@ Acts::Experimental::detail::CylindricalDetectorHelper::connectInR(
   rBoundaries.push_back(refValues[CylinderVolumeBounds::BoundValues::eMaxR]);
 
   // Connect in R ? (2u is the index of the outer cylinder)
-  bool connectR = selectedOnly.empty() ||
-                  std::find(selectedOnly.begin(), selectedOnly.end(), 2u) !=
-                      selectedOnly.end();
+  bool connectR = selectedOnly.empty() || rangeContainsValue(selectedOnly, 2u);
 
   // Get phi sector and average phi
   ActsScalar phiSector =
@@ -376,9 +375,7 @@ Acts::Experimental::detail::CylindricalDetectorHelper::connectInR(
   std::vector<Acts::Direction> discDirs = {Acts::Direction::Forward,
                                            Acts::Direction::Backward};
   for (const auto [iu, idir] : enumerate(discDirs)) {
-    if (selectedOnly.empty() ||
-        std::find(selectedOnly.begin(), selectedOnly.end(), iu) !=
-            selectedOnly.end()) {
+    if (selectedOnly.empty() || rangeContainsValue(selectedOnly, iu)) {
       const Surface& refSurface = volumes[0u]->portals()[iu]->surface();
       const Transform3& refTransform = refSurface.transform(gctx);
       pReplacements.push_back(createDiscReplacement(
@@ -397,9 +394,7 @@ Acts::Experimental::detail::CylindricalDetectorHelper::connectInR(
     for (const auto [iu, idir] : enumerate(sectorDirs)) {
       // (iu + 4u) corresponds to the indices of the phi-low and phi-high sector
       // planes.
-      if (selectedOnly.empty() ||
-          std::find(selectedOnly.begin(), selectedOnly.end(), iu + 4u) !=
-              selectedOnly.end()) {
+      if (selectedOnly.empty() || rangeContainsValue(selectedOnly, iu + 4u)) {
         // As it is r-wrapping, the inner tube is guaranteed
         const Surface& refSurface =
             volumes[volumes.size() - 1u]->portals()[iu + 4u]->surface();
@@ -410,7 +405,8 @@ Acts::Experimental::detail::CylindricalDetectorHelper::connectInR(
     }
   } else {
     ACTS_VERBOSE(
-        "No sector planes present, full 2 * M_PI cylindrical geometry.");
+        "No sector planes present, full 2 * std::numbers::pi cylindrical "
+        "geometry.");
   }
 
   // Attach the new volume multi links
@@ -471,9 +467,8 @@ Acts::Experimental::detail::CylindricalDetectorHelper::connectInZ(
   // Connect in Z ?
   // - 1u corresponds to the index of the high-z disc portal for the reference
   // volume.
-  bool connectZ = selectedOnly.empty() ||
-                  std::find(selectedOnly.begin(), selectedOnly.end(), 1u) !=
-                      selectedOnly.end();
+  const bool connectZ =
+      selectedOnly.empty() || rangeContainsValue(selectedOnly, 1u);
   // Reference z axis
   const auto rotation = volumes[0u]->transform(gctx).rotation();
 
@@ -586,9 +581,7 @@ Acts::Experimental::detail::CylindricalDetectorHelper::connectInZ(
   unsigned int iSecOffset = innerPresent ? 4u : 3u;
   // Prepare the cylinder replacements
   for (const auto [iu, idir] : enumerate(cylinderDirs)) {
-    if (selectedOnly.empty() ||
-        std::find(selectedOnly.begin(), selectedOnly.end(), iu + 2u) !=
-            selectedOnly.end()) {
+    if (selectedOnly.empty() || rangeContainsValue(selectedOnly, iu + 2u)) {
       pReplacements.push_back(createCylinderReplacement(
           combinedTransform, cylinderR[iu], zBoundaries,
           {avgPhi - phiSector, avgPhi + phiSector}, iu + 2u, idir));
@@ -603,9 +596,7 @@ Acts::Experimental::detail::CylindricalDetectorHelper::connectInZ(
                                                Acts::Direction::Backward};
     for (const auto [iu, idir] : enumerate(sectorDirs)) {
       // Access with 3u or 4u but always write 4u (to be caught later)
-      if (selectedOnly.empty() ||
-          std::find(selectedOnly.begin(), selectedOnly.end(), iu + 4u) !=
-              selectedOnly.end()) {
+      if (selectedOnly.empty() || rangeContainsValue(selectedOnly, iu + 4u)) {
         const Surface& refSurface =
             volumes[0u]->portals()[iu + iSecOffset]->surface();
         pReplacements.push_back(createSectorReplacement(
@@ -615,7 +606,8 @@ Acts::Experimental::detail::CylindricalDetectorHelper::connectInZ(
     }
   } else {
     ACTS_VERBOSE(
-        "No sector planes present, full 2 * M_PI cylindrical geometry.");
+        "No sector planes present, full 2 * std::numbers::pi cylindrical "
+        "geometry.");
   }
 
   // Attach the new volume multi links
@@ -834,7 +826,7 @@ Acts::Experimental::detail::CylindricalDetectorHelper::wrapInZR(
     std::vector<PortalReplacement> pReplacements;
     pReplacements.push_back(createCylinderReplacement(
         volumes[0u]->transform(gctx), innerR, {-HlZ, -hlZ, hlZ, HlZ},
-        {-M_PI, M_PI}, 3u, Direction::Forward));
+        {-std::numbers::pi, std::numbers::pi}, 3u, Direction::Forward));
     std::vector<std::shared_ptr<DetectorVolume>> zVolumes = {
         volumes[1u], volumes[0u], volumes[1u]};
     // Attach the new volume multi links
@@ -871,16 +863,14 @@ Acts::Experimental::detail::CylindricalDetectorHelper::connectInR(
     auto& formerContainer = containers[ic - 1];
     auto& currentContainer = containers[ic];
     // Check and throw exception
-    if (formerContainer.find(2u) == formerContainer.end()) {
+    if (!formerContainer.contains(2u)) {
       throw std::invalid_argument(
-          "CylindricalDetectorHelper: proto container has no outer cover, "
-          "can "
+          "CylindricalDetectorHelper: proto container has no outer cover, can "
           "not be connected in R");
     }
-    if (currentContainer.find(3u) == currentContainer.end()) {
+    if (!currentContainer.contains(3u)) {
       throw std::invalid_argument(
-          "CylindricalDetectorHelper: proto container has no inner cover, "
-          "can "
+          "CylindricalDetectorHelper: proto container has no inner cover, can "
           "not be connected in R");
     }
 
@@ -908,7 +898,7 @@ Acts::Experimental::detail::CylindricalDetectorHelper::connectInR(
   }
 
   // Proto container refurbishment
-  if (containers[0u].find(3u) != containers[0u].end()) {
+  if (containers[0u].contains(3u)) {
     dShell[3u] = containers[0u].find(3u)->second;
   }
   dShell[2u] = containers[containers.size() - 1u].find(2u)->second;
@@ -918,7 +908,7 @@ Acts::Experimental::detail::CylindricalDetectorHelper::connectInR(
 
   for (auto [s, volumes] : sideVolumes) {
     auto pR = connectInR(gctx, volumes, {s});
-    if (pR.find(s) != pR.end()) {
+    if (pR.contains(s)) {
       dShell[s] = pR.find(s)->second;
     }
   }
@@ -945,12 +935,12 @@ Acts::Experimental::detail::CylindricalDetectorHelper::connectInZ(
     auto& formerContainer = containers[ic - 1];
     auto& currentContainer = containers[ic];
     // Check and throw exception
-    if (formerContainer.find(1u) == formerContainer.end()) {
+    if (!formerContainer.contains(1u)) {
       throw std::invalid_argument(
           "CylindricalDetectorHelper: proto container has no negative disc, "
           "can not be connected in Z");
     }
-    if (currentContainer.find(0u) == currentContainer.end()) {
+    if (!currentContainer.contains(0u)) {
       throw std::invalid_argument(
           "CylindricalDetectorHelper: proto container has no positive disc, "
           "can not be connected in Z");
@@ -983,7 +973,7 @@ Acts::Experimental::detail::CylindricalDetectorHelper::connectInZ(
 
   // Check if this is a tube or a cylinder container (check done on 1st)
   std::vector<unsigned int> nominalSides = {2u, 4u, 5u};
-  if (containers[0u].find(3u) != containers[0u].end()) {
+  if (containers[0u].contains(3u)) {
     nominalSides.push_back(3u);
   }
 
@@ -996,7 +986,7 @@ Acts::Experimental::detail::CylindricalDetectorHelper::connectInZ(
   for (auto [s, volumes] : sideVolumes) {
     ACTS_VERBOSE(" - connect " << volumes.size() << " at selected side " << s);
     auto pR = connectInZ(gctx, volumes, {s}, logLevel);
-    if (pR.find(s) != pR.end()) {
+    if (pR.contains(s)) {
       dShell[s] = pR.find(s)->second;
     }
   }
diff --git a/Core/src/Detector/detail/DetectorVolumeConsistency.cpp b/Core/src/Detector/detail/DetectorVolumeConsistency.cpp
index 0f9487c7953..1d9cae71402 100644
--- a/Core/src/Detector/detail/DetectorVolumeConsistency.cpp
+++ b/Core/src/Detector/detail/DetectorVolumeConsistency.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2023 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include "Acts/Detector/detail/DetectorVolumeConsistency.hpp"
 
diff --git a/Core/src/Detector/detail/IndexedGridFiller.cpp b/Core/src/Detector/detail/IndexedGridFiller.cpp
index 82373d23947..6e2f8cfd114 100644
--- a/Core/src/Detector/detail/IndexedGridFiller.cpp
+++ b/Core/src/Detector/detail/IndexedGridFiller.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2023 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include "Acts/Detector/detail/IndexedGridFiller.hpp"
 
@@ -82,12 +82,12 @@ std::vector<std::size_t> Acts::Experimental::detail::binSequence(
             abs(static_cast<int>(bmin) - static_cast<int>(expand));
         fill_linear(nBins - understep, nBins);
       }
-      std::sort(rBins.begin(), rBins.end());
+      std::ranges::sort(rBins);
     } else {
       // Jump over the phi boundary
       fill_linear(bmax - expand, nBins);
       fill_linear(1, bmin + expand);
-      std::sort(rBins.begin(), rBins.end());
+      std::ranges::sort(rBins);
     }
   }
   return rBins;
diff --git a/Core/src/Detector/detail/PortalHelper.cpp b/Core/src/Detector/detail/PortalHelper.cpp
index ec6458aa42e..72d4d8ac7f1 100644
--- a/Core/src/Detector/detail/PortalHelper.cpp
+++ b/Core/src/Detector/detail/PortalHelper.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2023 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include "Acts/Detector/detail/PortalHelper.hpp"
 
diff --git a/Core/src/Detector/detail/ProtoMaterialHelper.cpp b/Core/src/Detector/detail/ProtoMaterialHelper.cpp
index be3eeb167af..af5b96b187e 100644
--- a/Core/src/Detector/detail/ProtoMaterialHelper.cpp
+++ b/Core/src/Detector/detail/ProtoMaterialHelper.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2023 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include "Acts/Detector/detail/ProtoMaterialHelper.hpp"
 
diff --git a/Core/src/Detector/detail/SupportSurfacesHelper.cpp b/Core/src/Detector/detail/SupportSurfacesHelper.cpp
index 32c12a6499d..62916abe39c 100644
--- a/Core/src/Detector/detail/SupportSurfacesHelper.cpp
+++ b/Core/src/Detector/detail/SupportSurfacesHelper.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2023 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include "Acts/Detector/detail/SupportSurfacesHelper.hpp"
 
@@ -20,6 +20,7 @@
 
 #include <algorithm>
 #include <cmath>
+#include <numbers>
 #include <stdexcept>
 #include <utility>
 
@@ -39,7 +40,7 @@ operator()(const Extent& lExtent) const {
   ActsScalar maxZ = lExtent.max(BinningValue::binZ) - std::abs(zClearance[1u]);
 
   // Phi sector
-  ActsScalar hPhiSector = M_PI;
+  ActsScalar hPhiSector = std::numbers::pi_v<ActsScalar>;
   ActsScalar avgPhi = 0.;
   if (lExtent.constrains(BinningValue::binPhi)) {
     // Min / Max phi  with clearances adapted
@@ -83,7 +84,7 @@ Acts::Experimental::detail::SupportSurfacesHelper::DiscSupport::operator()(
   ActsScalar maxR = lExtent.max(BinningValue::binR) - std::abs(rClearance[1u]);
 
   // Phi sector
-  ActsScalar hPhiSector = M_PI;
+  ActsScalar hPhiSector = std::numbers::pi_v<ActsScalar>;
   ActsScalar avgPhi = 0.;
   if (lExtent.constrains(BinningValue::binPhi)) {
     // Min / Max phi  with clearances adapted
@@ -192,7 +193,8 @@ Acts::Experimental::detail::SupportSurfacesHelper::cylindricalSupport(
     // Now create the Trapezoids
     for (unsigned int iphi = 0; iphi < splits; ++iphi) {
       // Get the moduleTransform
-      ActsScalar phi = -M_PI + (iphi + 0.5) * 2 * dHalfPhi;
+      ActsScalar phi =
+          -std::numbers::pi_v<ActsScalar> + (2 * iphi + 1) * dHalfPhi;
       ActsScalar cosPhi = std::cos(phi);
       ActsScalar sinPhi = std::sin(phi);
       ActsScalar planeX = planeR * cosPhi;
@@ -271,10 +273,12 @@ Acts::Experimental::detail::SupportSurfacesHelper::discSupport(
     // Now create the Trapezoids
     for (unsigned int iphi = 0; iphi < splits; ++iphi) {
       // Create the split module transform
-      ActsScalar phi = -M_PI + (iphi + 0.5) * 2 * dHalfPhi;
+      ActsScalar phi =
+          -std::numbers::pi_v<ActsScalar> + (2 * iphi + 1) * dHalfPhi;
       auto sTransform = Transform3(
           Translation3(hR * std::cos(phi), hR * std::sin(phi), zPosition) *
-          AngleAxis3(phi - 0.5 * M_PI, zAxis));
+          AngleAxis3(phi - static_cast<ActsScalar>(std::numbers::pi / 2.),
+                     zAxis));
       // Place it
       dSupport.push_back(
           Surface::makeShared<PlaneSurface>(sTransform, sTrapezoid));
diff --git a/Core/src/EventData/CMakeLists.txt b/Core/src/EventData/CMakeLists.txt
index 08a69711378..c425d533649 100644
--- a/Core/src/EventData/CMakeLists.txt
+++ b/Core/src/EventData/CMakeLists.txt
@@ -8,4 +8,5 @@ target_sources(
         TrackStatePropMask.cpp
         VectorMultiTrajectory.cpp
         VectorTrackContainer.cpp
+        TrackParameterHelpers.cpp
 )
diff --git a/Core/src/EventData/CorrectedTransformationFreeToBound.cpp b/Core/src/EventData/CorrectedTransformationFreeToBound.cpp
index fea13647d42..ebeb73c00ba 100644
--- a/Core/src/EventData/CorrectedTransformationFreeToBound.cpp
+++ b/Core/src/EventData/CorrectedTransformationFreeToBound.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2021-2022 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include "Acts/EventData/detail/CorrectedTransformationFreeToBound.hpp"
 
diff --git a/Core/src/EventData/PrintParameters.cpp b/Core/src/EventData/PrintParameters.cpp
index fcb2e61666e..01d62694c66 100644
--- a/Core/src/EventData/PrintParameters.cpp
+++ b/Core/src/EventData/PrintParameters.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2016-2020 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include "Acts/EventData/detail/PrintParameters.hpp"
 
diff --git a/Core/src/EventData/TrackParameterHelpers.cpp b/Core/src/EventData/TrackParameterHelpers.cpp
new file mode 100644
index 00000000000..9e7ddb40abf
--- /dev/null
+++ b/Core/src/EventData/TrackParameterHelpers.cpp
@@ -0,0 +1,64 @@
+// This file is part of the ACTS project.
+//
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
+//
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
+
+#include "Acts/EventData/TrackParameterHelpers.hpp"
+
+#include "Acts/Utilities/AngleHelpers.hpp"
+#include "Acts/Utilities/VectorHelpers.hpp"
+
+#include <numbers>
+
+bool Acts::isBoundVectorValid(const BoundVector& v, bool validateAngleRange,
+                              double epsilon, double maxAbsEta) {
+  constexpr auto pi = std::numbers::pi_v<double>;
+
+  bool loc0Valid = std::isfinite(v[eBoundLoc0]);
+  bool loc1Valid = std::isfinite(v[eBoundLoc1]);
+  bool phiValid = std::isfinite(v[eBoundPhi]);
+  bool thetaValid = std::isfinite(v[eBoundTheta]);
+  bool qOverPValid = std::isfinite(v[eBoundQOverP]);
+  bool timeValid = std::isfinite(v[eBoundTime]);
+
+  if (validateAngleRange) {
+    phiValid = phiValid && (v[eBoundPhi] + epsilon >= -pi) &&
+               (v[eBoundPhi] - epsilon < pi);
+    thetaValid = thetaValid && (v[eBoundTheta] + epsilon >= 0) &&
+                 (v[eBoundTheta] - epsilon <= pi);
+  }
+
+  bool etaValid = true;
+  if (std::isfinite(maxAbsEta)) {
+    double eta = AngleHelpers::etaFromTheta(v[eBoundTheta]);
+    etaValid = std::isfinite(eta) && (std::abs(eta) - epsilon <= maxAbsEta);
+  }
+
+  return loc0Valid && loc1Valid && phiValid && thetaValid && qOverPValid &&
+         timeValid && etaValid;
+}
+
+bool Acts::isFreeVectorValid(const FreeVector& v, double epsilon,
+                             double maxAbsEta) {
+  bool pos0Valid = std::isfinite(v[eFreePos0]);
+  bool pos1Valid = std::isfinite(v[eFreePos1]);
+  bool pos2Valid = std::isfinite(v[eFreePos2]);
+  bool dir0Valid = std::isfinite(v[eFreeDir0]);
+  bool dir1Valid = std::isfinite(v[eFreeDir1]);
+  bool dir2Valid = std::isfinite(v[eFreeDir2]);
+  bool dirValid = (std::abs(v.segment<3>(eFreeDir0).norm() - 1) - epsilon <= 0);
+  bool qOverPValid = std::isfinite(v[eFreeQOverP]);
+  bool timeValid = std::isfinite(v[eFreeTime]);
+
+  bool etaValid = true;
+  if (std::isfinite(maxAbsEta)) {
+    double eta = VectorHelpers::eta(v.segment<3>(eFreeDir0));
+    etaValid = std::isfinite(eta) && (std::abs(eta) - epsilon <= maxAbsEta);
+  }
+
+  return pos0Valid && pos1Valid && pos2Valid && dir0Valid && dir1Valid &&
+         dir2Valid && dirValid && qOverPValid && timeValid && etaValid;
+}
diff --git a/Core/src/EventData/TrackParameters.cpp b/Core/src/EventData/TrackParameters.cpp
index 8a05f992b99..07579817d04 100644
--- a/Core/src/EventData/TrackParameters.cpp
+++ b/Core/src/EventData/TrackParameters.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2016-2020 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include "Acts/EventData/TrackParameters.hpp"
 
@@ -14,22 +14,17 @@ namespace Acts {
 
 // ensure concrete classes satisfy the concepts
 
+static_assert(BoundTrackParametersConcept<SinglyChargedBoundTrackParameters>);
 static_assert(
-    Concepts::BoundTrackParametersConcept<SinglyChargedBoundTrackParameters>);
-static_assert(Concepts::BoundTrackParametersConcept<
-              SinglyChargedCurvilinearTrackParameters>);
-static_assert(
-    Concepts::FreeTrackParametersConcept<SinglyChargedFreeTrackParameters>);
+    BoundTrackParametersConcept<SinglyChargedCurvilinearTrackParameters>);
+static_assert(FreeTrackParametersConcept<SinglyChargedFreeTrackParameters>);
 
-static_assert(
-    Concepts::BoundTrackParametersConcept<NeutralBoundTrackParameters>);
-static_assert(
-    Concepts::BoundTrackParametersConcept<NeutralCurvilinearTrackParameters>);
-static_assert(Concepts::FreeTrackParametersConcept<NeutralFreeTrackParameters>);
+static_assert(BoundTrackParametersConcept<NeutralBoundTrackParameters>);
+static_assert(BoundTrackParametersConcept<NeutralCurvilinearTrackParameters>);
+static_assert(FreeTrackParametersConcept<NeutralFreeTrackParameters>);
 
-static_assert(Concepts::BoundTrackParametersConcept<BoundTrackParameters>);
-static_assert(
-    Concepts::BoundTrackParametersConcept<CurvilinearTrackParameters>);
-static_assert(Concepts::FreeTrackParametersConcept<FreeTrackParameters>);
+static_assert(BoundTrackParametersConcept<BoundTrackParameters>);
+static_assert(BoundTrackParametersConcept<CurvilinearTrackParameters>);
+static_assert(FreeTrackParametersConcept<FreeTrackParameters>);
 
 }  // namespace Acts
diff --git a/Core/src/EventData/TrackStatePropMask.cpp b/Core/src/EventData/TrackStatePropMask.cpp
index 0095eda91fa..1207d5508d7 100644
--- a/Core/src/EventData/TrackStatePropMask.cpp
+++ b/Core/src/EventData/TrackStatePropMask.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2022 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include "Acts/EventData/TrackStatePropMask.hpp"
 
diff --git a/Core/src/EventData/TransformationHelpers.cpp b/Core/src/EventData/TransformationHelpers.cpp
index 8bf6781fff7..90014814073 100644
--- a/Core/src/EventData/TransformationHelpers.cpp
+++ b/Core/src/EventData/TransformationHelpers.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2016-2020 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include "Acts/EventData/TransformationHelpers.hpp"
 
diff --git a/Core/src/EventData/VectorMultiTrajectory.cpp b/Core/src/EventData/VectorMultiTrajectory.cpp
index e6c1fb56161..66629d65f12 100644
--- a/Core/src/EventData/VectorMultiTrajectory.cpp
+++ b/Core/src/EventData/VectorMultiTrajectory.cpp
@@ -1,15 +1,17 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2022 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include "Acts/EventData/VectorMultiTrajectory.hpp"
 
+#include "Acts/Definitions/TrackParametrization.hpp"
 #include "Acts/EventData/MultiTrajectory.hpp"
 #include "Acts/EventData/TrackStatePropMask.hpp"
+#include "Acts/EventData/Types.hpp"
 #include "Acts/Utilities/Helpers.hpp"
 
 #include <iomanip>
@@ -65,16 +67,16 @@ auto VectorMultiTrajectory::addTrackState_impl(
   }
 
   m_sourceLinks.emplace_back(std::nullopt);
-  p.iuncalibrated = m_sourceLinks.size() - 1;
+  p.iUncalibrated = m_sourceLinks.size() - 1;
 
   m_measOffset.push_back(kInvalid);
   m_measCovOffset.push_back(kInvalid);
 
   if (ACTS_CHECK_BIT(mask, PropMask::Calibrated)) {
     m_sourceLinks.emplace_back(std::nullopt);
-    p.icalibratedsourcelink = m_sourceLinks.size() - 1;
+    p.iCalibratedSourceLink = m_sourceLinks.size() - 1;
 
-    m_projectors.emplace_back();
+    m_projectors.push_back(0);
     p.iprojector = m_projectors.size() - 1;
   }
 
@@ -127,9 +129,9 @@ void VectorMultiTrajectory::addTrackStateComponents_impl(
   if (ACTS_CHECK_BIT(mask, PropMask::Calibrated) &&
       !ACTS_CHECK_BIT(currentMask, PropMask::Calibrated)) {
     m_sourceLinks.emplace_back(std::nullopt);
-    p.icalibratedsourcelink = m_sourceLinks.size() - 1;
+    p.iCalibratedSourceLink = m_sourceLinks.size() - 1;
 
-    m_projectors.emplace_back();
+    m_projectors.push_back(0);
     p.iprojector = m_projectors.size() - 1;
   }
 
diff --git a/Core/src/EventData/VectorTrackContainer.cpp b/Core/src/EventData/VectorTrackContainer.cpp
index 663634af5f2..dc7cca761d1 100644
--- a/Core/src/EventData/VectorTrackContainer.cpp
+++ b/Core/src/EventData/VectorTrackContainer.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2023 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include "Acts/EventData/VectorTrackContainer.hpp"
 
@@ -115,7 +115,7 @@ void VectorTrackContainer::copyDynamicFrom_impl(IndexType dstIdx,
 void VectorTrackContainer::ensureDynamicColumns_impl(
     const detail_vtc::VectorTrackContainerBase& other) {
   for (auto& [key, value] : other.m_dynamic) {
-    if (m_dynamic.find(key) == m_dynamic.end()) {
+    if (!m_dynamic.contains(key)) {
       m_dynamic[key] = value->clone(true);
     }
   }
diff --git a/Core/src/Geometry/CMakeLists.txt b/Core/src/Geometry/CMakeLists.txt
index 0391a99b2fb..74f6e0e126d 100644
--- a/Core/src/Geometry/CMakeLists.txt
+++ b/Core/src/Geometry/CMakeLists.txt
@@ -35,4 +35,12 @@ target_sources(
         Volume.cpp
         VolumeBounds.cpp
         CylinderVolumeStack.cpp
+        Portal.cpp
+        GridPortalLink.cpp
+        GridPortalLinkMerging.cpp
+        TrivialPortalLink.cpp
+        CompositePortalLink.cpp
+        PortalLinkBase.cpp
+        PortalError.cpp
+        PortalShell.cpp
 )
diff --git a/Core/src/Geometry/CompositePortalLink.cpp b/Core/src/Geometry/CompositePortalLink.cpp
new file mode 100644
index 00000000000..d8010bbbce2
--- /dev/null
+++ b/Core/src/Geometry/CompositePortalLink.cpp
@@ -0,0 +1,298 @@
+// This file is part of the ACTS project.
+//
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
+//
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
+
+#include "Acts/Geometry/CompositePortalLink.hpp"
+
+#include "Acts/Geometry/GridPortalLink.hpp"
+#include "Acts/Geometry/PortalError.hpp"
+#include "Acts/Geometry/TrivialPortalLink.hpp"
+#include "Acts/Surfaces/CylinderSurface.hpp"
+#include "Acts/Surfaces/DiscSurface.hpp"
+#include "Acts/Surfaces/PlaneSurface.hpp"
+#include "Acts/Surfaces/RadialBounds.hpp"
+#include "Acts/Surfaces/RegularSurface.hpp"
+#include "Acts/Utilities/Axis.hpp"
+
+#include <algorithm>
+#include <iostream>
+#include <iterator>
+#include <stdexcept>
+
+#include <boost/algorithm/string/join.hpp>
+
+namespace Acts {
+
+namespace {
+std::shared_ptr<RegularSurface> mergedSurface(const Surface& a,
+                                              const Surface& b,
+                                              BinningValue direction) {
+  if (a.type() != b.type()) {
+    throw std::invalid_argument{"Cannot merge surfaces of different types"};
+  }
+
+  if (const auto* cylinderA = dynamic_cast<const CylinderSurface*>(&a);
+      cylinderA != nullptr) {
+    const auto& cylinderB = dynamic_cast<const CylinderSurface&>(b);
+
+    auto [merged, reversed] = cylinderA->mergedWith(cylinderB, direction, true);
+    return merged;
+  } else if (const auto* discA = dynamic_cast<const DiscSurface*>(&a);
+             discA != nullptr) {
+    const auto& discB = dynamic_cast<const DiscSurface&>(b);
+    auto [merged, reversed] = discA->mergedWith(discB, direction, true);
+    return merged;
+  } else if (const auto* planeA = dynamic_cast<const PlaneSurface*>(&a);
+             planeA != nullptr) {
+    throw std::logic_error{"Plane surfaces not implemented yet"};
+  } else {
+    throw std::invalid_argument{"Unsupported surface type"};
+  }
+}
+
+std::shared_ptr<RegularSurface> mergePortalLinks(
+    const std::vector<std::unique_ptr<PortalLinkBase>>& links,
+    BinningValue direction) {
+  assert(std::ranges::all_of(links,
+                             [](const auto& link) { return link != nullptr; }));
+  assert(!links.empty());
+
+  std::shared_ptr<RegularSurface> result = links.front()->surfacePtr();
+  for (auto it = std::next(links.begin()); it != links.end(); ++it) {
+    assert(result != nullptr);
+    result = mergedSurface(*result, it->get()->surface(), direction);
+  }
+
+  return result;
+}
+}  // namespace
+
+CompositePortalLink::CompositePortalLink(std::unique_ptr<PortalLinkBase> a,
+                                         std::unique_ptr<PortalLinkBase> b,
+                                         BinningValue direction, bool flatten)
+    : PortalLinkBase(mergedSurface(a->surface(), b->surface(), direction)),
+      m_direction{direction} {
+  if (!flatten) {
+    m_children.push_back(std::move(a));
+    m_children.push_back(std::move(b));
+
+  } else {
+    auto handle = [&](std::unique_ptr<PortalLinkBase> link) {
+      if (auto* composite = dynamic_cast<CompositePortalLink*>(link.get());
+          composite != nullptr) {
+        m_children.insert(
+            m_children.end(),
+            std::make_move_iterator(composite->m_children.begin()),
+            std::make_move_iterator(composite->m_children.end()));
+      } else {
+        m_children.push_back(std::move(link));
+      }
+    };
+
+    handle(std::move(a));
+    handle(std::move(b));
+  }
+}
+
+CompositePortalLink::CompositePortalLink(
+    std::vector<std::unique_ptr<PortalLinkBase>> links, BinningValue direction,
+    bool flatten)
+    : PortalLinkBase(mergePortalLinks(links, direction)),
+      m_direction(direction) {
+  if (!flatten) {
+    for (auto& child : links) {
+      m_children.push_back(std::move(child));
+    }
+
+  } else {
+    auto handle = [&](std::unique_ptr<PortalLinkBase> link) {
+      if (auto* composite = dynamic_cast<CompositePortalLink*>(link.get());
+          composite != nullptr) {
+        m_children.insert(
+            m_children.end(),
+            std::make_move_iterator(composite->m_children.begin()),
+            std::make_move_iterator(composite->m_children.end()));
+      } else {
+        m_children.push_back(std::move(link));
+      }
+    };
+
+    for (auto& child : links) {
+      handle(std::move(child));
+    }
+  }
+}
+
+Result<const TrackingVolume*> CompositePortalLink::resolveVolume(
+    const GeometryContext& gctx, const Vector2& position,
+    double tolerance) const {
+  // In this overload, we have to go back to global, because the children have
+  // their own local coordinate systems
+  Vector3 global = m_surface->localToGlobal(gctx, position);
+  auto res = resolveVolume(gctx, global, tolerance);
+  if (!res.ok()) {
+    return res.error();
+  }
+  return *res;
+}
+
+Result<const TrackingVolume*> CompositePortalLink::resolveVolume(
+    const GeometryContext& gctx, const Vector3& position,
+    double tolerance) const {
+  assert(m_surface->isOnSurface(gctx, position, BoundaryTolerance::None(),
+                                tolerance));
+
+  for (const auto& child : m_children) {
+    if (child->surface().isOnSurface(gctx, position, BoundaryTolerance::None(),
+                                     tolerance)) {
+      return child->resolveVolume(gctx, position);
+    }
+  }
+
+  return PortalError::PositionNotOnAnyChildPortalLink;
+}
+
+std::size_t CompositePortalLink::depth() const {
+  std::size_t result = 1;
+
+  for (const auto& child : m_children) {
+    if (const auto* composite =
+            dynamic_cast<const CompositePortalLink*>(child.get())) {
+      result = std::max(result, composite->depth() + 1);
+    }
+  }
+
+  return result;
+}
+
+std::size_t CompositePortalLink::size() const {
+  return m_children.size();
+}
+
+void CompositePortalLink::toStream(std::ostream& os) const {
+  os << "CompositePortalLink";
+}
+
+std::unique_ptr<GridPortalLink> CompositePortalLink::makeGrid(
+    const GeometryContext& gctx, const Logger& logger) const {
+  ACTS_VERBOSE("Attempting to make a grid from a composite portal link");
+  std::vector<TrivialPortalLink*> trivialLinks;
+  std::ranges::transform(m_children, std::back_inserter(trivialLinks),
+                         [](const auto& child) {
+                           return dynamic_cast<TrivialPortalLink*>(child.get());
+                         });
+
+  if (std::ranges::any_of(trivialLinks,
+                          [](auto link) { return link == nullptr; })) {
+    ACTS_VERBOSE(
+        "Failed to make a grid from a composite portal link -> returning "
+        "nullptr");
+    return nullptr;
+  }
+
+  // we already know all children have surfaces that are compatible, we produced
+  // a merged surface for the overall dimensions.
+
+  auto printEdges = [](const auto& edges) -> std::string {
+    std::vector<std::string> strings;
+    std::ranges::transform(edges, std::back_inserter(strings),
+                           [](const auto& v) { return std::to_string(v); });
+    return boost::algorithm::join(strings, ", ");
+  };
+
+  if (surface().type() == Surface::SurfaceType::Cylinder) {
+    ACTS_VERBOSE("Combining composite into cylinder grid");
+
+    if (m_direction != BinningValue::binZ) {
+      ACTS_ERROR("Cylinder grid only supports binning in Z direction");
+      throw std::runtime_error{"Unsupported binning direction"};
+    }
+
+    std::vector<double> edges;
+    edges.reserve(m_children.size() + 1);
+
+    const Transform3& groupTransform = m_surface->transform(gctx);
+    Transform3 itransform = groupTransform.inverse();
+
+    std::ranges::sort(
+        trivialLinks, [&itransform, &gctx](const auto& a, const auto& b) {
+          return (itransform * a->surface().transform(gctx)).translation()[eZ] <
+                 (itransform * b->surface().transform(gctx)).translation()[eZ];
+        });
+
+    for (const auto& [i, child] : enumerate(trivialLinks)) {
+      const auto& bounds =
+          dynamic_cast<const CylinderBounds&>(child->surface().bounds());
+      Transform3 ltransform = itransform * child->surface().transform(gctx);
+      ActsScalar hlZ = bounds.get(CylinderBounds::eHalfLengthZ);
+      ActsScalar minZ = ltransform.translation()[eZ] - hlZ;
+      ActsScalar maxZ = ltransform.translation()[eZ] + hlZ;
+      if (i == 0) {
+        edges.push_back(minZ);
+      }
+      edges.push_back(maxZ);
+    }
+
+    ACTS_VERBOSE("~> Determined bin edges to be " << printEdges(edges));
+
+    Axis axis{AxisBound, edges};
+
+    auto grid = GridPortalLink::make(m_surface, m_direction, std::move(axis));
+    for (const auto& [i, child] : enumerate(trivialLinks)) {
+      grid->atLocalBins({i + 1}) = &child->volume();
+    }
+
+    return grid;
+
+  } else if (surface().type() == Surface::SurfaceType::Disc) {
+    ACTS_VERBOSE("Combining composite into disc grid");
+
+    if (m_direction != BinningValue::binR) {
+      ACTS_ERROR("Disc grid only supports binning in R direction");
+      throw std::runtime_error{"Unsupported binning direction"};
+    }
+
+    std::vector<double> edges;
+    edges.reserve(m_children.size() + 1);
+
+    std::ranges::sort(trivialLinks, [](const auto& a, const auto& b) {
+      const auto& boundsA =
+          dynamic_cast<const RadialBounds&>(a->surface().bounds());
+      const auto& boundsB =
+          dynamic_cast<const RadialBounds&>(b->surface().bounds());
+      return boundsA.get(RadialBounds::eMinR) <
+             boundsB.get(RadialBounds::eMinR);
+    });
+
+    for (const auto& [i, child] : enumerate(trivialLinks)) {
+      const auto& bounds =
+          dynamic_cast<const RadialBounds&>(child->surface().bounds());
+
+      if (i == 0) {
+        edges.push_back(bounds.get(RadialBounds::eMinR));
+      }
+      edges.push_back(bounds.get(RadialBounds::eMaxR));
+    }
+
+    ACTS_VERBOSE("~> Determined bin edges to be " << printEdges(edges));
+
+    Axis axis{AxisBound, edges};
+
+    auto grid = GridPortalLink::make(m_surface, m_direction, std::move(axis));
+    for (const auto& [i, child] : enumerate(trivialLinks)) {
+      grid->atLocalBins({i + 1}) = &child->volume();
+    }
+
+    return grid;
+  } else if (surface().type() == Surface::SurfaceType::Plane) {
+    throw std::runtime_error{"Plane surfaces not implemented yet"};
+  } else {
+    throw std::invalid_argument{"Unsupported surface type"};
+  }
+}
+
+}  // namespace Acts
diff --git a/Core/src/Geometry/ConeLayer.cpp b/Core/src/Geometry/ConeLayer.cpp
index c59c244a901..a19e7710135 100644
--- a/Core/src/Geometry/ConeLayer.cpp
+++ b/Core/src/Geometry/ConeLayer.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2016-2018 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include "Acts/Geometry/ConeLayer.hpp"
 
diff --git a/Core/src/Geometry/ConeVolumeBounds.cpp b/Core/src/Geometry/ConeVolumeBounds.cpp
index 89767492c1e..31339ca4779 100644
--- a/Core/src/Geometry/ConeVolumeBounds.cpp
+++ b/Core/src/Geometry/ConeVolumeBounds.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2016-2018 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include "Acts/Geometry/ConeVolumeBounds.hpp"
 
@@ -24,6 +24,7 @@
 
 #include <algorithm>
 #include <cmath>
+#include <numbers>
 #include <stdexcept>
 #include <type_traits>
 #include <utility>
@@ -179,7 +180,7 @@ void ConeVolumeBounds::checkConsistency() noexcept(false) {
     throw std::invalid_argument(
         "ConeVolumeBounds: invalid longitudinal input.");
   }
-  if (get(eHalfPhiSector) < 0. || get(eHalfPhiSector) > M_PI) {
+  if (get(eHalfPhiSector) < 0. || get(eHalfPhiSector) > std::numbers::pi) {
     throw std::invalid_argument("ConeVolumeBounds: invalid phi sector setup.");
   }
   if (get(eAveragePhi) != detail::radian_sym(get(eAveragePhi))) {
@@ -200,7 +201,7 @@ bool ConeVolumeBounds::inside(const Vector3& pos, ActsScalar tol) const {
     return false;
   }
   ActsScalar r = VectorHelpers::perp(pos);
-  if (std::abs(get(eHalfPhiSector) - M_PI) > s_onSurfaceTolerance) {
+  if (std::abs(get(eHalfPhiSector) - std::numbers::pi) > s_onSurfaceTolerance) {
     // need to check the phi sector - approximate phi tolerance
     ActsScalar phitol = tol / r;
     ActsScalar phi = VectorHelpers::phi(pos);
@@ -280,7 +281,7 @@ void ConeVolumeBounds::buildSurfaceBounds() {
       m_innerRmax, m_outerRmax, get(eHalfPhiSector), get(eAveragePhi));
 
   // Create the sector bounds
-  if (std::abs(get(eHalfPhiSector) - M_PI) > s_epsilon) {
+  if (std::abs(get(eHalfPhiSector) - std::numbers::pi) > s_epsilon) {
     // The 4 points building the sector
     std::vector<Vector2> polyVertices = {{-get(eHalfLengthZ), m_innerRmin},
                                          {get(eHalfLengthZ), m_innerRmax},
diff --git a/Core/src/Geometry/CuboidVolumeBounds.cpp b/Core/src/Geometry/CuboidVolumeBounds.cpp
index e88507860f6..64b0b67f8d7 100644
--- a/Core/src/Geometry/CuboidVolumeBounds.cpp
+++ b/Core/src/Geometry/CuboidVolumeBounds.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2016-2020 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include "Acts/Geometry/CuboidVolumeBounds.hpp"
 
diff --git a/Core/src/Geometry/CuboidVolumeBuilder.cpp b/Core/src/Geometry/CuboidVolumeBuilder.cpp
index 02b600b37ef..614ce28a67f 100644
--- a/Core/src/Geometry/CuboidVolumeBuilder.cpp
+++ b/Core/src/Geometry/CuboidVolumeBuilder.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2018-2020 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include "Acts/Geometry/CuboidVolumeBuilder.hpp"
 
@@ -212,10 +212,7 @@ Acts::MutableTrackingVolumePtr Acts::CuboidVolumeBuilder::trackingVolume(
 
   // Sort the volumes vectors according to the center location, otherwise the
   // binning boundaries will fail
-  std::sort(volumes.begin(), volumes.end(),
-            [](const TrackingVolumePtr& lhs, const TrackingVolumePtr& rhs) {
-              return lhs->center().x() < rhs->center().x();
-            });
+  std::ranges::sort(volumes, {}, [](const auto& v) { return v->center().x(); });
 
   // Glue volumes
   for (unsigned int i = 0; i < volumes.size() - 1; i++) {
diff --git a/Core/src/Geometry/CutoutCylinderVolumeBounds.cpp b/Core/src/Geometry/CutoutCylinderVolumeBounds.cpp
index cdc2c392b43..9d70f49b4b9 100644
--- a/Core/src/Geometry/CutoutCylinderVolumeBounds.cpp
+++ b/Core/src/Geometry/CutoutCylinderVolumeBounds.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2019 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include "Acts/Geometry/CutoutCylinderVolumeBounds.hpp"
 
diff --git a/Core/src/Geometry/CylinderLayer.cpp b/Core/src/Geometry/CylinderLayer.cpp
index 610147286cd..87b64ef5e12 100644
--- a/Core/src/Geometry/CylinderLayer.cpp
+++ b/Core/src/Geometry/CylinderLayer.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2016-2020 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include "Acts/Geometry/CylinderLayer.hpp"
 
diff --git a/Core/src/Geometry/CylinderVolumeBounds.cpp b/Core/src/Geometry/CylinderVolumeBounds.cpp
index 325345e2465..b4f8084a4c0 100644
--- a/Core/src/Geometry/CylinderVolumeBounds.cpp
+++ b/Core/src/Geometry/CylinderVolumeBounds.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2016-2020 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include "Acts/Geometry/CylinderVolumeBounds.hpp"
 
@@ -21,6 +21,7 @@
 #include "Acts/Utilities/BoundingBox.hpp"
 
 #include <cmath>
+#include <numbers>
 #include <utility>
 
 namespace Acts {
@@ -142,7 +143,7 @@ std::vector<OrientedSurface> CylinderVolumeBounds::orientedSurfaces(
                    AngleAxis3(get(eAveragePhi) - get(eHalfPhiSector),
                               Vector3(0., 0., 1.)) *
                    Translation3(0.5 * (get(eMinR) + get(eMaxR)), 0., 0.) *
-                   AngleAxis3(M_PI / 2, Vector3(1., 0., 0.)));
+                   AngleAxis3(std::numbers::pi / 2, Vector3(1., 0., 0.)));
     auto pSurface =
         Surface::makeShared<PlaneSurface>(sp1Transform, m_sectorPlaneBounds);
     oSurfaces.push_back(
@@ -153,7 +154,7 @@ std::vector<OrientedSurface> CylinderVolumeBounds::orientedSurfaces(
                    AngleAxis3(get(eAveragePhi) + get(eHalfPhiSector),
                               Vector3(0., 0., 1.)) *
                    Translation3(0.5 * (get(eMinR) + get(eMaxR)), 0., 0.) *
-                   AngleAxis3(-M_PI / 2, Vector3(1., 0., 0.)));
+                   AngleAxis3(-std::numbers::pi / 2, Vector3(1., 0., 0.)));
     pSurface =
         Surface::makeShared<PlaneSurface>(sp2Transform, m_sectorPlaneBounds);
     oSurfaces.push_back(
@@ -174,7 +175,7 @@ void CylinderVolumeBounds::buildSurfaceBounds() {
   m_discBounds = std::make_shared<const RadialBounds>(
       get(eMinR), get(eMaxR), get(eHalfPhiSector), get(eAveragePhi));
 
-  if (std::abs(get(eHalfPhiSector) - M_PI) > s_epsilon) {
+  if (std::abs(get(eHalfPhiSector) - std::numbers::pi) > s_epsilon) {
     m_sectorPlaneBounds = std::make_shared<const RectangleBounds>(
         0.5 * (get(eMaxR) - get(eMinR)), get(eHalfLengthZ));
   }
@@ -197,7 +198,7 @@ Volume::BoundingBox CylinderVolumeBounds::boundingBox(
   ActsScalar xmax = 0, xmin = 0, ymax = 0, ymin = 0;
   xmax = get(eMaxR);
 
-  if (get(eHalfPhiSector) > M_PI / 2.) {
+  if (get(eHalfPhiSector) > std::numbers::pi / 2.) {
     // more than half
     ymax = xmax;
     ymin = -xmax;
@@ -274,7 +275,7 @@ void CylinderVolumeBounds::checkConsistency() {
         "CylinderVolumeBounds: invalid longitudinal input: hlZ (" +
         std::to_string(get(eHalfLengthZ)) + ") <= 0");
   }
-  if (get(eHalfPhiSector) < 0. || get(eHalfPhiSector) > M_PI) {
+  if (get(eHalfPhiSector) < 0. || get(eHalfPhiSector) > std::numbers::pi) {
     throw std::invalid_argument(
         "CylinderVolumeBounds: invalid phi sector setup.");
   }
@@ -309,4 +310,7 @@ void CylinderVolumeBounds::set(
   }
 }
 
+CylinderVolumeBounds::CylinderVolumeBounds(const CylinderVolumeBounds& cylbo) =
+    default;
+
 }  // namespace Acts
diff --git a/Core/src/Geometry/CylinderVolumeBuilder.cpp b/Core/src/Geometry/CylinderVolumeBuilder.cpp
index 195eaefffe6..47de379d9be 100644
--- a/Core/src/Geometry/CylinderVolumeBuilder.cpp
+++ b/Core/src/Geometry/CylinderVolumeBuilder.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2016-2020 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include "Acts/Geometry/CylinderVolumeBuilder.hpp"
 
@@ -274,19 +274,17 @@ Acts::CylinderVolumeBuilder::trackingVolume(
           double tolerance = m_cfg.ringTolerance;
           // Search for the rmin value  - and insert if necessary
           double rMin = discBounds->rMin();
-          auto innerSearch = std::find_if(
-              innerRadii.begin(), innerRadii.end(), [&](double reference) {
-                return std::abs(rMin - reference) < tolerance;
-              });
+          auto innerSearch = std::ranges::find_if(innerRadii, [&](double r) {
+            return std::abs(rMin - r) < tolerance;
+          });
           if (innerSearch == innerRadii.end()) {
             innerRadii.push_back(rMin);
           }
           // Search for the rmax value - and insert if necessary
           double rMax = discBounds->rMax();
-          auto outerSearch = std::find_if(
-              outerRadii.begin(), outerRadii.end(), [&](double reference) {
-                return std::abs(rMax - reference) < tolerance;
-              });
+          auto outerSearch = std::ranges::find_if(outerRadii, [&](double r) {
+            return std::abs(rMax - r) < tolerance;
+          });
           if (outerSearch == outerRadii.end()) {
             outerRadii.push_back(rMax);
           }
@@ -295,8 +293,8 @@ Acts::CylinderVolumeBuilder::trackingVolume(
 
       // we check radii for consistency from the inside outwards, so need to
       // sort
-      std::sort(innerRadii.begin(), innerRadii.end());
-      std::sort(outerRadii.begin(), outerRadii.end());
+      std::ranges::sort(innerRadii);
+      std::ranges::sort(outerRadii);
 
       ACTS_DEBUG("Inner radii:" << [&]() {
         std::stringstream ss;
@@ -356,10 +354,9 @@ Acts::CylinderVolumeBuilder::trackingVolume(
             double test = elay->surfaceRepresentation().binningPositionValue(
                 gctx, BinningValue::binR);
             // Find the right bin
-            auto ringVolume = std::find_if(
-                volumeRminRmax.begin(), volumeRminRmax.end(),
-                [&](const auto& reference) {
-                  return (test > reference.first && test < reference.second);
+            auto ringVolume =
+                std::ranges::find_if(volumeRminRmax, [&](const auto& vrr) {
+                  return (test > vrr.first && test < vrr.second);
                 });
             if (ringVolume != volumeRminRmax.end()) {
               unsigned int ringBin =
diff --git a/Core/src/Geometry/CylinderVolumeHelper.cpp b/Core/src/Geometry/CylinderVolumeHelper.cpp
index 5606f177f14..f5b244983ef 100644
--- a/Core/src/Geometry/CylinderVolumeHelper.cpp
+++ b/Core/src/Geometry/CylinderVolumeHelper.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2016-2020 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include "Acts/Geometry/CylinderVolumeHelper.hpp"
 
@@ -36,6 +36,7 @@
 #include <cstddef>
 #include <iosfwd>
 #include <memory>
+#include <numbers>
 #include <ostream>
 #include <utility>
 
@@ -291,6 +292,10 @@ Acts::CylinderVolumeHelper::createContainerTrackingVolume(
   auto lastVolume = volumes.end();
 
   for (std::size_t ivol = 0; firstVolume != lastVolume; ++firstVolume, ++ivol) {
+    if (*firstVolume == nullptr) {
+      ACTS_ERROR("Volume " << ivol << " is nullptr, return nullptr");
+      return nullptr;
+    }
     ACTS_VERBOSE("   - volume (" << ivol
                                  << ") is : " << (*firstVolume)->volumeName());
     ACTS_VERBOSE("     at position : " << (*firstVolume)->center().x() << ", "
@@ -965,7 +970,8 @@ Acts::CylinderVolumeHelper::createCylinderLayer(double z, double r,
 
   } else {  // break the phi symmetry
     // update the BinUtility: local position on Cylinder is rPhi, z
-    BinUtility layerBinUtilityPhiZ(binsPhi, -r * M_PI, +r * M_PI, closed,
+    BinUtility layerBinUtilityPhiZ(binsPhi, -r * std::numbers::pi,
+                                   r * std::numbers::pi, closed,
                                    BinningValue::binPhi);
     layerBinUtilityPhiZ += layerBinUtility;
     // ---------------------> create material for the layer surface
@@ -998,8 +1004,8 @@ std::shared_ptr<const Acts::Layer> Acts::CylinderVolumeHelper::createDiscLayer(
   } else {
     // also binning in phi chosen
     materialBinUtility +=
-        BinUtility(binsPhi, -static_cast<float>(M_PI), static_cast<float>(M_PI),
-                   closed, BinningValue::binPhi);
+        BinUtility(binsPhi, -std::numbers::pi_v<float>,
+                   std::numbers::pi_v<float>, closed, BinningValue::binPhi);
     ACTS_VERBOSE(" -> Preparing the binned material with "
                  << binsPhi << " / " << binsR << " bins in phi / R. ");
   }
diff --git a/Core/src/Geometry/CylinderVolumeStack.cpp b/Core/src/Geometry/CylinderVolumeStack.cpp
index b6c75afb54f..5dd0949ac79 100644
--- a/Core/src/Geometry/CylinderVolumeStack.cpp
+++ b/Core/src/Geometry/CylinderVolumeStack.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2024 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include "Acts/Geometry/CylinderVolumeStack.hpp"
 
@@ -15,7 +15,9 @@
 #include "Acts/Utilities/BinningType.hpp"
 #include "Acts/Utilities/Logger.hpp"
 
+#include <algorithm>
 #include <memory>
+#include <numbers>
 #include <sstream>
 
 namespace Acts {
@@ -66,7 +68,7 @@ struct CylinderVolumeStack::VolumeTuple {
     transformDirty = true;
   }
 
-  void commit() {
+  void commit(const Logger& logger) {
     // make a copy so we can't accidentally modify in-place
     auto copy = std::make_shared<CylinderVolumeBounds>(*updatedBounds);
 
@@ -75,7 +77,7 @@ struct CylinderVolumeStack::VolumeTuple {
       transform = globalTransform;
     }
 
-    volume->update(std::move(updatedBounds), transform);
+    volume->update(std::move(updatedBounds), transform, logger);
     bounds = copy.get();
     updatedBounds = std::move(copy);
     transformDirty = false;
@@ -150,7 +152,9 @@ void CylinderVolumeStack::initializeOuterVolume(BinningValue direction,
     const auto* cylBounds = dynamic_cast<const CylinderVolumeBounds*>(
         &m_volumes.front()->volumeBounds());
     assert(cylBounds != nullptr && "Volume bounds are not cylinder bounds");
-    m_volumeBounds = std::make_shared<CylinderVolumeBounds>(*cylBounds);
+    Volume::update(std::make_shared<CylinderVolumeBounds>(*cylBounds),
+                   std::nullopt, logger);
+    ACTS_VERBOSE("Transform is now: " << m_transform.matrix());
     return;
   }
 
@@ -159,11 +163,9 @@ void CylinderVolumeStack::initializeOuterVolume(BinningValue direction,
 
   if (direction == Acts::BinningValue::binZ) {
     ACTS_VERBOSE("Sorting by volume z position");
-    std::sort(volumeTuples.begin(), volumeTuples.end(),
-              [](const auto& a, const auto& b) {
-                return a.localTransform.translation()[eZ] <
-                       b.localTransform.translation()[eZ];
-              });
+    std::ranges::sort(volumeTuples, {}, [](const auto& v) {
+      return v.localTransform.translation()[eZ];
+    });
 
     ACTS_VERBOSE("Checking for overlaps and attaching volumes in z");
     std::vector<VolumeTuple> gapVolumes =
@@ -186,14 +188,13 @@ void CylinderVolumeStack::initializeOuterVolume(BinningValue direction,
                    << vt.localTransform.translation()[eZ]);
       ACTS_VERBOSE(*vt.updatedBounds);
 
-      vt.commit();
+      vt.commit(logger);
     }
 
     ACTS_VERBOSE("*** Volume configuration after r synchronization:");
     printVolumeSequence(volumeTuples, logger, Acts::Logging::VERBOSE);
 
-    std::sort(volumeTuples.begin(), volumeTuples.end(),
-              [](const auto& a, const auto& b) { return a.midZ() < b.midZ(); });
+    std::ranges::sort(volumeTuples, {}, [](const auto& v) { return v.midZ(); });
 
     m_volumes.clear();
     for (const auto& vt : volumeTuples) {
@@ -211,8 +212,9 @@ void CylinderVolumeStack::initializeOuterVolume(BinningValue direction,
 
     m_transform = m_groupTransform * Translation3{0, 0, midZ};
 
-    m_volumeBounds = std::make_shared<CylinderVolumeBounds>(minR, maxR, hlZ);
-    ACTS_DEBUG("Outer bounds are:\n" << *m_volumeBounds);
+    Volume::update(std::make_shared<CylinderVolumeBounds>(minR, maxR, hlZ),
+                   std::nullopt, logger);
+    ACTS_DEBUG("Outer bounds are:\n" << volumeBounds());
     ACTS_DEBUG("Outer transform / new group transform is:\n"
                << m_transform.matrix());
 
@@ -222,8 +224,7 @@ void CylinderVolumeStack::initializeOuterVolume(BinningValue direction,
 
   } else if (direction == Acts::BinningValue::binR) {
     ACTS_VERBOSE("Sorting by volume r middle point");
-    std::sort(volumeTuples.begin(), volumeTuples.end(),
-              [](const auto& a, const auto& b) { return a.midR() < b.midR(); });
+    std::ranges::sort(volumeTuples, {}, [](const auto& v) { return v.midR(); });
 
     ACTS_VERBOSE("Checking for overlaps and attaching volumes in r");
     std::vector<VolumeTuple> gapVolumes =
@@ -244,14 +245,13 @@ void CylinderVolumeStack::initializeOuterVolume(BinningValue direction,
     for (auto& vt : volumeTuples) {
       ACTS_VERBOSE("Updated bounds for volume at r: " << vt.midR());
       ACTS_VERBOSE(*vt.updatedBounds);
-      vt.commit();
+      vt.commit(logger);
     }
 
     ACTS_VERBOSE("*** Volume configuration after z synchronization:");
     printVolumeSequence(volumeTuples, logger, Acts::Logging::VERBOSE);
 
-    std::sort(volumeTuples.begin(), volumeTuples.end(),
-              [](const auto& a, const auto& b) { return a.midR() < b.midR(); });
+    std::ranges::sort(volumeTuples, {}, [](const auto& v) { return v.midR(); });
 
     m_volumes.clear();
     for (const auto& vt : volumeTuples) {
@@ -269,9 +269,10 @@ void CylinderVolumeStack::initializeOuterVolume(BinningValue direction,
 
     m_transform = m_groupTransform * Translation3{0, 0, midZ};
 
-    m_volumeBounds = std::make_shared<CylinderVolumeBounds>(minR, maxR, hlZ);
+    Volume::update(std::make_shared<CylinderVolumeBounds>(minR, maxR, hlZ),
+                   std::nullopt, logger);
 
-    ACTS_DEBUG("Outer bounds are:\n" << *m_volumeBounds);
+    ACTS_DEBUG("Outer bounds are:\n" << volumeBounds());
     ACTS_DEBUG("Outer transform is:\n" << m_transform.matrix());
 
     // Update group transform to the new center
@@ -287,25 +288,40 @@ void CylinderVolumeStack::initializeOuterVolume(BinningValue direction,
 }
 
 void CylinderVolumeStack::overlapPrint(
-    const CylinderVolumeStack::VolumeTuple& a,
+    BinningValue direction, const CylinderVolumeStack::VolumeTuple& a,
     const CylinderVolumeStack::VolumeTuple& b, const Logger& logger) {
   if (logger().doPrint(Acts::Logging::DEBUG)) {
     std::stringstream ss;
     ss << std::fixed;
     ss << std::setprecision(3);
     ss << std::setfill(' ');
-    ACTS_VERBOSE("Checking overlap between");
+
     int w = 9;
-    ss << " - "
-       << " z: [ " << std::setw(w) << a.minZ() << " <- " << std::setw(w)
-       << a.midZ() << " -> " << std::setw(w) << a.maxZ() << " ]";
-    ACTS_VERBOSE(ss.str());
 
-    ss.str("");
-    ss << " - "
-       << " z: [ " << std::setw(w) << b.minZ() << " <- " << std::setw(w)
-       << b.midZ() << " -> " << std::setw(w) << b.maxZ() << " ]";
-    ACTS_VERBOSE(ss.str());
+    ACTS_VERBOSE("Checking overlap between");
+    if (direction == BinningValue::binZ) {
+      ss << " - "
+         << " z: [ " << std::setw(w) << a.minZ() << " <- " << std::setw(w)
+         << a.midZ() << " -> " << std::setw(w) << a.maxZ() << " ]";
+      ACTS_VERBOSE(ss.str());
+
+      ss.str("");
+      ss << " - "
+         << " z: [ " << std::setw(w) << b.minZ() << " <- " << std::setw(w)
+         << b.midZ() << " -> " << std::setw(w) << b.maxZ() << " ]";
+      ACTS_VERBOSE(ss.str());
+    } else {
+      ss << " - "
+         << " r: [ " << std::setw(w) << a.minR() << " <-> " << std::setw(w)
+         << a.maxR() << " ]";
+      ACTS_VERBOSE(ss.str());
+
+      ss.str("");
+      ss << " - "
+         << " r: [ " << std::setw(w) << b.minR() << " <-> " << std::setw(w)
+         << b.maxR() << " ]";
+      ACTS_VERBOSE(ss.str());
+    }
   }
 }
 
@@ -320,7 +336,7 @@ CylinderVolumeStack::checkOverlapAndAttachInZ(
     auto& a = volumes.at(i);
     auto& b = volumes.at(j);
 
-    overlapPrint(a, b, logger);
+    overlapPrint(BinningValue::binZ, a, b, logger);
 
     if (a.maxZ() > b.minZ()) {
       ACTS_ERROR(" -> Overlap in z");
@@ -348,8 +364,9 @@ CylinderVolumeStack::checkOverlapAndAttachInZ(
                        << (aZMidNew - aHlZNew) << " <- " << aZMidNew << " -> "
                        << (aZMidNew + aHlZNew) << "]");
 
-          assert(a.minZ() == aZMidNew - aHlZNew && "Volume shrunk");
-          assert(a.maxZ() <= aZMidNew + aHlZNew && "Volume shrunk");
+          assert(std::abs(a.minZ() - (aZMidNew - aHlZNew)) < 1e-9 &&
+                 "Volume shrunk");
+          assert(aHlZNew >= a.halfLengthZ() && "Volume shrunk");
 
           ActsScalar bZMidNew = (b.minZ() + b.maxZ()) / 2.0 - gapWidth / 4.0;
           ActsScalar bHlZNew = b.halfLengthZ() + gapWidth / 4.0;
@@ -358,15 +375,16 @@ CylinderVolumeStack::checkOverlapAndAttachInZ(
                        << (bZMidNew - bHlZNew) << " <- " << bZMidNew << " -> "
                        << (bZMidNew + bHlZNew) << "]");
 
-          assert(b.minZ() >= bZMidNew - bHlZNew && "Volume shrunk");
-          assert(b.maxZ() == bZMidNew + bHlZNew && "Volume shrunk");
+          assert(bHlZNew >= b.halfLengthZ() && "Volume shrunk");
+          assert(std::abs(b.maxZ() - (bZMidNew + bHlZNew)) < 1e-9 &&
+                 "Volume shrunk");
 
-          a.localTransform = Translation3{0, 0, aZMidNew};
-          a.volume->setTransform(m_groupTransform * a.localTransform);
+          a.setLocalTransform(Transform3{Translation3{0, 0, aZMidNew}},
+                              m_groupTransform);
           a.updatedBounds->set(CylinderVolumeBounds::eHalfLengthZ, aHlZNew);
 
-          b.localTransform = Translation3{0, 0, bZMidNew};
-          b.volume->setTransform(m_groupTransform * b.localTransform);
+          b.setLocalTransform(Transform3{Translation3{0, 0, bZMidNew}},
+                              m_groupTransform);
           b.updatedBounds->set(CylinderVolumeBounds::eHalfLengthZ, bHlZNew);
 
           break;
@@ -380,11 +398,12 @@ CylinderVolumeStack::checkOverlapAndAttachInZ(
                        << (aZMidNew - aHlZNew) << " <- " << aZMidNew << " -> "
                        << (aZMidNew + aHlZNew) << "]");
 
-          assert(a.minZ() == aZMidNew - aHlZNew && "Volume shrunk");
-          assert(a.maxZ() <= aZMidNew + aHlZNew && "Volume shrunk");
+          assert(std::abs(a.minZ() - (aZMidNew - aHlZNew)) < 1e-9 &&
+                 "Volume shrunk");
+          assert(aHlZNew >= a.halfLengthZ() && "Volume shrunk");
 
-          a.localTransform = Translation3{0, 0, aZMidNew};
-          a.volume->setTransform(m_groupTransform * a.localTransform);
+          a.setLocalTransform(Transform3{Translation3{0, 0, aZMidNew}},
+                              m_groupTransform);
           a.updatedBounds->set(CylinderVolumeBounds::eHalfLengthZ, aHlZNew);
 
           break;
@@ -398,11 +417,12 @@ CylinderVolumeStack::checkOverlapAndAttachInZ(
                        << (bZMidNew - bHlZNew) << " <- " << bZMidNew << " -> "
                        << (bZMidNew + bHlZNew) << "]");
 
-          assert(b.minZ() >= bZMidNew - bHlZNew && "Volume shrunk");
-          assert(b.maxZ() == bZMidNew + bHlZNew && "Volume shrunk");
+          assert(bHlZNew >= b.halfLengthZ() && "Volume shrunk");
+          assert(std::abs(b.maxZ() - (bZMidNew + bHlZNew)) < 1e-9 &&
+                 "Volume shrunk");
 
-          b.localTransform = Translation3{0, 0, bZMidNew};
-          b.volume->setTransform(m_groupTransform * b.localTransform);
+          b.setLocalTransform(Transform3{Translation3{0, 0, bZMidNew}},
+                              m_groupTransform);
           b.updatedBounds->set(CylinderVolumeBounds::eHalfLengthZ, bHlZNew);
           break;
         }
@@ -414,10 +434,13 @@ CylinderVolumeStack::checkOverlapAndAttachInZ(
           ACTS_VERBOSE("  - Gap half length: " << gapHlZ
                                                << " at z: " << gapMidZ);
 
+          ActsScalar minR = std::min(a.minR(), b.minR());
+          ActsScalar maxR = std::max(a.maxR(), b.maxR());
+
           Transform3 gapLocalTransform{Translation3{0, 0, gapMidZ}};
           Transform3 gapGlobalTransform = m_groupTransform * gapLocalTransform;
-          auto gapBounds = std::make_shared<CylinderVolumeBounds>(
-              a.minR(), b.maxR(), gapHlZ);
+          auto gapBounds =
+              std::make_shared<CylinderVolumeBounds>(minR, maxR, gapHlZ);
 
           auto gap = addGapVolume(gapGlobalTransform, gapBounds);
           gapVolumes.emplace_back(*gap, m_groupTransform);
@@ -447,7 +470,7 @@ CylinderVolumeStack::checkOverlapAndAttachInR(
     auto& a = volumes.at(i);
     auto& b = volumes.at(j);
 
-    overlapPrint(a, b, logger);
+    overlapPrint(BinningValue::binR, a, b, logger);
 
     if (a.maxR() > b.minR()) {
       ACTS_ERROR(" -> Overlap in r");
@@ -625,46 +648,46 @@ std::pair<ActsScalar, ActsScalar> CylinderVolumeStack::synchronizeZBounds(
   return {minZ, maxZ};
 }
 
-void CylinderVolumeStack::update(std::shared_ptr<const VolumeBounds> volbounds,
-                                 std::optional<Transform3> transform) {
-  if (volbounds == nullptr) {
-    throw std::invalid_argument("New bounds are nullptr");
+void CylinderVolumeStack::update(std::shared_ptr<VolumeBounds> volbounds,
+                                 std::optional<Transform3> transform,
+                                 const Logger& logger) {
+  ACTS_DEBUG(
+      "Resizing CylinderVolumeStack with strategy: " << m_resizeStrategy);
+  ACTS_DEBUG("Currently have " << m_volumes.size() << " children");
+  ACTS_DEBUG(m_gaps.size() << " gaps");
+  for (const auto& v : m_volumes) {
+    ACTS_DEBUG(" - volume bounds: \n" << v->volumeBounds());
+    ACTS_DEBUG("          transform: \n" << v->transform().matrix());
   }
-  auto cylBounds =
-      std::dynamic_pointer_cast<const CylinderVolumeBounds>(volbounds);
+
+  ACTS_DEBUG("New bounds are: \n" << *volbounds);
+
+  auto cylBounds = std::dynamic_pointer_cast<CylinderVolumeBounds>(volbounds);
   if (cylBounds == nullptr) {
     throw std::invalid_argument(
         "CylinderVolumeStack requires CylinderVolumeBounds");
   }
-  update(std::move(cylBounds), transform,
-         *Acts::getDefaultLogger("CYLSTACK", Logging::VERBOSE));
-}
 
-void CylinderVolumeStack::update(
-    std::shared_ptr<const CylinderVolumeBounds> newBounds,
-    std::optional<Transform3> transform, const Logger& logger) {
-  ACTS_DEBUG(
-      "Resizing CylinderVolumeStack with strategy: " << m_resizeStrategy);
-
-  if (newBounds == nullptr) {
+  if (cylBounds == nullptr) {
     throw std::invalid_argument("New bounds are nullptr");
   }
 
-  if (*newBounds == volumeBounds()) {
+  if (*cylBounds == volumeBounds()) {
     ACTS_VERBOSE("Bounds are the same, no resize needed");
     return;
   }
 
+  ACTS_VERBOSE("Group transform is:\n" << m_groupTransform.matrix());
+  ACTS_VERBOSE("Current transform is:\n" << m_transform.matrix());
   if (transform.has_value()) {
-    ACTS_VERBOSE(transform.value().matrix());
+    ACTS_VERBOSE("Input transform:\n" << transform.value().matrix());
   }
 
   VolumeTuple oldVolume{*this, m_transform};
   VolumeTuple newVolume{*this, m_transform};
-  newVolume.updatedBounds = std::make_shared<CylinderVolumeBounds>(*newBounds);
+  newVolume.updatedBounds = std::make_shared<CylinderVolumeBounds>(*cylBounds);
   newVolume.globalTransform = transform.value_or(m_transform);
-  newVolume.localTransform =
-      m_groupTransform.inverse() * newVolume.globalTransform;
+  newVolume.localTransform = m_transform.inverse() * newVolume.globalTransform;
 
   if (!transform.has_value()) {
     ACTS_VERBOSE("Local transform does not change");
@@ -678,7 +701,7 @@ void CylinderVolumeStack::update(
     checkVolumeAlignment(volTemp, logger);
   }
 
-  checkNoPhiOrBevel(*newBounds, logger);
+  checkNoPhiOrBevel(*cylBounds, logger);
 
   const ActsScalar newMinR = newVolume.minR();
   const ActsScalar newMaxR = newVolume.maxR();
@@ -695,32 +718,48 @@ void CylinderVolumeStack::update(
   const ActsScalar oldHlZ = oldVolume.halfLengthZ();
 
   ACTS_VERBOSE("Previous bounds are: z: [ "
-               << oldMinZ << " <- " << oldMidZ << " -> " << oldMaxZ
-               << " ], r: [ " << oldMinR << " <-> " << oldMaxR << " ]");
+               << oldMinZ << " <- " << oldMidZ << " -> " << oldMaxZ << " ] ("
+               << oldHlZ << "), r: [ " << oldMinR << " <-> " << oldMaxR
+               << " ]");
   ACTS_VERBOSE("New bounds are: z:      [ "
-               << newMinZ << " <- " << newMidZ << " -> " << newMaxZ
-               << " ], r: [ " << newMinR << " <-> " << newMaxR << " ]");
-
-  if (newMinZ > oldMinZ) {
-    ACTS_ERROR("Shrinking the stack size in z is not supported");
-    throw std::invalid_argument("Shrinking the stack is not supported");
+               << newMinZ << " <- " << newMidZ << " -> " << newMaxZ << " ] ("
+               << newHlZ << "), r: [ " << newMinR << " <-> " << newMaxR
+               << " ]");
+
+  constexpr auto tolerance = s_onSurfaceTolerance;
+  auto same = [](ActsScalar a, ActsScalar b) {
+    return std::abs(a - b) < tolerance;
+  };
+
+  if (!same(newMinZ, oldMinZ) && newMinZ > oldMinZ) {
+    ACTS_ERROR("Shrinking the stack size in z is not supported: "
+               << newMinZ << " -> " << oldMinZ);
+    throw std::invalid_argument("Shrinking the stack in z is not supported");
   }
 
-  if (newMaxZ < oldMaxZ) {
-    ACTS_ERROR("Shrinking the stack size in z is not supported");
-    throw std::invalid_argument("Shrinking the stack is not supported");
+  if (!same(newMaxZ, oldMaxZ) && newMaxZ < oldMaxZ) {
+    ACTS_ERROR("Shrinking the stack size in z is not supported: "
+               << newMaxZ << " -> " << oldMaxZ);
+    throw std::invalid_argument("Shrinking the stack in z is not supported");
   }
 
-  if (newMinR > oldMinR) {
-    ACTS_ERROR("Shrinking the stack size in r is not supported");
-    throw std::invalid_argument("Shrinking the stack is not supported");
+  if (!same(newMinR, oldMinR) && newMinR > oldMinR) {
+    ACTS_ERROR("Shrinking the stack size in r is not supported: "
+               << newMinR << " -> " << oldMinR);
+    throw std::invalid_argument("Shrinking the stack in r is not supported");
   }
 
-  if (newMaxR < oldMaxR) {
-    ACTS_ERROR("Shrinking the stack size in r is not supported");
-    throw std::invalid_argument("Shrinking the stack is not supported");
+  if (!same(newMaxR, oldMaxR) && newMaxR < oldMaxR) {
+    ACTS_ERROR("Shrinking the stack size in r is not supported: "
+               << newMaxR << " -> " << oldMaxR);
+    throw std::invalid_argument("Shrinking the stack is r in not supported");
   }
 
+  auto isGap = [this](const Volume* vol) {
+    return std::ranges::any_of(
+        m_gaps, [&](const auto& gap) { return vol == gap.get(); });
+  };
+
   if (m_direction == BinningValue::binZ) {
     ACTS_VERBOSE("Stack direction is z");
 
@@ -735,7 +774,7 @@ void CylinderVolumeStack::update(
     ACTS_VERBOSE("*** Initial volume configuration:");
     printVolumeSequence(volumeTuples, logger, Acts::Logging::DEBUG);
 
-    if (newMinR != oldMinR || newMaxR != oldMaxR) {
+    if (!same(newMinR, oldMinR) || !same(newMaxR, oldMaxR)) {
       ACTS_VERBOSE("Resize all volumes to new r bounds");
       for (auto& volume : volumeTuples) {
         volume.set({
@@ -749,7 +788,7 @@ void CylinderVolumeStack::update(
       ACTS_VERBOSE("R bounds are the same, no r resize needed");
     }
 
-    if (newHlZ == oldHlZ) {
+    if (same(newHlZ, oldHlZ)) {
       ACTS_VERBOSE("Halflength z is the same, no z resize needed");
     } else {
       if (m_resizeStrategy == ResizeStrategy::Expand) {
@@ -789,43 +828,86 @@ void CylinderVolumeStack::update(
       } else if (m_resizeStrategy == ResizeStrategy::Gap) {
         ACTS_VERBOSE("Creating gap volumes to fill the new z bounds");
 
-        if (newMinZ < oldMinZ) {
-          ACTS_VERBOSE("Adding gap volume at negative z");
+        auto printGapDimensions = [&](const VolumeTuple& gap,
+                                      const std::string& prefix = "") {
+          ACTS_VERBOSE(" -> gap" << prefix << ": [ " << gap.minZ() << " <- "
+                                 << gap.midZ() << " -> " << gap.maxZ()
+                                 << " ], r: [ " << gap.minR() << " <-> "
+                                 << gap.maxR() << " ]");
+        };
 
+        if (!same(newMinZ, oldMinZ) && newMinZ < oldMinZ) {
           ActsScalar gap1MinZ = newVolume.minZ();
           ActsScalar gap1MaxZ = oldVolume.minZ();
           ActsScalar gap1HlZ = (gap1MaxZ - gap1MinZ) / 2.0;
           ActsScalar gap1PZ = (gap1MaxZ + gap1MinZ) / 2.0;
 
-          ACTS_VERBOSE(" -> gap1 z: [ " << gap1MinZ << " <- " << gap1PZ
-                                        << " -> " << gap1MaxZ
-                                        << " ] (hl: " << gap1HlZ << ")");
-
-          auto gap1Bounds =
-              std::make_shared<CylinderVolumeBounds>(newMinR, newMaxR, gap1HlZ);
-          auto gap1Transform = m_groupTransform * Translation3{0, 0, gap1PZ};
-          auto gap1 = addGapVolume(gap1Transform, std::move(gap1Bounds));
-          volumeTuples.insert(volumeTuples.begin(),
-                              VolumeTuple{*gap1, m_groupTransform});
+          // // check if we need a new gap volume or reuse an existing one
+          auto& candidate = volumeTuples.front();
+          if (isGap(candidate.volume)) {
+            ACTS_VERBOSE("~> Reusing existing gap volume at negative z");
+
+            gap1HlZ =
+                candidate.bounds->get(CylinderVolumeBounds::eHalfLengthZ) +
+                gap1HlZ;
+            gap1MaxZ = gap1MinZ + gap1HlZ * 2;
+            gap1PZ = (gap1MaxZ + gap1MinZ) / 2.0;
+
+            printGapDimensions(candidate, " before");
+            auto gap1Bounds = std::make_shared<CylinderVolumeBounds>(
+                newMinR, newMaxR, gap1HlZ);
+            auto gap1Transform = m_groupTransform * Translation3{0, 0, gap1PZ};
+            candidate.volume->update(std::move(gap1Bounds), gap1Transform);
+            candidate = VolumeTuple{*candidate.volume, m_groupTransform};
+            ACTS_VERBOSE("After:");
+            printGapDimensions(candidate, " after ");
+
+          } else {
+            ACTS_VERBOSE("~> Creating new gap volume at negative z");
+            auto gap1Bounds = std::make_shared<CylinderVolumeBounds>(
+                newMinR, newMaxR, gap1HlZ);
+            auto gap1Transform = m_groupTransform * Translation3{0, 0, gap1PZ};
+            auto gap1 = addGapVolume(gap1Transform, std::move(gap1Bounds));
+            volumeTuples.insert(volumeTuples.begin(),
+                                VolumeTuple{*gap1, m_groupTransform});
+            printGapDimensions(volumeTuples.front());
+          }
         }
 
-        if (newMaxZ > oldMaxZ) {
-          ACTS_VERBOSE("Adding gap volume at positive z");
-
+        if (!same(newMaxZ, oldMaxZ) && newMaxZ > oldMaxZ) {
           ActsScalar gap2MinZ = oldVolume.maxZ();
           ActsScalar gap2MaxZ = newVolume.maxZ();
           ActsScalar gap2HlZ = (gap2MaxZ - gap2MinZ) / 2.0;
           ActsScalar gap2PZ = (gap2MaxZ + gap2MinZ) / 2.0;
 
-          ACTS_VERBOSE(" -> gap2 z: [ " << gap2MinZ << " <- " << gap2PZ
-                                        << " -> " << gap2MaxZ
-                                        << " ] (hl: " << gap2HlZ << ")");
-
-          auto gap2Bounds =
-              std::make_shared<CylinderVolumeBounds>(newMinR, newMaxR, gap2HlZ);
-          auto gap2Transform = m_groupTransform * Translation3{0, 0, gap2PZ};
-          auto gap2 = addGapVolume(gap2Transform, std::move(gap2Bounds));
-          volumeTuples.emplace_back(*gap2, m_groupTransform);
+          // check if we need a new gap volume or reuse an existing one
+          auto& candidate = volumeTuples.back();
+          if (isGap(candidate.volume)) {
+            ACTS_VERBOSE("~> Reusing existing gap volume at positive z");
+
+            gap2HlZ =
+                candidate.bounds->get(CylinderVolumeBounds::eHalfLengthZ) +
+                gap2HlZ;
+            gap2MinZ = newVolume.maxZ() - gap2HlZ * 2;
+            gap2PZ = (gap2MaxZ + gap2MinZ) / 2.0;
+
+            printGapDimensions(candidate, " before");
+            auto gap2Bounds = std::make_shared<CylinderVolumeBounds>(
+                newMinR, newMaxR, gap2HlZ);
+            auto gap2Transform = m_groupTransform * Translation3{0, 0, gap2PZ};
+
+            candidate.volume->update(std::move(gap2Bounds), gap2Transform);
+            candidate = VolumeTuple{*candidate.volume, m_groupTransform};
+            printGapDimensions(candidate, " after ");
+          } else {
+            ACTS_VERBOSE("~> Creating new gap volume at positive z");
+            auto gap2Bounds = std::make_shared<CylinderVolumeBounds>(
+                newMinR, newMaxR, gap2HlZ);
+            auto gap2Transform = m_groupTransform * Translation3{0, 0, gap2PZ};
+            auto gap2 = addGapVolume(gap2Transform, std::move(gap2Bounds));
+            volumeTuples.emplace_back(*gap2, m_groupTransform);
+            printGapDimensions(volumeTuples.back());
+          }
         }
       }
 
@@ -836,7 +918,7 @@ void CylinderVolumeStack::update(
     ACTS_VERBOSE("Commit and update outer vector of volumes");
     m_volumes.clear();
     for (auto& vt : volumeTuples) {
-      vt.commit();
+      vt.commit(logger);
       m_volumes.push_back(vt.volume);
     }
 
@@ -892,32 +974,56 @@ void CylinderVolumeStack::update(
                                    << " ]");
         }
       } else if (m_resizeStrategy == ResizeStrategy::Gap) {
+        auto printGapDimensions = [&](const VolumeTuple& gap,
+                                      const std::string& prefix = "") {
+          ACTS_VERBOSE(" -> gap" << prefix << ": [ " << gap.minZ() << " <- "
+                                 << gap.midZ() << " -> " << gap.maxZ()
+                                 << " ], r: [ " << gap.minR() << " <-> "
+                                 << gap.maxR() << " ]");
+        };
+
         if (oldMinR > newMinR) {
-          ACTS_VERBOSE("Creating gap volume at the innermost end");
-          auto gapBounds =
-              std::make_shared<CylinderVolumeBounds>(newMinR, oldMinR, newHlZ);
-          auto gapTransform = m_groupTransform;
-          auto gapVolume = addGapVolume(gapTransform, gapBounds);
-          volumeTuples.insert(volumeTuples.begin(),
-                              VolumeTuple{*gapVolume, m_groupTransform});
-          auto gap = volumeTuples.front();
-          ACTS_VERBOSE(" -> gap inner: [ "
-                       << gap.minZ() << " <- " << gap.midZ() << " -> "
-                       << gap.maxZ() << " ], r: [ " << gap.minR() << " <-> "
-                       << gap.maxR() << " ]");
+          auto& candidate = volumeTuples.front();
+          if (isGap(candidate.volume)) {
+            ACTS_VERBOSE("~> Reusing existing gap volume at inner r");
+            auto& candidateCylBounds = dynamic_cast<CylinderVolumeBounds&>(
+                candidate.volume->volumeBounds());
+            printGapDimensions(candidate, " before");
+            candidateCylBounds.set(CylinderVolumeBounds::eMinR, newMinR);
+            candidate = VolumeTuple{*candidate.volume, m_groupTransform};
+            printGapDimensions(candidate, " after ");
+          } else {
+            ACTS_VERBOSE("~> Creating new gap volume at inner r");
+            auto gapBounds = std::make_shared<CylinderVolumeBounds>(
+                newMinR, oldMinR, newHlZ);
+            auto gapTransform = m_groupTransform;
+            auto gapVolume = addGapVolume(gapTransform, gapBounds);
+            volumeTuples.insert(volumeTuples.begin(),
+                                VolumeTuple{*gapVolume, m_groupTransform});
+            auto gap = volumeTuples.front();
+            printGapDimensions(gap);
+          }
         }
         if (oldMaxR < newMaxR) {
-          ACTS_VERBOSE("Creating gap volume at the outermost end");
-          auto gapBounds =
-              std::make_shared<CylinderVolumeBounds>(oldMaxR, newMaxR, newHlZ);
-          auto gapTransform = m_groupTransform;
-          auto gapVolume = addGapVolume(gapTransform, gapBounds);
-          volumeTuples.emplace_back(*gapVolume, m_groupTransform);
-          auto gap = volumeTuples.back();
-          ACTS_VERBOSE(" -> gap outer: [ "
-                       << gap.minZ() << " <- " << gap.midZ() << " -> "
-                       << gap.maxZ() << " ], r: [ " << gap.minR() << " <-> "
-                       << gap.maxR() << " ]");
+          auto& candidate = volumeTuples.back();
+          if (isGap(candidate.volume)) {
+            ACTS_VERBOSE("~> Reusing existing gap volume at outer r");
+            auto& candidateCylBounds = dynamic_cast<CylinderVolumeBounds&>(
+                candidate.volume->volumeBounds());
+            printGapDimensions(candidate, " before");
+            candidateCylBounds.set(CylinderVolumeBounds::eMaxR, newMaxR);
+            candidate = VolumeTuple{*candidate.volume, m_groupTransform};
+            printGapDimensions(candidate, " after ");
+          } else {
+            ACTS_VERBOSE("~> Creating new gap volume at outer r");
+            auto gapBounds = std::make_shared<CylinderVolumeBounds>(
+                oldMaxR, newMaxR, newHlZ);
+            auto gapTransform = m_groupTransform;
+            auto gapVolume = addGapVolume(gapTransform, gapBounds);
+            volumeTuples.emplace_back(*gapVolume, m_groupTransform);
+            auto gap = volumeTuples.back();
+            printGapDimensions(gap);
+          }
         }
       }
 
@@ -928,18 +1034,20 @@ void CylinderVolumeStack::update(
     ACTS_VERBOSE("Commit and update outer vector of volumes");
     m_volumes.clear();
     for (auto& vt : volumeTuples) {
-      vt.commit();
+      vt.commit(logger);
       m_volumes.push_back(vt.volume);
     }
   }
 
   m_transform = newVolume.globalTransform;
-  m_volumeBounds = std::move(newBounds);
+  // @TODO: We probably can reuse m_transform
+  m_groupTransform = m_transform;
+  Volume::update(std::move(cylBounds), std::nullopt, logger);
 }
 
 void CylinderVolumeStack::checkNoPhiOrBevel(const CylinderVolumeBounds& bounds,
                                             const Logger& logger) {
-  if (bounds.get(CylinderVolumeBounds::eHalfPhiSector) != M_PI) {
+  if (bounds.get(CylinderVolumeBounds::eHalfPhiSector) != std::numbers::pi) {
     ACTS_ERROR(
         "CylinderVolumeStack requires all volumes to have a full "
         "phi sector");
diff --git a/Core/src/Geometry/DiscLayer.cpp b/Core/src/Geometry/DiscLayer.cpp
index 14f6f82ad68..021101d5f73 100644
--- a/Core/src/Geometry/DiscLayer.cpp
+++ b/Core/src/Geometry/DiscLayer.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2016-2018 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include "Acts/Geometry/DiscLayer.hpp"
 
diff --git a/Core/src/Geometry/Extent.cpp b/Core/src/Geometry/Extent.cpp
index 262f84ebcaf..bd50d8536ef 100644
--- a/Core/src/Geometry/Extent.cpp
+++ b/Core/src/Geometry/Extent.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2022 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include "Acts/Geometry/Extent.hpp"
 
@@ -15,13 +15,14 @@
 #include <cstddef>
 #include <iomanip>
 #include <limits>
+#include <numbers>
 
 Acts::Extent::Extent(const ExtentEnvelope& envelope)
     : m_constrains(0), m_envelope(envelope) {
   m_range[toUnderlying(BinningValue::binR)] =
       Range1D<ActsScalar>(0., std::numeric_limits<ActsScalar>::max());
-  m_range[toUnderlying(BinningValue::binPhi)] =
-      Range1D<ActsScalar>(-M_PI, M_PI);
+  m_range[toUnderlying(BinningValue::binPhi)] = Range1D<ActsScalar>(
+      -std::numbers::pi_v<ActsScalar>, std::numbers::pi_v<ActsScalar>);
   m_range[toUnderlying(BinningValue::binRPhi)] =
       Range1D<ActsScalar>(0., std::numeric_limits<ActsScalar>::max());
   m_range[toUnderlying(BinningValue::binMag)] =
@@ -144,8 +145,7 @@ bool Acts::Extent::contains(const Extent& rhs,
 
   // Check all
   if (!bValue.has_value()) {
-    return std::all_of(allBinningValues().begin(), allBinningValues().end(),
-                       checkContainment);
+    return std::ranges::all_of(allBinningValues(), checkContainment);
   }
   // Check specific
   return checkContainment(bValue.value());
@@ -163,8 +163,7 @@ bool Acts::Extent::intersects(const Extent& rhs,
 
   // Check all
   if (!bValue.has_value()) {
-    return std::any_of(allBinningValues().begin(), allBinningValues().end(),
-                       checkIntersect);
+    return std::ranges::any_of(allBinningValues(), checkIntersect);
   }
   // Check specific
   return checkIntersect(bValue.value());
diff --git a/Core/src/Geometry/GenericApproachDescriptor.cpp b/Core/src/Geometry/GenericApproachDescriptor.cpp
index e532e2f5eb2..12d6fd2fd87 100644
--- a/Core/src/Geometry/GenericApproachDescriptor.cpp
+++ b/Core/src/Geometry/GenericApproachDescriptor.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2018 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include "Acts/Geometry/GenericApproachDescriptor.hpp"
 
diff --git a/Core/src/Geometry/GenericCuboidVolumeBounds.cpp b/Core/src/Geometry/GenericCuboidVolumeBounds.cpp
index 059338cf538..bdf8f960dc2 100644
--- a/Core/src/Geometry/GenericCuboidVolumeBounds.cpp
+++ b/Core/src/Geometry/GenericCuboidVolumeBounds.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2019 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include "Acts/Geometry/GenericCuboidVolumeBounds.hpp"
 
diff --git a/Core/src/Geometry/GeometryIdentifier.cpp b/Core/src/Geometry/GeometryIdentifier.cpp
index 967a291af83..81f7e5aa886 100644
--- a/Core/src/Geometry/GeometryIdentifier.cpp
+++ b/Core/src/Geometry/GeometryIdentifier.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2019-2020 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include "Acts/Geometry/GeometryIdentifier.hpp"
 
diff --git a/Core/src/Geometry/GlueVolumesDescriptor.cpp b/Core/src/Geometry/GlueVolumesDescriptor.cpp
index 129e9c71251..7fbd9a5b50a 100644
--- a/Core/src/Geometry/GlueVolumesDescriptor.cpp
+++ b/Core/src/Geometry/GlueVolumesDescriptor.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2016-2018 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include "Acts/Geometry/GlueVolumesDescriptor.hpp"
 
diff --git a/Core/src/Geometry/GridPortalLink.cpp b/Core/src/Geometry/GridPortalLink.cpp
new file mode 100644
index 00000000000..632289d9dc3
--- /dev/null
+++ b/Core/src/Geometry/GridPortalLink.cpp
@@ -0,0 +1,423 @@
+// This file is part of the ACTS project.
+//
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
+//
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
+
+#include "Acts/Geometry/GridPortalLink.hpp"
+
+#include "Acts/Surfaces/PlaneSurface.hpp"
+#include "Acts/Surfaces/RadialBounds.hpp"
+
+#include <numbers>
+
+namespace Acts {
+
+std::unique_ptr<GridPortalLink> GridPortalLink::make(
+    const std::shared_ptr<RegularSurface>& surface, TrackingVolume& volume,
+    BinningValue direction) {
+  std::unique_ptr<GridPortalLink> grid;
+
+  if (const auto* cylinder =
+          dynamic_cast<const CylinderSurface*>(surface.get());
+      cylinder != nullptr) {
+    if (direction == BinningValue::binRPhi) {
+      ActsScalar r = cylinder->bounds().get(CylinderBounds::eR);
+      if (cylinder->bounds().coversFullAzimuth()) {
+        grid = GridPortalLink::make(
+            surface, direction,
+            Axis{AxisClosed, -std::numbers::pi * r, std::numbers::pi * r, 1});
+      } else {
+        ActsScalar hlPhi =
+            cylinder->bounds().get(CylinderBounds::eHalfPhiSector);
+
+        grid = GridPortalLink::make(surface, direction,
+                                    Axis{AxisBound, -hlPhi * r, hlPhi * r, 1});
+      }
+    } else if (direction == BinningValue::binZ) {
+      ActsScalar hlZ = cylinder->bounds().get(CylinderBounds::eHalfLengthZ);
+      grid = GridPortalLink::make(surface, direction,
+                                  Axis{AxisBound, -hlZ, hlZ, 1});
+    } else {
+      throw std::invalid_argument{"Invalid binning direction"};
+    }
+  } else if (const auto* disc = dynamic_cast<const DiscSurface*>(surface.get());
+             disc != nullptr) {
+    const auto& bounds = dynamic_cast<const RadialBounds&>(disc->bounds());
+    if (direction == BinningValue::binR) {
+      ActsScalar minR = bounds.get(RadialBounds::eMinR);
+      ActsScalar maxR = bounds.get(RadialBounds::eMaxR);
+      grid = GridPortalLink::make(surface, direction,
+                                  Axis{AxisBound, minR, maxR, 1});
+    } else if (direction == BinningValue::binPhi) {
+      if (bounds.coversFullAzimuth()) {
+        grid = GridPortalLink::make(
+            surface, direction,
+            Axis{AxisClosed, -std::numbers::pi, std::numbers::pi, 1});
+      } else {
+        ActsScalar hlPhi = bounds.get(RadialBounds::eHalfPhiSector);
+        grid = GridPortalLink::make(surface, direction,
+                                    Axis{AxisBound, -hlPhi, hlPhi, 1});
+      }
+    } else {
+      throw std::invalid_argument{"Invalid binning direction"};
+    }
+  } else if (const auto* plane =
+                 dynamic_cast<const PlaneSurface*>(surface.get());
+             plane != nullptr) {
+    throw std::invalid_argument{"Plane surface is not implemented yet"};
+
+  } else {
+    throw std::invalid_argument{"Surface type is not supported"};
+  }
+
+  assert(grid != nullptr);
+  grid->setVolume(&volume);
+
+  return grid;
+}
+
+void GridPortalLink::checkConsistency(const CylinderSurface& cyl) const {
+  if (cyl.bounds().get(CylinderBounds::eAveragePhi) != 0) {
+    throw std::invalid_argument(
+        "GridPortalLink: CylinderBounds: only average phi == 0 is "
+        "supported. Rotate the cylinder surface.");
+  }
+
+  constexpr auto tolerance = s_onSurfaceTolerance;
+  auto same = [](auto a, auto b) { return std::abs(a - b) < tolerance; };
+
+  auto checkZ = [&cyl, same](const IAxis& axis) {
+    ActsScalar hlZ = cyl.bounds().get(CylinderBounds::eHalfLengthZ);
+    if (!same(axis.getMin(), -hlZ) || !same(axis.getMax(), hlZ)) {
+      throw std::invalid_argument(
+          "GridPortalLink: CylinderBounds: invalid length setup: " +
+          std::to_string(axis.getMin()) + " != " + std::to_string(-hlZ) +
+          " or " + std::to_string(axis.getMax()) +
+          " != " + std::to_string(hlZ));
+    }
+  };
+  auto checkRPhi = [&cyl, same](const IAxis& axis) {
+    ActsScalar hlPhi = cyl.bounds().get(CylinderBounds::eHalfPhiSector);
+    ActsScalar r = cyl.bounds().get(CylinderBounds::eR);
+    if (ActsScalar hlRPhi = r * hlPhi;
+        !same(axis.getMin(), -hlRPhi) || !same(axis.getMax(), hlRPhi)) {
+      throw std::invalid_argument(
+          "GridPortalLink: CylinderBounds: invalid phi sector setup: axes "
+          "don't match bounds");
+    }
+
+    // If full cylinder, make sure axis wraps around
+    if (same(hlPhi, std::numbers::pi)) {
+      if (axis.getBoundaryType() != AxisBoundaryType::Closed) {
+        throw std::invalid_argument(
+            "GridPortalLink: CylinderBounds: invalid phi sector setup: "
+            "axis is not closed.");
+      }
+    } else {
+      if (axis.getBoundaryType() == AxisBoundaryType::Closed) {
+        throw std::invalid_argument(
+            "GridPortalLink: CylinderBounds: invalid phi sector setup: "
+            "axis is closed.");
+      }
+    }
+  };
+
+  if (dim() == 1) {
+    const IAxis& axisLoc0 = *grid().axes().front();
+    if (direction() == BinningValue::binRPhi) {
+      checkRPhi(axisLoc0);
+    } else {
+      checkZ(axisLoc0);
+    }
+  } else {  // DIM == 2
+    const auto& axisLoc0 = *grid().axes().front();
+    const auto& axisLoc1 = *grid().axes().back();
+    checkRPhi(axisLoc0);
+    checkZ(axisLoc1);
+  }
+}
+
+void GridPortalLink::checkConsistency(const DiscSurface& disc) const {
+  constexpr auto tolerance = s_onSurfaceTolerance;
+  auto same = [](auto a, auto b) { return std::abs(a - b) < tolerance; };
+
+  const auto* bounds = dynamic_cast<const RadialBounds*>(&disc.bounds());
+  if (bounds == nullptr) {
+    throw std::invalid_argument(
+        "GridPortalLink: DiscBounds: invalid bounds type.");
+  }
+
+  if (bounds->get(RadialBounds::eAveragePhi) != 0) {
+    throw std::invalid_argument(
+        "GridPortalLink: DiscBounds: only average phi == 0 is supported. "
+        "Rotate the disc surface.");
+  }
+
+  auto checkR = [&bounds, same](const IAxis& axis) {
+    ActsScalar minR = bounds->get(RadialBounds::eMinR);
+    ActsScalar maxR = bounds->get(RadialBounds::eMaxR);
+    if (!same(axis.getMin(), minR) || !same(axis.getMax(), maxR)) {
+      throw std::invalid_argument(
+          "GridPortalLink: DiscBounds: invalid radius setup.");
+    }
+  };
+
+  auto checkPhi = [&bounds, same](const IAxis& axis) {
+    ActsScalar hlPhi = bounds->get(RadialBounds::eHalfPhiSector);
+    if (!same(axis.getMin(), -hlPhi) || !same(axis.getMax(), hlPhi)) {
+      throw std::invalid_argument(
+          "GridPortalLink: DiscBounds: invalid phi sector setup.");
+    }
+    // If full disc, make sure axis wraps around
+    if (same(hlPhi, std::numbers::pi)) {
+      if (axis.getBoundaryType() != Acts::AxisBoundaryType::Closed) {
+        throw std::invalid_argument(
+            "GridPortalLink: DiscBounds: invalid phi sector setup: axis is "
+            "not closed.");
+      }
+    } else {
+      if (axis.getBoundaryType() == Acts::AxisBoundaryType::Closed) {
+        throw std::invalid_argument(
+            "GridPortalLink: DiscBounds: invalid phi sector setup: axis "
+            "is closed.");
+      }
+    }
+  };
+
+  if (dim() == 1) {
+    const IAxis& axisLoc0 = *grid().axes().front();
+    if (direction() == BinningValue::binR) {
+      checkR(axisLoc0);
+    } else {
+      checkPhi(axisLoc0);
+    }
+  } else {  // DIM == 2
+    const auto& axisLoc0 = *grid().axes().front();
+    const auto& axisLoc1 = *grid().axes().back();
+    checkR(axisLoc0);
+    checkPhi(axisLoc1);
+  }
+}
+
+void GridPortalLink::printContents(std::ostream& os) const {
+  std::size_t dim = grid().axes().size();
+  os << "----- GRID " << dim << "d -----" << std::endl;
+  os << grid() << " along " << direction() << std::endl;
+
+  auto lpad = [](const std::string& s, std::size_t n) {
+    return s.size() < n ? std::string(n - s.size(), ' ') + s : s;
+  };
+
+  auto rpad = [](const std::string& s, std::size_t n) {
+    return s.size() < n ? s + std::string(n - s.size(), ' ') : s;
+  };
+
+  std::string loc0;
+  std::string loc1;
+
+  bool flipped = false;
+
+  if (surface().type() == Surface::Cylinder) {
+    loc0 = "rPhi";
+    loc1 = "z";
+    flipped = direction() != BinningValue::binRPhi;
+  } else if (surface().type() == Surface::Disc) {
+    loc0 = "r";
+    loc1 = "phi";
+    flipped = direction() != BinningValue::binR;
+  } else if (surface().type() == Surface::Plane) {
+    loc0 = "x";
+    loc1 = "y";
+    flipped = direction() != BinningValue::binX;
+  } else {
+    throw std::invalid_argument{"Unsupported surface type"};
+  }
+
+  if (dim == 1) {
+    auto loc = numLocalBins();
+
+    if (flipped) {
+      os << lpad(loc1, 4) << " > " << lpad("i=0", 10) << " ";
+      for (std::size_t i = 1; i <= loc.at(0) + 1; i++) {
+        os << lpad("i=" + std::to_string(i), 13) + " ";
+      }
+      os << std::endl;
+
+      os << std::string(4, ' ');
+      for (std::size_t i = 0; i <= loc.at(0) + 1; i++) {
+        std::string name = "0x0";
+        if (const auto* v = atLocalBins({i}); v != nullptr) {
+          name = v->volumeName();
+        }
+        name = name.substr(0, std::min(name.size(), std::size_t{13}));
+        os << lpad(name, 13) << " ";
+      }
+      os << std::endl;
+
+    } else {
+      os << "v " << loc0 << std::endl;
+      for (std::size_t i = 0; i <= loc.at(0) + 1; i++) {
+        os << "i=" << i << " ";
+        std::string name = "0x0";
+        if (const auto* v = atLocalBins({i}); v != nullptr) {
+          name = v->volumeName();
+        }
+        name = name.substr(0, std::min(name.size(), std::size_t{13}));
+        os << lpad(name, 13) << " ";
+        os << std::endl;
+      }
+    }
+
+  } else {
+    auto loc = numLocalBins();
+    os << rpad("v " + loc0 + "|" + loc1 + " >", 14) + "j=0 ";
+    for (std::size_t j = 1; j <= loc.at(1) + 1; j++) {
+      os << lpad("j=" + std::to_string(j), 13) << " ";
+    }
+    os << std::endl;
+    for (std::size_t i = 0; i <= loc.at(0) + 1; i++) {
+      os << "i=" << i << " ";
+      for (std::size_t j = 0; j <= loc.at(1) + 1; j++) {
+        std::string name = "0x0";
+        if (const auto* v = atLocalBins({i, j}); v != nullptr) {
+          name = v->volumeName();
+        }
+        name = name.substr(0, std::min(name.size(), std::size_t{13}));
+        os << lpad(name, 13) << " ";
+      }
+      os << std::endl;
+    }
+  }
+}
+
+void GridPortalLink::fillGrid1dTo2d(FillDirection dir,
+                                    const GridPortalLink& grid1d,
+                                    GridPortalLink& grid2d) {
+  const auto locSource = grid1d.numLocalBins();
+  const auto locDest = grid2d.numLocalBins();
+  assert(locSource.size() == 1);
+  assert(locDest.size() == 2);
+
+  for (std::size_t i = 0; i <= locSource[0] + 1; ++i) {
+    const TrackingVolume* source = grid1d.atLocalBins({i});
+
+    if (dir == FillDirection::loc1) {
+      for (std::size_t j = 0; j <= locDest[1] + 1; ++j) {
+        grid2d.atLocalBins({i, j}) = source;
+      }
+    } else if (dir == FillDirection::loc0) {
+      for (std::size_t j = 0; j <= locDest[0] + 1; ++j) {
+        grid2d.atLocalBins({j, i}) = source;
+      }
+    }
+  }
+}
+
+std::unique_ptr<GridPortalLink> GridPortalLink::extendTo2dImpl(
+    const std::shared_ptr<CylinderSurface>& surface, const IAxis* other) const {
+  assert(dim() == 1);
+  if (direction() == BinningValue::binRPhi) {
+    const auto& axisRPhi = *grid().axes().front();
+    // 1D direction is binRPhi, so add a Z axis
+    ActsScalar hlZ = surface->bounds().get(CylinderBounds::eHalfLengthZ);
+
+    auto grid = axisRPhi.visit([&](const auto& axis0) {
+      Axis axisZ{AxisBound, -hlZ, hlZ, 1};
+      const IAxis* axis = other != nullptr ? other : &axisZ;
+      return axis->visit(
+          [&surface,
+           &axis0](const auto& axis1) -> std::unique_ptr<GridPortalLink> {
+            return GridPortalLink::make(surface, axis0, axis1);
+          });
+    });
+
+    fillGrid1dTo2d(FillDirection::loc1, *this, *grid);
+    return grid;
+
+  } else {
+    const auto& axisZ = *grid().axes().front();
+    // 1D direction is binZ, so add an rPhi axis
+    ActsScalar r = surface->bounds().get(CylinderBounds::eR);
+    ActsScalar hlPhi = surface->bounds().get(CylinderBounds::eHalfPhiSector);
+    ActsScalar hlRPhi = r * hlPhi;
+
+    auto makeGrid = [&](auto bdt) {
+      auto grid = axisZ.visit([&](const auto& axis1) {
+        Axis axisRPhi{bdt, -hlRPhi, hlRPhi, 1};
+        const IAxis* axis = other != nullptr ? other : &axisRPhi;
+        return axis->visit(
+            [&](const auto& axis0) -> std::unique_ptr<GridPortalLink> {
+              return GridPortalLink::make(surface, axis0, axis1);
+            });
+      });
+
+      fillGrid1dTo2d(FillDirection::loc0, *this, *grid);
+      return grid;
+    };
+
+    if (surface->bounds().coversFullAzimuth()) {
+      return makeGrid(AxisClosed);
+    } else {
+      return makeGrid(AxisBound);
+    }
+  }
+}
+
+std::unique_ptr<GridPortalLink> GridPortalLink::extendTo2dImpl(
+    const std::shared_ptr<DiscSurface>& surface, const IAxis* other) const {
+  assert(dim() == 1);
+
+  const auto* bounds = dynamic_cast<const RadialBounds*>(&surface->bounds());
+  if (bounds == nullptr) {
+    throw std::invalid_argument(
+        "GridPortalLink: DiscBounds: invalid bounds type.");
+  }
+
+  if (direction() == BinningValue::binR) {
+    const auto& axisR = *grid().axes().front();
+    // 1D direction is binR, so add a phi axis
+    ActsScalar hlPhi = bounds->get(RadialBounds::eHalfPhiSector);
+
+    auto makeGrid = [&](auto bdt) {
+      auto grid = axisR.visit([&](const auto& axis0) {
+        Axis axisPhi{bdt, -hlPhi, hlPhi, 1};
+        const IAxis* axis = other != nullptr ? other : &axisPhi;
+        return axis->visit(
+            [&](const auto& axis1) -> std::unique_ptr<GridPortalLink> {
+              return GridPortalLink::make(surface, axis0, axis1);
+            });
+      });
+
+      fillGrid1dTo2d(FillDirection::loc1, *this, *grid);
+      return grid;
+    };
+
+    if (bounds->coversFullAzimuth()) {
+      return makeGrid(AxisClosed);
+    } else {
+      return makeGrid(AxisBound);
+    }
+  } else {
+    const auto& axisPhi = *grid().axes().front();
+    // 1D direction is binPhi, so add an R axis
+    ActsScalar rMin = bounds->get(RadialBounds::eMinR);
+    ActsScalar rMax = bounds->get(RadialBounds::eMaxR);
+
+    auto grid = axisPhi.visit([&](const auto& axis1) {
+      Axis axisR{AxisBound, rMin, rMax, 1};
+      const IAxis* axis = other != nullptr ? other : &axisR;
+      return axis->visit(
+          [&surface,
+           &axis1](const auto& axis0) -> std::unique_ptr<GridPortalLink> {
+            return GridPortalLink::make(surface, axis0, axis1);
+          });
+    });
+    fillGrid1dTo2d(FillDirection::loc0, *this, *grid);
+    return grid;
+  }
+}
+
+}  // namespace Acts
diff --git a/Core/src/Geometry/GridPortalLinkMerging.cpp b/Core/src/Geometry/GridPortalLinkMerging.cpp
new file mode 100644
index 00000000000..1a828e71176
--- /dev/null
+++ b/Core/src/Geometry/GridPortalLinkMerging.cpp
@@ -0,0 +1,572 @@
+// This file is part of the ACTS project.
+//
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
+//
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
+
+#include "Acts/Definitions/Tolerance.hpp"
+#include "Acts/Geometry/CompositePortalLink.hpp"
+#include "Acts/Geometry/GridPortalLink.hpp"
+#include "Acts/Surfaces/CylinderSurface.hpp"
+#include "Acts/Surfaces/DiscSurface.hpp"
+#include "Acts/Surfaces/PlaneSurface.hpp"
+#include "Acts/Surfaces/RadialBounds.hpp"
+
+#include <algorithm>
+#include <cassert>
+#include <limits>
+#include <memory>
+#include <stdexcept>
+
+namespace Acts {
+
+namespace {
+
+template <typename... Args>
+std::unique_ptr<GridPortalLink> makeGrid(
+    const std::shared_ptr<RegularSurface>& surface, BinningValue direction,
+    const Logger& logger, std::tuple<Args...> args, const IAxis* otherAxis,
+    bool prepend) {
+  // @TODO: PlaneSurface support
+
+  ACTS_VERBOSE("Make resulting merged grid");
+
+  // This is to make it possible to construct Axis with the tuple arguments
+  auto axisFactory = []<typename... Ts>(Ts&&... axisArgs) {
+    return Axis{std::forward<Ts>(axisArgs)...};
+  };
+
+  // Avoid copy-pasting identical code twice below
+  auto makeGrid = [&](auto boundaryType) -> std::unique_ptr<GridPortalLink> {
+    auto axisArgs = std::tuple_cat(std::tuple{boundaryType}, std::move(args));
+    auto merged = std::apply(axisFactory, std::move(axisArgs));
+
+    if (otherAxis == nullptr) {
+      // No other axis
+      ACTS_VERBOSE("    ~> merged axis: " << merged);
+      return GridPortalLink::make(surface, direction, std::move(merged));
+    } else {
+      return otherAxis->visit(
+          [&](const auto& axis) -> std::unique_ptr<GridPortalLink> {
+            if (prepend) {
+              ACTS_VERBOSE("    ~> other axis (prepend): " << axis);
+              ACTS_VERBOSE("    ~> merged axis: " << merged);
+              return GridPortalLink::make(surface, axis, std::move(merged));
+            } else {
+              ACTS_VERBOSE("    ~> merged axis: " << merged);
+              ACTS_VERBOSE("    ~> other axis (append): " << axis);
+              return GridPortalLink::make(surface, std::move(merged), axis);
+            }
+          });
+    }
+  };
+
+  // Check if we're in the cylinder or disc case, and the resulting bounds wrap
+  // around and should have closed binning
+  if (direction == BinningValue::binPhi || direction == BinningValue::binRPhi) {
+    if (const auto* cylinder =
+            dynamic_cast<const CylinderSurface*>(surface.get());
+        cylinder != nullptr) {
+      if (cylinder->bounds().coversFullAzimuth()) {
+        return makeGrid(AxisClosed);
+      }
+    } else if (const auto* disc =
+                   dynamic_cast<const DiscSurface*>(surface.get());
+               disc != nullptr) {
+      const auto& radialBounds =
+          dynamic_cast<const RadialBounds&>(disc->bounds());
+      if (radialBounds.coversFullAzimuth()) {
+        return makeGrid(AxisClosed);
+      }
+    }
+  }
+
+  return makeGrid(AxisBound);
+}
+
+std::unique_ptr<GridPortalLink> mergeVariable(
+    const std::shared_ptr<RegularSurface>& mergedSurface, const IAxis& axisA,
+    const IAxis& axisB, ActsScalar /*tolerance*/, BinningValue direction,
+    const Logger& logger, const IAxis* otherAxis, bool prepend) {
+  ACTS_VERBOSE("Variable merge: direction is " << direction);
+
+  ACTS_VERBOSE("~> axis a: " << axisA);
+  ACTS_VERBOSE("~> axis b: " << axisB);
+
+  std::vector<ActsScalar> binEdges;
+
+  binEdges.reserve(axisA.getNBins() + axisB.getNBins() + 1);
+
+  auto edgesA = axisA.getBinEdges();
+
+  if (direction == BinningValue::binR) {
+    ACTS_VERBOSE("Performing asymmetric merge");
+    std::ranges::copy(edgesA, std::back_inserter(binEdges));
+
+  } else {
+    ACTS_VERBOSE("Performing symmetrized merge");
+    ActsScalar halfWidth =
+        (axisA.getMax() - axisA.getMin() + axisB.getMax() - axisB.getMin()) /
+        2.0;
+    ACTS_VERBOSE("    ~> half width: " << halfWidth);
+
+    ActsScalar shift = axisA.getMax() - halfWidth;
+    ACTS_VERBOSE("    ~> shift: " << shift);
+
+    std::ranges::transform(edgesA, std::back_inserter(binEdges),
+                           [&](ActsScalar edge) { return edge + shift; });
+  }
+
+  ActsScalar stitchPoint = binEdges.back();
+  auto edgesB = axisB.getBinEdges();
+  std::transform(
+      std::next(edgesB.begin()), edgesB.end(), std::back_inserter(binEdges),
+      [&](ActsScalar edge) { return edge - axisB.getMin() + stitchPoint; });
+
+  return makeGrid(mergedSurface, direction, logger,
+                  std::tuple{std::move(binEdges)}, otherAxis, prepend);
+}
+
+std::unique_ptr<GridPortalLink> mergeEquidistant(
+    const std::shared_ptr<RegularSurface>& mergedSurface, const IAxis& axisA,
+    const IAxis& axisB, ActsScalar tolerance, BinningValue direction,
+    const Logger& logger, const IAxis* otherAxis, bool prepend) {
+  ACTS_VERBOSE("===> potentially equidistant merge: checking bin widths");
+
+  ACTS_VERBOSE("~> axis a: " << axisA);
+  ACTS_VERBOSE("~> axis b: " << axisB);
+
+  ActsScalar binsWidthA = (axisA.getMax() - axisA.getMin()) /
+                          static_cast<ActsScalar>(axisA.getNBins());
+  ActsScalar binsWidthB = (axisB.getMax() - axisB.getMin()) /
+                          static_cast<ActsScalar>(axisB.getNBins());
+
+  ACTS_VERBOSE("  ~> binWidths: " << binsWidthA << " vs " << binsWidthB);
+
+  if (std::abs(binsWidthA - binsWidthB) < tolerance) {
+    ACTS_VERBOSE("==> binWidths same: " << binsWidthA);
+
+    ActsScalar min = std::numeric_limits<ActsScalar>::signaling_NaN();
+    ActsScalar max = std::numeric_limits<ActsScalar>::signaling_NaN();
+
+    if (direction == BinningValue::binR) {
+      ACTS_VERBOSE("Performing asymmetric merge");
+      min = axisA.getMin();
+      max = axisB.getMax();
+    } else {
+      ACTS_VERBOSE("Performing symmetrized merge");
+
+      ActsScalar halfWidth =
+          (axisA.getMax() - axisA.getMin() + axisB.getMax() - axisB.getMin()) /
+          2.0;
+
+      min = -halfWidth;
+      max = halfWidth;
+    }
+
+    return makeGrid(mergedSurface, direction, logger,
+                    std::tuple{min, max, axisA.getNBins() + axisB.getNBins()},
+                    otherAxis, prepend);
+
+  } else {
+    ACTS_VERBOSE("==> binWidths differ: " << binsWidthA << " vs " << binsWidthB
+                                          << " ~> variable merge");
+
+    std::unique_ptr<GridPortalLink> mergedPortalLink =
+        mergeVariable(mergedSurface, axisA, axisB, tolerance, direction, logger,
+                      otherAxis, prepend);
+    return mergedPortalLink;
+  }
+}
+
+std::unique_ptr<GridPortalLink> colinearMerge(
+    const std::shared_ptr<RegularSurface>& mergedSurface, const IAxis& axisA,
+    const IAxis& axisB, ActsScalar tolerance, BinningValue direction,
+    const Logger& logger, const IAxis* otherAxis, bool prepend) {
+  AxisType aType = axisA.getType();
+  AxisType bType = axisB.getType();
+  if (axisA.getBoundaryType() != axisB.getBoundaryType()) {
+    ACTS_WARNING("AxisBoundaryTypes are different");
+    return nullptr;
+  }
+
+  if (axisA.getBoundaryType() != AxisBoundaryType::Bound) {
+    ACTS_WARNING("AxisBoundaryType is not Bound, cannot do colinear merge");
+    return nullptr;
+  }
+
+  // convenience only
+  auto mergeVariableLocal = [&] {
+    return mergeVariable(mergedSurface, axisA, axisB, tolerance, direction,
+                         logger, otherAxis, prepend);
+  };
+
+  if (aType == AxisType::Equidistant && bType == AxisType::Equidistant) {
+    auto mergedPortalLink =
+        mergeEquidistant(mergedSurface, axisA, axisB, tolerance, direction,
+                         logger, otherAxis, prepend);
+    return mergedPortalLink;
+  } else if (aType == AxisType::Variable && bType == AxisType::Variable) {
+    ACTS_VERBOSE("===> variable merge");
+    auto mergedPortalLink = mergeVariableLocal();
+    return mergedPortalLink;
+  } else if (aType == AxisType::Equidistant && bType == AxisType::Variable) {
+    ACTS_VERBOSE("===> mixed merged");
+    auto mergedPortalLink = mergeVariableLocal();
+    return mergedPortalLink;
+  } else {
+    ACTS_VERBOSE("===> mixed merged");
+    auto mergedPortalLink = mergeVariableLocal();
+    return mergedPortalLink;
+  }
+}
+
+std::unique_ptr<PortalLinkBase> mergeGridPortals(
+    const GridPortalLink* a, const GridPortalLink* b,
+    const RegularSurface* surfaceA, const RegularSurface* surfaceB,
+    BinningValue loc0, BinningValue loc1, BinningValue direction,
+    const Logger& logger) {
+  assert(surfaceA != nullptr);
+  assert(surfaceB != nullptr);
+  assert(surfaceA->type() == surfaceB->type());
+  assert(a->dim() == 2 || a->dim() == 1);
+  assert(a->dim() == b->dim());
+
+  ACTS_VERBOSE(" - a: " << a->surface().bounds());
+  ACTS_VERBOSE(" - b: " << b->surface().bounds());
+
+  // This tolerance is used checking bin equivalence. It's not intended to be
+  // user configurable, as we don't foresee cases where the tolerance would have
+  // to be adjusteed to the input geometry.
+  constexpr auto tolerance = s_onSurfaceTolerance;
+
+  std::shared_ptr<RegularSurface> mergedSurface = nullptr;
+  bool reversed = false;
+
+  if (const auto* cylinderA = dynamic_cast<const CylinderSurface*>(surfaceA);
+      cylinderA != nullptr) {
+    std::tie(mergedSurface, reversed) =
+        cylinderA->mergedWith(dynamic_cast<const CylinderSurface&>(*surfaceB),
+                              direction, true, logger);
+  } else if (const auto* discA = dynamic_cast<const DiscSurface*>(surfaceA);
+             discA != nullptr) {
+    std::tie(mergedSurface, reversed) = discA->mergedWith(
+        dynamic_cast<const DiscSurface&>(*surfaceB), direction, true, logger);
+  } else if (const auto* planeA = dynamic_cast<const PlaneSurface*>(surfaceA);
+             planeA != nullptr) {
+    throw std::logic_error{"Plane surfaces not implemented yet"};
+  } else {
+    throw std::invalid_argument{"Unsupported surface type"};
+  }
+
+  ACTS_VERBOSE("Merged surface: " << mergedSurface->bounds());
+  ACTS_VERBOSE("~> reversed? " << std::boolalpha << reversed);
+
+  // Normalize ordering of grid portals and surfaces: a is always at lower
+  // range than b
+  if (reversed) {
+    ACTS_VERBOSE("Swapping grid portals and surfaces after merging");
+    std::swap(surfaceA, surfaceB);
+    std::swap(a, b);
+  }
+
+  // We do this here, because this is the only place where we've normalized
+  // the ordering of grids just above: a is always "before" b, so we can
+  // iterate over the bins in a unified way to fill the merged grid.
+  auto fillGrid = [&](std::unique_ptr<GridPortalLink> merged) {
+    if (merged != nullptr) {
+      ACTS_VERBOSE("Post processing merged grid: " << merged->grid());
+      GridPortalLink::fillMergedGrid(*a, *b, *merged, direction, logger);
+    }
+    return merged;
+  };
+
+  if (a->dim() == 1) {
+    ACTS_VERBOSE("Merge two 1D GridPortalLinks on " << surfaceA->name()
+                                                    << "s in " << direction);
+    if (a->direction() != b->direction()) {
+      ACTS_VERBOSE("GridPortalLinks have different directions");
+      ACTS_VERBOSE("=> cross merge");
+
+      // Find the one which is already binned in the merging direction
+      const auto* aligned = a->direction() == direction ? a : b;
+      const auto* alignedSurface =
+          a->direction() == direction ? surfaceA : surfaceB;
+      const auto* other = a->direction() == direction ? b : a;
+      const auto* otherSurface =
+          a->direction() == direction ? surfaceB : surfaceA;
+
+      // Extend the aligned one by the other one's axis
+      auto aligned2D = aligned->extendTo2d(other->grid().axes().front());
+      // Edtend the other one with a single bin
+      auto other2D = other->extendTo2d(nullptr);
+
+      assert(aligned2D != nullptr);
+      assert(other2D != nullptr);
+
+      ACTS_VERBOSE("Expanded grids:");
+      ACTS_VERBOSE(" - aligned: " << aligned2D->grid());
+      ACTS_VERBOSE(" - other: " << other2D->grid());
+
+      // @Fix ordering (a,b) should already be in good order, to save us one additional roundtrip
+      if (a->direction() == direction) {
+        return mergeGridPortals(aligned2D.get(), other2D.get(), alignedSurface,
+                                otherSurface, loc0, loc1, direction, logger);
+      } else {
+        return mergeGridPortals(other2D.get(), aligned2D.get(), otherSurface,
+                                alignedSurface, loc0, loc1, direction, logger);
+      }
+    }
+
+    const auto& axisA = *a->grid().axes().front();
+    const auto& axisB = *b->grid().axes().front();
+
+    if (direction == loc0) {
+      ACTS_VERBOSE("Grids are binned along " << a->direction());
+      if (a->direction() == loc0) {
+        ACTS_VERBOSE("=> colinear merge");
+
+        return fillGrid(colinearMerge(mergedSurface, axisA, axisB, tolerance,
+                                      loc0, logger, nullptr, false));
+
+      } else {
+        ACTS_VERBOSE("=> parallel merge");
+
+        auto a2D = a->extendTo2d(nullptr);
+        auto b2D = b->extendTo2d(nullptr);
+        assert(a2D != nullptr);
+        assert(b2D != nullptr);
+
+        ACTS_VERBOSE("Expanded grids:");
+        ACTS_VERBOSE(" - a: " << a2D->grid());
+        ACTS_VERBOSE(" - b: " << b2D->grid());
+
+        return mergeGridPortals(a2D.get(), b2D.get(), surfaceA, surfaceB, loc0,
+                                loc1, direction, logger);
+      }
+    } else if (direction == loc1) {
+      ACTS_VERBOSE("Grids are binned along " << a->direction());
+      if (a->direction() == loc1) {
+        ACTS_VERBOSE("=> colinear merge");
+
+        return fillGrid(colinearMerge(mergedSurface, axisA, axisB, tolerance,
+                                      loc1, logger, nullptr, false));
+
+      } else {
+        ACTS_VERBOSE("=> parallel merge");
+        auto a2D = a->extendTo2d(nullptr);
+        auto b2D = b->extendTo2d(nullptr);
+        assert(a2D != nullptr);
+        assert(b2D != nullptr);
+
+        ACTS_VERBOSE("Expanded grids:");
+        ACTS_VERBOSE(" - a: " << a2D->grid());
+        ACTS_VERBOSE(" - b: " << b2D->grid());
+        return mergeGridPortals(a2D.get(), b2D.get(), surfaceA, surfaceB, loc0,
+                                loc1, direction, logger);
+      }
+
+    } else {
+      ACTS_ERROR("Invalid binning direction: " << direction);
+      throw std::invalid_argument{"Invalid binning direction"};
+    }
+  } else {
+    ACTS_VERBOSE("Merging two 2D GridPortalLinks on "
+                 << surfaceA->name() << "s in " << direction << " direction");
+
+    const auto& loc0AxisA = *a->grid().axes().front();
+    const auto& loc1AxisA = *a->grid().axes().back();
+    const auto& loc0AxisB = *b->grid().axes().front();
+    const auto& loc1AxisB = *b->grid().axes().back();
+
+    if (direction == loc0) {
+      ACTS_VERBOSE("=> colinear merge along " << loc0);
+      ACTS_VERBOSE("--> Checking if " << loc1 << " axes are identical");
+
+      if (loc1AxisA != loc1AxisB) {
+        ACTS_WARNING("    ~> "
+                     << loc1
+                     << " axes are not identical, falling back to composite "
+                        "merging");
+        return nullptr;
+      }
+      ACTS_VERBOSE("    ~> they are!");
+
+      ACTS_VERBOSE("    ~> " << loc1 << " axis: " << loc1AxisA);
+      return fillGrid(colinearMerge(mergedSurface, loc0AxisA, loc0AxisB,
+                                    tolerance, loc0, logger, &loc1AxisA,
+                                    false));
+
+    } else if (direction == loc1) {
+      ACTS_VERBOSE("=> colinear merge along " << loc1);
+      ACTS_VERBOSE("--> Checking if " << loc0 << " axes are identical");
+
+      if (loc0AxisA != loc0AxisB) {
+        ACTS_WARNING("    ~> "
+                     << loc0
+                     << " axes are not identical, falling back to composite "
+                        "merging");
+        return nullptr;
+      }
+      ACTS_VERBOSE("    ~> they are!");
+
+      ACTS_VERBOSE("    ~> " << loc0 << " axis: " << loc0AxisA);
+      return fillGrid(colinearMerge(mergedSurface, loc1AxisA, loc1AxisB,
+                                    tolerance, loc1, logger, &loc0AxisA, true));
+
+    } else {
+      ACTS_ERROR("Invalid binning direction: " << a->direction());
+      throw std::invalid_argument{"Invalid binning direction"};
+    }
+  }
+}
+
+std::unique_ptr<PortalLinkBase> mergeGridPortals(const GridPortalLink* a,
+                                                 const GridPortalLink* b,
+                                                 BinningValue direction,
+                                                 const Logger& logger) {
+  using enum BinningValue;
+  assert(a->dim() == 2 || a->dim() == 1);
+  assert(b->dim() == 2 || b->dim() == 1);
+
+  if (a->dim() < b->dim()) {
+    return mergeGridPortals(b, a, direction, logger);
+  }
+
+  ACTS_VERBOSE("Merging GridPortalLinks along " << direction << ":");
+  ACTS_VERBOSE(" - a: " << a->grid() << " along: " << a->direction());
+  ACTS_VERBOSE(" - b: " << b->grid() << " along: " << b->direction());
+
+  const auto* cylinder = dynamic_cast<const CylinderSurface*>(&a->surface());
+  const auto* disc = dynamic_cast<const DiscSurface*>(&a->surface());
+
+  if (a->dim() == b->dim()) {
+    ACTS_VERBOSE("Grid both have same dimension: " << a->dim());
+
+    if (cylinder != nullptr) {
+      return mergeGridPortals(
+          a, b, cylinder, &dynamic_cast<const CylinderSurface&>(b->surface()),
+          binRPhi, binZ, direction, logger);
+    } else if (disc != nullptr) {
+      return mergeGridPortals(a, b, disc,
+                              &dynamic_cast<const DiscSurface&>(b->surface()),
+                              binR, binPhi, direction, logger);
+    } else {
+      // @TODO: Support PlaneSurface
+      ACTS_VERBOSE("Surface type is not supported here, falling back");
+      return nullptr;
+    }
+  } else {
+    ACTS_VERBOSE("Grids have different dimension, extending rhs to 2D");
+    const IAxis* otherAxis = nullptr;
+
+    if (b->direction() == direction) {
+      ACTS_VERBOSE("1D grid is binned in merging direction " << direction);
+      ACTS_VERBOSE("~> Adding complementary axis");
+
+      if (cylinder != nullptr) {
+        otherAxis = direction == binRPhi ? a->grid().axes().back()
+                                         : a->grid().axes().front();
+      } else if (disc != nullptr) {
+        otherAxis = direction == binR ? a->grid().axes().back()
+                                      : a->grid().axes().front();
+      } else {
+        ACTS_VERBOSE("Surface type is not supported here, falling back");
+        return nullptr;
+      }
+    } else {
+      ACTS_VERBOSE("1D grid is binned in complementary direction");
+    }
+
+    auto b2D = b->extendTo2d(otherAxis);
+    ACTS_VERBOSE("-> new grid: " << b2D->grid());
+    return mergeGridPortals(a, b2D.get(), direction, logger);
+  }
+}
+
+}  // namespace
+
+void GridPortalLink::fillMergedGrid(const GridPortalLink& a,
+                                    const GridPortalLink& b,
+                                    GridPortalLink& merged,
+                                    BinningValue direction,
+                                    const Logger& logger) {
+  ACTS_VERBOSE("Filling merged grid");
+  assert(a.dim() == b.dim());
+  assert(a.direction() == b.direction());
+  const auto locBinsA = a.numLocalBins();
+  const auto locBinsB = b.numLocalBins();
+
+  ACTS_VERBOSE("a: " << a.grid());
+  ACTS_VERBOSE("b: " << b.grid());
+  ACTS_VERBOSE("merged: " << merged.grid());
+
+  if (a.dim() == 1) {
+    std::size_t nBinsA = locBinsA.at(0);
+    std::size_t nBinsB = locBinsB.at(0);
+
+    for (std::size_t i = 1; i <= nBinsA; ++i) {
+      merged.atLocalBins({i}) = a.atLocalBins({i});
+    }
+    for (std::size_t i = 1; i <= nBinsB; ++i) {
+      merged.atLocalBins({nBinsA + i}) = b.atLocalBins({i});
+    }
+  } else {
+    if (a.direction() == direction) {
+      std::size_t nBinsA = locBinsA.at(0);
+      std::size_t nBinsB = locBinsB.at(0);
+      std::size_t nBinsCommon = locBinsB.at(1);
+
+      for (std::size_t i = 1; i <= nBinsA; ++i) {
+        for (std::size_t j = 1; j <= nBinsCommon; ++j) {
+          merged.atLocalBins({i, j}) = a.atLocalBins({i, j});
+        }
+      }
+
+      for (std::size_t i = 1; i <= nBinsB; ++i) {
+        for (std::size_t j = 1; j <= nBinsCommon; ++j) {
+          std::size_t ti = i + nBinsA;
+          merged.atLocalBins({ti, j}) = b.atLocalBins({i, j});
+        }
+      }
+    } else {
+      std::size_t nBinsA = locBinsA.at(1);
+      std::size_t nBinsB = locBinsB.at(1);
+      std::size_t nBinsCommon = locBinsB.at(0);
+
+      for (std::size_t i = 1; i <= nBinsCommon; ++i) {
+        for (std::size_t j = 1; j <= nBinsA; ++j) {
+          merged.atLocalBins({i, j}) = a.atLocalBins({i, j});
+        }
+      }
+
+      for (std::size_t i = 1; i <= nBinsCommon; ++i) {
+        for (std::size_t j = 1; j <= nBinsB; ++j) {
+          std::size_t tj = j + nBinsA;
+          merged.atLocalBins({i, tj}) = b.atLocalBins({i, j});
+        }
+      }
+    }
+  }
+}
+
+std::unique_ptr<PortalLinkBase> GridPortalLink::merge(const GridPortalLink& a,
+                                                      const GridPortalLink& b,
+                                                      BinningValue direction,
+                                                      const Logger& logger) {
+  ACTS_VERBOSE("Merging two GridPortalLinks");
+
+  checkMergePreconditions(a, b, direction);
+
+  auto merged = mergeGridPortals(&a, &b, direction, logger);
+  if (merged == nullptr) {
+    ACTS_WARNING("Grid merging failed returning nullptr");
+    return nullptr;
+  }
+
+  return merged;
+}
+
+}  // namespace Acts
diff --git a/Core/src/Geometry/KDTreeTrackingGeometryBuilder.cpp b/Core/src/Geometry/KDTreeTrackingGeometryBuilder.cpp
index 315c06de01c..75e2d50d4fa 100644
--- a/Core/src/Geometry/KDTreeTrackingGeometryBuilder.cpp
+++ b/Core/src/Geometry/KDTreeTrackingGeometryBuilder.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2022 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include "Acts/Geometry/KDTreeTrackingGeometryBuilder.hpp"
 
diff --git a/Core/src/Geometry/Layer.cpp b/Core/src/Geometry/Layer.cpp
index c88bfccb301..024f99e9c42 100644
--- a/Core/src/Geometry/Layer.cpp
+++ b/Core/src/Geometry/Layer.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2016-2018 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include "Acts/Geometry/Layer.hpp"
 
@@ -14,6 +14,7 @@
 #include "Acts/Propagator/Navigator.hpp"
 #include "Acts/Surfaces/BoundaryTolerance.hpp"
 #include "Acts/Surfaces/Surface.hpp"
+#include "Acts/Utilities/Helpers.hpp"
 #include "Acts/Utilities/Intersection.hpp"
 
 #include <algorithm>
@@ -124,42 +125,10 @@ Acts::Layer::compatibleSurfaces(
   double nearLimit = options.nearLimit;
   double farLimit = options.farLimit;
 
-  // TODO this looks like a major hack; is this really needed?
-  // (0) End surface check
-  // @todo: - we might be able to skip this by use of options.pathLimit
-  // check if you have to stop at the endSurface
-  if (options.endObject != nullptr) {
-    // intersect the end surface
-    // - it is the final one don't use the boundary check at all
-    SurfaceIntersection endInter =
-        options.endObject
-            ->intersect(gctx, position, direction, BoundaryTolerance::None())
-            .closest();
-    // non-valid intersection with the end surface provided at this layer
-    // indicates wrong direction or faulty setup
-    // -> do not return compatible surfaces since they may lead you on a wrong
-    // navigation path
-    if (endInter.isValid()) {
-      farLimit = endInter.pathLength();
-    } else {
-      return sIntersections;
-    }
-  } else {
-    // compatibleSurfaces() should only be called when on the layer,
-    // i.e. the maximum path limit is given by the layer thickness times
-    // path correction, we take a safety factor of 1.5
-    // -> this avoids punch through for cylinders
-    double pCorrection =
-        surfaceRepresentation().pathCorrection(gctx, position, direction);
-    farLimit = 1.5 * thickness() * pCorrection;
-  }
-
   auto isUnique = [&](const SurfaceIntersection& b) {
-    auto find_it = std::find_if(
-        sIntersections.begin(), sIntersections.end(), [&b](const auto& a) {
-          return a.object() == b.object() && a.index() == b.index();
-        });
-    return find_it == sIntersections.end();
+    return std::ranges::none_of(sIntersections, [&b](const auto& a) {
+      return a.object() == b.object() && a.index() == b.index();
+    });
   };
 
   // lemma 0 : accept the surface
@@ -169,7 +138,7 @@ Acts::Layer::compatibleSurfaces(
     if (sensitive && options.resolveSensitive) {
       return true;
     }
-    // next option: it's a material surface and you want to have it
+    // next option: it's a material surface, and you want to have it
     if (options.resolveMaterial && sf.surfaceMaterial() != nullptr) {
       return true;
     }
@@ -189,9 +158,7 @@ Acts::Layer::compatibleSurfaces(
       return;
     }
     BoundaryTolerance boundaryTolerance = options.boundaryTolerance;
-    if (std::find(options.externalSurfaces.begin(),
-                  options.externalSurfaces.end(),
-                  sf.geometryId()) != options.externalSurfaces.end()) {
+    if (rangeContainsValue(options.externalSurfaces, sf.geometryId())) {
       boundaryTolerance = BoundaryTolerance::Infinite();
     }
     // the surface intersection
diff --git a/Core/src/Geometry/LayerArrayCreator.cpp b/Core/src/Geometry/LayerArrayCreator.cpp
index baca1a8c13d..e8b972cb6d1 100644
--- a/Core/src/Geometry/LayerArrayCreator.cpp
+++ b/Core/src/Geometry/LayerArrayCreator.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2016-2018 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include "Acts/Geometry/LayerArrayCreator.hpp"
 
@@ -42,7 +42,7 @@ std::unique_ptr<const Acts::LayerArray> Acts::LayerArrayCreator::layerArray(
 
   // sort it accordingly to the binning value
   GeometryObjectSorterT<std::shared_ptr<const Layer>> layerSorter(gctx, bValue);
-  std::sort(layers.begin(), layers.end(), layerSorter);
+  std::ranges::sort(layers, layerSorter);
   // useful typedef
   using LayerOrderPosition = std::pair<std::shared_ptr<const Layer>, Vector3>;
   // needed for all cases
diff --git a/Core/src/Geometry/LayerCreator.cpp b/Core/src/Geometry/LayerCreator.cpp
index 8c4e3c61bc4..632274c671f 100644
--- a/Core/src/Geometry/LayerCreator.cpp
+++ b/Core/src/Geometry/LayerCreator.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2016-2020 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include "Acts/Geometry/LayerCreator.hpp"
 
diff --git a/Core/src/Geometry/NavigationLayer.cpp b/Core/src/Geometry/NavigationLayer.cpp
index f79eb4ca08f..c00611c78dd 100644
--- a/Core/src/Geometry/NavigationLayer.cpp
+++ b/Core/src/Geometry/NavigationLayer.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2016-2018 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include "Acts/Geometry/NavigationLayer.hpp"
 
diff --git a/Core/src/Geometry/PassiveLayerBuilder.cpp b/Core/src/Geometry/PassiveLayerBuilder.cpp
index 865067c8a27..2518611111f 100644
--- a/Core/src/Geometry/PassiveLayerBuilder.cpp
+++ b/Core/src/Geometry/PassiveLayerBuilder.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2016-2020 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include "Acts/Geometry/PassiveLayerBuilder.hpp"
 
diff --git a/Core/src/Geometry/PlaneLayer.cpp b/Core/src/Geometry/PlaneLayer.cpp
index b1baa55f9c6..9ae8efcba0f 100644
--- a/Core/src/Geometry/PlaneLayer.cpp
+++ b/Core/src/Geometry/PlaneLayer.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2016-2018 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include "Acts/Geometry/PlaneLayer.hpp"
 
diff --git a/Core/src/Geometry/Polyhedron.cpp b/Core/src/Geometry/Polyhedron.cpp
index 6663a49705a..5f7336ca3fc 100644
--- a/Core/src/Geometry/Polyhedron.cpp
+++ b/Core/src/Geometry/Polyhedron.cpp
@@ -1,19 +1,21 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2020 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include "Acts/Geometry/Polyhedron.hpp"
 
 #include "Acts/Surfaces/detail/VerticesHelper.hpp"
 #include "Acts/Utilities/BinningType.hpp"
+#include "Acts/Visualization/IVisualization3D.hpp"
 
 #include <algorithm>
 #include <cmath>
 #include <limits>
+#include <numbers>
 #include <utility>
 
 void Acts::Polyhedron::merge(const Acts::Polyhedron& other) {
@@ -61,7 +63,8 @@ Acts::Extent Acts::Polyhedron::extent(const Transform3& transform) const {
       }
       if (detail::VerticesHelper::isInsidePolygon(origin, tface)) {
         extent.range(BinningValue::binR).setMin(0.);
-        extent.range(BinningValue::binPhi).set(-M_PI, M_PI);
+        extent.range(BinningValue::binPhi)
+            .set(-std::numbers::pi, std::numbers::pi);
         break;
       }
     }
@@ -96,3 +99,14 @@ Acts::Extent Acts::Polyhedron::extent(const Transform3& transform) const {
   }
   return extent;
 }
+
+void Acts::Polyhedron::visualize(IVisualization3D& helper,
+                                 const ViewConfig& viewConfig) const {
+  if (viewConfig.visible) {
+    if (!viewConfig.triangulate) {
+      helper.faces(vertices, faces, viewConfig.color);
+    } else {
+      helper.faces(vertices, triangularMesh, viewConfig.color);
+    }
+  }
+}
diff --git a/Core/src/Geometry/Portal.cpp b/Core/src/Geometry/Portal.cpp
new file mode 100644
index 00000000000..69cab13b8e0
--- /dev/null
+++ b/Core/src/Geometry/Portal.cpp
@@ -0,0 +1,374 @@
+// This file is part of the ACTS project.
+//
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
+//
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
+
+#include "Acts/Geometry/Portal.hpp"
+
+#include "Acts/Definitions/Algebra.hpp"
+#include "Acts/Definitions/Tolerance.hpp"
+#include "Acts/Geometry/CompositePortalLink.hpp"
+#include "Acts/Geometry/GeometryContext.hpp"
+#include "Acts/Geometry/GridPortalLink.hpp"
+#include "Acts/Geometry/PortalLinkBase.hpp"
+#include "Acts/Geometry/TrivialPortalLink.hpp"
+#include "Acts/Surfaces/RegularSurface.hpp"
+#include "Acts/Utilities/BinningType.hpp"
+#include "Acts/Utilities/Zip.hpp"
+
+#include <cstdlib>
+#include <memory>
+#include <stdexcept>
+
+namespace Acts {
+
+const char* PortalMergingException::what() const noexcept {
+  return "Failure to merge portals";
+}
+
+const char* PortalFusingException::what() const noexcept {
+  return "Failure to fuse portals";
+}
+
+Portal::Portal(Direction direction, std::unique_ptr<PortalLinkBase> link) {
+  if (link == nullptr) {
+    throw std::invalid_argument("Link must not be null");
+  }
+
+  m_surface = link->surfacePtr();
+
+  if (direction == Direction::AlongNormal) {
+    m_alongNormal = std::move(link);
+  } else {
+    m_oppositeNormal = std::move(link);
+  }
+}
+
+Portal::Portal(Direction direction, std::shared_ptr<RegularSurface> surface,
+               TrackingVolume& volume)
+    : Portal(direction,
+             std::make_unique<TrivialPortalLink>(std::move(surface), volume)) {}
+
+Portal::Portal(const GeometryContext& gctx,
+               std::unique_ptr<PortalLinkBase> alongNormal,
+               std::unique_ptr<PortalLinkBase> oppositeNormal) {
+  if (alongNormal == nullptr && oppositeNormal == nullptr) {
+    throw std::invalid_argument("At least one link must be provided");
+  }
+
+  if (alongNormal != nullptr) {
+    setLink(gctx, Direction::AlongNormal, std::move(alongNormal));
+  }
+  if (oppositeNormal != nullptr) {
+    setLink(gctx, Direction::OppositeNormal, std::move(oppositeNormal));
+  }
+}
+
+Portal::Portal(const GeometryContext& gctx, Arguments&& args) {
+  if (!args.alongNormal.surface && !args.oppositeNormal.surface) {
+    throw std::invalid_argument("At least one link must be provided");
+  }
+
+  if (args.alongNormal.surface) {
+    setLink(gctx, Direction::AlongNormal,
+            std::make_unique<TrivialPortalLink>(
+                std::move(args.alongNormal.surface), *args.alongNormal.volume));
+  }
+  if (args.oppositeNormal.surface) {
+    setLink(gctx, Direction::OppositeNormal,
+            std::make_unique<TrivialPortalLink>(
+                std::move(args.oppositeNormal.surface),
+                *args.oppositeNormal.volume));
+  }
+}
+
+void Portal::setLink(const GeometryContext& gctx, Direction direction,
+                     std::unique_ptr<PortalLinkBase> link) {
+  if (link == nullptr) {
+    throw std::invalid_argument("Link must not be null");
+  }
+
+  auto& target =
+      direction == Direction::AlongNormal ? m_alongNormal : m_oppositeNormal;
+  const auto& other =
+      direction == Direction::AlongNormal ? m_oppositeNormal : m_alongNormal;
+
+  // check if surfaces are identical
+  if (m_surface != nullptr &&
+      !isSameSurface(gctx, link->surface(), *m_surface)) {
+    throw PortalFusingException();
+  }
+
+  // check if they both have material but are not the same surface
+  if (m_surface != nullptr && (m_surface.get() != &link->surface()) &&
+      link->surface().surfaceMaterial() != nullptr &&
+      m_surface->surfaceMaterial() != nullptr) {
+    throw PortalFusingException();
+  }
+
+  target = std::move(link);
+
+  if (other == nullptr) {
+    // We don't have an existing surface, take the one we just got
+    m_surface = target->surfacePtr();
+    return;
+  }
+
+  if (target->surface().surfaceMaterial() != nullptr) {
+    // new link has material: assign that to existing link
+    m_surface = target->surfacePtr();
+    other->setSurface(m_surface);
+  } else {
+    // none have material, or the existing surface had material: assign the
+    // existing surface by convention
+    target->setSurface(m_surface);
+  }
+}
+
+void Portal::setLink(const GeometryContext& gctx, Direction direction,
+                     std::shared_ptr<RegularSurface> surface,
+                     TrackingVolume& volume) {
+  setLink(gctx, direction,
+          std::make_unique<TrivialPortalLink>(std::move(surface), volume));
+}
+
+const PortalLinkBase* Portal::getLink(Direction direction) const {
+  if (direction == Direction::AlongNormal) {
+    return m_alongNormal.get();
+  } else {
+    return m_oppositeNormal.get();
+  }
+}
+
+Result<const TrackingVolume*> Portal::resolveVolume(
+    const GeometryContext& gctx, const Vector3& position,
+    const Vector3& direction) const {
+  assert(m_surface != nullptr);
+  const Vector3 normal = m_surface->normal(gctx, position);
+  Direction side = Direction::fromScalarZeroAsPositive(normal.dot(direction));
+
+  const PortalLinkBase* link = side == Direction::AlongNormal
+                                   ? m_alongNormal.get()
+                                   : m_oppositeNormal.get();
+
+  if (link == nullptr) {
+    // no link is attached in this direction => this is the end of the world as
+    // we know it. (i feel fine)
+    return nullptr;
+  } else {
+    auto res = link->resolveVolume(gctx, position);
+    if (!res.ok()) {
+      return res.error();
+    }
+    return *res;
+  }
+}
+
+bool Portal::isValid() const {
+  return m_alongNormal != nullptr || m_oppositeNormal != nullptr;
+}
+
+const RegularSurface& Portal::surface() const {
+  assert(m_surface != nullptr);
+  return *m_surface;
+}
+
+RegularSurface& Portal::surface() {
+  assert(m_surface != nullptr);
+  return *m_surface;
+}
+
+Portal Portal::merge(const GeometryContext& gctx, Portal& aPortal,
+                     Portal& bPortal, BinningValue direction,
+                     const Logger& logger) {
+  ACTS_VERBOSE("Merging two portals along " << direction);
+
+  if (&aPortal == &bPortal) {
+    ACTS_ERROR("Cannot merge a portal with itself");
+    throw PortalMergingException{};
+  }
+
+  if (aPortal.m_surface->surfaceMaterial() != nullptr ||
+      bPortal.m_surface->surfaceMaterial() != nullptr) {
+    ACTS_ERROR("Cannot merge portals with material");
+    throw PortalMergingException{};
+  }
+
+  std::unique_ptr<PortalLinkBase> mergedAlongNormal = nullptr;
+  std::unique_ptr<PortalLinkBase> mergedOppositeNormal = nullptr;
+
+  bool aHasAlongNormal = aPortal.m_alongNormal != nullptr;
+  bool aHasOppositeNormal = aPortal.m_oppositeNormal != nullptr;
+  bool bHasAlongNormal = bPortal.m_alongNormal != nullptr;
+  bool bHasOppositeNormal = bPortal.m_oppositeNormal != nullptr;
+
+  if (aHasAlongNormal != bHasAlongNormal ||
+      aHasOppositeNormal != bHasOppositeNormal) {
+    ACTS_ERROR("Portals do not have the same links attached");
+    throw PortalMergingException();
+  }
+
+  if (aPortal.m_alongNormal != nullptr) {
+    if (bPortal.m_alongNormal == nullptr) {
+      ACTS_ERROR(
+          "Portal A has link along normal, while b does not. This is not "
+          "supported");
+      throw PortalMergingException();
+    }
+
+    ACTS_VERBOSE("Portals have links along normal, merging");
+    mergedAlongNormal = PortalLinkBase::merge(std::move(aPortal.m_alongNormal),
+                                              std::move(bPortal.m_alongNormal),
+                                              direction, logger);
+  }
+
+  if (aPortal.m_oppositeNormal != nullptr) {
+    if (bPortal.m_oppositeNormal == nullptr) {
+      ACTS_ERROR(
+          "Portal A has link opposite normal, while b does not. This is not "
+          "supported");
+      throw PortalMergingException();
+    }
+
+    ACTS_VERBOSE("Portals have links opposite normal, merging");
+    mergedOppositeNormal = PortalLinkBase::merge(
+        std::move(aPortal.m_oppositeNormal),
+        std::move(bPortal.m_oppositeNormal), direction, logger);
+  }
+
+  aPortal.m_surface.reset();
+  bPortal.m_surface.reset();
+  return Portal{gctx, std::move(mergedAlongNormal),
+                std::move(mergedOppositeNormal)};
+}
+
+Portal Portal::fuse(const GeometryContext& gctx, Portal& aPortal,
+                    Portal& bPortal, const Logger& logger) {
+  ACTS_VERBOSE("Fusing two portals");
+  if (&aPortal == &bPortal) {
+    ACTS_ERROR("Cannot fuse a portal with itself");
+    throw PortalMergingException{};
+  }
+
+  bool aHasAlongNormal = aPortal.m_alongNormal != nullptr;
+  bool aHasOppositeNormal = aPortal.m_oppositeNormal != nullptr;
+  bool bHasAlongNormal = bPortal.m_alongNormal != nullptr;
+  bool bHasOppositeNormal = bPortal.m_oppositeNormal != nullptr;
+
+  if (aPortal.m_surface == nullptr || bPortal.m_surface == nullptr) {
+    ACTS_ERROR("Portals have no surface");
+    throw PortalFusingException();
+  }
+
+  if (aPortal.m_surface->associatedDetectorElement() != nullptr ||
+      bPortal.m_surface->associatedDetectorElement() != nullptr) {
+    ACTS_ERROR("Cannot fuse portals with detector elements");
+    throw PortalFusingException();
+  }
+
+  if (!isSameSurface(gctx, *aPortal.m_surface, *bPortal.m_surface)) {
+    ACTS_ERROR("Portals have different surfaces");
+    ACTS_ERROR("A: " << aPortal.m_surface->bounds());
+    ACTS_ERROR("\n" << aPortal.m_surface->transform(gctx).matrix());
+    ACTS_ERROR("B: " << bPortal.m_surface->bounds());
+    ACTS_ERROR("\n" << bPortal.m_surface->transform(gctx).matrix());
+    throw PortalFusingException();
+  }
+
+  if (aPortal.m_surface->surfaceMaterial() != nullptr &&
+      bPortal.m_surface->surfaceMaterial() != nullptr) {
+    ACTS_ERROR("Cannot fuse portals if both have material");
+    throw PortalFusingException();
+  }
+
+  if (aHasAlongNormal == bHasAlongNormal ||
+      aHasOppositeNormal == bHasOppositeNormal) {
+    ACTS_ERROR("Portals have the same links attached");
+    throw PortalFusingException();
+  }
+
+  auto maybeConvertToGrid = [&](std::unique_ptr<PortalLinkBase> link)
+      -> std::unique_ptr<PortalLinkBase> {
+    auto* composite = dynamic_cast<CompositePortalLink*>(link.get());
+    if (composite == nullptr) {
+      return link;
+    }
+
+    ACTS_VERBOSE("Converting composite to grid during portal fusing");
+    return composite->makeGrid(gctx, logger);
+  };
+
+  aPortal.m_surface.reset();
+  bPortal.m_surface.reset();
+  if (aHasAlongNormal) {
+    ACTS_VERBOSE("Taking along normal from lhs, opposite normal from rhs");
+    return Portal{gctx, maybeConvertToGrid(std::move(aPortal.m_alongNormal)),
+                  maybeConvertToGrid(std::move(bPortal.m_oppositeNormal))};
+  } else {
+    ACTS_VERBOSE("Taking along normal from rhs, opposite normal from lhs");
+    return Portal{gctx, maybeConvertToGrid(std::move(bPortal.m_alongNormal)),
+                  maybeConvertToGrid(std::move(aPortal.m_oppositeNormal))};
+  }
+}
+
+bool Portal::isSameSurface(const GeometryContext& gctx, const Surface& a,
+                           const Surface& b) {
+  if (&a == &b) {
+    return true;
+  }
+
+  if (a.type() != b.type()) {
+    return false;
+  }
+
+  std::vector<double> aValues = a.bounds().values();
+  std::vector<double> bValues = b.bounds().values();
+  bool different = false;
+  for (auto [aVal, bVal] : zip(aValues, bValues)) {
+    if (std::abs(aVal - bVal) > s_onSurfaceTolerance) {
+      different = true;
+      break;
+    }
+  }
+
+  if (a.bounds().type() != b.bounds().type() || different) {
+    return false;
+  }
+
+  if (!a.transform(gctx).linear().isApprox(b.transform(gctx).linear(),
+                                           s_transformEquivalentTolerance)) {
+    return false;
+  }
+
+  Vector3 delta =
+      (a.transform(gctx).translation() - b.transform(gctx).translation())
+          .cwiseAbs();
+
+  if (delta.maxCoeff() > s_onSurfaceTolerance) {
+    return false;
+  }
+
+  return true;
+};
+
+void Portal::fill(TrackingVolume& volume) {
+  if (m_alongNormal != nullptr && m_oppositeNormal != nullptr) {
+    throw std::logic_error{"Portal is already filled"};
+  }
+
+  if (m_surface == nullptr) {
+    throw std::logic_error{"Portal has no existing link set, can't fill"};
+  }
+
+  if (m_alongNormal == nullptr) {
+    m_alongNormal = std::make_unique<TrivialPortalLink>(m_surface, volume);
+  } else {
+    assert(m_oppositeNormal == nullptr);
+    m_oppositeNormal = std::make_unique<TrivialPortalLink>(m_surface, volume);
+  }
+}
+
+}  // namespace Acts
diff --git a/Core/src/Geometry/PortalError.cpp b/Core/src/Geometry/PortalError.cpp
new file mode 100644
index 00000000000..001b23f6b01
--- /dev/null
+++ b/Core/src/Geometry/PortalError.cpp
@@ -0,0 +1,39 @@
+// This file is part of the ACTS project.
+//
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
+//
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
+
+#include "Acts/Surfaces/SurfaceError.hpp"
+
+#include <string>
+
+namespace {
+
+class SurfaceErrorCategory : public std::error_category {
+ public:
+  // Return a short descriptive name for the category.
+  const char* name() const noexcept final { return "SurfaceError"; }
+
+  // Return what each enum means in text.
+  std::string message(int c) const final {
+    using Acts::SurfaceError;
+
+    switch (static_cast<SurfaceError>(c)) {
+      case SurfaceError::GlobalPositionNotOnSurface:
+        return "Global to local transformation failed: position not on "
+               "surface.";
+      default:
+        return "unknown";
+    }
+  }
+};
+
+}  // namespace
+
+std::error_code Acts::make_error_code(Acts::SurfaceError e) {
+  static SurfaceErrorCategory c;
+  return {static_cast<int>(e), c};
+}
diff --git a/Core/src/Geometry/PortalLinkBase.cpp b/Core/src/Geometry/PortalLinkBase.cpp
new file mode 100644
index 00000000000..bdc65f8a552
--- /dev/null
+++ b/Core/src/Geometry/PortalLinkBase.cpp
@@ -0,0 +1,177 @@
+// This file is part of the ACTS project.
+//
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
+//
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
+
+#include "Acts/Geometry/PortalLinkBase.hpp"
+
+#include "Acts/Geometry/CompositePortalLink.hpp"
+#include "Acts/Geometry/GridPortalLink.hpp"
+#include "Acts/Geometry/TrivialPortalLink.hpp"
+#include "Acts/Surfaces/CylinderSurface.hpp"
+#include "Acts/Surfaces/DiscSurface.hpp"
+#include "Acts/Surfaces/RadialBounds.hpp"
+#include "Acts/Surfaces/RegularSurface.hpp"
+#include "Acts/Utilities/ThrowAssert.hpp"
+
+namespace Acts {
+
+void PortalLinkBase::checkMergePreconditions(const PortalLinkBase& a,
+                                             const PortalLinkBase& b,
+                                             BinningValue direction) {
+  const auto& surfaceA = a.surface();
+  const auto& surfaceB = b.surface();
+
+  throw_assert(&surfaceA != &surfaceB,
+               "Cannot merge portals to the same surface");
+
+  throw_assert(surfaceA.type() == surfaceB.type(),
+               "Cannot merge portals of different surface types");
+
+  throw_assert(surfaceA.bounds().type() == surfaceB.bounds().type(),
+               "Cannot merge portals of different surface bounds");
+
+  if (const auto* cylA = dynamic_cast<const CylinderSurface*>(&surfaceA);
+      cylA != nullptr) {
+    const auto* cylB = dynamic_cast<const CylinderSurface*>(&surfaceB);
+    throw_assert(cylB != nullptr,
+                 "Cannot merge CylinderSurface with "
+                 "non-CylinderSurface");
+    throw_assert(
+        direction == BinningValue::binZ || direction == BinningValue::binRPhi,
+        "Invalid binning direction: " + binningValueName(direction));
+  } else if (const auto* discA = dynamic_cast<const DiscSurface*>(&surfaceA);
+             discA != nullptr) {
+    const auto* discB = dynamic_cast<const DiscSurface*>(&surfaceB);
+    throw_assert(discB != nullptr,
+                 "Cannot merge DiscSurface with non-DiscSurface");
+    throw_assert(
+        direction == BinningValue::binR || direction == BinningValue::binPhi,
+        "Invalid binning direction: " + binningValueName(direction));
+
+    throw_assert(dynamic_cast<const RadialBounds*>(&discA->bounds()) &&
+                     dynamic_cast<const RadialBounds*>(&discB->bounds()),
+                 "DiscSurface bounds must be RadialBounds");
+
+  } else {
+    throw std::logic_error{"Surface type is not supported"};
+  }
+}
+
+std::unique_ptr<PortalLinkBase> PortalLinkBase::merge(
+    std::unique_ptr<PortalLinkBase> a, std::unique_ptr<PortalLinkBase> b,
+    BinningValue direction, const Logger& logger) {
+  ACTS_VERBOSE("Merging two arbitrary portals");
+
+  ACTS_VERBOSE(" - a: " << *a);
+  ACTS_VERBOSE(" - b: " << *b);
+
+  checkMergePreconditions(*a, *b, direction);
+
+  // Three options:
+  // 1. Grid
+  // 2. Trivial
+  // 3. Composite
+
+  // Grid Grid
+  // Grid Trivial
+  // Grid Composite
+  // Trivial Grid
+  // Trivial Trivial
+  // Trivial Composite
+  // Composite Grid
+  // Composite Trivial
+  // Composite Composite
+
+  auto gridMerge =
+      [&](const GridPortalLink& aGrid,
+          const GridPortalLink& bGrid) -> std::unique_ptr<PortalLinkBase> {
+    assert(a != nullptr);
+    assert(b != nullptr);
+    auto merged = GridPortalLink::merge(aGrid, bGrid, direction, logger);
+    if (merged == nullptr) {
+      return std::make_unique<CompositePortalLink>(std::move(a), std::move(b),
+                                                   direction);
+    }
+    return merged;
+  };
+
+  if (const auto* aGrid = dynamic_cast<const GridPortalLink*>(a.get());
+      aGrid != nullptr) {
+    if (const auto* bGrid = dynamic_cast<const GridPortalLink*>(b.get());
+        bGrid != nullptr) {
+      ACTS_VERBOSE("Merging two grid portals");
+      return gridMerge(*aGrid, *bGrid);
+
+    } else if (const auto* bTrivial =
+                   dynamic_cast<const TrivialPortalLink*>(b.get());
+               bTrivial != nullptr) {
+      ACTS_VERBOSE(
+          "Merging a grid portal with a trivial portal (via composite)");
+      return std::make_unique<CompositePortalLink>(std::move(a), std::move(b),
+                                                   direction);
+
+    } else if (dynamic_cast<const CompositePortalLink*>(b.get()) != nullptr) {
+      ACTS_WARNING("Merging a grid portal with a composite portal");
+      return std::make_unique<CompositePortalLink>(std::move(a), std::move(b),
+                                                   direction);
+
+    } else {
+      throw std::logic_error{"Portal link type is not supported"};
+    }
+
+  } else if (const auto* aTrivial =
+                 dynamic_cast<const TrivialPortalLink*>(a.get());
+             aTrivial != nullptr) {
+    if (const auto* bGrid = dynamic_cast<const GridPortalLink*>(b.get());
+        bGrid) {
+      ACTS_VERBOSE(
+          "Merging a trivial portal with a grid portal (via composite)");
+      return std::make_unique<CompositePortalLink>(std::move(a), std::move(b),
+                                                   direction);
+
+    } else if (const auto* bTrivial =
+                   dynamic_cast<const TrivialPortalLink*>(b.get());
+               bTrivial != nullptr) {
+      ACTS_VERBOSE("Merging two trivial portals (via composite");
+      return std::make_unique<CompositePortalLink>(std::move(a), std::move(b),
+                                                   direction);
+
+    } else if (dynamic_cast<const CompositePortalLink*>(b.get()) != nullptr) {
+      ACTS_WARNING("Merging a trivial portal with a composite portal");
+      return std::make_unique<CompositePortalLink>(std::move(a), std::move(b),
+                                                   direction);
+
+    } else {
+      throw std::logic_error{"Portal link type is not supported"};
+    }
+
+  } else if (dynamic_cast<const CompositePortalLink*>(a.get()) != nullptr) {
+    if (dynamic_cast<const GridPortalLink*>(b.get()) != nullptr) {
+      ACTS_WARNING("Merging a composite portal with a grid portal");
+      return std::make_unique<CompositePortalLink>(std::move(a), std::move(b),
+                                                   direction);
+
+    } else if (dynamic_cast<const TrivialPortalLink*>(b.get()) != nullptr) {
+      ACTS_WARNING("Merging a composite portal with a trivial portal");
+      return std::make_unique<CompositePortalLink>(std::move(a), std::move(b),
+                                                   direction);
+
+    } else if (dynamic_cast<CompositePortalLink*>(b.get()) != nullptr) {
+      ACTS_WARNING("Merging two composite portals");
+      return std::make_unique<CompositePortalLink>(std::move(a), std::move(b),
+                                                   direction);
+
+    } else {
+      throw std::logic_error{"Portal link type is not supported"};
+    }
+
+  } else {
+    throw std::logic_error{"Portal link type is not supported"};
+  }
+}
+
+}  // namespace Acts
diff --git a/Core/src/Geometry/PortalShell.cpp b/Core/src/Geometry/PortalShell.cpp
new file mode 100644
index 00000000000..5b2d8e167c8
--- /dev/null
+++ b/Core/src/Geometry/PortalShell.cpp
@@ -0,0 +1,388 @@
+// This file is part of the ACTS project.
+//
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
+//
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
+
+#include "Acts/Geometry/PortalShell.hpp"
+
+#include "Acts/Geometry/BoundarySurfaceFace.hpp"
+#include "Acts/Geometry/CylinderVolumeBounds.hpp"
+#include "Acts/Geometry/Portal.hpp"
+#include "Acts/Geometry/PortalLinkBase.hpp"
+#include "Acts/Geometry/TrackingVolume.hpp"
+
+#include <algorithm>
+#include <ranges>
+#include <stdexcept>
+
+#include <boost/algorithm/string/join.hpp>
+
+namespace Acts {
+
+void CylinderPortalShell::fill(TrackingVolume& volume) {
+  for (Face face : {PositiveDisc, NegativeDisc, OuterCylinder, InnerCylinder,
+                    NegativePhiPlane, PositivePhiPlane}) {
+    const auto& portalAtFace = portalPtr(face);
+    if (portalAtFace != nullptr) {
+      portalAtFace->fill(volume);
+      volume.addPortal(portalAtFace);
+    }
+  }
+}
+
+SingleCylinderPortalShell::SingleCylinderPortalShell(TrackingVolume& volume)
+    : m_volume{&volume} {
+  if (m_volume->volumeBounds().type() != VolumeBounds::BoundsType::eCylinder) {
+    throw std::invalid_argument("Invalid volume bounds type");
+  }
+
+  const auto& bounds =
+      dynamic_cast<const CylinderVolumeBounds&>(m_volume->volumeBounds());
+
+  std::vector<OrientedSurface> orientedSurfaces =
+      bounds.orientedSurfaces(m_volume->transform());
+
+  auto handle = [&](Face face, std::size_t from) {
+    const auto& source = orientedSurfaces.at(from);
+    m_portals.at(toUnderlying(face)) =
+        std::make_shared<Portal>(source.direction, source.surface, *m_volume);
+  };
+
+  if (orientedSurfaces.size() == 6) {
+    // Fully equipped cylinder
+    handle(PositiveDisc, positiveFaceXY);
+    handle(NegativeDisc, negativeFaceXY);
+    handle(OuterCylinder, tubeOuterCover);
+    handle(InnerCylinder, tubeInnerCover);
+    handle(NegativePhiPlane, tubeSectorNegativePhi);
+    handle(PositivePhiPlane, tubeSectorPositivePhi);
+  } else if (orientedSurfaces.size() == 5) {
+    // Phi sector but no inner cylinder (rMin == 0)
+    handle(PositiveDisc, positiveFaceXY);
+    handle(NegativeDisc, negativeFaceXY);
+    handle(OuterCylinder, tubeOuterCover);
+    // Skip inner tube cover, requires offsetting
+    handle(NegativePhiPlane, tubeSectorNegativePhi - 1);
+    handle(PositivePhiPlane, tubeSectorPositivePhi - 1);
+  } else if (orientedSurfaces.size() == 4) {
+    // No phi sector but rMin > 0
+    handle(PositiveDisc, positiveFaceXY);
+    handle(NegativeDisc, negativeFaceXY);
+    handle(OuterCylinder, tubeOuterCover);
+    handle(InnerCylinder, tubeInnerCover);
+  } else if (orientedSurfaces.size() == 3) {
+    // No phi sector and rMin == 0
+    handle(PositiveDisc, positiveFaceXY);
+    handle(NegativeDisc, negativeFaceXY);
+    handle(OuterCylinder, tubeOuterCover);
+  } else {
+    throw std::invalid_argument("Invalid number of oriented surfaces");
+  }
+}
+
+Portal* SingleCylinderPortalShell::portal(Face face) {
+  return portalPtr(face).get();
+}
+
+std::shared_ptr<Portal> SingleCylinderPortalShell::portalPtr(Face face) {
+  return m_portals.at(toUnderlying(face));
+}
+
+void SingleCylinderPortalShell::setPortal(std::shared_ptr<Portal> portal,
+                                          Face face) {
+  assert(portal != nullptr);
+  assert(portal->isValid());
+  m_portals.at(toUnderlying(face)) = std::move(portal);
+}
+
+std::size_t SingleCylinderPortalShell::size() const {
+  std::size_t count = 0;
+  std::ranges::for_each(
+      m_portals, [&count](const auto& portal) { count += portal ? 1 : 0; });
+  return count;
+}
+
+void SingleCylinderPortalShell::applyToVolume() {
+  for (std::size_t i = 0; i < m_portals.size(); i++) {
+    const auto& portal = m_portals.at(i);
+    if (portal != nullptr) {
+      if (!portal->isValid()) {
+        std::stringstream ss;
+        ss << static_cast<Face>(i);
+        throw std::runtime_error{"Invalid portal found in shell at " +
+                                 ss.str()};
+      }
+      m_volume->addPortal(portal);
+    }
+  }
+}
+
+bool SingleCylinderPortalShell::isValid() const {
+  return std::ranges::all_of(m_portals, [](const auto& portal) {
+    return portal == nullptr || portal->isValid();
+  });
+};
+
+std::string SingleCylinderPortalShell::label() const {
+  std::stringstream ss;
+  ss << "CylinderShell(vol=" << m_volume->volumeName() << ")";
+  return ss.str();
+}
+
+CylinderStackPortalShell::CylinderStackPortalShell(
+    const GeometryContext& gctx, std::vector<CylinderPortalShell*> shells,
+    BinningValue direction, const Logger& logger)
+    : m_direction{direction}, m_shells{std::move(shells)} {
+  ACTS_VERBOSE("Making cylinder stack shell in " << m_direction
+                                                 << " direction");
+  if (std::ranges::any_of(m_shells,
+                          [](const auto* shell) { return shell == nullptr; })) {
+    ACTS_ERROR("Invalid shell pointer");
+    throw std::invalid_argument("Invalid shell pointer");
+  }
+
+  ACTS_VERBOSE(" ~> " << label());
+
+  if (!std::ranges::all_of(
+          m_shells, [](const auto* shell) { return shell->isValid(); })) {
+    ACTS_ERROR("Invalid shell");
+    throw std::invalid_argument("Invalid shell");
+  }
+
+  auto merge = [&](Face face) {
+    std::vector<std::shared_ptr<Portal>> portals;
+    std::ranges::transform(
+        m_shells, std::back_inserter(portals),
+        [face](auto* shell) { return shell->portalPtr(face); });
+
+    auto merged = std::accumulate(
+        std::next(portals.begin()), portals.end(), portals.front(),
+        [&](const auto& aPortal,
+            const auto& bPortal) -> std::shared_ptr<Portal> {
+          assert(aPortal != nullptr);
+          assert(bPortal != nullptr);
+
+          return std::make_shared<Portal>(
+              Portal::merge(gctx, *aPortal, *bPortal, direction, logger));
+        });
+
+    assert(merged != nullptr);
+    assert(merged->isValid());
+
+    // reset merged portal on all shells
+    for (auto& shell : m_shells) {
+      shell->setPortal(merged, face);
+    }
+  };
+
+  auto fuse = [&](Face faceA, Face faceB) {
+    for (std::size_t i = 1; i < m_shells.size(); i++) {
+      auto& shellA = m_shells.at(i - 1);
+      auto& shellB = m_shells.at(i);
+      ACTS_VERBOSE("Fusing " << shellA->label() << " and " << shellB->label());
+
+      auto fused = std::make_shared<Portal>(Portal::fuse(
+          gctx, *shellA->portalPtr(faceA), *shellB->portalPtr(faceB), logger));
+
+      assert(fused != nullptr && "Invalid fused portal");
+      assert(fused->isValid() && "Fused portal is invalid");
+
+      shellA->setPortal(fused, faceA);
+      shellB->setPortal(fused, faceB);
+
+      assert(shellA->isValid() && "Shell A is not valid after fusing");
+      assert(shellB->isValid() && "Shell B is not valid after fusing");
+    }
+  };
+
+  if (direction == BinningValue::binR) {
+    ACTS_VERBOSE("Merging portals at positive and negative discs");
+    merge(PositiveDisc);
+    merge(NegativeDisc);
+
+    ACTS_VERBOSE("Fusing portals at outer and inner cylinders");
+    fuse(OuterCylinder, InnerCylinder);
+
+  } else if (direction == BinningValue::binZ) {
+    bool allHaveInnerCylinders = std::ranges::all_of(
+        m_shells, [](const auto* shell) { return shell->size() == 4; });
+
+    bool noneHaveInnerCylinders = std::ranges::all_of(
+        m_shells, [](const auto* shell) { return shell->size() == 3; });
+
+    if (!allHaveInnerCylinders && !noneHaveInnerCylinders) {
+      ACTS_ERROR("Invalid inner cylinder configuration");
+      throw std::invalid_argument("Invalid inner cylinder configuration");
+    }
+
+    m_hasInnerCylinder = allHaveInnerCylinders;
+
+    ACTS_VERBOSE("Merging portals at outer cylinders");
+    merge(OuterCylinder);
+    assert(isValid() && "Shell is not valid after outer merging");
+
+    if (m_hasInnerCylinder) {
+      ACTS_VERBOSE("Merging portals at inner cylinders");
+      merge(InnerCylinder);
+      assert(isValid() && "Shell is not valid after inner merging");
+    }
+
+    ACTS_VERBOSE("Fusing portals at positive and negative discs");
+    fuse(PositiveDisc, NegativeDisc);
+    assert(isValid() && "Shell is not valid after disc fusing");
+
+  } else {
+    throw std::invalid_argument("Invalid direction");
+  }
+
+  assert(isValid() && "Shell is not valid after construction");
+}
+
+std::size_t CylinderStackPortalShell::size() const {
+  return m_hasInnerCylinder ? 4 : 3;
+}
+
+Portal* CylinderStackPortalShell::portal(Face face) {
+  return portalPtr(face).get();
+}
+
+std::shared_ptr<Portal> CylinderStackPortalShell::portalPtr(Face face) {
+  if (m_direction == BinningValue::binR) {
+    switch (face) {
+      case NegativeDisc:
+        return m_shells.front()->portalPtr(NegativeDisc);
+      case PositiveDisc:
+        return m_shells.front()->portalPtr(PositiveDisc);
+      case OuterCylinder:
+        return m_shells.back()->portalPtr(OuterCylinder);
+      case InnerCylinder:
+        return m_shells.front()->portalPtr(InnerCylinder);
+      case NegativePhiPlane:
+        [[fallthrough]];
+      case PositivePhiPlane:
+        return nullptr;
+      default:
+        std::stringstream ss;
+        ss << "Invalid face: " << face;
+        throw std::invalid_argument(ss.str());
+    }
+
+  } else {
+    switch (face) {
+      case NegativeDisc:
+        return m_shells.front()->portalPtr(NegativeDisc);
+      case PositiveDisc:
+        return m_shells.back()->portalPtr(PositiveDisc);
+      case OuterCylinder:
+        [[fallthrough]];
+      case InnerCylinder:
+        return m_shells.front()->portalPtr(face);
+      case NegativePhiPlane:
+        [[fallthrough]];
+      case PositivePhiPlane:
+        return nullptr;
+      default:
+        std::stringstream ss;
+        ss << "Invalid face: " << face;
+        throw std::invalid_argument(ss.str());
+    }
+  }
+}
+
+void CylinderStackPortalShell::setPortal(std::shared_ptr<Portal> portal,
+                                         Face face) {
+  assert(portal != nullptr);
+
+  if (m_direction == BinningValue::binR) {
+    switch (face) {
+      case NegativeDisc:
+        [[fallthrough]];
+      case PositiveDisc:
+        for (auto* shell : m_shells) {
+          shell->setPortal(portal, face);
+        }
+        break;
+      case OuterCylinder:
+        m_shells.back()->setPortal(std::move(portal), OuterCylinder);
+        break;
+      case InnerCylinder:
+        if (!m_hasInnerCylinder) {
+          throw std::invalid_argument("Inner cylinder not available");
+        }
+        m_shells.front()->setPortal(std::move(portal), InnerCylinder);
+        break;
+      default:
+        std::stringstream ss;
+        ss << "Invalid face: " << face;
+        throw std::invalid_argument(ss.str());
+    }
+
+  } else {
+    switch (face) {
+      case NegativeDisc:
+        m_shells.front()->setPortal(std::move(portal), NegativeDisc);
+        break;
+      case PositiveDisc:
+        m_shells.back()->setPortal(std::move(portal), PositiveDisc);
+        break;
+      case InnerCylinder:
+        if (!m_hasInnerCylinder) {
+          throw std::invalid_argument("Inner cylinder not available");
+        }
+        [[fallthrough]];
+      case OuterCylinder:
+        for (auto* shell : m_shells) {
+          shell->setPortal(portal, face);
+        }
+        break;
+      default:
+        std::stringstream ss;
+        ss << "Invalid face: " << face;
+        throw std::invalid_argument(ss.str());
+    }
+  }
+}
+
+bool CylinderStackPortalShell::isValid() const {
+  return std::ranges::all_of(m_shells, [](const auto* shell) {
+    assert(shell != nullptr);
+    return shell->isValid();
+  });
+}
+
+std::string CylinderStackPortalShell::label() const {
+  std::stringstream ss;
+  ss << "CylinderStackShell(dir=" << m_direction << ", children=";
+
+  std::vector<std::string> labels;
+  std::ranges::transform(m_shells, std::back_inserter(labels),
+                         [](const auto* shell) { return shell->label(); });
+  ss << boost::algorithm::join(labels, "|");
+  ss << ")";
+  return ss.str();
+}
+
+std::ostream& operator<<(std::ostream& os, CylinderPortalShell::Face face) {
+  switch (face) {
+    using enum CylinderVolumeBounds::Face;
+    case PositiveDisc:
+      return os << "PositiveDisc";
+    case NegativeDisc:
+      return os << "NegativeDisc";
+    case OuterCylinder:
+      return os << "OuterCylinder";
+    case InnerCylinder:
+      return os << "InnerCylinder";
+    case NegativePhiPlane:
+      return os << "NegativePhiPlane";
+    case PositivePhiPlane:
+      return os << "PositivePhiPlane";
+    default:
+      return os << "Invalid face";
+  }
+}
+
+}  // namespace Acts
diff --git a/Core/src/Geometry/ProtoLayer.cpp b/Core/src/Geometry/ProtoLayer.cpp
index af2313e2ce6..c8f190d4293 100644
--- a/Core/src/Geometry/ProtoLayer.cpp
+++ b/Core/src/Geometry/ProtoLayer.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2018-2020 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include "Acts/Geometry/ProtoLayer.hpp"
 
@@ -13,26 +13,34 @@
 #include "Acts/Surfaces/RegularSurface.hpp"
 #include "Acts/Utilities/Helpers.hpp"
 
-#include <algorithm>
-#include <array>
-#include <string>
-#include <utility>
-
 using Acts::VectorHelpers::perp;
 using Acts::VectorHelpers::phi;
 
 namespace Acts {
 
 ProtoLayer::ProtoLayer(const GeometryContext& gctx,
-                       const std::vector<const Surface*>& surfaces)
-    : m_surfaces(surfaces) {
+                       const std::vector<const Surface*>& surfaces,
+                       const Transform3& transformIn)
+    : transform(transformIn), m_surfaces(surfaces) {
   measure(gctx, surfaces);
 }
 
 ProtoLayer::ProtoLayer(
     const GeometryContext& gctx,
-    const std::vector<std::shared_ptr<const Surface>>& surfaces)
-    : m_surfaces(unpack_shared_vector(surfaces)) {
+    const std::vector<std::shared_ptr<const Surface>>& surfaces,
+    const Transform3& transformIn)
+    : transform(transformIn), m_surfaces(unpack_shared_vector(surfaces)) {
+  measure(gctx, m_surfaces);
+}
+
+ProtoLayer::ProtoLayer(const GeometryContext& gctx,
+                       const std::vector<std::shared_ptr<Surface>>& surfaces,
+                       const Transform3& transformIn)
+    : transform(transformIn) {
+  m_surfaces.reserve(surfaces.size());
+  for (const auto& sf : surfaces) {
+    m_surfaces.push_back(sf.get());
+  }
   measure(gctx, m_surfaces);
 }
 
@@ -78,15 +86,13 @@ void ProtoLayer::measure(const GeometryContext& gctx,
       double thickness = element->thickness();
       // We need a translation along and opposite half thickness
       Vector3 sfNormal = regSurface->normal(gctx, sf->center(gctx));
-      std::vector<double> deltaT = {-0.5 * thickness, 0.5 * thickness};
-      for (const auto& dT : deltaT) {
-        Transform3 dtransform = Transform3::Identity();
-        dtransform.pretranslate(dT * sfNormal);
+      for (const auto& dT : {-0.5 * thickness, 0.5 * thickness}) {
+        Transform3 dtransform = transform * Translation3{dT * sfNormal};
         extent.extend(sfPolyhedron.extent(dtransform));
       }
       continue;
     }
-    extent.extend(sfPolyhedron.extent());
+    extent.extend(sfPolyhedron.extent(transform));
   }
 }
 
diff --git a/Core/src/Geometry/ProtoLayerHelper.cpp b/Core/src/Geometry/ProtoLayerHelper.cpp
index 6a2c7fc1ce8..ae3dfc4896b 100644
--- a/Core/src/Geometry/ProtoLayerHelper.cpp
+++ b/Core/src/Geometry/ProtoLayerHelper.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2020 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include "Acts/Geometry/ProtoLayerHelper.hpp"
 
diff --git a/Core/src/Geometry/SurfaceArrayCreator.cpp b/Core/src/Geometry/SurfaceArrayCreator.cpp
index c01a4473b4f..3ec85b020f6 100644
--- a/Core/src/Geometry/SurfaceArrayCreator.cpp
+++ b/Core/src/Geometry/SurfaceArrayCreator.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2016-2020 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include "Acts/Geometry/SurfaceArrayCreator.hpp"
 
@@ -21,6 +21,7 @@
 
 #include <algorithm>
 #include <cmath>
+#include <numbers>
 #include <stdexcept>
 
 using Acts::VectorHelpers::perp;
@@ -444,7 +445,7 @@ Acts::SurfaceArrayCreator::createVariableAxis(
                phi(keys.at(1)->binningPosition(gctx, BinningValue::binPhi)));
 
     // create rotation, so that maxPhi is +pi
-    AxisScalar angle = -(M_PI + maxPhi);
+    AxisScalar angle = -(std::numbers::pi + maxPhi);
     transform = (transform)*AngleAxis3(angle, Vector3::UnitZ());
 
     // iterate over all key surfaces, and use their mean position as bValues,
@@ -488,7 +489,7 @@ Acts::SurfaceArrayCreator::createVariableAxis(
 
     bValues.push_back(maxBValue);
 
-    bValues.push_back(M_PI);
+    bValues.push_back(std::numbers::pi_v<AxisScalar>);
 
   } else if (bValue == Acts::BinningValue::binZ) {
     std::stable_sort(
@@ -539,7 +540,7 @@ Acts::SurfaceArrayCreator::createVariableAxis(
       previous = perp((*surface)->binningPosition(gctx, BinningValue::binR));
     }
   }
-  std::sort(bValues.begin(), bValues.end());
+  std::ranges::sort(bValues);
   ACTS_VERBOSE("Create variable binning Axis for binned SurfaceArray");
   ACTS_VERBOSE("	BinningValue: " << bValue);
   ACTS_VERBOSE("	Number of bins: " << (bValues.size() - 1));
@@ -612,16 +613,16 @@ Acts::SurfaceArrayCreator::createEquidistantAxis(
       if (keys.size() > 1) {
         // bOption = Acts::closed;
 
-        minimum = -M_PI;
-        maximum = M_PI;
+        minimum = -std::numbers::pi;
+        maximum = std::numbers::pi;
 
-        // double step = 2 * M_PI / keys.size();
-        double step = 2 * M_PI / binNumber;
+        // double step = 2 * std::numbers::pi / keys.size();
+        double step = 2 * std::numbers::pi / binNumber;
         // rotate to max phi module plus one half step
         // this should make sure that phi wrapping at +- pi
         // never falls on a module center
         double max = phi(maxElem->binningPosition(gctx, BinningValue::binR));
-        double angle = M_PI - (max + 0.5 * step);
+        double angle = std::numbers::pi - (max + 0.5 * step);
 
         // replace given transform ref
         transform = (transform)*AngleAxis3(angle, Vector3::UnitZ());
@@ -632,8 +633,8 @@ Acts::SurfaceArrayCreator::createEquidistantAxis(
         // we do not need a transform in this case
       }
     } else {
-      minimum = -M_PI;
-      maximum = M_PI;
+      minimum = -std::numbers::pi;
+      maximum = std::numbers::pi;
     }
   } else {
     maximum = protoLayer.max(bValue, false);
diff --git a/Core/src/Geometry/TrackingGeometry.cpp b/Core/src/Geometry/TrackingGeometry.cpp
index 1ccf40ee1a9..f9207afbd18 100644
--- a/Core/src/Geometry/TrackingGeometry.cpp
+++ b/Core/src/Geometry/TrackingGeometry.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2016-2019 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include "Acts/Geometry/TrackingGeometry.hpp"
 
@@ -22,8 +22,7 @@ Acts::TrackingGeometry::TrackingGeometry(
     const MutableTrackingVolumePtr& highestVolume,
     const IMaterialDecorator* materialDecorator,
     const GeometryIdentifierHook& hook, const Logger& logger)
-    : m_world(highestVolume),
-      m_beam(Surface::makeShared<PerigeeSurface>(Vector3::Zero())) {
+    : m_world(highestVolume) {
   // Close the geometry: assign geometryID and successively the material
   std::size_t volumeID = 0;
   highestVolume->closeGeometry(materialDecorator, m_volumesById, volumeID, hook,
@@ -42,13 +41,7 @@ Acts::TrackingGeometry::~TrackingGeometry() = default;
 
 const Acts::TrackingVolume* Acts::TrackingGeometry::lowestTrackingVolume(
     const GeometryContext& gctx, const Acts::Vector3& gp) const {
-  const TrackingVolume* searchVolume = m_world.get();
-  const TrackingVolume* currentVolume = nullptr;
-  while (currentVolume != searchVolume && (searchVolume != nullptr)) {
-    currentVolume = searchVolume;
-    searchVolume = searchVolume->lowestTrackingVolume(gctx, gp);
-  }
-  return currentVolume;
+  return m_world->lowestTrackingVolume(gctx, gp);
 }
 
 const Acts::TrackingVolume* Acts::TrackingGeometry::highestTrackingVolume()
@@ -56,26 +49,20 @@ const Acts::TrackingVolume* Acts::TrackingGeometry::highestTrackingVolume()
   return m_world.get();
 }
 
-const std::shared_ptr<const Acts::TrackingVolume>&
-Acts::TrackingGeometry::highestTrackingVolumeShared() const {
+std::shared_ptr<const Acts::TrackingVolume>
+Acts::TrackingGeometry::highestTrackingVolumePtr() const {
   return m_world;
 }
 
 const Acts::Layer* Acts::TrackingGeometry::associatedLayer(
     const GeometryContext& gctx, const Acts::Vector3& gp) const {
-  const TrackingVolume* lowestVol = (lowestTrackingVolume(gctx, gp));
+  const TrackingVolume* lowestVol = lowestTrackingVolume(gctx, gp);
+  if (lowestVol == nullptr) {
+    return nullptr;
+  }
   return lowestVol->associatedLayer(gctx, gp);
 }
 
-void Acts::TrackingGeometry::registerBeamTube(
-    std::shared_ptr<const PerigeeSurface> beam) {
-  m_beam = std::move(beam);
-}
-
-const Acts::Surface* Acts::TrackingGeometry::getBeamline() const {
-  return m_beam.get();
-}
-
 const Acts::TrackingVolume* Acts::TrackingGeometry::findVolume(
     GeometryIdentifier id) const {
   auto vol = m_volumesById.find(id);
@@ -98,3 +85,11 @@ const std::unordered_map<Acts::GeometryIdentifier, const Acts::Surface*>&
 Acts::TrackingGeometry::geoIdSurfaceMap() const {
   return m_surfacesById;
 }
+
+void Acts::TrackingGeometry::visualize(
+    IVisualization3D& helper, const GeometryContext& gctx,
+    const ViewConfig& viewConfig, const ViewConfig& portalViewConfig,
+    const ViewConfig& sensitiveViewConfig) const {
+  highestTrackingVolume()->visualize(helper, gctx, viewConfig, portalViewConfig,
+                                     sensitiveViewConfig);
+}
diff --git a/Core/src/Geometry/TrackingGeometryBuilder.cpp b/Core/src/Geometry/TrackingGeometryBuilder.cpp
index 90a10b0ba04..b8a8b0bf070 100644
--- a/Core/src/Geometry/TrackingGeometryBuilder.cpp
+++ b/Core/src/Geometry/TrackingGeometryBuilder.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2016-2018 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include "Acts/Geometry/TrackingGeometryBuilder.hpp"
 
diff --git a/Core/src/Geometry/TrackingVolume.cpp b/Core/src/Geometry/TrackingVolume.cpp
index 9cc4afc2a37..bbe9b60fc98 100644
--- a/Core/src/Geometry/TrackingVolume.cpp
+++ b/Core/src/Geometry/TrackingVolume.cpp
@@ -1,20 +1,23 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2016-2019 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include "Acts/Geometry/TrackingVolume.hpp"
 
 #include "Acts/Definitions/Direction.hpp"
 #include "Acts/Geometry/GeometryIdentifier.hpp"
 #include "Acts/Geometry/GlueVolumesDescriptor.hpp"
+#include "Acts/Geometry/Portal.hpp"
 #include "Acts/Geometry/VolumeBounds.hpp"
 #include "Acts/Material/IMaterialDecorator.hpp"
 #include "Acts/Material/IVolumeMaterial.hpp"
 #include "Acts/Material/ProtoVolumeMaterial.hpp"
+#include "Acts/Navigation/INavigationPolicy.hpp"
+#include "Acts/Navigation/NavigationStream.hpp"
 #include "Acts/Propagator/Navigator.hpp"
 #include "Acts/Surfaces/RegularSurface.hpp"
 #include "Acts/Surfaces/Surface.hpp"
@@ -27,12 +30,13 @@
 #include <string>
 #include <utility>
 
+#include <boost/container/small_vector.hpp>
+
 namespace Acts {
 
 // constructor for arguments
 TrackingVolume::TrackingVolume(
-    const Transform3& transform,
-    std::shared_ptr<const VolumeBounds> volumeBounds,
+    const Transform3& transform, std::shared_ptr<VolumeBounds> volumeBounds,
     std::shared_ptr<const IVolumeMaterial> volumeMaterial,
     std::unique_ptr<const LayerArray> staticLayerArray,
     std::shared_ptr<const TrackingVolumeArray> containedVolumeArray,
@@ -47,28 +51,40 @@ TrackingVolume::TrackingVolume(
   createBoundarySurfaces();
   interlinkLayers();
   connectDenseBoundarySurfaces(denseVolumeVector);
+
+  DelegateChainBuilder{m_navigationDelegate}
+      .add<&INavigationPolicy::noopInitializeCandidates>()
+      .store(m_navigationDelegate);
 }
 
-TrackingVolume::TrackingVolume(const Volume& volume,
-                               const std::string& volumeName)
+TrackingVolume::TrackingVolume(Volume& volume, const std::string& volumeName)
     : TrackingVolume(volume.transform(), volume.volumeBoundsPtr(), nullptr,
                      nullptr, nullptr, MutableTrackingVolumeVector{},
                      volumeName) {}
 
 TrackingVolume::TrackingVolume(const Transform3& transform,
-                               std::shared_ptr<const VolumeBounds> volbounds,
+                               std::shared_ptr<VolumeBounds> volbounds,
                                const std::string& volumeName)
     : TrackingVolume(transform, std::move(volbounds), nullptr, nullptr, nullptr,
                      {}, volumeName) {}
 
 TrackingVolume::~TrackingVolume() = default;
+TrackingVolume::TrackingVolume(TrackingVolume&&) noexcept = default;
+TrackingVolume& TrackingVolume::operator=(TrackingVolume&&) noexcept = default;
 
 const TrackingVolume* TrackingVolume::lowestTrackingVolume(
-    const GeometryContext& /*gctx*/, const Vector3& position,
+    const GeometryContext& gctx, const Vector3& position,
     const double tol) const {
+  if (!inside(position, tol)) {
+    return nullptr;
+  }
+
   // confined static volumes - highest hierarchy
   if (m_confinedVolumes) {
-    return (m_confinedVolumes->object(position).get());
+    const TrackingVolume* volume = m_confinedVolumes->object(position).get();
+    if (volume != nullptr) {
+      return volume->lowestTrackingVolume(gctx, position, tol);
+    }
   }
 
   // search for dense volumes
@@ -341,6 +357,22 @@ void TrackingVolume::closeGeometry(
     std::unordered_map<GeometryIdentifier, const TrackingVolume*>& volumeMap,
     std::size_t& vol, const GeometryIdentifierHook& hook,
     const Logger& logger) {
+  if (m_confinedVolumes && !volumes().empty()) {
+    ACTS_ERROR(
+        "TrackingVolume::closeGeometry: Volume "
+        << volumeName()
+        << " has both confined volumes and volumes. This is not supported.");
+    throw std::invalid_argument("Volume has both confined volumes and volumes");
+  }
+
+  if (m_confinedLayers && !surfaces().empty()) {
+    ACTS_ERROR(
+        "TrackingVolume::closeGeometry: Volume "
+        << volumeName()
+        << " has both confined layers and surfaces. This is not supported.");
+    throw std::invalid_argument("Volume has both confined layers and surfaces");
+  }
+
   // we can construct the volume ID from this
   auto volumeID = GeometryIdentifier().setVolume(++vol);
   // assign the Volume ID to the volume itself
@@ -361,7 +393,7 @@ void TrackingVolume::closeGeometry(
         thisVolume->motherVolume()->volumeMaterial());
     if (protoMaterial == nullptr) {
       thisVolume->assignVolumeMaterial(
-          thisVolume->motherVolume()->volumeMaterialSharedPtr());
+          thisVolume->motherVolume()->volumeMaterialPtr());
     }
   }
 
@@ -373,7 +405,8 @@ void TrackingVolume::closeGeometry(
     // get the intersection solution
     auto& bSurface = bSurfIter->surfaceRepresentation();
     // create the boundary surface id
-    auto boundaryID = GeometryIdentifier(volumeID).setBoundary(++iboundary);
+    iboundary++;
+    auto boundaryID = GeometryIdentifier(volumeID).setBoundary(iboundary);
     // now assign to the boundary surface
     auto& mutableBSurface = *(const_cast<RegularSurface*>(&bSurface));
     mutableBSurface.assignGeometryId(boundaryID);
@@ -391,7 +424,8 @@ void TrackingVolume::closeGeometry(
       // loop over the layers
       for (auto& layerPtr : m_confinedLayers->arrayObjects()) {
         // create the layer identification
-        auto layerID = GeometryIdentifier(volumeID).setLayer(++ilayer);
+        ilayer++;
+        auto layerID = GeometryIdentifier(volumeID).setLayer(ilayer);
         // now close the geometry
         auto mutableLayerPtr = std::const_pointer_cast<Layer>(layerPtr);
         mutableLayerPtr->closeGeometry(materialDecorator, layerID, hook,
@@ -419,6 +453,30 @@ void TrackingVolume::closeGeometry(
                                         logger);
     }
   }
+
+  GeometryIdentifier::Value iportal = 0;
+  for (auto& portal : portals()) {
+    iportal++;
+    auto portalId = GeometryIdentifier(volumeID).setBoundary(iportal);
+    assert(portal.isValid() && "Invalid portal encountered during closing");
+
+    portal.surface().assignGeometryId(portalId);
+  }
+
+  GeometryIdentifier::Value isensitive = 0;
+
+  for (auto& surface : surfaces()) {
+    if (surface.associatedDetectorElement() == nullptr) {
+      continue;
+    }
+    isensitive++;
+    auto sensitiveId = GeometryIdentifier(volumeID).setSensitive(isensitive);
+    surface.assignGeometryId(sensitiveId);
+  }
+
+  for (auto& volume : volumes()) {
+    volume.closeGeometry(materialDecorator, volumeMap, vol, hook, logger);
+  }
 }
 
 // Returns the boundary surfaces ordered in probability to hit them based on
@@ -445,24 +503,6 @@ TrackingVolume::compatibleBoundaries(const GeometryContext& gctx,
         continue;
       }
 
-      if (options.forceIntersectBoundaries) {
-        const bool coCriterion =
-            std::abs(intersection.pathLength()) < std::abs(nearLimit);
-        ACTS_VERBOSE("Forcing intersection with surface "
-                     << boundary->surfaceRepresentation().geometryId());
-        if (coCriterion) {
-          ACTS_VERBOSE("Intersection forced successfully ");
-          ACTS_VERBOSE("- intersection path length "
-                       << std::abs(intersection.pathLength())
-                       << " < overstep limit " << std::abs(nearLimit));
-          return BoundaryIntersection(intersection, boundary);
-        }
-        ACTS_VERBOSE("Can't force intersection: ");
-        ACTS_VERBOSE("- intersection path length "
-                     << std::abs(intersection.pathLength())
-                     << " > overstep limit " << std::abs(nearLimit));
-      }
-
       ACTS_VERBOSE("Check intersection with surface "
                    << boundary->surfaceRepresentation().geometryId());
       if (detail::checkPathLength(intersection.pathLength(), nearLimit,
@@ -581,12 +621,16 @@ const std::string& TrackingVolume::volumeName() const {
   return m_name;
 }
 
+void TrackingVolume::setVolumeName(const std::string& volumeName) {
+  m_name = volumeName;
+}
+
 const IVolumeMaterial* TrackingVolume::volumeMaterial() const {
   return m_volumeMaterial.get();
 }
 
 const std::shared_ptr<const IVolumeMaterial>&
-TrackingVolume::volumeMaterialSharedPtr() const {
+TrackingVolume::volumeMaterialPtr() const {
   return m_volumeMaterial;
 }
 
@@ -650,4 +694,71 @@ TrackingVolume& TrackingVolume::addVolume(
   return *m_volumes.back();
 }
 
+TrackingVolume::PortalRange TrackingVolume::portals() const {
+  return PortalRange{m_portals};
+}
+
+TrackingVolume::MutablePortalRange TrackingVolume::portals() {
+  return MutablePortalRange{m_portals};
+}
+
+void TrackingVolume::addPortal(std::shared_ptr<Portal> portal) {
+  if (portal == nullptr) {
+    throw std::invalid_argument("Portal is nullptr");
+  }
+  m_portals.push_back(std::move(portal));
+}
+
+TrackingVolume::SurfaceRange TrackingVolume::surfaces() const {
+  return SurfaceRange{m_surfaces};
+}
+
+TrackingVolume::MutableSurfaceRange TrackingVolume::surfaces() {
+  return MutableSurfaceRange{m_surfaces};
+}
+
+void TrackingVolume::addSurface(std::shared_ptr<Surface> surface) {
+  if (surface == nullptr) {
+    throw std::invalid_argument("Surface is nullptr");
+  }
+  m_surfaces.push_back(std::move(surface));
+}
+
+void TrackingVolume::visualize(IVisualization3D& helper,
+                               const GeometryContext& gctx,
+                               const ViewConfig& viewConfig,
+                               const ViewConfig& portalViewConfig,
+                               const ViewConfig& sensitiveViewConfig) const {
+  helper.object(volumeName());
+  Volume::visualize(helper, gctx, viewConfig);
+
+  if (!surfaces().empty()) {
+    helper.object(volumeName() + "_sensitives");
+  }
+  for (const auto& surface : surfaces()) {
+    surface.visualize(helper, gctx, sensitiveViewConfig);
+  }
+
+  for (const auto& child : volumes()) {
+    child.visualize(helper, gctx, viewConfig, portalViewConfig,
+                    sensitiveViewConfig);
+  }
+}
+
+void TrackingVolume::setNavigationPolicy(
+    std::unique_ptr<INavigationPolicy> policy) {
+  if (policy == nullptr) {
+    throw std::invalid_argument("Navigation policy is nullptr");
+  }
+
+  m_navigationPolicy = std::move(policy);
+  m_navigationPolicy->connect(m_navigationDelegate);
+}
+
+void TrackingVolume::initializeNavigationCandidates(
+    const NavigationArguments& args, AppendOnlyNavigationStream& stream,
+    const Logger& logger) const {
+  m_navigationDelegate(args, stream, logger);
+}
+
 }  // namespace Acts
diff --git a/Core/src/Geometry/TrackingVolumeArrayCreator.cpp b/Core/src/Geometry/TrackingVolumeArrayCreator.cpp
index 15ca130289a..61727f9dee0 100644
--- a/Core/src/Geometry/TrackingVolumeArrayCreator.cpp
+++ b/Core/src/Geometry/TrackingVolumeArrayCreator.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2016-2018 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include "Acts/Geometry/TrackingVolumeArrayCreator.hpp"
 
@@ -29,7 +29,7 @@ Acts::TrackingVolumeArrayCreator::trackingVolumeArray(
   // sort it accordingly to the binning value
   GeometryObjectSorterT<std::shared_ptr<const TrackingVolume>> volumeSorter(
       gctx, bValue);
-  std::sort(volumes.begin(), volumes.end(), volumeSorter);
+  std::ranges::sort(volumes, volumeSorter);
 
   // prepare what we need :
   // (1) arbitrary binning for volumes is fast enough
diff --git a/Core/src/Geometry/TrapezoidVolumeBounds.cpp b/Core/src/Geometry/TrapezoidVolumeBounds.cpp
index add969b1769..96d682a35dc 100644
--- a/Core/src/Geometry/TrapezoidVolumeBounds.cpp
+++ b/Core/src/Geometry/TrapezoidVolumeBounds.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2016-2018 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include "Acts/Geometry/TrapezoidVolumeBounds.hpp"
 
@@ -18,6 +18,7 @@
 
 #include <cmath>
 #include <cstddef>
+#include <numbers>
 #include <utility>
 
 namespace Acts {
@@ -31,7 +32,7 @@ TrapezoidVolumeBounds::TrapezoidVolumeBounds(ActsScalar minhalex,
   m_values[eHalfLengthY] = haley;
   m_values[eHalfLengthZ] = halez;
   m_values[eAlpha] = atan2(2 * haley, (maxhalex - minhalex));
-  m_values[eBeta] = M_PI - get(eAlpha);
+  m_values[eBeta] = std::numbers::pi - get(eAlpha);
   checkConsistency();
   buildSurfaceBounds();
 }
@@ -46,8 +47,8 @@ TrapezoidVolumeBounds::TrapezoidVolumeBounds(ActsScalar minhalex,
   m_values[eAlpha] = alpha;
   m_values[eBeta] = beta;
   // now calculate the remaining max half X
-  ActsScalar gamma =
-      (alpha > beta) ? (alpha - 0.5 * M_PI) : (beta - 0.5 * M_PI);
+  ActsScalar gamma = (alpha > beta) ? (alpha - std::numbers::pi / 2.)
+                                    : (beta - std::numbers::pi / 2.);
   m_values[eHalfLengthXposY] = minhalex + (2. * haley) * tan(gamma);
 
   checkConsistency();
@@ -84,9 +85,10 @@ std::vector<OrientedSurface> TrapezoidVolumeBounds::orientedSurfaces(
   // Face surfaces yz
   // (3) - At point B, attached to beta opening angle
   Vector3 fbPosition(-get(eHalfLengthXnegY) + neghOffset, 0., 0.);
-  auto fbTransform = transform * Translation3(fbPosition) *
-                     AngleAxis3(-0.5 * M_PI + get(eBeta), Vector3(0., 0., 1.)) *
-                     s_planeYZ;
+  auto fbTransform =
+      transform * Translation3(fbPosition) *
+      AngleAxis3(-std::numbers::pi / 2. + get(eBeta), Vector3(0., 0., 1.)) *
+      s_planeYZ;
   sf =
       Surface::makeShared<PlaneSurface>(fbTransform, m_faceBetaRectangleBounds);
   oSurfaces.push_back(OrientedSurface{std::move(sf), Direction::AlongNormal});
@@ -95,7 +97,8 @@ std::vector<OrientedSurface> TrapezoidVolumeBounds::orientedSurfaces(
   Vector3 faPosition(get(eHalfLengthXnegY) + poshOffset, 0., 0.);
   auto faTransform =
       transform * Translation3(faPosition) *
-      AngleAxis3(-0.5 * M_PI + get(eAlpha), Vector3(0., 0., 1.)) * s_planeYZ;
+      AngleAxis3(-std::numbers::pi / 2. + get(eAlpha), Vector3(0., 0., 1.)) *
+      s_planeYZ;
   sf = Surface::makeShared<PlaneSurface>(faTransform,
                                          m_faceAlphaRectangleBounds);
   oSurfaces.push_back(
@@ -124,10 +127,12 @@ void TrapezoidVolumeBounds::buildSurfaceBounds() {
       get(eHalfLengthXnegY), get(eHalfLengthXposY), get(eHalfLengthY));
 
   m_faceAlphaRectangleBounds = std::make_shared<const RectangleBounds>(
-      get(eHalfLengthY) / cos(get(eAlpha) - 0.5 * M_PI), get(eHalfLengthZ));
+      get(eHalfLengthY) / cos(get(eAlpha) - std::numbers::pi / 2.),
+      get(eHalfLengthZ));
 
   m_faceBetaRectangleBounds = std::make_shared<const RectangleBounds>(
-      get(eHalfLengthY) / cos(get(eBeta) - 0.5 * M_PI), get(eHalfLengthZ));
+      get(eHalfLengthY) / cos(get(eBeta) - std::numbers::pi / 2.),
+      get(eHalfLengthZ));
 
   m_faceZXRectangleBoundsBottom = std::make_shared<const RectangleBounds>(
       get(eHalfLengthZ), get(eHalfLengthXnegY));
diff --git a/Core/src/Geometry/TrivialPortalLink.cpp b/Core/src/Geometry/TrivialPortalLink.cpp
new file mode 100644
index 00000000000..6976388dbc0
--- /dev/null
+++ b/Core/src/Geometry/TrivialPortalLink.cpp
@@ -0,0 +1,49 @@
+// This file is part of the ACTS project.
+//
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
+//
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
+
+#include "Acts/Geometry/TrivialPortalLink.hpp"
+
+#include "Acts/Geometry/GridPortalLink.hpp"
+#include "Acts/Geometry/TrackingVolume.hpp"
+
+#include <memory>
+
+namespace Acts {
+
+std::unique_ptr<GridPortalLink> TrivialPortalLink::makeGrid(
+    BinningValue direction) const {
+  return GridPortalLink::make(m_surface, *m_volume, direction);
+}
+
+Result<const TrackingVolume*> TrivialPortalLink::resolveVolume(
+    const GeometryContext& /*gctx*/, const Vector2& /*position*/,
+    double /*tolerance*/) const {
+  return m_volume;
+}
+
+Result<const TrackingVolume*> TrivialPortalLink::resolveVolume(
+    const GeometryContext& gctx, const Vector3& position,
+    double tolerance) const {
+  static_cast<void>(gctx);
+  static_cast<void>(position);
+  static_cast<void>(tolerance);
+  assert(m_surface->isOnSurface(gctx, position, BoundaryTolerance::None(),
+                                tolerance) &&
+         "Trivial portal lookup point should be on surface");
+  return m_volume;
+}
+
+void TrivialPortalLink::toStream(std::ostream& os) const {
+  os << "TrivialPortalLink<vol=" << m_volume->volumeName() << ">";
+}
+
+const TrackingVolume& TrivialPortalLink::volume() const {
+  return *m_volume;
+}
+
+}  // namespace Acts
diff --git a/Core/src/Geometry/Volume.cpp b/Core/src/Geometry/Volume.cpp
index 79dcf5598dc..97a026b039f 100644
--- a/Core/src/Geometry/Volume.cpp
+++ b/Core/src/Geometry/Volume.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2016-2020 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include "Acts/Geometry/Volume.hpp"
 
@@ -19,7 +19,7 @@ using namespace Acts::UnitLiterals;
 namespace Acts {
 
 Volume::Volume(const Transform3& transform,
-               std::shared_ptr<const VolumeBounds> volbounds)
+               std::shared_ptr<VolumeBounds> volbounds)
     : GeometryObject(),
       m_transform(transform),
       m_itransform(m_transform.inverse()),
@@ -74,12 +74,13 @@ Volume::BoundingBox Volume::orientedBoundingBox() const {
                                      this);
 }
 
-void Volume::assignVolumeBounds(std::shared_ptr<const VolumeBounds> volbounds) {
+void Volume::assignVolumeBounds(std::shared_ptr<VolumeBounds> volbounds) {
   update(std::move(volbounds));
 }
 
-void Volume::update(std::shared_ptr<const VolumeBounds> volbounds,
-                    std::optional<Transform3> transform) {
+void Volume::update(std::shared_ptr<VolumeBounds> volbounds,
+                    std::optional<Transform3> transform,
+                    const Logger& /*logger*/) {
   if (volbounds) {
     m_volumeBounds = std::move(volbounds);
   }
@@ -104,10 +105,18 @@ const VolumeBounds& Volume::volumeBounds() const {
   return *m_volumeBounds;
 }
 
+VolumeBounds& Volume::volumeBounds() {
+  return *m_volumeBounds;
+}
+
 std::shared_ptr<const VolumeBounds> Volume::volumeBoundsPtr() const {
   return m_volumeBounds;
 }
 
+std::shared_ptr<VolumeBounds> Volume::volumeBoundsPtr() {
+  return m_volumeBounds;
+}
+
 void Volume::setTransform(const Transform3& transform) {
   m_transform = transform;
   m_itransform = m_transform.inverse();
@@ -119,7 +128,12 @@ bool Volume::operator==(const Volume& other) const {
          (*m_volumeBounds == *other.m_volumeBounds);
 }
 
-bool Volume::operator!=(const Volume& other) const {
-  return !(*this == other);
+void Volume::visualize(IVisualization3D& helper, const GeometryContext& gctx,
+                       const ViewConfig& viewConfig) const {
+  auto bSurfaces = volumeBounds().orientedSurfaces(transform());
+  for (const auto& bs : bSurfaces) {
+    bs.surface->visualize(helper, gctx, viewConfig);
+  }
 }
+
 }  // namespace Acts
diff --git a/Core/src/Geometry/VolumeBounds.cpp b/Core/src/Geometry/VolumeBounds.cpp
index 95039632f3e..b27d7839d39 100644
--- a/Core/src/Geometry/VolumeBounds.cpp
+++ b/Core/src/Geometry/VolumeBounds.cpp
@@ -1,18 +1,45 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2016-2018 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include "Acts/Geometry/VolumeBounds.hpp"
 
-const std::vector<std::string> Acts::VolumeBounds::s_boundsTypeNames = {
-    "Cone",          "Cuboid",    "CutoutCylinder", "Cylinder",
-    "GenericCuboid", "Trapezoid", "Other"};
+namespace Acts {
 
-/**Overload of << operator for std::ostream for debug output*/
-std::ostream& Acts::operator<<(std::ostream& sl, const Acts::VolumeBounds& vb) {
+std::ostream& operator<<(std::ostream& sl, const Acts::VolumeBounds& vb) {
   return vb.toStream(sl);
 }
+
+std::ostream& operator<<(std::ostream& sl, const VolumeBounds::BoundsType& bt) {
+  switch (bt) {
+    using enum VolumeBounds::BoundsType;
+    case eCone:
+      sl << "Cone";
+      break;
+    case eCuboid:
+      sl << "Cuboid";
+      break;
+    case eCutoutCylinder:
+      sl << "CutoutCylinder";
+      break;
+    case eCylinder:
+      sl << "Cylinder";
+      break;
+    case eGenericCuboid:
+      sl << "GenericCuboid";
+      break;
+    case eTrapezoid:
+      sl << "Trapezoid";
+      break;
+    case eOther:
+      sl << "Other";
+      break;
+  }
+  return sl;
+}
+
+}  // namespace Acts
diff --git a/Core/src/MagneticField/BFieldMapUtils.cpp b/Core/src/MagneticField/BFieldMapUtils.cpp
index b1977daac0b..b5b92191589 100644
--- a/Core/src/MagneticField/BFieldMapUtils.cpp
+++ b/Core/src/MagneticField/BFieldMapUtils.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2017-2018 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include "Acts/MagneticField/BFieldMapUtils.hpp"
 
@@ -39,8 +39,8 @@ Acts::fieldMapRZ(
     bool firstQuadrant) {
   // [1] Create Grid
   // sort the values
-  std::sort(rPos.begin(), rPos.end());
-  std::sort(zPos.begin(), zPos.end());
+  std::ranges::sort(rPos);
+  std::ranges::sort(zPos);
   // Get unique values
   rPos.erase(std::unique(rPos.begin(), rPos.end()), rPos.end());
   zPos.erase(std::unique(zPos.begin(), zPos.end()), zPos.end());
@@ -58,8 +58,8 @@ Acts::fieldMapRZ(
   double zMax = zPos[nBinsZ - 1];
   // calculate maxima (add one last bin, because bin value always corresponds to
   // left boundary)
-  double stepZ = std::fabs(zMax - zMin) / (nBinsZ - 1);
-  double stepR = std::fabs(rMax - rMin) / (nBinsR - 1);
+  double stepZ = std::abs(zMax - zMin) / (nBinsZ - 1);
+  double stepR = std::abs(rMax - rMin) / (nBinsR - 1);
   rMax += stepR;
   zMax += stepZ;
   if (firstQuadrant) {
@@ -145,9 +145,9 @@ Acts::fieldMapXYZ(
     double lengthUnit, double BFieldUnit, bool firstOctant) {
   // [1] Create Grid
   // Sort the values
-  std::sort(xPos.begin(), xPos.end());
-  std::sort(yPos.begin(), yPos.end());
-  std::sort(zPos.begin(), zPos.end());
+  std::ranges::sort(xPos);
+  std::ranges::sort(yPos);
+  std::ranges::sort(zPos);
   // Get unique values
   xPos.erase(std::unique(xPos.begin(), xPos.end()), xPos.end());
   yPos.erase(std::unique(yPos.begin(), yPos.end()), yPos.end());
@@ -172,9 +172,9 @@ Acts::fieldMapXYZ(
   double zMax = zPos[nBinsZ - 1];
   // calculate maxima (add one last bin, because bin value always corresponds to
   // left boundary)
-  double stepZ = std::fabs(zMax - zMin) / (nBinsZ - 1);
-  double stepY = std::fabs(yMax - yMin) / (nBinsY - 1);
-  double stepX = std::fabs(xMax - xMin) / (nBinsX - 1);
+  double stepZ = std::abs(zMax - zMin) / (nBinsZ - 1);
+  double stepY = std::abs(yMax - yMin) / (nBinsY - 1);
+  double stepX = std::abs(xMax - xMin) / (nBinsX - 1);
   xMax += stepX;
   yMax += stepY;
   zMax += stepZ;
@@ -254,12 +254,9 @@ Acts::solenoidFieldMap(std::pair<double, double> rlim,
                        std::pair<double, double> zlim,
                        std::pair<std::size_t, std::size_t> nbins,
                        const SolenoidBField& field) {
-  double rMin = 0, rMax = 0, zMin = 0, zMax = 0;
-  std::tie(rMin, rMax) = rlim;
-  std::tie(zMin, zMax) = zlim;
-
-  std::size_t nBinsR = 0, nBinsZ = 0;
-  std::tie(nBinsR, nBinsZ) = nbins;
+  auto [rMin, rMax] = rlim;
+  auto [zMin, zMax] = zlim;
+  const auto [nBinsR, nBinsZ] = nbins;
 
   double stepZ = std::abs(zMax - zMin) / (nBinsZ - 1);
   double stepR = std::abs(rMax - rMin) / (nBinsR - 1);
diff --git a/Core/src/MagneticField/MagneticFieldError.cpp b/Core/src/MagneticField/MagneticFieldError.cpp
index 1a90de4bac1..8afaa3669be 100644
--- a/Core/src/MagneticField/MagneticFieldError.cpp
+++ b/Core/src/MagneticField/MagneticFieldError.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2021 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include "Acts/MagneticField/MagneticFieldError.hpp"
 
diff --git a/Core/src/MagneticField/SolenoidBField.cpp b/Core/src/MagneticField/SolenoidBField.cpp
index bba6f99f3ef..6fefe017b38 100644
--- a/Core/src/MagneticField/SolenoidBField.cpp
+++ b/Core/src/MagneticField/SolenoidBField.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2017-2018 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include "Acts/MagneticField/SolenoidBField.hpp"
 
@@ -12,6 +12,7 @@
 
 #include <algorithm>
 #include <cmath>
+#include <numbers>
 
 #define BOOST_MATH_NO_LONG_DOUBLE_MATH_FUNCTIONS
 
@@ -110,7 +111,8 @@ double Acts::SolenoidBField::B_r(const Vector2& pos, double scale) const {
   double k_2 = k2(r, z);
   double k = std::sqrt(k_2);
   double constant =
-      scale * k * z / (4 * M_PI * std::sqrt(m_cfg.radius * r * r * r));
+      scale * k * z /
+      (4 * std::numbers::pi * std::sqrt(m_cfg.radius * r * r * r));
 
   double B = (2. - k_2) / (2. - 2. * k_2) * ellint_2(k_2) - ellint_1(k_2);
 
@@ -147,7 +149,8 @@ double Acts::SolenoidBField::B_z(const Vector2& pos, double scale) const {
 
   double k_2 = k2(r, z);
   double k = std::sqrt(k_2);
-  double constant = scale * k / (4 * M_PI * std::sqrt(m_cfg.radius * r));
+  double constant =
+      scale * k / (4 * std::numbers::pi * std::sqrt(m_cfg.radius * r));
   double B = ((m_cfg.radius + r) * k_2 - 2. * r) / (2. * r * (1. - k_2)) *
                  ellint_2(k_2) +
              ellint_1(k_2);
diff --git a/Core/src/Material/AccumulatedMaterialSlab.cpp b/Core/src/Material/AccumulatedMaterialSlab.cpp
index f1099578b46..b8b7ebf88fe 100644
--- a/Core/src/Material/AccumulatedMaterialSlab.cpp
+++ b/Core/src/Material/AccumulatedMaterialSlab.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2020 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include "Acts/Material/AccumulatedMaterialSlab.hpp"
 
diff --git a/Core/src/Material/AccumulatedSurfaceMaterial.cpp b/Core/src/Material/AccumulatedSurfaceMaterial.cpp
index 42350b4f327..be0d9fa3be2 100644
--- a/Core/src/Material/AccumulatedSurfaceMaterial.cpp
+++ b/Core/src/Material/AccumulatedSurfaceMaterial.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2018-2020 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include "Acts/Material/AccumulatedSurfaceMaterial.hpp"
 
diff --git a/Core/src/Material/AccumulatedVolumeMaterial.cpp b/Core/src/Material/AccumulatedVolumeMaterial.cpp
index 59827a01995..8636dfd7df1 100644
--- a/Core/src/Material/AccumulatedVolumeMaterial.cpp
+++ b/Core/src/Material/AccumulatedVolumeMaterial.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2019-2020 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include "Acts/Material/AccumulatedVolumeMaterial.hpp"
 
diff --git a/Core/src/Material/AverageMaterials.cpp b/Core/src/Material/AverageMaterials.cpp
index af81781c8d5..e9770e910bf 100644
--- a/Core/src/Material/AverageMaterials.cpp
+++ b/Core/src/Material/AverageMaterials.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2020 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include "Acts/Material/detail/AverageMaterials.hpp"
 
@@ -29,10 +29,11 @@ Acts::MaterialSlab Acts::detail::combineSlabs(const MaterialSlab& slab1,
   // to properly account for the energy loss in multiple material.
 
   // use double for (intermediate) computations to avoid precision loss
+  const double thickness1 = static_cast<double>(slab1.thickness());
+  const double thickness2 = static_cast<double>(slab2.thickness());
 
   // the thickness properties are purely additive
-  double thickness = static_cast<double>(slab1.thickness()) +
-                     static_cast<double>(slab2.thickness());
+  const double thickness = thickness1 + thickness2;
 
   // if the two materials are the same there is no need for additional
   // computation
@@ -40,30 +41,30 @@ Acts::MaterialSlab Acts::detail::combineSlabs(const MaterialSlab& slab1,
     return {mat1, static_cast<float>(thickness)};
   }
 
-  double thicknessInX0 = static_cast<double>(slab1.thicknessInX0()) +
-                         static_cast<double>(slab2.thicknessInX0());
-  double thicknessInL0 = static_cast<double>(slab1.thicknessInL0()) +
-                         static_cast<double>(slab2.thicknessInL0());
-
-  // radiation/interaction length follows from consistency argument
-  float x0 = thickness / thicknessInX0;
-  float l0 = thickness / thicknessInL0;
-
   // molar amount-of-substance assuming a unit area, i.e. volume = thickness*1*1
-  double molarAmount1 = static_cast<double>(mat1.molarDensity()) *
-                        static_cast<double>(slab1.thickness());
-  double molarAmount2 = static_cast<double>(mat2.molarDensity()) *
-                        static_cast<double>(slab2.thickness());
-  double molarAmount = molarAmount1 + molarAmount2;
+  const double molarDensity1 = static_cast<double>(mat1.molarDensity());
+  const double molarDensity2 = static_cast<double>(mat2.molarDensity());
+
+  const double molarAmount1 = molarDensity1 * thickness1;
+  const double molarAmount2 = molarDensity2 * thickness2;
+  const double molarAmount = molarAmount1 + molarAmount2;
 
   // handle vacuum specially
   if (!(0.0 < molarAmount)) {
     return {Material(), static_cast<float>(thickness)};
   }
 
-  // compute average molar density by dividing the total amount-of-substance by
-  // the total volume for the same unit area, i.e. volume = totalThickness*1*1
-  float molarDensity = molarAmount / thickness;
+  // radiation/interaction length follows from consistency argument
+  const double thicknessX01 = static_cast<double>(slab1.thicknessInX0());
+  const double thicknessX02 = static_cast<double>(slab2.thicknessInX0());
+  const double thicknessL01 = static_cast<double>(slab1.thicknessInL0());
+  const double thicknessL02 = static_cast<double>(slab2.thicknessInL0());
+
+  const double thicknessInX0 = thicknessX01 + thicknessX02;
+  const double thicknessInL0 = thicknessL01 + thicknessL02;
+
+  const float x0 = static_cast<float>(thickness / thicknessInX0);
+  const float l0 = static_cast<float>(thickness / thicknessInL0);
 
   // assume two slabs of materials with N1,N2 atoms/molecules each with atomic
   // masses A1,A2 and nuclear charges. We have a total of N = N1 + N2
@@ -82,10 +83,12 @@ Acts::MaterialSlab Acts::detail::combineSlabs(const MaterialSlab& slab1,
   //        = (Vi*rhoi) / (V1*rho1 + V2*rho2)
   //
   // which can be computed from the molar amount-of-substance above.
+  const double ar1 = static_cast<double>(mat1.Ar());
+  const double ar2 = static_cast<double>(mat2.Ar());
 
-  double molarWeight1 = molarAmount1 / molarAmount;
-  double molarWeight2 = molarAmount2 / molarAmount;
-  float ar = molarWeight1 * mat1.Ar() + molarWeight2 * mat2.Ar();
+  const double molarWeight1 = molarAmount1 / molarAmount;
+  const double molarWeight2 = molarAmount2 / molarAmount;
+  const float ar = static_cast<float>(molarWeight1 * ar1 + molarWeight2 * ar2);
 
   // In the case of the atomic number, its main use is the computation
   // of the mean excitation energy approximated in ATL-SOFT-PUB-2008-003 as :
@@ -100,17 +103,23 @@ Acts::MaterialSlab Acts::detail::combineSlabs(const MaterialSlab& slab1,
   // To respect this the average atomic number thus need to be defined as :
   //     ln(Z)*t = ln(Z1)*t1 + ln(Z2)*t2
   //           Z = Exp( ln(Z1)*t1/t + ln(Z2)*t2/t )
-
-  double thicknessWeight1 = slab1.thickness() / thickness;
-  double thicknessWeight2 = slab2.thickness() / thickness;
-  float z = 0;
-  if (mat1.Z() != 0 && mat2.Z() != 0) {
-    z = exp(thicknessWeight1 * log(mat1.Z()) +
-            thicknessWeight2 * log(mat2.Z()));
+  const double z1 = static_cast<double>(mat1.Z());
+  const double z2 = static_cast<double>(mat2.Z());
+
+  const double thicknessWeight1 = thickness1 / thickness;
+  const double thicknessWeight2 = thickness2 / thickness;
+  float z = 0.f;
+  if (z1 > 0. && z2 > 0.) {
+    z = static_cast<float>(std::exp(thicknessWeight1 * std::log(z1) +
+                                    thicknessWeight2 * std::log(z2)));
   } else {
-    z = thicknessWeight1 * mat1.Z() + thicknessWeight2 * mat2.Z();
+    z = static_cast<float>(thicknessWeight1 * z1 + thicknessWeight2 * z2);
   }
 
+  // compute average molar density by dividing the total amount-of-substance by
+  // the total volume for the same unit area, i.e. volume = totalThickness*1*1
+  const float molarDensity = static_cast<float>(molarAmount / thickness);
+
   return {Material::fromMolarDensity(x0, l0, ar, z, molarDensity),
           static_cast<float>(thickness)};
 }
diff --git a/Core/src/Material/BinnedSurfaceMaterial.cpp b/Core/src/Material/BinnedSurfaceMaterial.cpp
index 380bcc1a4b3..0113e89a6e3 100644
--- a/Core/src/Material/BinnedSurfaceMaterial.cpp
+++ b/Core/src/Material/BinnedSurfaceMaterial.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2016-2020 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include "Acts/Material/BinnedSurfaceMaterial.hpp"
 
diff --git a/Core/src/Material/BinnedSurfaceMaterialAccumulater.cpp b/Core/src/Material/BinnedSurfaceMaterialAccumulater.cpp
index 60620bce24e..a4d2366b743 100644
--- a/Core/src/Material/BinnedSurfaceMaterialAccumulater.cpp
+++ b/Core/src/Material/BinnedSurfaceMaterialAccumulater.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2024 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include "Acts/Material/BinnedSurfaceMaterialAccumulater.hpp"
 
@@ -119,9 +119,9 @@ void Acts::BinnedSurfaceMaterialAccumulater::accumulate(
   }
 
   // After mapping this track, average the touched bins
-  for (auto tmapBin : touchedMapBins) {
-    std::vector<std::array<std::size_t, 3>> trackBins = {tmapBin.second};
-    tmapBin.first->trackAverage(trackBins, true);
+  for (const auto& [key, value] : touchedMapBins) {
+    std::vector<std::array<std::size_t, 3>> trackBins = {value};
+    key->trackAverage(trackBins, true);
   }
 
   // Empty bin correction
diff --git a/Core/src/Material/HomogeneousSurfaceMaterial.cpp b/Core/src/Material/HomogeneousSurfaceMaterial.cpp
index 3c942981eed..ec56cfd4c81 100644
--- a/Core/src/Material/HomogeneousSurfaceMaterial.cpp
+++ b/Core/src/Material/HomogeneousSurfaceMaterial.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2016-2020 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include "Acts/Material/HomogeneousSurfaceMaterial.hpp"
 
diff --git a/Core/src/Material/HomogeneousVolumeMaterial.cpp b/Core/src/Material/HomogeneousVolumeMaterial.cpp
index fcc8e820755..574859bb648 100644
--- a/Core/src/Material/HomogeneousVolumeMaterial.cpp
+++ b/Core/src/Material/HomogeneousVolumeMaterial.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2020 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include "Acts/Material/HomogeneousVolumeMaterial.hpp"
 
diff --git a/Core/src/Material/Interactions.cpp b/Core/src/Material/Interactions.cpp
index db3c4f9d483..a0612e4d0f8 100644
--- a/Core/src/Material/Interactions.cpp
+++ b/Core/src/Material/Interactions.cpp
@@ -1,15 +1,16 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2019-2020 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include "Acts/Material/Interactions.hpp"
 
 #include "Acts/Definitions/PdgParticle.hpp"
 #include "Acts/Material/Material.hpp"
+#include "Acts/Utilities/MathHelpers.hpp"
 
 #include <cassert>
 #include <cmath>
@@ -51,7 +52,7 @@ struct RelativisticQuantities {
     betaGamma = pOverM;
     assert((betaGamma >= 0) && "Negative betaGamma");
     // gamma = sqrt(m² + p²)/m = sqrt(1 + (p/m)²)
-    gamma = std::sqrt(1.0f + pOverM * pOverM);
+    gamma = Acts::fastHypot(1.0f, pOverM);
   }
 };
 
@@ -154,7 +155,7 @@ namespace detail {
 inline float computeEnergyLossLandauFwhm(const Acts::MaterialSlab& slab,
                                          const RelativisticQuantities& rq) {
   // return early in case of vacuum or zero thickness
-  if (!slab) {
+  if (!slab.isValid()) {
     return 0.0f;
   }
 
@@ -171,7 +172,7 @@ inline float computeEnergyLossLandauFwhm(const Acts::MaterialSlab& slab,
 float Acts::computeEnergyLossBethe(const MaterialSlab& slab, float m,
                                    float qOverP, float absQ) {
   // return early in case of vacuum or zero thickness
-  if (!slab) {
+  if (!slab.isValid()) {
     return 0.0f;
   }
 
@@ -196,7 +197,7 @@ float Acts::computeEnergyLossBethe(const MaterialSlab& slab, float m,
 float Acts::deriveEnergyLossBetheQOverP(const MaterialSlab& slab, float m,
                                         float qOverP, float absQ) {
   // return early in case of vacuum or zero thickness
-  if (!slab) {
+  if (!slab.isValid()) {
     return 0.0f;
   }
 
@@ -233,7 +234,7 @@ float Acts::deriveEnergyLossBetheQOverP(const MaterialSlab& slab, float m,
 float Acts::computeEnergyLossLandau(const MaterialSlab& slab, float m,
                                     float qOverP, float absQ) {
   // return early in case of vacuum or zero thickness
-  if (!slab) {
+  if (!slab.isValid()) {
     return 0.0f;
   }
 
@@ -253,7 +254,7 @@ float Acts::computeEnergyLossLandau(const MaterialSlab& slab, float m,
 float Acts::deriveEnergyLossLandauQOverP(const MaterialSlab& slab, float m,
                                          float qOverP, float absQ) {
   // return early in case of vacuum or zero thickness
-  if (!slab) {
+  if (!slab.isValid()) {
     return 0.0f;
   }
 
@@ -288,7 +289,7 @@ float Acts::deriveEnergyLossLandauQOverP(const MaterialSlab& slab, float m,
 float Acts::computeEnergyLossLandauSigma(const MaterialSlab& slab, float m,
                                          float qOverP, float absQ) {
   // return early in case of vacuum or zero thickness
-  if (!slab) {
+  if (!slab.isValid()) {
     return 0.0f;
   }
 
@@ -386,7 +387,7 @@ float Acts::computeEnergyLossRadiative(const MaterialSlab& slab,
          "pdg is not absolute");
 
   // return early in case of vacuum or zero thickness
-  if (!slab) {
+  if (!slab.isValid()) {
     return 0.0f;
   }
 
@@ -395,7 +396,7 @@ float Acts::computeEnergyLossRadiative(const MaterialSlab& slab,
   // particle momentum and energy
   // do not need to care about the sign since it is only used squared
   const float momentum = absQ / qOverP;
-  const float energy = std::hypot(m, momentum);
+  const float energy = fastHypot(m, momentum);
 
   float dEdx = computeBremsstrahlungLossMean(m, energy);
 
@@ -415,7 +416,7 @@ float Acts::deriveEnergyLossRadiativeQOverP(const MaterialSlab& slab,
          "pdg is not absolute");
 
   // return early in case of vacuum or zero thickness
-  if (!slab) {
+  if (!slab.isValid()) {
     return 0.0f;
   }
 
@@ -424,7 +425,7 @@ float Acts::deriveEnergyLossRadiativeQOverP(const MaterialSlab& slab,
   // particle momentum and energy
   // do not need to care about the sign since it is only used squared
   const float momentum = absQ / qOverP;
-  const float energy = std::hypot(m, momentum);
+  const float energy = fastHypot(m, momentum);
 
   // compute derivative w/ respect to energy.
   float derE = deriveBremsstrahlungLossMeanE(m);
@@ -504,7 +505,7 @@ float Acts::computeMultipleScatteringTheta0(const MaterialSlab& slab,
          "pdg is not absolute");
 
   // return early in case of vacuum or zero thickness
-  if (!slab) {
+  if (!slab.isValid()) {
     return 0.0f;
   }
 
diff --git a/Core/src/Material/IntersectionMaterialAssigner.cpp b/Core/src/Material/IntersectionMaterialAssigner.cpp
index f3f068e8b0f..f85320ee119 100644
--- a/Core/src/Material/IntersectionMaterialAssigner.cpp
+++ b/Core/src/Material/IntersectionMaterialAssigner.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2024 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include "Acts/Material/IntersectionMaterialAssigner.hpp"
 
@@ -12,6 +12,8 @@
 #include "Acts/Surfaces/Surface.hpp"
 #include "Acts/Utilities/StringHelpers.hpp"
 
+#include <algorithm>
+
 namespace {
 
 std::vector<Acts::SurfaceIntersection> forwardOrderedIntersections(
@@ -35,8 +37,8 @@ std::vector<Acts::SurfaceIntersection> forwardOrderedIntersections(
     }
   }
   // Sort the intersection along the pathlength
-  std::sort(sIntersections.begin(), sIntersections.end(),
-            &Acts::SurfaceIntersection::pathLengthOrder);
+  std::ranges::sort(sIntersections,
+                    &Acts::SurfaceIntersection::pathLengthOrder);
   return sIntersections;
 }
 
diff --git a/Core/src/Material/Material.cpp b/Core/src/Material/Material.cpp
index 9056c937fa7..dd8c1e5cca1 100644
--- a/Core/src/Material/Material.cpp
+++ b/Core/src/Material/Material.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2019-2020 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include "Acts/Material/Material.hpp"
 
@@ -96,7 +96,7 @@ Acts::Material::ParametersVector Acts::Material::parameters() const {
 }
 
 std::ostream& Acts::operator<<(std::ostream& os, const Material& material) {
-  if (!material) {
+  if (!material.isValid()) {
     os << "vacuum";
   } else {
     os << "x0=" << material.X0();
diff --git a/Core/src/Material/MaterialGridHelper.cpp b/Core/src/Material/MaterialGridHelper.cpp
index 23792f3bd7f..83c7946f77c 100644
--- a/Core/src/Material/MaterialGridHelper.cpp
+++ b/Core/src/Material/MaterialGridHelper.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2020 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include "Acts/Material/MaterialGridHelper.hpp"
 
@@ -32,8 +32,8 @@ Acts::Grid2D Acts::createGrid(Acts::MaterialGridAxisData gridAxis1,
   // calculate maxima (add one last bin, because bin value always corresponds
   // to
   // left boundary)
-  double stepAxis1 = std::fabs(maxAxis1 - minAxis1) / (nBinsAxis1 - 1);
-  double stepAxis2 = std::fabs(maxAxis2 - minAxis2) / (nBinsAxis2 - 1);
+  double stepAxis1 = std::abs(maxAxis1 - minAxis1) / (nBinsAxis1 - 1);
+  double stepAxis2 = std::abs(maxAxis2 - minAxis2) / (nBinsAxis2 - 1);
   maxAxis1 += stepAxis1;
   maxAxis2 += stepAxis2;
 
@@ -64,11 +64,11 @@ Acts::Grid3D Acts::createGrid(Acts::MaterialGridAxisData gridAxis1,
   // to
   // left boundary)
   double stepAxis1 =
-      std::fabs(maxAxis1 - minAxis1) / std::max(nBinsAxis1 - 1, std::size_t{1});
+      std::abs(maxAxis1 - minAxis1) / std::max(nBinsAxis1 - 1, std::size_t{1});
   double stepAxis2 =
-      std::fabs(maxAxis2 - minAxis2) / std::max(nBinsAxis2 - 1, std::size_t{1});
+      std::abs(maxAxis2 - minAxis2) / std::max(nBinsAxis2 - 1, std::size_t{1});
   double stepAxis3 =
-      std::fabs(maxAxis3 - minAxis3) / std::max(nBinsAxis3 - 1, std::size_t{1});
+      std::abs(maxAxis3 - minAxis3) / std::max(nBinsAxis3 - 1, std::size_t{1});
   maxAxis1 += stepAxis1;
   maxAxis2 += stepAxis2;
   maxAxis3 += stepAxis3;
diff --git a/Core/src/Material/MaterialInteractionAssignment.cpp b/Core/src/Material/MaterialInteractionAssignment.cpp
index 793a2d3ba4f..8d4b4b0ac60 100644
--- a/Core/src/Material/MaterialInteractionAssignment.cpp
+++ b/Core/src/Material/MaterialInteractionAssignment.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2024 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include "Acts/Material/MaterialInteractionAssignment.hpp"
 
@@ -73,7 +73,7 @@ Acts::MaterialInteractionAssignment::assign(
 
     // A local veta veto kicked in
     GeometryIdentifier intersectionID = surface->geometryId();
-    if (options.localVetos.find(intersectionID) != options.localVetos.end()) {
+    if (options.localVetos.contains(intersectionID)) {
       const auto& localVeto = *options.localVetos.find(intersectionID);
       if (localVeto(materialInteraction, intersectedSurfaces[is])) {
         unassignedMaterialInteractions.push_back(materialInteraction);
@@ -91,8 +91,7 @@ Acts::MaterialInteractionAssignment::assign(
     assignedMaterialInteraction.intersectionID = intersectionID;
     // Check for possible reassignment
     if (is + 1u < intersectedSurfaces.size() &&
-        options.reAssignments.find(intersectionID) !=
-            options.reAssignments.end()) {
+        options.reAssignments.contains(intersectionID)) {
       auto reAssignment = (*options.reAssignments.find(intersectionID));
       reAssignment(assignedMaterialInteraction, intersectedSurfaces[is],
                    intersectedSurfaces[is + 1]);
@@ -110,8 +109,7 @@ Acts::MaterialInteractionAssignment::assign(
   // (empty bin correction can use this information)
   std::vector<IAssignmentFinder::SurfaceAssignment> surfacesWithoutAssignments;
   for (const auto& intersectedSurface : intersectedSurfaces) {
-    if (assignedSurfaces.find(intersectedSurface.surface) ==
-        assignedSurfaces.end()) {
+    if (!assignedSurfaces.contains(intersectedSurface.surface)) {
       surfacesWithoutAssignments.push_back(intersectedSurface);
     }
   }
diff --git a/Core/src/Material/MaterialMapUtils.cpp b/Core/src/Material/MaterialMapUtils.cpp
index ee866556cd5..b51b1a3e223 100644
--- a/Core/src/Material/MaterialMapUtils.cpp
+++ b/Core/src/Material/MaterialMapUtils.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2019-2020 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include "Acts/Material/MaterialMapUtils.hpp"
 
@@ -44,8 +44,8 @@ auto Acts::materialMapperRZ(
 
   // [2] Create Grid
   // sort the values
-  std::sort(rPos.begin(), rPos.end());
-  std::sort(zPos.begin(), zPos.end());
+  std::ranges::sort(rPos);
+  std::ranges::sort(zPos);
   // Get unique values
   rPos.erase(std::unique(rPos.begin(), rPos.end()), rPos.end());
   zPos.erase(std::unique(zPos.begin(), zPos.end()), zPos.end());
@@ -64,8 +64,8 @@ auto Acts::materialMapperRZ(
   double zMax = *minMaxZ.second;
   // calculate maxima (add one last bin, because bin value always corresponds to
   // left boundary)
-  double stepZ = std::fabs(zMax - zMin) / (nBinsZ - 1);
-  double stepR = std::fabs(rMax - rMin) / (nBinsR - 1);
+  double stepZ = std::abs(zMax - zMin) / (nBinsZ - 1);
+  double stepR = std::abs(rMax - rMin) / (nBinsR - 1);
   rMax += stepR;
   zMax += stepZ;
 
@@ -126,9 +126,9 @@ auto Acts::materialMapperXYZ(
 
   // [2] Create Grid
   // Sort the values
-  std::sort(xPos.begin(), xPos.end());
-  std::sort(yPos.begin(), yPos.end());
-  std::sort(zPos.begin(), zPos.end());
+  std::ranges::sort(xPos);
+  std::ranges::sort(yPos);
+  std::ranges::sort(zPos);
   // Get unique values
   xPos.erase(std::unique(xPos.begin(), xPos.end()), xPos.end());
   yPos.erase(std::unique(yPos.begin(), yPos.end()), yPos.end());
@@ -156,9 +156,9 @@ auto Acts::materialMapperXYZ(
   double zMax = *minMaxZ.second;
   // calculate maxima (add one last bin, because bin value always corresponds to
   // left boundary)
-  double stepZ = std::fabs(zMax - zMin) / (nBinsZ - 1);
-  double stepY = std::fabs(yMax - yMin) / (nBinsY - 1);
-  double stepX = std::fabs(xMax - xMin) / (nBinsX - 1);
+  double stepZ = std::abs(zMax - zMin) / (nBinsZ - 1);
+  double stepY = std::abs(yMax - yMin) / (nBinsY - 1);
+  double stepX = std::abs(xMax - xMin) / (nBinsX - 1);
   xMax += stepX;
   yMax += stepY;
   zMax += stepZ;
diff --git a/Core/src/Material/MaterialMapper.cpp b/Core/src/Material/MaterialMapper.cpp
index 1a490a16c18..bd635bfd608 100644
--- a/Core/src/Material/MaterialMapper.cpp
+++ b/Core/src/Material/MaterialMapper.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2024 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include "Acts/Material/MaterialMapper.hpp"
 
diff --git a/Core/src/Material/MaterialSlab.cpp b/Core/src/Material/MaterialSlab.cpp
index a38a1fcae01..acfd7064936 100644
--- a/Core/src/Material/MaterialSlab.cpp
+++ b/Core/src/Material/MaterialSlab.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2016-2020 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include "Acts/Material/MaterialSlab.hpp"
 
diff --git a/Core/src/Material/MaterialValidater.cpp b/Core/src/Material/MaterialValidater.cpp
index 04ef21de1ae..ad39692295e 100644
--- a/Core/src/Material/MaterialValidater.cpp
+++ b/Core/src/Material/MaterialValidater.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2024 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include "Acts/Material/MaterialValidater.hpp"
 
diff --git a/Core/src/Material/ProtoVolumeMaterial.cpp b/Core/src/Material/ProtoVolumeMaterial.cpp
index df3f51a3190..2b2bc74ae0c 100644
--- a/Core/src/Material/ProtoVolumeMaterial.cpp
+++ b/Core/src/Material/ProtoVolumeMaterial.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2020 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include "Acts/Material/ProtoVolumeMaterial.hpp"
 
diff --git a/Core/src/Material/SurfaceMaterialMapper.cpp b/Core/src/Material/SurfaceMaterialMapper.cpp
index a8d62f0e75c..f4ad7ecc6f9 100644
--- a/Core/src/Material/SurfaceMaterialMapper.cpp
+++ b/Core/src/Material/SurfaceMaterialMapper.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2018-2020 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include "Acts/Material/SurfaceMaterialMapper.hpp"
 
@@ -21,8 +21,7 @@
 #include "Acts/Material/ISurfaceMaterial.hpp"
 #include "Acts/Material/MaterialInteraction.hpp"
 #include "Acts/Material/ProtoSurfaceMaterial.hpp"
-#include "Acts/Propagator/AbortList.hpp"
-#include "Acts/Propagator/ActionList.hpp"
+#include "Acts/Propagator/ActorList.hpp"
 #include "Acts/Propagator/Navigator.hpp"
 #include "Acts/Propagator/Propagator.hpp"
 #include "Acts/Propagator/SurfaceCollector.hpp"
@@ -173,8 +172,7 @@ void Acts::SurfaceMaterialMapper::collectMaterialVolumes(
                                    << "' for material surfaces.");
   ACTS_VERBOSE("- Insert Volume ...");
   if (tVolume.volumeMaterial() != nullptr) {
-    mState.volumeMaterial[tVolume.geometryId()] =
-        tVolume.volumeMaterialSharedPtr();
+    mState.volumeMaterial[tVolume.geometryId()] = tVolume.volumeMaterialPtr();
   }
 
   // Step down into the sub volume
@@ -240,12 +238,11 @@ void Acts::SurfaceMaterialMapper::mapInteraction(
   // Prepare Action list and abort list
   using MaterialSurfaceCollector = SurfaceCollector<MaterialSurface>;
   using MaterialVolumeCollector = VolumeCollector<MaterialVolume>;
-  using ActionList =
-      ActionList<MaterialSurfaceCollector, MaterialVolumeCollector>;
-  using AbortList = AbortList<EndOfWorldReached>;
+  using ActorList = ActorList<MaterialSurfaceCollector, MaterialVolumeCollector,
+                              EndOfWorldReached>;
 
-  StraightLinePropagator::Options<ActionList, AbortList> options(
-      mState.geoContext, mState.magFieldContext);
+  StraightLinePropagator::Options<ActorList> options(mState.geoContext,
+                                                     mState.magFieldContext);
 
   // Now collect the material layers by using the straight line propagator
   const auto& result = m_propagator.propagate(start, options).value();
@@ -395,8 +392,7 @@ void Acts::SurfaceMaterialMapper::mapInteraction(
     // Now assign the material for the accumulation process
     auto tBin = currentAccMaterial->second.accumulate(
         currentPos, rmIter->materialSlab, currentPathCorrection);
-    if (touchedMapBins.find(&(currentAccMaterial->second)) ==
-        touchedMapBins.end()) {
+    if (!touchedMapBins.contains(&(currentAccMaterial->second))) {
       touchedMapBins.insert(MapBin(&(currentAccMaterial->second), tBin));
     }
     if (m_cfg.computeVariance) {
@@ -420,19 +416,19 @@ void Acts::SurfaceMaterialMapper::mapInteraction(
   }
 
   // After mapping this track, average the touched bins
-  for (auto tmapBin : touchedMapBins) {
-    std::vector<std::array<std::size_t, 3>> trackBins = {tmapBin.second};
+  for (const auto& [key, value] : touchedMapBins) {
+    std::vector<std::array<std::size_t, 3>> trackBins = {value};
     if (m_cfg.computeVariance) {
       // This only makes sense for the binned material
       auto binnedMaterial = dynamic_cast<const BinnedSurfaceMaterial*>(
-          touchedMaterialBin[tmapBin.first].get());
+          touchedMaterialBin[key].get());
       if (binnedMaterial != nullptr) {
-        tmapBin.first->trackVariance(
+        key->trackVariance(
             trackBins,
             binnedMaterial->fullMaterial()[trackBins[0][1]][trackBins[0][0]]);
       }
     }
-    tmapBin.first->trackAverage(trackBins);
+    key->trackAverage(trackBins);
   }
 
   // After mapping this track, average the untouched but intersected bins
@@ -486,8 +482,7 @@ void Acts::SurfaceMaterialMapper::mapSurfaceInteraction(
     // Now assign the material for the accumulation process
     auto tBin = currentAccMaterial->second.accumulate(
         currentPos, rmIter->materialSlab, rmIter->pathCorrection);
-    if (touchedMapBins.find(&(currentAccMaterial->second)) ==
-        touchedMapBins.end()) {
+    if (!touchedMapBins.contains(&(currentAccMaterial->second))) {
       touchedMapBins.insert(MapBin(&(currentAccMaterial->second), tBin));
     }
     if (m_cfg.computeVariance) {
@@ -498,14 +493,14 @@ void Acts::SurfaceMaterialMapper::mapSurfaceInteraction(
   }
 
   // After mapping this track, average the touched bins
-  for (auto tmapBin : touchedMapBins) {
-    std::vector<std::array<std::size_t, 3>> trackBins = {tmapBin.second};
+  for (const auto& [key, value] : touchedMapBins) {
+    std::vector<std::array<std::size_t, 3>> trackBins = {value};
     if (m_cfg.computeVariance) {
       // This only makes sense for the binned material
       auto binnedMaterial = dynamic_cast<const BinnedSurfaceMaterial*>(
-          touchedMaterialBin[tmapBin.first].get());
+          touchedMaterialBin[key].get());
       if (binnedMaterial != nullptr) {
-        tmapBin.first->trackVariance(
+        key->trackVariance(
             trackBins,
             binnedMaterial->fullMaterial()[trackBins[0][1]][trackBins[0][0]],
             true);
@@ -513,6 +508,6 @@ void Acts::SurfaceMaterialMapper::mapSurfaceInteraction(
     }
     // No need to do an extra pass for untouched surfaces they would have been
     // added to the material interaction in the initial mapping
-    tmapBin.first->trackAverage(trackBins, true);
+    key->trackAverage(trackBins, true);
   }
 }
diff --git a/Core/src/Material/VolumeMaterialMapper.cpp b/Core/src/Material/VolumeMaterialMapper.cpp
index 2bb9113f4a9..ca7c00b5730 100644
--- a/Core/src/Material/VolumeMaterialMapper.cpp
+++ b/Core/src/Material/VolumeMaterialMapper.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2019-2020 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include "Acts/Material/VolumeMaterialMapper.hpp"
 
@@ -24,8 +24,7 @@
 #include "Acts/Material/MaterialGridHelper.hpp"
 #include "Acts/Material/MaterialInteraction.hpp"
 #include "Acts/Material/ProtoVolumeMaterial.hpp"
-#include "Acts/Propagator/AbortList.hpp"
-#include "Acts/Propagator/ActionList.hpp"
+#include "Acts/Propagator/ActorList.hpp"
 #include "Acts/Propagator/SurfaceCollector.hpp"
 #include "Acts/Propagator/VolumeCollector.hpp"
 #include "Acts/Surfaces/SurfaceArray.hpp"
@@ -374,11 +373,11 @@ void Acts::VolumeMaterialMapper::mapMaterialTrack(
   // Prepare Action list and abort list
   using BoundSurfaceCollector = SurfaceCollector<BoundSurfaceSelector>;
   using MaterialVolumeCollector = VolumeCollector<MaterialVolumeSelector>;
-  using ActionList = ActionList<BoundSurfaceCollector, MaterialVolumeCollector>;
-  using AbortList = AbortList<EndOfWorldReached>;
+  using ActionList = ActorList<BoundSurfaceCollector, MaterialVolumeCollector,
+                               EndOfWorldReached>;
 
-  StraightLinePropagator::Options<ActionList, AbortList> options(
-      mState.geoContext, mState.magFieldContext);
+  StraightLinePropagator::Options<ActionList> options(mState.geoContext,
+                                                      mState.magFieldContext);
 
   // Now collect the material volume by using the straight line propagator
   const auto& result = m_propagator.propagate(start, options).value();
diff --git a/Core/src/Navigation/CMakeLists.txt b/Core/src/Navigation/CMakeLists.txt
new file mode 100644
index 00000000000..72bbf65b853
--- /dev/null
+++ b/Core/src/Navigation/CMakeLists.txt
@@ -0,0 +1,7 @@
+target_sources(
+    ActsCore
+    PRIVATE
+        NavigationStream.cpp
+        TryAllNavigationPolicy.cpp
+        SurfaceArrayNavigationPolicy.cpp
+)
diff --git a/Core/src/Navigation/NavigationStream.cpp b/Core/src/Navigation/NavigationStream.cpp
new file mode 100644
index 00000000000..c36eed12bbe
--- /dev/null
+++ b/Core/src/Navigation/NavigationStream.cpp
@@ -0,0 +1,179 @@
+// This file is part of the ACTS project.
+//
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
+//
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
+
+#include "Acts/Navigation/NavigationStream.hpp"
+
+#include "Acts/Detector/Portal.hpp"
+#include "Acts/Surfaces/Surface.hpp"
+
+#include <algorithm>
+
+namespace Acts {
+
+bool NavigationStream::initialize(const GeometryContext& gctx,
+                                  const QueryPoint& queryPoint,
+                                  const BoundaryTolerance& cTolerance,
+                                  ActsScalar onSurfaceTolerance) {
+  // Position and direction from the query point
+  const Vector3& position = queryPoint.position;
+  const Vector3& direction = queryPoint.direction;
+
+  // De-duplicate first (necessary to deal correctly with multiple
+  // intersections) - sort them by surface pointer
+  std::ranges::sort(m_candidates, [](const Candidate& a, const Candidate& b) {
+    return (&a.surface()) < (&b.surface());
+  });
+  // Remove duplicates on basis of the surface pointer
+  m_candidates.erase(std::unique(m_candidates.begin(), m_candidates.end(),
+                                 [](const Candidate& a, const Candidate& b) {
+                                   return (&a.surface()) == (&b.surface());
+                                 }),
+                     m_candidates.end());
+
+  // A container collecting additional candidates from multiple
+  // valid interseciton
+  std::vector<Candidate> additionalCandidates = {};
+  for (auto& [sIntersection, gen2Portal, portal, bTolerance] : m_candidates) {
+    // Get the surface from the object intersection
+    const Surface* surface = sIntersection.object();
+    // Intersect the surface
+    auto multiIntersection = surface->intersect(gctx, position, direction,
+                                                cTolerance, onSurfaceTolerance);
+
+    // Split them into valid intersections, keep track of potentially
+    // additional candidates
+    bool originalCandidateUpdated = false;
+    for (const auto& rsIntersection : multiIntersection.split()) {
+      // Skip negative solutions, respecting the on surface tolerance
+      if (rsIntersection.pathLength() < -onSurfaceTolerance) {
+        continue;
+      }
+      // Valid solution is either on surface or updates the distance
+      if (rsIntersection.isValid()) {
+        if (!originalCandidateUpdated) {
+          sIntersection = rsIntersection;
+          originalCandidateUpdated = true;
+        } else {
+          additionalCandidates.emplace_back(
+              Candidate{.intersection = rsIntersection,
+                        .gen2Portal = gen2Portal,
+                        .portal = portal,
+                        .bTolerance = bTolerance});
+        }
+      }
+    }
+  }
+
+  // Append the multi intersection candidates
+  m_candidates.insert(m_candidates.end(), additionalCandidates.begin(),
+                      additionalCandidates.end());
+
+  // Sort the candidates by path length
+  std::ranges::sort(m_candidates, Candidate::pathLengthOrder);
+
+  // The we find the first invalid candidate
+  auto firstInvalid =
+      std::ranges::find_if(m_candidates, [](const Candidate& a) {
+        const auto& [aIntersection, aGen2Portal, aPortal, aTolerance] = a;
+        return !aIntersection.isValid();
+      });
+
+  // Set the range and initialize
+  m_candidates.resize(std::distance(m_candidates.begin(), firstInvalid));
+
+  m_currentIndex = 0;
+  if (m_candidates.empty()) {
+    return false;
+  }
+  return true;
+}
+
+bool NavigationStream::update(const GeometryContext& gctx,
+                              const QueryPoint& queryPoint,
+                              ActsScalar onSurfaceTolerance) {
+  // Loop over the (currently valid) candidates and update
+  for (; m_currentIndex < m_candidates.size(); ++m_currentIndex) {
+    // Get the candidate, and resolve the tuple
+    Candidate& candidate = currentCandidate();
+    // Get the surface from the object intersection
+    const Surface* surface = candidate.intersection.object();
+    // (re-)Intersect the surface
+    auto multiIntersection =
+        surface->intersect(gctx, queryPoint.position, queryPoint.direction,
+                           candidate.bTolerance, onSurfaceTolerance);
+    // Split them into valid intersections
+    for (const auto& rsIntersection : multiIntersection.split()) {
+      // Skip wrong index solution
+      if (rsIntersection.index() != candidate.intersection.index()) {
+        continue;
+      }
+      // Valid solution is either on surface or updates the distance
+      if (rsIntersection.isValid()) {
+        candidate.intersection = rsIntersection;
+        return true;
+      }
+    }
+  }
+  // No candidate was reachable
+  return false;
+}
+
+void NavigationStream::addSurfaceCandidate(
+    const Surface& surface, const BoundaryTolerance& bTolerance) {
+  m_candidates.emplace_back(
+      Candidate{.intersection = ObjectIntersection<Surface>::invalid(&surface),
+                .bTolerance = bTolerance});
+}
+
+void NavigationStream::addSurfaceCandidates(
+    std::span<const Surface*> surfaces, const BoundaryTolerance& bTolerance) {
+  std::ranges::for_each(surfaces, [&](const auto* surface) {
+    m_candidates.emplace_back(
+        Candidate{.intersection = ObjectIntersection<Surface>::invalid(surface),
+                  .bTolerance = bTolerance});
+  });
+}
+
+void NavigationStream::addPortalCandidate(const Experimental::Portal& portal) {
+  m_candidates.emplace_back(Candidate{
+      .intersection = ObjectIntersection<Surface>::invalid(&portal.surface()),
+      .gen2Portal = &portal,
+      .bTolerance = BoundaryTolerance::None()});
+}
+
+void NavigationStream::addPortalCandidate(const Portal& portal) {
+  m_candidates.emplace_back(Candidate{
+      .intersection = ObjectIntersection<Surface>::invalid(&portal.surface()),
+      .portal = &portal,
+      .bTolerance = BoundaryTolerance::None()});
+}
+
+void NavigationStream::addPortalCandidates(
+    std::span<const Experimental::Portal*> portals) {
+  std::ranges::for_each(portals, [&](const auto& portal) {
+    m_candidates.emplace_back(Candidate{
+        .intersection =
+            ObjectIntersection<Surface>::invalid(&(portal->surface())),
+        .gen2Portal = portal,
+        .bTolerance = BoundaryTolerance::None()});
+  });
+}
+
+AppendOnlyNavigationStream::AppendOnlyNavigationStream(NavigationStream& stream)
+    : m_stream{&stream} {}
+
+void AppendOnlyNavigationStream::addPortalCandidate(const Portal& portal) {
+  m_stream->addPortalCandidate(portal);
+}
+
+void AppendOnlyNavigationStream::addSurfaceCandidate(
+    const Surface& surface, const BoundaryTolerance& bTolerance) {
+  m_stream->addSurfaceCandidate(surface, bTolerance);
+}
+
+}  // namespace Acts
diff --git a/Core/src/Navigation/SurfaceArrayNavigationPolicy.cpp b/Core/src/Navigation/SurfaceArrayNavigationPolicy.cpp
new file mode 100644
index 00000000000..f60bbbf6839
--- /dev/null
+++ b/Core/src/Navigation/SurfaceArrayNavigationPolicy.cpp
@@ -0,0 +1,81 @@
+// This file is part of the ACTS project.
+//
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
+//
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
+
+#include "Acts/Navigation/SurfaceArrayNavigationPolicy.hpp"
+
+#include "Acts/Geometry/SurfaceArrayCreator.hpp"
+#include "Acts/Geometry/TrackingVolume.hpp"
+#include "Acts/Navigation/NavigationStream.hpp"
+
+#include <algorithm>
+
+namespace Acts {
+
+SurfaceArrayNavigationPolicy::SurfaceArrayNavigationPolicy(
+    const GeometryContext& gctx, const TrackingVolume& volume,
+    const Logger& logger, Config config)
+    : m_volume(volume) {
+  ACTS_VERBOSE("Constructing SurfaceArrayNavigationPolicy for volume "
+               << volume.volumeName());
+  ACTS_VERBOSE("~> Layer type is " << config.layerType);
+  ACTS_VERBOSE("~> bins: " << config.bins.first << " x " << config.bins.second);
+
+  SurfaceArrayCreator::Config sacConfig;
+  SurfaceArrayCreator sac{sacConfig, logger.clone("SrfArrCrtr")};
+
+  std::vector<std::shared_ptr<const Surface>> surfaces;
+  surfaces.reserve(volume.surfaces().size());
+  for (const auto& surface : volume.surfaces()) {
+    if (surface.associatedDetectorElement() == nullptr) {
+      continue;
+    }
+    surfaces.push_back(surface.getSharedPtr());
+  }
+
+  if (config.layerType == LayerType::Disc) {
+    auto [binsR, binsPhi] = config.bins;
+    m_surfaceArray =
+        sac.surfaceArrayOnDisc(gctx, std::move(surfaces), binsPhi, binsR);
+  } else if (config.layerType == LayerType::Cylinder) {
+    auto [binsPhi, binsZ] = config.bins;
+    m_surfaceArray =
+        sac.surfaceArrayOnCylinder(gctx, std::move(surfaces), binsPhi, binsZ);
+  } else if (config.layerType == LayerType::Plane) {
+    ACTS_ERROR("Plane layers are not yet supported");
+    throw std::invalid_argument("Plane layers are not yet supported");
+  } else {
+    throw std::invalid_argument("Unknown layer type");
+  }
+
+  if (!m_surfaceArray) {
+    ACTS_ERROR("Failed to create surface array");
+    throw std::runtime_error("Failed to create surface array");
+  }
+}
+
+void SurfaceArrayNavigationPolicy::initializeCandidates(
+    const NavigationArguments& args, AppendOnlyNavigationStream& stream,
+    const Logger& logger) const {
+  ACTS_VERBOSE("SrfArrNavPol (volume=" << m_volume.volumeName() << ")");
+
+  ACTS_VERBOSE("Querying sensitive surfaces at " << args.position.transpose());
+  const std::vector<const Surface*>& sensitiveSurfaces =
+      m_surfaceArray->neighbors(args.position);
+  ACTS_VERBOSE("~> Surface array reports " << sensitiveSurfaces.size()
+                                           << " sensitive surfaces");
+
+  for (const auto* surface : sensitiveSurfaces) {
+    stream.addSurfaceCandidate(*surface, args.tolerance);
+  };
+}
+
+void SurfaceArrayNavigationPolicy::connect(NavigationDelegate& delegate) const {
+  connectDefault<SurfaceArrayNavigationPolicy>(delegate);
+}
+
+}  // namespace Acts
diff --git a/Core/src/Navigation/TryAllNavigationPolicy.cpp b/Core/src/Navigation/TryAllNavigationPolicy.cpp
new file mode 100644
index 00000000000..4423c7d62a8
--- /dev/null
+++ b/Core/src/Navigation/TryAllNavigationPolicy.cpp
@@ -0,0 +1,54 @@
+// This file is part of the ACTS project.
+//
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
+//
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
+
+#include "Acts/Navigation/TryAllNavigationPolicy.hpp"
+
+#include "Acts/Geometry/TrackingVolume.hpp"
+#include "Acts/Navigation/NavigationStream.hpp"
+
+namespace Acts {
+
+TryAllNavigationPolicy::TryAllNavigationPolicy(const GeometryContext& /*gctx*/,
+                                               const TrackingVolume& volume,
+                                               const Logger& logger,
+                                               const Config& config)
+    : m_cfg{config}, m_volume(&volume) {
+  assert(m_volume != nullptr);
+  ACTS_VERBOSE("TryAllNavigationPolicy created for volume "
+               << m_volume->volumeName());
+}
+
+TryAllNavigationPolicy::TryAllNavigationPolicy(const GeometryContext& gctx,
+                                               const TrackingVolume& volume,
+                                               const Logger& logger)
+    : TryAllNavigationPolicy(gctx, volume, logger, {}) {}
+
+void TryAllNavigationPolicy::initializeCandidates(
+    const NavigationArguments& args, AppendOnlyNavigationStream& stream,
+    const Logger& logger) const {
+  ACTS_VERBOSE("TryAllNavigationPolicy");
+  assert(m_volume != nullptr);
+
+  if (m_cfg.portals) {
+    for (const auto& portal : m_volume->portals()) {
+      stream.addPortalCandidate(portal);
+    }
+  }
+
+  if (m_cfg.sensitives) {
+    for (const auto& surface : m_volume->surfaces()) {
+      stream.addSurfaceCandidate(surface, args.tolerance);
+    };
+  }
+}
+
+void TryAllNavigationPolicy::connect(NavigationDelegate& delegate) const {
+  connectDefault<TryAllNavigationPolicy>(delegate);
+}
+
+}  // namespace Acts
diff --git a/Core/src/Propagator/EigenStepperError.cpp b/Core/src/Propagator/EigenStepperError.cpp
index 6134133cdf1..2ca0476a2c3 100644
--- a/Core/src/Propagator/EigenStepperError.cpp
+++ b/Core/src/Propagator/EigenStepperError.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2020 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include "Acts/Propagator/EigenStepperError.hpp"
 
diff --git a/Core/src/Propagator/MultiStepperError.cpp b/Core/src/Propagator/MultiStepperError.cpp
index 07cf1b523d3..0bffc361f0e 100644
--- a/Core/src/Propagator/MultiStepperError.cpp
+++ b/Core/src/Propagator/MultiStepperError.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2021 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include "Acts/Propagator/MultiStepperError.hpp"
 
diff --git a/Core/src/Propagator/PropagatorError.cpp b/Core/src/Propagator/PropagatorError.cpp
index b0da9572a4c..20931b27515 100644
--- a/Core/src/Propagator/PropagatorError.cpp
+++ b/Core/src/Propagator/PropagatorError.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2020 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include "Acts/Propagator/PropagatorError.hpp"
 
diff --git a/Core/src/Propagator/StraightLineStepper.cpp b/Core/src/Propagator/StraightLineStepper.cpp
index fa28aafe49f..e98f76ee81c 100644
--- a/Core/src/Propagator/StraightLineStepper.cpp
+++ b/Core/src/Propagator/StraightLineStepper.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2019-2020 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include "Acts/Propagator/StraightLineStepper.hpp"
 
diff --git a/Core/src/Propagator/SympyStepper.cpp b/Core/src/Propagator/SympyStepper.cpp
index 669e17ee7cb..a33e1f567bb 100644
--- a/Core/src/Propagator/SympyStepper.cpp
+++ b/Core/src/Propagator/SympyStepper.cpp
@@ -1,16 +1,15 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2024 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include "Acts/Propagator/SympyStepper.hpp"
 
 #include "Acts/Propagator/detail/SympyCovarianceEngine.hpp"
 #include "Acts/Propagator/detail/SympyJacobianEngine.hpp"
-#include "Acts/Utilities/QuickMath.hpp"
 
 #include <cmath>
 #include <cstdint>
@@ -127,17 +126,11 @@ Result<double> SympyStepper::stepImpl(
     // This is given by the order of the Runge-Kutta method
     constexpr double exponent = 0.25;
 
-    // Whether to use fast power function if available
-    constexpr bool tryUseFastPow{false};
-
     double x = stepTolerance / errorEstimate_;
 
-    if constexpr (exponent == 0.25 && !tryUseFastPow) {
+    if constexpr (exponent == 0.25) {
       // This is 3x faster than std::pow
       x = std::sqrt(std::sqrt(x));
-    } else if constexpr (std::numeric_limits<double>::is_iec559 &&
-                         tryUseFastPow) {
-      x = fastPow(x, exponent);
     } else {
       x = std::pow(x, exponent);
     }
diff --git a/Core/src/Propagator/codegen/sympy_stepper_math.hpp b/Core/src/Propagator/codegen/sympy_stepper_math.hpp
index e65c911cb51..d5c0ed4d769 100644
--- a/Core/src/Propagator/codegen/sympy_stepper_math.hpp
+++ b/Core/src/Propagator/codegen/sympy_stepper_math.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2024 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 // Note: This file is generated by generate_sympy_stepper.py
 //       Do not modify it manually.
diff --git a/Core/src/Propagator/detail/CovarianceEngine.cpp b/Core/src/Propagator/detail/CovarianceEngine.cpp
index 984eae2f580..a89016bce3c 100644
--- a/Core/src/Propagator/detail/CovarianceEngine.cpp
+++ b/Core/src/Propagator/detail/CovarianceEngine.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2019-2020 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include "Acts/Propagator/detail/CovarianceEngine.hpp"
 
diff --git a/Core/src/Propagator/detail/JacobianEngine.cpp b/Core/src/Propagator/detail/JacobianEngine.cpp
index 435bd1b1f98..4da84b6569b 100644
--- a/Core/src/Propagator/detail/JacobianEngine.cpp
+++ b/Core/src/Propagator/detail/JacobianEngine.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2021 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include "Acts/Propagator/detail/JacobianEngine.hpp"
 
diff --git a/Core/src/Propagator/detail/PointwiseMaterialInteraction.cpp b/Core/src/Propagator/detail/PointwiseMaterialInteraction.cpp
index 8314003111e..b18fd373038 100644
--- a/Core/src/Propagator/detail/PointwiseMaterialInteraction.cpp
+++ b/Core/src/Propagator/detail/PointwiseMaterialInteraction.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2019 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include "Acts/Propagator/detail/PointwiseMaterialInteraction.hpp"
 
diff --git a/Core/src/Propagator/detail/SympyCovarianceEngine.cpp b/Core/src/Propagator/detail/SympyCovarianceEngine.cpp
index 8c3f67c5973..f10171cc5ec 100644
--- a/Core/src/Propagator/detail/SympyCovarianceEngine.cpp
+++ b/Core/src/Propagator/detail/SympyCovarianceEngine.cpp
@@ -1,14 +1,15 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2024 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include "Acts/Propagator/detail/SympyCovarianceEngine.hpp"
 
 #include "Acts/Propagator/detail/JacobianEngine.hpp"
+#include "Acts/Propagator/detail/SympyJacobianEngine.hpp"
 
 #include "codegen/sympy_cov_math.hpp"
 
@@ -97,9 +98,9 @@ void sympy::transportCovarianceToBound(
     const FreeToBoundCorrection& freeToBoundCorrection) {
   // Calculate the full jacobian from local parameters at the start surface to
   // current bound parameters
-  boundToBoundTransportJacobian(geoContext, surface, freeParameters,
-                                boundToFreeJacobian, freeTransportJacobian,
-                                freeToPathDerivatives, fullTransportJacobian);
+  sympy::boundToBoundTransportJacobian(
+      geoContext, surface, freeParameters, boundToFreeJacobian,
+      freeTransportJacobian, freeToPathDerivatives, fullTransportJacobian);
 
   bool correction = false;
   if (freeToBoundCorrection) {
@@ -153,7 +154,7 @@ void sympy::transportCovarianceToCurvilinear(
     BoundToFreeMatrix& boundToFreeJacobian, const Vector3& direction) {
   // Calculate the full jacobian from local parameters at the start surface to
   // current curvilinear parameters
-  boundToCurvilinearTransportJacobian(
+  sympy::boundToCurvilinearTransportJacobian(
       direction, boundToFreeJacobian, freeTransportJacobian,
       freeToPathDerivatives, fullTransportJacobian);
 
diff --git a/Core/src/Propagator/detail/SympyJacobianEngine.cpp b/Core/src/Propagator/detail/SympyJacobianEngine.cpp
index c59ce74eeaf..aa471918643 100644
--- a/Core/src/Propagator/detail/SympyJacobianEngine.cpp
+++ b/Core/src/Propagator/detail/SympyJacobianEngine.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2024 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include "Acts/Propagator/detail/SympyJacobianEngine.hpp"
 
diff --git a/Core/src/Propagator/detail/codegen/sympy_cov_math.hpp b/Core/src/Propagator/detail/codegen/sympy_cov_math.hpp
index b35cbf07798..661d4f51978 100644
--- a/Core/src/Propagator/detail/codegen/sympy_cov_math.hpp
+++ b/Core/src/Propagator/detail/codegen/sympy_cov_math.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2024 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 // Note: This file is generated by generate_sympy_cov.py
 //       Do not modify it manually.
diff --git a/Core/src/Propagator/detail/codegen/sympy_jac_math.hpp b/Core/src/Propagator/detail/codegen/sympy_jac_math.hpp
index 34d5c4efb9f..3b96d867d01 100644
--- a/Core/src/Propagator/detail/codegen/sympy_jac_math.hpp
+++ b/Core/src/Propagator/detail/codegen/sympy_jac_math.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2024 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 // Note: This file is generated by generate_sympy_jac.py
 //       Do not modify it manually.
diff --git a/Core/src/Seeding/CMakeLists.txt b/Core/src/Seeding/CMakeLists.txt
new file mode 100644
index 00000000000..770037b1dfd
--- /dev/null
+++ b/Core/src/Seeding/CMakeLists.txt
@@ -0,0 +1 @@
+target_sources(ActsCore PRIVATE EstimateTrackParamsFromSeed.cpp)
diff --git a/Core/src/Seeding/EstimateTrackParamsFromSeed.cpp b/Core/src/Seeding/EstimateTrackParamsFromSeed.cpp
new file mode 100644
index 00000000000..eebcd1c5760
--- /dev/null
+++ b/Core/src/Seeding/EstimateTrackParamsFromSeed.cpp
@@ -0,0 +1,52 @@
+// This file is part of the ACTS project.
+//
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
+//
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
+
+#include "Acts/Seeding/EstimateTrackParamsFromSeed.hpp"
+
+#include "Acts/Definitions/TrackParametrization.hpp"
+
+#include <numbers>
+
+Acts::BoundMatrix Acts::estimateTrackParamCovariance(
+    const EstimateTrackParamCovarianceConfig& config, const BoundVector& params,
+    bool hasTime) {
+  assert((params[eBoundTheta] > 0 && params[eBoundTheta] < std::numbers::pi) &&
+         "Theta must be in the range (0, pi)");
+
+  BoundSquareMatrix result = BoundSquareMatrix::Zero();
+
+  for (std::size_t i = eBoundLoc0; i < eBoundSize; ++i) {
+    double sigma = config.initialSigmas[i];
+    double variance = sigma * sigma;
+
+    if (i == eBoundQOverP) {
+      // note that we rely on the fact that sigma theta is already computed
+      double varianceTheta = result(eBoundTheta, eBoundTheta);
+
+      // transverse momentum contribution
+      variance += std::pow(config.initialSigmaPtRel * params[eBoundQOverP], 2);
+
+      // theta contribution
+      variance +=
+          varianceTheta *
+          std::pow(params[eBoundQOverP] / std::tan(params[eBoundTheta]), 2);
+    }
+
+    if (i == eBoundTime && !hasTime) {
+      // Inflate the time uncertainty if no time measurement is available
+      variance *= config.noTimeVarInflation;
+    }
+
+    // Inflate the initial covariance
+    variance *= config.initialVarInflation[i];
+
+    result(i, i) = variance;
+  }
+
+  return result;
+}
diff --git a/Core/src/Surfaces/AnnulusBounds.cpp b/Core/src/Surfaces/AnnulusBounds.cpp
index 0752a41b4ff..34c7b5c468b 100644
--- a/Core/src/Surfaces/AnnulusBounds.cpp
+++ b/Core/src/Surfaces/AnnulusBounds.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2020 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include "Acts/Surfaces/AnnulusBounds.hpp"
 
@@ -103,33 +103,30 @@ std::vector<Acts::Vector2> Acts::AnnulusBounds::corners() const {
 }
 
 std::vector<Acts::Vector2> Acts::AnnulusBounds::vertices(
-    unsigned int lseg) const {
-  if (lseg > 0) {
-    // List of vertices counter-clockwise starting with left inner
-    std::vector<Acts::Vector2> rvertices;
-
+    unsigned int quarterSegments) const {
+  if (quarterSegments > 0u) {
     using VectorHelpers::phi;
-    auto phisInner = detail::VerticesHelper::phiSegments(
-        phi(m_inRightStripXY - m_moduleOrigin),
-        phi(m_inLeftStripXY - m_moduleOrigin));
-    auto phisOuter = detail::VerticesHelper::phiSegments(
-        phi(m_outLeftStripXY - m_moduleOrigin),
-        phi(m_outRightStripXY - m_moduleOrigin));
-
-    // Inner bow from phi_min -> phi_max
-    for (unsigned int iseg = 0; iseg < phisInner.size() - 1; ++iseg) {
-      int addon = (iseg == phisInner.size() - 2) ? 1 : 0;
-      detail::VerticesHelper::createSegment<Vector2, Transform2>(
-          rvertices, {get(eMinR), get(eMinR)}, phisInner[iseg],
-          phisInner[iseg + 1], lseg, addon);
-    }
-    // Upper bow from phi_max -> phi_min
-    for (unsigned int iseg = 0; iseg < phisOuter.size() - 1; ++iseg) {
-      int addon = (iseg == phisOuter.size() - 2) ? 1 : 0;
-      detail::VerticesHelper::createSegment<Vector2, Transform2>(
-          rvertices, {get(eMaxR), get(eMaxR)}, phisOuter[iseg],
-          phisOuter[iseg + 1], lseg, addon);
-    }
+
+    ActsScalar phiMinInner = phi(m_inRightStripXY - m_moduleOrigin);
+    ActsScalar phiMaxInner = phi(m_inLeftStripXY - m_moduleOrigin);
+
+    ActsScalar phiMinOuter = phi(m_outRightStripXY - m_moduleOrigin);
+    ActsScalar phiMaxOuter = phi(m_outLeftStripXY - m_moduleOrigin);
+
+    // Inner bow from phi_min -> phi_max (needs to be reversed)
+    std::vector<Acts::Vector2> rvertices =
+        detail::VerticesHelper::segmentVertices<Vector2, Transform2>(
+            {get(eMinR), get(eMinR)}, phiMinInner, phiMaxInner, {},
+            quarterSegments);
+    std::reverse(rvertices.begin(), rvertices.end());
+
+    // Outer bow from phi_min -> phi_max
+    auto overtices =
+        detail::VerticesHelper::segmentVertices<Vector2, Transform2>(
+            {get(eMaxR), get(eMaxR)}, phiMinOuter, phiMaxOuter, {},
+            quarterSegments);
+    rvertices.insert(rvertices.end(), overtices.begin(), overtices.end());
+
     std::for_each(rvertices.begin(), rvertices.end(),
                   [&](Acts::Vector2& rv) { rv += m_moduleOrigin; });
     return rvertices;
diff --git a/Core/src/Surfaces/BoundaryTolerance.cpp b/Core/src/Surfaces/BoundaryTolerance.cpp
index 199105c26b0..b5077fa4ec4 100644
--- a/Core/src/Surfaces/BoundaryTolerance.cpp
+++ b/Core/src/Surfaces/BoundaryTolerance.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2024 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include "Acts/Surfaces/BoundaryTolerance.hpp"
 
diff --git a/Core/src/Surfaces/CMakeLists.txt b/Core/src/Surfaces/CMakeLists.txt
index 2f704f595c6..07cc26cbfcf 100644
--- a/Core/src/Surfaces/CMakeLists.txt
+++ b/Core/src/Surfaces/CMakeLists.txt
@@ -24,7 +24,7 @@ target_sources(
         SurfaceArray.cpp
         SurfaceError.cpp
         TrapezoidBounds.cpp
-        VerticesHelper.cpp
+        detail/VerticesHelper.cpp
         RegularSurface.cpp
         CurvilinearSurface.cpp
         detail/AlignmentHelper.cpp
diff --git a/Core/src/Surfaces/ConeBounds.cpp b/Core/src/Surfaces/ConeBounds.cpp
index 8fed88a7f9e..5dce8995326 100644
--- a/Core/src/Surfaces/ConeBounds.cpp
+++ b/Core/src/Surfaces/ConeBounds.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2016-2020 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include "Acts/Surfaces/ConeBounds.hpp"
 
diff --git a/Core/src/Surfaces/ConeSurface.cpp b/Core/src/Surfaces/ConeSurface.cpp
index 4aee9a679f8..b6d04e87e06 100644
--- a/Core/src/Surfaces/ConeSurface.cpp
+++ b/Core/src/Surfaces/ConeSurface.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2016-2020 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include "Acts/Surfaces/ConeSurface.hpp"
 
@@ -22,6 +22,7 @@
 #include <algorithm>
 #include <cmath>
 #include <limits>
+#include <numbers>
 #include <stdexcept>
 #include <utility>
 #include <vector>
@@ -183,19 +184,18 @@ const Acts::ConeBounds& Acts::ConeSurface::bounds() const {
 }
 
 Acts::Polyhedron Acts::ConeSurface::polyhedronRepresentation(
-    const GeometryContext& gctx, std::size_t lseg) const {
+    const GeometryContext& gctx, unsigned int quarterSegments) const {
   // Prepare vertices and faces
   std::vector<Vector3> vertices;
   std::vector<Polyhedron::FaceType> faces;
   std::vector<Polyhedron::FaceType> triangularMesh;
-
-  double minZ = bounds().get(ConeBounds::eMinZ);
-  double maxZ = bounds().get(ConeBounds::eMaxZ);
+  ActsScalar minZ = bounds().get(ConeBounds::eMinZ);
+  ActsScalar maxZ = bounds().get(ConeBounds::eMaxZ);
 
   if (minZ == -std::numeric_limits<double>::infinity() ||
       maxZ == std::numeric_limits<double>::infinity()) {
     throw std::domain_error(
-        "Polyhedron repr of boundless surface not possible");
+        "Polyhedron representation of boundless surface is not possible");
   }
 
   auto ctransform = transform(gctx);
@@ -208,64 +208,53 @@ Acts::Polyhedron Acts::ConeSurface::polyhedronRepresentation(
   }
 
   // Cone parameters
-  double hPhiSec = bounds().get(ConeBounds::eHalfPhiSector);
-  double avgPhi = bounds().get(ConeBounds::eAveragePhi);
-  bool fullCone = (hPhiSec == M_PI);
-
-  // Get the phi segments from the helper
-  auto phiSegs = fullCone ? detail::VerticesHelper::phiSegments()
-                          : detail::VerticesHelper::phiSegments(
-                                avgPhi - hPhiSec, avgPhi + hPhiSec,
-                                {static_cast<ActsScalar>(avgPhi)});
-
-  // Negative cone if exists
-  std::vector<double> coneSides;
+  ActsScalar hPhiSec = bounds().get(ConeBounds::eHalfPhiSector);
+  ActsScalar avgPhi = bounds().get(ConeBounds::eAveragePhi);
+  std::vector<ActsScalar> refPhi = {};
+  if (bool fullCone = (hPhiSec == std::numbers::pi_v<ActsScalar>); !fullCone) {
+    refPhi = {avgPhi};
+  }
+
+  // Add the cone sizes
+  std::vector<ActsScalar> coneSides;
   if (std::abs(minZ) > s_onSurfaceTolerance) {
     coneSides.push_back(minZ);
   }
   if (std::abs(maxZ) > s_onSurfaceTolerance) {
     coneSides.push_back(maxZ);
   }
+
   for (auto& z : coneSides) {
-    // Remember the first vertex
     std::size_t firstIv = vertices.size();
     // Radius and z offset
     double r = std::abs(z) * bounds().tanAlpha();
     Vector3 zoffset(0., 0., z);
-    for (unsigned int iseg = 0; iseg < phiSegs.size() - 1; ++iseg) {
-      int addon = (iseg == phiSegs.size() - 2 && !fullCone) ? 1 : 0;
-      detail::VerticesHelper::createSegment(vertices, {r, r}, phiSegs[iseg],
-                                            phiSegs[iseg + 1], lseg, addon,
-                                            zoffset, ctransform);
-    }
-    // Create the faces
+    auto svertices = detail::VerticesHelper::segmentVertices(
+        {r, r}, avgPhi - hPhiSec, avgPhi + hPhiSec, refPhi, quarterSegments,
+        zoffset, ctransform);
+    vertices.insert(vertices.end(), svertices.begin(), svertices.end());
+    // If the tip exists, the faces need to be triangular
     if (tipExists) {
-      for (std::size_t iv = firstIv + 2; iv < vertices.size() + 1; ++iv) {
-        std::size_t one = 0, two = iv - 1, three = iv - 2;
+      for (std::size_t iv = firstIv + 1; iv < svertices.size() + firstIv;
+           ++iv) {
+        std::size_t one = 0, two = iv, three = iv - 1;
         if (z < 0.) {
           std::swap(two, three);
         }
         faces.push_back({one, two, three});
       }
-      // Complete cone if necessary
-      if (fullCone) {
-        if (z > 0.) {
-          faces.push_back({0, firstIv, vertices.size() - 1});
-        } else {
-          faces.push_back({0, vertices.size() - 1, firstIv});
-        }
-      }
     }
   }
+
   // if no tip exists, connect the two bows
   if (tipExists) {
     triangularMesh = faces;
   } else {
-    auto facesMesh =
-        detail::FacesHelper::cylindricalFaceMesh(vertices, fullCone);
+    auto facesMesh = detail::FacesHelper::cylindricalFaceMesh(vertices);
     faces = facesMesh.first;
     triangularMesh = facesMesh.second;
   }
+
   return Polyhedron(vertices, faces, triangularMesh, false);
 }
 
diff --git a/Core/src/Surfaces/ConvexPolygonBounds.cpp b/Core/src/Surfaces/ConvexPolygonBounds.cpp
index 3d7656ea266..f6b08624308 100644
--- a/Core/src/Surfaces/ConvexPolygonBounds.cpp
+++ b/Core/src/Surfaces/ConvexPolygonBounds.cpp
@@ -1,13 +1,14 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2016-2020 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include "Acts/Surfaces/ConvexPolygonBounds.hpp"
 
+#include "Acts/Definitions/Algebra.hpp"
 #include "Acts/Surfaces/BoundaryTolerance.hpp"
 #include "Acts/Surfaces/detail/BoundaryCheckHelper.hpp"
 
@@ -51,8 +52,9 @@ Acts::ConvexPolygonBounds<Acts::PolygonDynamic>::type() const {
 bool Acts::ConvexPolygonBounds<Acts::PolygonDynamic>::inside(
     const Acts::Vector2& lposition,
     const Acts::BoundaryTolerance& boundaryTolerance) const {
-  return detail::insidePolygon(m_vertices, boundaryTolerance, lposition,
-                               std::nullopt);
+  return detail::insidePolygon(
+      std::span<const Vector2>(m_vertices.data(), m_vertices.size()),
+      boundaryTolerance, lposition, std::nullopt);
 }
 
 std::vector<Acts::Vector2> Acts::ConvexPolygonBounds<
diff --git a/Core/src/Surfaces/CurvilinearSurface.cpp b/Core/src/Surfaces/CurvilinearSurface.cpp
index b0e2914f9d7..c320177de57 100644
--- a/Core/src/Surfaces/CurvilinearSurface.cpp
+++ b/Core/src/Surfaces/CurvilinearSurface.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2023-2024 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include "Acts/Surfaces/CurvilinearSurface.hpp"
 
diff --git a/Core/src/Surfaces/CylinderBounds.cpp b/Core/src/Surfaces/CylinderBounds.cpp
index a6c037088bc..82f809c6c5b 100644
--- a/Core/src/Surfaces/CylinderBounds.cpp
+++ b/Core/src/Surfaces/CylinderBounds.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2016-2020 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include "Acts/Surfaces/CylinderBounds.hpp"
 
@@ -18,6 +18,7 @@
 #include <cmath>
 #include <iomanip>
 #include <iostream>
+#include <numbers>
 #include <utility>
 
 using Acts::VectorHelpers::perp;
@@ -69,8 +70,8 @@ bool Acts::CylinderBounds::inside(
   double localx =
       lposition[0] > radius ? 2 * radius - lposition[0] : lposition[0];
   Vector2 shiftedlposition = shifted(lposition);
-  if ((std::fabs(shiftedlposition[0]) <= halfPhi &&
-       std::fabs(shiftedlposition[1]) <= halfLengthZ)) {
+  if ((std::abs(shiftedlposition[0]) <= halfPhi &&
+       std::abs(shiftedlposition[1]) <= halfLengthZ)) {
     return true;
   }
 
@@ -104,45 +105,40 @@ std::ostream& Acts::CylinderBounds::toStream(std::ostream& sl) const {
   return sl;
 }
 
-std::vector<Acts::Vector3> Acts::CylinderBounds::createCircles(
-    const Transform3 ctrans, std::size_t lseg) const {
+std::vector<Acts::Vector3> Acts::CylinderBounds::circleVertices(
+    const Transform3 transform, unsigned int quarterSegments) const {
   std::vector<Vector3> vertices;
 
   double avgPhi = get(eAveragePhi);
   double halfPhi = get(eHalfPhiSector);
 
-  bool fullCylinder = coversFullAzimuth();
-
-  // Get the phi segments from the helper - ensures extra points
-  auto phiSegs = fullCylinder ? detail::VerticesHelper::phiSegments()
-                              : detail::VerticesHelper::phiSegments(
-                                    avgPhi - halfPhi, avgPhi + halfPhi,
-                                    {static_cast<ActsScalar>(avgPhi)});
+  std::vector<ActsScalar> phiRef = {};
+  if (bool fullCylinder = coversFullAzimuth(); fullCylinder) {
+    phiRef = {static_cast<ActsScalar>(avgPhi)};
+  }
 
   // Write the two bows/circles on either side
   std::vector<int> sides = {-1, 1};
   for (auto& side : sides) {
-    for (std::size_t iseg = 0; iseg < phiSegs.size() - 1; ++iseg) {
-      int addon = (iseg == phiSegs.size() - 2 && !fullCylinder) ? 1 : 0;
-      /// Helper method to create the segment
-      detail::VerticesHelper::createSegment(
-          vertices, {get(eR), get(eR)}, phiSegs[iseg], phiSegs[iseg + 1], lseg,
-          addon, Vector3(0., 0., side * get(eHalfLengthZ)), ctrans);
-    }
+    /// Helper method to create the segment
+    auto svertices = detail::VerticesHelper::segmentVertices(
+        {get(eR), get(eR)}, avgPhi - halfPhi, avgPhi + halfPhi, phiRef,
+        quarterSegments, Vector3(0., 0., side * get(eHalfLengthZ)), transform);
+    vertices.insert(vertices.end(), svertices.begin(), svertices.end());
   }
 
-  double bevelMinZ = get(eBevelMinZ);
-  double bevelMaxZ = get(eBevelMaxZ);
+  ActsScalar bevelMinZ = get(eBevelMinZ);
+  ActsScalar bevelMaxZ = get(eBevelMaxZ);
 
   // Modify the vertices position if bevel is defined
   if ((bevelMinZ != 0. || bevelMaxZ != 0.) && vertices.size() % 2 == 0) {
     auto halfWay = vertices.end() - vertices.size() / 2;
-    double mult{1};
-    auto invCtrans = ctrans.inverse();
-    auto func = [&mult, &ctrans, &invCtrans](Vector3& v) {
-      v = invCtrans * v;
+    ActsScalar mult{1};
+    auto invTransform = transform.inverse();
+    auto func = [&mult, &transform, &invTransform](Vector3& v) {
+      v = invTransform * v;
       v(2) += v(1) * mult;
-      v = ctrans * v;
+      v = transform * v;
     };
     if (bevelMinZ != 0.) {
       mult = std::tan(-bevelMinZ);
@@ -158,16 +154,18 @@ std::vector<Acts::Vector3> Acts::CylinderBounds::createCircles(
 
 void Acts::CylinderBounds::checkConsistency() noexcept(false) {
   if (get(eR) <= 0.) {
-    throw std::invalid_argument("CylinderBounds: invalid radial setup.");
+    throw std::invalid_argument(
+        "CylinderBounds: invalid radial setup: radius is negative");
   }
   if (get(eHalfLengthZ) <= 0.) {
-    throw std::invalid_argument("CylinderBounds: invalid length setup.");
+    throw std::invalid_argument(
+        "CylinderBounds: invalid length setup: half length is negative");
   }
-  if (get(eHalfPhiSector) <= 0. || get(eHalfPhiSector) > M_PI) {
+  if (get(eHalfPhiSector) <= 0. || get(eHalfPhiSector) > std::numbers::pi) {
     throw std::invalid_argument("CylinderBounds: invalid phi sector setup.");
   }
   if (get(eAveragePhi) != detail::radian_sym(get(eAveragePhi)) &&
-      std::abs(std::abs(get(eAveragePhi)) - M_PI) > s_epsilon) {
+      std::abs(std::abs(get(eAveragePhi)) - std::numbers::pi) > s_epsilon) {
     throw std::invalid_argument("CylinderBounds: invalid phi positioning.");
   }
   if (get(eBevelMinZ) != detail::radian_sym(get(eBevelMinZ))) {
diff --git a/Core/src/Surfaces/CylinderSurface.cpp b/Core/src/Surfaces/CylinderSurface.cpp
index b53e6bf1b7d..4b3cd2db7be 100644
--- a/Core/src/Surfaces/CylinderSurface.cpp
+++ b/Core/src/Surfaces/CylinderSurface.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2016-2020 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include "Acts/Surfaces/CylinderSurface.hpp"
 
@@ -180,7 +180,7 @@ double Acts::CylinderSurface::pathCorrection(
     const Acts::Vector3& direction) const {
   Vector3 normalT = normal(gctx, position);
   double cosAlpha = normalT.dot(direction);
-  return std::fabs(1. / cosAlpha);
+  return std::abs(1. / cosAlpha);
 }
 
 const Acts::CylinderBounds& Acts::CylinderSurface::bounds() const {
@@ -188,19 +188,15 @@ const Acts::CylinderBounds& Acts::CylinderSurface::bounds() const {
 }
 
 Acts::Polyhedron Acts::CylinderSurface::polyhedronRepresentation(
-    const GeometryContext& gctx, std::size_t lseg) const {
+    const GeometryContext& gctx, unsigned int quarterSegments) const {
   auto ctrans = transform(gctx);
 
   // Prepare vertices and faces
-  std::vector<Vector3> vertices = bounds().createCircles(ctrans, lseg);
-  std::vector<Polyhedron::FaceType> faces;
-  std::vector<Polyhedron::FaceType> triangularMesh;
-
-  bool fullCylinder = bounds().coversFullAzimuth();
-
-  auto facesMesh =
-      detail::FacesHelper::cylindricalFaceMesh(vertices, fullCylinder);
-  return Polyhedron(vertices, facesMesh.first, facesMesh.second, false);
+  std::vector<Vector3> vertices =
+      bounds().circleVertices(ctrans, quarterSegments);
+  auto [faces, triangularMesh] =
+      detail::FacesHelper::cylindricalFaceMesh(vertices);
+  return Polyhedron(vertices, faces, triangularMesh, false);
 }
 
 Acts::Vector3 Acts::CylinderSurface::rotSymmetryAxis(
@@ -374,8 +370,8 @@ Acts::CylinderSurface::mergedWith(const CylinderSurface& other,
                                   const Logger& logger) const {
   using namespace Acts::UnitLiterals;
 
-  ACTS_DEBUG("Merging cylinder surfaces in " << binningValueName(direction)
-                                             << " direction");
+  ACTS_VERBOSE("Merging cylinder surfaces in " << binningValueName(direction)
+                                               << " direction");
 
   if (m_associatedDetElement != nullptr ||
       other.m_associatedDetElement != nullptr) {
diff --git a/Core/src/Surfaces/DiamondBounds.cpp b/Core/src/Surfaces/DiamondBounds.cpp
index 0c30236f31e..aa913404c0f 100644
--- a/Core/src/Surfaces/DiamondBounds.cpp
+++ b/Core/src/Surfaces/DiamondBounds.cpp
@@ -1,13 +1,14 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2016-2020 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include "Acts/Surfaces/DiamondBounds.hpp"
 
+#include "Acts/Definitions/Algebra.hpp"
 #include "Acts/Surfaces/BoundaryTolerance.hpp"
 #include "Acts/Surfaces/detail/BoundaryCheckHelper.hpp"
 
@@ -22,12 +23,22 @@ Acts::SurfaceBounds::BoundsType Acts::DiamondBounds::type() const {
 bool Acts::DiamondBounds::inside(
     const Acts::Vector2& lposition,
     const Acts::BoundaryTolerance& boundaryTolerance) const {
-  return detail::insidePolygon(vertices(), boundaryTolerance, lposition,
+  // Vertices starting at lower left (min rel. phi)
+  // counter-clockwise
+  double x1 = get(DiamondBounds::eHalfLengthXnegY);
+  double y1 = get(DiamondBounds::eHalfLengthYneg);
+  double x2 = get(DiamondBounds::eHalfLengthXzeroY);
+  double y2 = 0.;
+  double x3 = get(DiamondBounds::eHalfLengthXposY);
+  double y3 = get(DiamondBounds::eHalfLengthYpos);
+  Vector2 vertices[] = {{-x1, -y1}, {x1, -y1}, {x2, y2},
+                        {x3, y3},   {-x3, y3}, {-x2, y2}};
+  return detail::insidePolygon(vertices, boundaryTolerance, lposition,
                                std::nullopt);
 }
 
 std::vector<Acts::Vector2> Acts::DiamondBounds::vertices(
-    unsigned int /*lseg*/) const {
+    unsigned int /*ignoredSegments*/) const {
   // Vertices starting at lower left (min rel. phi)
   // counter-clockwise
   double x1 = get(DiamondBounds::eHalfLengthXnegY);
diff --git a/Core/src/Surfaces/DiscSurface.cpp b/Core/src/Surfaces/DiscSurface.cpp
index 140047a5785..da1aa2b54bc 100644
--- a/Core/src/Surfaces/DiscSurface.cpp
+++ b/Core/src/Surfaces/DiscSurface.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2016-2021 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include "Acts/Surfaces/DiscSurface.hpp"
 
@@ -154,12 +154,9 @@ const Acts::SurfaceBounds& Acts::DiscSurface::bounds() const {
 }
 
 Acts::Polyhedron Acts::DiscSurface::polyhedronRepresentation(
-    const GeometryContext& gctx, std::size_t lseg) const {
+    const GeometryContext& gctx, unsigned int quarterSegments) const {
   // Prepare vertices and faces
   std::vector<Vector3> vertices;
-  std::vector<Polyhedron::FaceType> faces;
-  std::vector<Polyhedron::FaceType> triangularMesh;
-
   // Understand the disc
   bool fullDisc = m_bounds->coversFullAzimuth();
   bool toCenter = m_bounds->rMin() < s_onSurfaceTolerance;
@@ -167,7 +164,7 @@ Acts::Polyhedron Acts::DiscSurface::polyhedronRepresentation(
   bool exactPolyhedron = (m_bounds->type() == SurfaceBounds::eDiscTrapezoid);
   bool addCentreFromConvexFace = (m_bounds->type() != SurfaceBounds::eAnnulus);
   if (m_bounds) {
-    auto vertices2D = m_bounds->vertices(lseg);
+    auto vertices2D = m_bounds->vertices(quarterSegments);
     vertices.reserve(vertices2D.size() + 1);
     Vector3 wCenter(0., 0., 0);
     for (const auto& v2D : vertices2D) {
@@ -182,22 +179,19 @@ Acts::Polyhedron Acts::DiscSurface::polyhedronRepresentation(
       if (addCentreFromConvexFace) {
         vertices.push_back(wCenter);
       }
-      auto facesMesh = detail::FacesHelper::convexFaceMesh(vertices, true);
-      faces = facesMesh.first;
-      triangularMesh = facesMesh.second;
+      auto [faces, triangularMesh] =
+          detail::FacesHelper::convexFaceMesh(vertices, true);
+      return Polyhedron(vertices, faces, triangularMesh, exactPolyhedron);
     } else {
       // Two concentric rings, we use the pure concentric method momentarily,
       // but that creates too  many unneccesarry faces, when only two
       // are needed to describe the mesh, @todo investigate merging flag
-      auto facesMesh = detail::FacesHelper::cylindricalFaceMesh(vertices, true);
-      faces = facesMesh.first;
-      triangularMesh = facesMesh.second;
+      auto [faces, triangularMesh] =
+          detail::FacesHelper::cylindricalFaceMesh(vertices);
+      return Polyhedron(vertices, faces, triangularMesh, exactPolyhedron);
     }
-  } else {
-    throw std::domain_error(
-        "Polyhedron repr of boundless surface not possible.");
   }
-  return Polyhedron(vertices, faces, triangularMesh, exactPolyhedron);
+  throw std::domain_error("Polyhedron repr of boundless surface not possible.");
 }
 
 Acts::Vector2 Acts::DiscSurface::localPolarToCartesian(
@@ -208,7 +202,7 @@ Acts::Vector2 Acts::DiscSurface::localPolarToCartesian(
 
 Acts::Vector2 Acts::DiscSurface::localCartesianToPolar(
     const Vector2& lcart) const {
-  return Vector2(std::hypot(lcart[eBoundLoc0], lcart[eBoundLoc1]),
+  return Vector2(lcart.norm(),
                  std::atan2(lcart[eBoundLoc1], lcart[eBoundLoc0]));
 }
 
@@ -385,7 +379,7 @@ Acts::DiscSurface::mergedWith(const DiscSurface& other, BinningValue direction,
                               const Logger& logger) const {
   using namespace Acts::UnitLiterals;
 
-  ACTS_DEBUG("Merging disc surfaces in " << direction << " direction");
+  ACTS_VERBOSE("Merging disc surfaces in " << direction << " direction");
 
   if (m_associatedDetElement != nullptr ||
       other.m_associatedDetElement != nullptr) {
diff --git a/Core/src/Surfaces/DiscTrapezoidBounds.cpp b/Core/src/Surfaces/DiscTrapezoidBounds.cpp
index d83680dbd54..ed02bac17de 100644
--- a/Core/src/Surfaces/DiscTrapezoidBounds.cpp
+++ b/Core/src/Surfaces/DiscTrapezoidBounds.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2016-2020 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include "Acts/Surfaces/DiscTrapezoidBounds.hpp"
 
@@ -64,7 +64,7 @@ bool Acts::DiscTrapezoidBounds::inside(
 }
 
 std::vector<Acts::Vector2> Acts::DiscTrapezoidBounds::vertices(
-    unsigned int /*lseg*/) const {
+    unsigned int /*ignoredSegments*/) const {
   Vector2 cAxis(std::cos(get(eAveragePhi)), std::sin(get(eAveragePhi)));
   Vector2 nAxis(cAxis.y(), -cAxis.x());
   auto ymin = std::sqrt(get(eMinR) * get(eMinR) -
diff --git a/Core/src/Surfaces/EllipseBounds.cpp b/Core/src/Surfaces/EllipseBounds.cpp
index 552eb740bf2..485f36736d8 100644
--- a/Core/src/Surfaces/EllipseBounds.cpp
+++ b/Core/src/Surfaces/EllipseBounds.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2016-2020 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include "Acts/Surfaces/EllipseBounds.hpp"
 
@@ -61,10 +61,10 @@ bool Acts::EllipseBounds::inside(
 }
 
 std::vector<Acts::Vector2> Acts::EllipseBounds::vertices(
-    unsigned int lseg) const {
+    unsigned int quarterSegments) const {
   return detail::VerticesHelper::ellipsoidVertices(
       get(eInnerRx), get(eInnerRy), get(eOuterRx), get(eOuterRy),
-      get(eAveragePhi), get(eHalfPhiSector), lseg);
+      get(eAveragePhi), get(eHalfPhiSector), quarterSegments);
 }
 
 const Acts::RectangleBounds& Acts::EllipseBounds::boundingBox() const {
diff --git a/Core/src/Surfaces/IntersectionHelper2D.cpp b/Core/src/Surfaces/IntersectionHelper2D.cpp
index 14fb777eb31..1053021034f 100644
--- a/Core/src/Surfaces/IntersectionHelper2D.cpp
+++ b/Core/src/Surfaces/IntersectionHelper2D.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2020 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include "Acts/Surfaces/detail/IntersectionHelper2D.hpp"
 
diff --git a/Core/src/Surfaces/LineBounds.cpp b/Core/src/Surfaces/LineBounds.cpp
index 4fffd8ec54e..bdb0673a010 100644
--- a/Core/src/Surfaces/LineBounds.cpp
+++ b/Core/src/Surfaces/LineBounds.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2016-2020 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include "Acts/Surfaces/LineBounds.hpp"
 
diff --git a/Core/src/Surfaces/LineSurface.cpp b/Core/src/Surfaces/LineSurface.cpp
index ae740658403..f67fe038aa9 100644
--- a/Core/src/Surfaces/LineSurface.cpp
+++ b/Core/src/Surfaces/LineSurface.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2016-2020 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include "Acts/Surfaces/LineSurface.hpp"
 
diff --git a/Core/src/Surfaces/PerigeeSurface.cpp b/Core/src/Surfaces/PerigeeSurface.cpp
index cfa85858fe2..777d061b2b1 100644
--- a/Core/src/Surfaces/PerigeeSurface.cpp
+++ b/Core/src/Surfaces/PerigeeSurface.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2016-2020 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include "Acts/Surfaces/PerigeeSurface.hpp"
 
@@ -58,7 +58,7 @@ std::ostream& Acts::PerigeeSurface::toStreamImpl(const GeometryContext& gctx,
 }
 
 Acts::Polyhedron Acts::PerigeeSurface::polyhedronRepresentation(
-    const GeometryContext& gctx, std::size_t /*lseg*/) const {
+    const GeometryContext& gctx, unsigned int /*quarterSegments*/) const {
   // Prepare vertices and faces
   std::vector<Vector3> vertices;
   std::vector<Polyhedron::FaceType> faces;
diff --git a/Core/src/Surfaces/PlaneSurface.cpp b/Core/src/Surfaces/PlaneSurface.cpp
index e8b0e90a76f..658920e6686 100644
--- a/Core/src/Surfaces/PlaneSurface.cpp
+++ b/Core/src/Surfaces/PlaneSurface.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2016-2020 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include "Acts/Surfaces/PlaneSurface.hpp"
 
@@ -23,6 +23,7 @@
 #include "Acts/Utilities/ThrowAssert.hpp"
 
 #include <cmath>
+#include <numbers>
 #include <stdexcept>
 #include <utility>
 #include <vector>
@@ -37,12 +38,6 @@ Acts::PlaneSurface::PlaneSurface(const GeometryContext& gctx,
       RegularSurface(gctx, other, transform),
       m_bounds(other.m_bounds) {}
 
-Acts::PlaneSurface::PlaneSurface(const Vector3& center, const Vector3& normal)
-    : RegularSurface(), m_bounds(nullptr) {
-  m_transform = std::make_unique<Transform3>(
-      CurvilinearSurface(center, normal).transform());
-}
-
 Acts::PlaneSurface::PlaneSurface(std::shared_ptr<const PlanarBounds> pbounds,
                                  const Acts::DetectorElementBase& detelement)
     : RegularSurface(detelement), m_bounds(std::move(pbounds)) {
@@ -94,16 +89,14 @@ const Acts::SurfaceBounds& Acts::PlaneSurface::bounds() const {
 }
 
 Acts::Polyhedron Acts::PlaneSurface::polyhedronRepresentation(
-    const GeometryContext& gctx, std::size_t lseg) const {
+    const GeometryContext& gctx, unsigned int quarterSegments) const {
   // Prepare vertices and faces
   std::vector<Vector3> vertices;
-  std::vector<Polyhedron::FaceType> faces;
-  std::vector<Polyhedron::FaceType> triangularMesh;
   bool exactPolyhedron = true;
 
   // If you have bounds you can create a polyhedron representation
   if (m_bounds) {
-    auto vertices2D = m_bounds->vertices(lseg);
+    auto vertices2D = m_bounds->vertices(quarterSegments);
     vertices.reserve(vertices2D.size() + 1);
     for (const auto& v2D : vertices2D) {
       vertices.push_back(transform(gctx) * Vector3(v2D.x(), v2D.y(), 0.));
@@ -115,29 +108,27 @@ Acts::Polyhedron Acts::PlaneSurface::polyhedronRepresentation(
       auto vStore = bounds().values();
       innerExists = vStore[EllipseBounds::eInnerRx] > s_epsilon &&
                     vStore[EllipseBounds::eInnerRy] > s_epsilon;
-      coversFull =
-          std::abs(vStore[EllipseBounds::eHalfPhiSector] - M_PI) < s_epsilon;
+      coversFull = std::abs(vStore[EllipseBounds::eHalfPhiSector] -
+                            std::numbers::pi) < s_epsilon;
     }
     // All of those can be described as convex
     // @todo same as for Discs: coversFull is not the right criterium
     // for triangulation
     if (!isEllipse || !innerExists || !coversFull) {
-      auto facesMesh = detail::FacesHelper::convexFaceMesh(vertices);
-      faces = facesMesh.first;
-      triangularMesh = facesMesh.second;
+      auto [faces, triangularMesh] =
+          detail::FacesHelper::convexFaceMesh(vertices);
+      return Polyhedron(vertices, faces, triangularMesh, exactPolyhedron);
     } else {
       // Two concentric rings, we use the pure concentric method momentarily,
       // but that creates too  many unneccesarry faces, when only two
       // are needed to describe the mesh, @todo investigate merging flag
-      auto facesMesh = detail::FacesHelper::cylindricalFaceMesh(vertices, true);
-      faces = facesMesh.first;
-      triangularMesh = facesMesh.second;
+      auto [faces, triangularMesh] =
+          detail::FacesHelper::cylindricalFaceMesh(vertices);
+      return Polyhedron(vertices, faces, triangularMesh, exactPolyhedron);
     }
-  } else {
-    throw std::domain_error(
-        "Polyhedron repr of boundless surface not possible.");
   }
-  return Polyhedron(vertices, faces, triangularMesh, exactPolyhedron);
+  throw std::domain_error(
+      "Polyhedron representation of boundless surface not possible.");
 }
 
 Acts::Vector3 Acts::PlaneSurface::normal(const GeometryContext& gctx,
diff --git a/Core/src/Surfaces/RadialBounds.cpp b/Core/src/Surfaces/RadialBounds.cpp
index 78e81fe3331..03a32ef2a34 100644
--- a/Core/src/Surfaces/RadialBounds.cpp
+++ b/Core/src/Surfaces/RadialBounds.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2016-2020 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include "Acts/Surfaces/RadialBounds.hpp"
 
diff --git a/Core/src/Surfaces/RectangleBounds.cpp b/Core/src/Surfaces/RectangleBounds.cpp
index c602b9dd2c2..21c8daec4e9 100644
--- a/Core/src/Surfaces/RectangleBounds.cpp
+++ b/Core/src/Surfaces/RectangleBounds.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2016-2020 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include "Acts/Surfaces/RectangleBounds.hpp"
 
diff --git a/Core/src/Surfaces/RegularSurface.cpp b/Core/src/Surfaces/RegularSurface.cpp
index 83ffc6c69df..d9664fe2210 100644
--- a/Core/src/Surfaces/RegularSurface.cpp
+++ b/Core/src/Surfaces/RegularSurface.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2023 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include "Acts/Surfaces/RegularSurface.hpp"
 
@@ -31,11 +31,12 @@ Vector3 RegularSurface::localToGlobal(const GeometryContext& gctx,
   return localToGlobal(gctx, lposition);
 }
 
-bool RegularSurface::isOnSurface(
-    const GeometryContext& gctx, const Vector3& position,
-    const BoundaryTolerance& boundaryTolerance) const {
+bool RegularSurface::isOnSurface(const GeometryContext& gctx,
+                                 const Vector3& position,
+                                 const BoundaryTolerance& boundaryTolerance,
+                                 double tolerance) const {
   // global to local transformation
-  auto lpResult = globalToLocal(gctx, position);
+  auto lpResult = globalToLocal(gctx, position, tolerance);
   if (!lpResult.ok()) {
     return false;
   }
diff --git a/Core/src/Surfaces/StrawSurface.cpp b/Core/src/Surfaces/StrawSurface.cpp
index 61ba65b0576..b6e241af858 100644
--- a/Core/src/Surfaces/StrawSurface.cpp
+++ b/Core/src/Surfaces/StrawSurface.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2016-2020 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include "Acts/Surfaces/StrawSurface.hpp"
 
@@ -15,6 +15,7 @@
 #include "Acts/Surfaces/detail/VerticesHelper.hpp"
 
 #include <algorithm>
+#include <numbers>
 #include <utility>
 #include <vector>
 
@@ -48,7 +49,7 @@ Acts::StrawSurface& Acts::StrawSurface::operator=(const StrawSurface& other) {
 }
 
 Acts::Polyhedron Acts::StrawSurface::polyhedronRepresentation(
-    const GeometryContext& gctx, std::size_t lseg) const {
+    const GeometryContext& gctx, unsigned int quarterSegments) const {
   // Prepare vertices and faces
   std::vector<Vector3> vertices;
   std::vector<Polyhedron::FaceType> faces;
@@ -56,20 +57,17 @@ Acts::Polyhedron Acts::StrawSurface::polyhedronRepresentation(
 
   const Transform3& ctransform = transform(gctx);
   // Draw the bounds if more than one segment are chosen
-  if (lseg > 1) {
+  if (quarterSegments > 0u) {
     double r = m_bounds->get(LineBounds::eR);
-    auto phiSegs = detail::VerticesHelper::phiSegments();
     // Write the two bows/circles on either side
     std::vector<int> sides = {-1, 1};
     for (auto& side : sides) {
-      for (std::size_t iseg = 0; iseg < phiSegs.size() - 1; ++iseg) {
-        int addon = (iseg == phiSegs.size() - 2) ? 1 : 0;
-        /// Helper method to create the segment
-        detail::VerticesHelper::createSegment(
-            vertices, {r, r}, phiSegs[iseg], phiSegs[iseg + 1], lseg, addon,
-            Vector3(0., 0., side * m_bounds->get(LineBounds::eHalfLengthZ)),
-            ctransform);
-      }
+      /// Helper method to create the segment
+      auto svertices = detail::VerticesHelper::segmentVertices(
+          {r, r}, -std::numbers::pi, std::numbers::pi, {}, quarterSegments,
+          Vector3(0., 0., side * m_bounds->get(LineBounds::eHalfLengthZ)),
+          ctransform);
+      vertices.insert(vertices.end(), svertices.begin(), svertices.end());
     }
     auto facesMesh = detail::FacesHelper::cylindricalFaceMesh(vertices);
     faces = facesMesh.first;
diff --git a/Core/src/Surfaces/Surface.cpp b/Core/src/Surfaces/Surface.cpp
index 1238488c7b2..cadef176cda 100644
--- a/Core/src/Surfaces/Surface.cpp
+++ b/Core/src/Surfaces/Surface.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2016-2020 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include "Acts/Surfaces/Surface.hpp"
 
@@ -13,6 +13,7 @@
 #include "Acts/Surfaces/detail/AlignmentHelper.hpp"
 #include "Acts/Utilities/JacobianHelpers.hpp"
 #include "Acts/Utilities/VectorHelpers.hpp"
+#include "Acts/Visualization/ViewConfig.hpp"
 
 #include <iomanip>
 #include <utility>
@@ -45,12 +46,13 @@ Acts::Surface::Surface(const GeometryContext& gctx, const Surface& other,
 
 Acts::Surface::~Surface() = default;
 
-bool Acts::Surface::isOnSurface(
-    const GeometryContext& gctx, const Vector3& position,
-    const Vector3& direction,
-    const BoundaryTolerance& boundaryTolerance) const {
+bool Acts::Surface::isOnSurface(const GeometryContext& gctx,
+                                const Vector3& position,
+                                const Vector3& direction,
+                                const BoundaryTolerance& boundaryTolerance,
+                                double tolerance) const {
   // global to local transformation
-  auto lpResult = globalToLocal(gctx, position, direction);
+  auto lpResult = globalToLocal(gctx, position, direction, tolerance);
   if (!lpResult.ok()) {
     return false;
   }
@@ -233,10 +235,6 @@ std::string Acts::Surface::toString(const GeometryContext& gctx) const {
   return ss.str();
 }
 
-bool Acts::Surface::operator!=(const Acts::Surface& sf) const {
-  return !(operator==(sf));
-}
-
 Acts::Vector3 Acts::Surface::center(const GeometryContext& gctx) const {
   // fast access via transform matrix (and not translation())
   auto tMatrix = transform(gctx).matrix();
@@ -357,3 +355,11 @@ void Acts::Surface::assignSurfaceMaterial(
 void Acts::Surface::associateLayer(const Acts::Layer& lay) {
   m_associatedLayer = (&lay);
 }
+
+void Acts::Surface::visualize(IVisualization3D& helper,
+                              const GeometryContext& gctx,
+                              const ViewConfig& viewConfig) const {
+  Polyhedron polyhedron =
+      polyhedronRepresentation(gctx, viewConfig.quarterSegments);
+  polyhedron.visualize(helper, viewConfig);
+}
diff --git a/Core/src/Surfaces/SurfaceArray.cpp b/Core/src/Surfaces/SurfaceArray.cpp
index 30bc0cf2ed6..2606c13a702 100644
--- a/Core/src/Surfaces/SurfaceArray.cpp
+++ b/Core/src/Surfaces/SurfaceArray.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2018-2020 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include "Acts/Surfaces/SurfaceArray.hpp"
 
diff --git a/Core/src/Surfaces/SurfaceError.cpp b/Core/src/Surfaces/SurfaceError.cpp
index bbedd3010e5..254d67064f3 100644
--- a/Core/src/Surfaces/SurfaceError.cpp
+++ b/Core/src/Surfaces/SurfaceError.cpp
@@ -1,30 +1,29 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2020 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
-#include "Acts/Surfaces/SurfaceError.hpp"
+#include "Acts/Geometry/PortalError.hpp"
 
 #include <string>
 
 namespace {
 
-class SurfaceErrorCategory : public std::error_category {
+class PortalErrorCategory : public std::error_category {
  public:
   // Return a short descriptive name for the category.
-  const char* name() const noexcept final { return "SurfaceError"; }
+  const char* name() const noexcept final { return "PortalError"; }
 
   // Return what each enum means in text.
   std::string message(int c) const final {
-    using Acts::SurfaceError;
+    using Acts::PortalError;
 
-    switch (static_cast<SurfaceError>(c)) {
-      case SurfaceError::GlobalPositionNotOnSurface:
-        return "Global to local transformation failed: position not on "
-               "surface.";
+    switch (static_cast<PortalError>(c)) {
+      case PortalError::PositionNotOnAnyChildPortalLink:
+        return "Position not on any of the composite child portal links";
       default:
         return "unknown";
     }
@@ -33,7 +32,7 @@ class SurfaceErrorCategory : public std::error_category {
 
 }  // namespace
 
-std::error_code Acts::make_error_code(Acts::SurfaceError e) {
-  static SurfaceErrorCategory c;
+std::error_code Acts::make_error_code(Acts::PortalError e) {
+  static PortalErrorCategory c;
   return {static_cast<int>(e), c};
 }
diff --git a/Core/src/Surfaces/TrapezoidBounds.cpp b/Core/src/Surfaces/TrapezoidBounds.cpp
index a065d607ed1..3450e8cea97 100644
--- a/Core/src/Surfaces/TrapezoidBounds.cpp
+++ b/Core/src/Surfaces/TrapezoidBounds.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2016-2020 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include "Acts/Surfaces/TrapezoidBounds.hpp"
 
@@ -89,14 +89,14 @@ bool Acts::TrapezoidBounds::inside(
 
   // at this stage, the point can only be in the triangles
   // run slow-ish polygon check
-  std::vector<Acts::Vector2> vertices = {
+  Vector2 vertices[] = {
       {-hlXnY, -hlY}, {hlXnY, -hlY}, {hlXpY, hlY}, {-hlXpY, hlY}};
   return detail::insidePolygon(vertices, boundaryTolerance, extPosition,
                                std::nullopt);
 }
 
 std::vector<Acts::Vector2> Acts::TrapezoidBounds::vertices(
-    unsigned int /*lseg*/) const {
+    unsigned int /*ignoredSegments*/) const {
   const double hlXnY = get(TrapezoidBounds::eHalfLengthXnegY);
   const double hlXpY = get(TrapezoidBounds::eHalfLengthXposY);
   const double hlY = get(TrapezoidBounds::eHalfLengthY);
diff --git a/Core/src/Surfaces/VerticesHelper.cpp b/Core/src/Surfaces/VerticesHelper.cpp
deleted file mode 100644
index a0367936dc9..00000000000
--- a/Core/src/Surfaces/VerticesHelper.cpp
+++ /dev/null
@@ -1,119 +0,0 @@
-// This file is part of the Acts project.
-//
-// Copyright (C) 2020 CERN for the benefit of the Acts project
-//
-// This Source Code Form is subject to the terms of the Mozilla Public
-// License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-#include "Acts/Surfaces/detail/VerticesHelper.hpp"
-
-#include <cmath>
-#include <cstddef>
-
-std::vector<Acts::ActsScalar> Acts::detail::VerticesHelper::phiSegments(
-    ActsScalar phiMin, ActsScalar phiMax,
-    const std::vector<ActsScalar>& phiRefs, ActsScalar phiTolerance) {
-  // This is to ensure that the extrema are built regardless of number
-  // of segments
-  std::vector<ActsScalar> phiSegments;
-  std::vector<ActsScalar> quarters = {-M_PI, -0.5 * M_PI, 0., 0.5 * M_PI, M_PI};
-  // It does not cover the full azimuth
-  if (phiMin != -M_PI || phiMax != M_PI) {
-    phiSegments.push_back(phiMin);
-    for (unsigned int iq = 1; iq < 4; ++iq) {
-      if (phiMin < quarters[iq] && phiMax > quarters[iq]) {
-        phiSegments.push_back(quarters[iq]);
-      }
-    }
-    phiSegments.push_back(phiMax);
-  } else {
-    phiSegments = quarters;
-  }
-  // Insert the reference phis if
-  if (!phiRefs.empty()) {
-    for (const auto& phiRef : phiRefs) {
-      // Trying to find the right patch
-      auto match = std::find_if(
-          phiSegments.begin(), phiSegments.end(), [&](ActsScalar phiSeg) {
-            return std::abs(phiSeg - phiRef) < phiTolerance;
-          });
-      if (match == phiSegments.end()) {
-        phiSegments.push_back(phiRef);
-      }
-    }
-    std::sort(phiSegments.begin(), phiSegments.end());
-  }
-  return phiSegments;
-}
-
-std::vector<Acts::Vector2> Acts::detail::VerticesHelper::ellipsoidVertices(
-    ActsScalar innerRx, ActsScalar innerRy, ActsScalar outerRx,
-    ActsScalar outerRy, ActsScalar avgPhi, ActsScalar halfPhi,
-    unsigned int lseg) {
-  // List of vertices counter-clockwise starting at smallest phi w.r.t center,
-  // for both inner/outer ring/segment
-  std::vector<Vector2> rvertices;  // return vertices
-  std::vector<Vector2> ivertices;  // inner vertices
-  std::vector<Vector2> overtices;  // outer verices
-
-  bool innerExists = (innerRx > 0. && innerRy > 0.);
-  bool closed = std::abs(halfPhi - M_PI) < s_onSurfaceTolerance;
-
-  // Get the phi segments from the helper method
-  auto phiSegs = detail::VerticesHelper::phiSegments(
-      avgPhi - halfPhi, avgPhi + halfPhi, {avgPhi});
-
-  // The inner (if exists) and outer bow
-  for (unsigned int iseg = 0; iseg < phiSegs.size() - 1; ++iseg) {
-    int addon = (iseg == phiSegs.size() - 2 && !closed) ? 1 : 0;
-    if (innerExists) {
-      createSegment<Vector2, Transform2>(ivertices, {innerRx, innerRy},
-                                         phiSegs[iseg], phiSegs[iseg + 1], lseg,
-                                         addon);
-    }
-    createSegment<Vector2, Transform2>(overtices, {outerRx, outerRy},
-                                       phiSegs[iseg], phiSegs[iseg + 1], lseg,
-                                       addon);
-  }
-
-  // We want to keep the same counter-clockwise orientation for displaying
-  if (!innerExists) {
-    if (!closed) {
-      // Add the center case we have a sector
-      rvertices.push_back(Vector2(0., 0.));
-    }
-    rvertices.insert(rvertices.end(), overtices.begin(), overtices.end());
-  } else if (!closed) {
-    rvertices.insert(rvertices.end(), overtices.begin(), overtices.end());
-    rvertices.insert(rvertices.end(), ivertices.rbegin(), ivertices.rend());
-  } else {
-    rvertices.insert(rvertices.end(), overtices.begin(), overtices.end());
-    rvertices.insert(rvertices.end(), ivertices.begin(), ivertices.end());
-  }
-  return rvertices;
-}
-
-std::vector<Acts::Vector2> Acts::detail::VerticesHelper::circularVertices(
-    ActsScalar innerR, ActsScalar outerR, ActsScalar avgPhi, ActsScalar halfPhi,
-    unsigned int lseg) {
-  return ellipsoidVertices(innerR, innerR, outerR, outerR, avgPhi, halfPhi,
-                           lseg);
-}
-
-bool Acts::detail::VerticesHelper::onHyperPlane(
-    const std::vector<Acts::Vector3>& vertices, ActsScalar tolerance) {
-  // Obvious always on one surface
-  if (vertices.size() < 4) {
-    return true;
-  }
-  // Create the hyperplane
-  auto hyperPlane = Eigen::Hyperplane<ActsScalar, 3>::Through(
-      vertices[0], vertices[1], vertices[2]);
-  for (std::size_t ip = 3; ip < vertices.size(); ++ip) {
-    if (hyperPlane.absDistance(vertices[ip]) > tolerance) {
-      return false;
-    }
-  }
-  return true;
-}
diff --git a/Core/src/Surfaces/detail/AlignmentHelper.cpp b/Core/src/Surfaces/detail/AlignmentHelper.cpp
index e208a541120..92c1fb7d2a1 100644
--- a/Core/src/Surfaces/detail/AlignmentHelper.cpp
+++ b/Core/src/Surfaces/detail/AlignmentHelper.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2020 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include "Acts/Surfaces/detail/AlignmentHelper.hpp"
 
diff --git a/Core/src/Surfaces/detail/AnnulusBoundsHelper.cpp b/Core/src/Surfaces/detail/AnnulusBoundsHelper.cpp
index da3fe516c16..47cb4e2e9a6 100644
--- a/Core/src/Surfaces/detail/AnnulusBoundsHelper.cpp
+++ b/Core/src/Surfaces/detail/AnnulusBoundsHelper.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2024 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include "Acts/Surfaces/detail/AnnulusBoundsHelper.hpp"
 
@@ -12,6 +12,7 @@
 #include "Acts/Utilities/VectorHelpers.hpp"
 
 #include <iostream>
+#include <numbers>
 
 std::tuple<std::shared_ptr<Acts::AnnulusBounds>, Acts::Transform3>
 Acts::detail::AnnulusBoundsHelper::create(const Transform3& transform,
@@ -27,7 +28,8 @@ Acts::detail::AnnulusBoundsHelper::create(const Transform3& transform,
     Vector2 ab = b - a;
     double phi = VectorHelpers::phi(ab);
 
-    if (std::abs(phi) > 3 * M_PI / 4. || std::abs(phi) < M_PI / 4.) {
+    if (std::abs(phi) > 3 * std::numbers::pi / 4. ||
+        std::abs(phi) < std::numbers::pi / 4.) {
       if (a.norm() < b.norm()) {
         boundLines.push_back(std::make_pair(a, b));
       } else {
diff --git a/Core/src/Surfaces/detail/MergeHelper.cpp b/Core/src/Surfaces/detail/MergeHelper.cpp
index 7910381be0f..414e5761686 100644
--- a/Core/src/Surfaces/detail/MergeHelper.cpp
+++ b/Core/src/Surfaces/detail/MergeHelper.cpp
@@ -1,13 +1,15 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2024 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include "Acts/Surfaces/detail/MergeHelper.hpp"
 
+#include <numbers>
+
 namespace Acts::detail {
 
 std::tuple<ActsScalar, ActsScalar, bool> mergedPhiSector(
@@ -15,23 +17,24 @@ std::tuple<ActsScalar, ActsScalar, bool> mergedPhiSector(
     ActsScalar avgPhi2, const Logger& logger, ActsScalar tolerance) {
   using namespace Acts::UnitLiterals;
 
-  if (std::abs(hlPhi1 - M_PI / 2.0) < tolerance &&
-      std::abs(hlPhi2 - M_PI / 2.0) < tolerance) {
+  if (std::abs(hlPhi1 - std::numbers::pi / 2.) < tolerance &&
+      std::abs(hlPhi2 - std::numbers::pi / 2.) < tolerance) {
     ACTS_VERBOSE("Both phi sectors cover a half circle");
 
-    ACTS_VERBOSE("-> distance between sectors: "
-                 << detail::difference_periodic(avgPhi1, avgPhi2, 2 * M_PI) /
-                        1_degree);
+    ACTS_VERBOSE("-> distance between sectors: " << detail::difference_periodic(
+                                                        avgPhi1, avgPhi2,
+                                                        2 * std::numbers::pi) /
+                                                        1_degree);
 
-    if (std::abs(
-            std::abs(detail::difference_periodic(avgPhi1, avgPhi2, 2 * M_PI)) -
-            M_PI) > tolerance) {
+    if (std::abs(std::abs(detail::difference_periodic(avgPhi1, avgPhi2,
+                                                      2 * std::numbers::pi)) -
+                 std::numbers::pi) > tolerance) {
       throw std::invalid_argument(
           "Phi sectors cover half a circle but are not opposite");
     }
 
-    ActsScalar newAvgPhi = detail::radian_sym(avgPhi1 + M_PI / 2.0);
-    ActsScalar newHlPhi = M_PI;
+    ActsScalar newAvgPhi = detail::radian_sym(avgPhi1 + std::numbers::pi / 2.);
+    ActsScalar newHlPhi = std::numbers::pi;
     ACTS_VERBOSE("merged: ["
                  << detail::radian_sym(newAvgPhi - newHlPhi) / 1_degree << ", "
                  << detail::radian_sym(newAvgPhi + newHlPhi) / 1_degree
diff --git a/Core/src/Surfaces/detail/VerticesHelper.cpp b/Core/src/Surfaces/detail/VerticesHelper.cpp
new file mode 100644
index 00000000000..e97d75d45bf
--- /dev/null
+++ b/Core/src/Surfaces/detail/VerticesHelper.cpp
@@ -0,0 +1,137 @@
+// This file is part of the ACTS project.
+//
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
+//
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
+
+#include "Acts/Surfaces/detail/VerticesHelper.hpp"
+
+#include <algorithm>
+#include <cmath>
+#include <cstddef>
+#include <numbers>
+
+std::vector<Acts::ActsScalar> Acts::detail::VerticesHelper::phiSegments(
+    ActsScalar phiMin, ActsScalar phiMax,
+    const std::vector<ActsScalar>& phiRefs, unsigned int quarterSegments) {
+  // Check that the phi range is valid
+  if (phiMin > phiMax) {
+    throw std::invalid_argument(
+        "VerticesHelper::phiSegments ... Minimum phi must be smaller than "
+        "maximum phi");
+  }
+
+  // First check that no reference phi is outside the range
+  for (ActsScalar phiRef : phiRefs) {
+    if (phiRef < phiMin || phiRef > phiMax) {
+      throw std::invalid_argument(
+          "VerticesHelper::phiSegments ... Reference phi is outside the range "
+          "of the segment");
+    }
+  }
+  if (quarterSegments == 0u) {
+    throw std::invalid_argument(
+        "VerticesHelper::phiSegments ... Number of segments must be larger "
+        "than 0.");
+  }
+  std::vector<ActsScalar> phiSegments = {phiMin, phiMax};
+  // Minimum approximation for a circle need
+  // - if the circle is closed the last point is given twice
+  for (unsigned int i = 0; i < 4 * quarterSegments + 1; ++i) {
+    ActsScalar phiExt =
+        -std::numbers::pi + i * 2 * std::numbers::pi / (4 * quarterSegments);
+    if (phiExt > phiMin && phiExt < phiMax &&
+        std::ranges::none_of(phiSegments, [&phiExt](ActsScalar phi) {
+          return std::abs(phi - phiExt) <
+                 std::numeric_limits<ActsScalar>::epsilon();
+        })) {
+      phiSegments.push_back(phiExt);
+    }
+  }
+  // Add the reference phis
+  for (const auto& phiRef : phiRefs) {
+    if (phiRef > phiMin && phiRef < phiMax) {
+      if (std::ranges::none_of(phiSegments, [&phiRef](ActsScalar phi) {
+            return std::abs(phi - phiRef) <
+                   std::numeric_limits<ActsScalar>::epsilon();
+          })) {
+        phiSegments.push_back(phiRef);
+      }
+    }
+  }
+
+  // Sort the phis
+  std::ranges::sort(phiSegments);
+  return phiSegments;
+}
+
+std::vector<Acts::Vector2> Acts::detail::VerticesHelper::ellipsoidVertices(
+    ActsScalar innerRx, ActsScalar innerRy, ActsScalar outerRx,
+    ActsScalar outerRy, ActsScalar avgPhi, ActsScalar halfPhi,
+    unsigned int quarterSegments) {
+  // List of vertices counter-clockwise starting at smallest phi w.r.t center,
+  // for both inner/outer ring/segment
+  std::vector<Vector2> rvertices;  // return vertices
+  std::vector<Vector2> ivertices;  // inner vertices
+  std::vector<Vector2> overtices;  // outer verices
+
+  bool innerExists = (innerRx > 0. && innerRy > 0.);
+  bool closed = std::abs(halfPhi - std::numbers::pi) < s_onSurfaceTolerance;
+
+  std::vector<ActsScalar> refPhi = {};
+  if (avgPhi != 0.) {
+    refPhi.push_back(avgPhi);
+  }
+
+  // The inner (if exists) and outer bow
+  if (innerExists) {
+    ivertices = segmentVertices<Vector2, Transform2>(
+        {innerRx, innerRy}, avgPhi - halfPhi, avgPhi + halfPhi, refPhi,
+        quarterSegments);
+  }
+  overtices = segmentVertices<Vector2, Transform2>(
+      {outerRx, outerRy}, avgPhi - halfPhi, avgPhi + halfPhi, refPhi,
+      quarterSegments);
+
+  // We want to keep the same counter-clockwise orientation for displaying
+  if (!innerExists) {
+    if (!closed) {
+      // Add the center case we have a sector
+      rvertices.push_back(Vector2(0., 0.));
+    }
+    rvertices.insert(rvertices.end(), overtices.begin(), overtices.end());
+  } else if (!closed) {
+    rvertices.insert(rvertices.end(), overtices.begin(), overtices.end());
+    rvertices.insert(rvertices.end(), ivertices.rbegin(), ivertices.rend());
+  } else {
+    rvertices.insert(rvertices.end(), overtices.begin(), overtices.end());
+    rvertices.insert(rvertices.end(), ivertices.begin(), ivertices.end());
+  }
+  return rvertices;
+}
+
+std::vector<Acts::Vector2> Acts::detail::VerticesHelper::circularVertices(
+    ActsScalar innerR, ActsScalar outerR, ActsScalar avgPhi, ActsScalar halfPhi,
+    unsigned int quarterSegments) {
+  return ellipsoidVertices(innerR, innerR, outerR, outerR, avgPhi, halfPhi,
+                           quarterSegments);
+}
+
+bool Acts::detail::VerticesHelper::onHyperPlane(
+    const std::vector<Acts::Vector3>& vertices, ActsScalar tolerance) {
+  // Obvious always on one surface
+  if (vertices.size() < 4) {
+    return true;
+  }
+  // Create the hyperplane
+  auto hyperPlane = Eigen::Hyperplane<ActsScalar, 3>::Through(
+      vertices[0], vertices[1], vertices[2]);
+  for (std::size_t ip = 3; ip < vertices.size(); ++ip) {
+    if (hyperPlane.absDistance(vertices[ip]) > tolerance) {
+      return false;
+    }
+  }
+  return true;
+}
diff --git a/Core/src/TrackFinding/AmbiguityTrackClustering.cpp b/Core/src/TrackFinding/AmbiguityTrackClustering.cpp
index b9cf526df7e..ff0e95cbb3d 100644
--- a/Core/src/TrackFinding/AmbiguityTrackClustering.cpp
+++ b/Core/src/TrackFinding/AmbiguityTrackClustering.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2023 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include "Acts/TrackFinding/detail/AmbiguityTrackClustering.hpp"
 
@@ -22,26 +22,26 @@ Acts::detail::clusterDuplicateTracks(
   std::unordered_map<std::size_t, std::size_t> hitToTrack;
 
   // Loop over all the tracks
-  for (auto track = trackMap.rbegin(); track != trackMap.rend(); ++track) {
-    std::vector<std::size_t> hits = track->second.second;
+  for (const auto& [_, trackValue] : trackMap) {
+    std::vector<std::size_t> hits = trackValue.second;
     auto matchedTrack = hitToTrack.end();
     // Loop over all the hits in the track
-    for (auto hit = hits.begin(); hit != hits.end(); hit++) {
+    for (const auto& hit : hits) {
       // Check if the hit is already associated to a track
-      matchedTrack = hitToTrack.find(*hit);
+      matchedTrack = hitToTrack.find(hit);
       if (matchedTrack != hitToTrack.end()) {
         // Add the track to the cluster associated to the matched track
-        cluster.at(matchedTrack->second).push_back(track->second.first);
+        cluster.at(matchedTrack->second).push_back(trackValue.first);
         break;
       }
     }
     // None of the hits have been matched to a track create a new cluster
     if (matchedTrack == hitToTrack.end()) {
-      cluster.emplace(track->second.first,
-                      std::vector<std::size_t>(1, track->second.first));
+      cluster.emplace(trackValue.first,
+                      std::vector<std::size_t>(1, trackValue.first));
       for (const auto& hit : hits) {
         // Add the hits of the new cluster to the hitToTrack
-        hitToTrack.emplace(hit, track->second.first);
+        hitToTrack.emplace(hit, trackValue.first);
       }
     }
   }
diff --git a/Core/src/TrackFinding/CombinatorialKalmanFilterError.cpp b/Core/src/TrackFinding/CombinatorialKalmanFilterError.cpp
index bbac2645ea4..e7d23b90eaf 100644
--- a/Core/src/TrackFinding/CombinatorialKalmanFilterError.cpp
+++ b/Core/src/TrackFinding/CombinatorialKalmanFilterError.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2020 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include "Acts/TrackFinding/CombinatorialKalmanFilterError.hpp"
 
diff --git a/Core/src/TrackFinding/GbtsConnector.cpp b/Core/src/TrackFinding/GbtsConnector.cpp
index 2b6e640bae0..d947894871c 100644
--- a/Core/src/TrackFinding/GbtsConnector.cpp
+++ b/Core/src/TrackFinding/GbtsConnector.cpp
@@ -1,14 +1,15 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2021 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 // TODO: update to C++17 style
 #include "Acts/TrackFinding/GbtsConnector.hpp"
 
+#include <algorithm>
 #include <fstream>
 #include <iostream>
 #include <list>
@@ -57,15 +58,8 @@ GbtsConnector::GbtsConnector(std::ifstream &inFile) {
       continue;
     }
 
-    std::map<int, std::vector<GbtsConnection *>>::iterator it =
-        m_connMap.find(stage);
-
-    if (it == m_connMap.end()) {
-      std::vector<GbtsConnection *> v(1, pC);
-      m_connMap.insert(std::make_pair(stage, v));
-    } else {
-      (*it).second.push_back(pC);
-    }
+    auto &connections = m_connMap[stage];
+    connections.push_back(pC);
   }
 
   // re-arrange the connection stages
@@ -74,9 +68,8 @@ GbtsConnector::GbtsConnector(std::ifstream &inFile) {
 
   std::map<int, std::vector<const GbtsConnection *>> newConnMap;
 
-  for (const auto &conn : m_connMap) {
-    std::copy(conn.second.begin(), conn.second.end(),
-              std::back_inserter(lConns));
+  for (const auto &[_, value] : m_connMap) {
+    std::ranges::copy(value, std::back_inserter(lConns));
   }
 
   int stageCounter = 0;
@@ -111,23 +104,22 @@ GbtsConnector::GbtsConnector(std::ifstream &inFile) {
 
     std::set<unsigned int> zeroLayers;
 
-    for (const auto &layerCounts : mCounter) {
-      if (layerCounts.second.second != 0) {
+    for (const auto &[key, value] : mCounter) {
+      if (value.second != 0) {
         continue;
       }
 
-      zeroLayers.insert(layerCounts.first);
+      zeroLayers.insert(key);
     }
 
     // remove connections which use zeroLayer as destination
 
     std::vector<const GbtsConnection *> theStage;
 
-    std::list<const GbtsConnection *>::iterator cIt = lConns.begin();
+    auto cIt = lConns.begin();
 
     while (cIt != lConns.end()) {
-      if (zeroLayers.find((*cIt)->m_dst) !=
-          zeroLayers.end()) {  // check if contains
+      if (zeroLayers.contains((*cIt)->m_dst)) {
         theStage.push_back(*cIt);
         cIt = lConns.erase(cIt);
         continue;
@@ -145,10 +137,9 @@ GbtsConnector::GbtsConnector(std::ifstream &inFile) {
   // the doublet making is done using "outside-in" approach hence the reverse
   // iterations
 
-  for (std::map<int, std::vector<const GbtsConnection *>>::reverse_iterator it =
-           newConnMap.rbegin();
-       it != newConnMap.rend(); ++it, currentStage++) {
-    const std::vector<const GbtsConnection *> &vConn = (*it).second;
+  for (auto it = newConnMap.rbegin(); it != newConnMap.rend();
+       it++, currentStage++) {
+    const auto &[_, vConn] = *it;
 
     // loop over links, extract all connections for the stage, group sources by
     // L1 (dst) index
@@ -158,8 +149,7 @@ GbtsConnector::GbtsConnector(std::ifstream &inFile) {
     for (const auto *conn : vConn) {
       unsigned int dst = conn->m_dst;
 
-      std::map<unsigned int, std::vector<const GbtsConnection *>>::iterator
-          l1MapIt = l1ConnMap.find(dst);
+      auto l1MapIt = l1ConnMap.find(dst);
       if (l1MapIt != l1ConnMap.end()) {
         (*l1MapIt).second.push_back(conn);
       } else {
@@ -172,8 +162,8 @@ GbtsConnector::GbtsConnector(std::ifstream &inFile) {
 
     lgv.reserve(l1ConnMap.size());
 
-    for (const auto &l1Group : l1ConnMap) {
-      lgv.push_back(LayerGroup(l1Group.first, l1Group.second));
+    for (const auto &[key, value] : l1ConnMap) {
+      lgv.emplace_back(LayerGroup(key, value));
     }
 
     m_layerGroups.insert(std::make_pair(currentStage, lgv));
@@ -184,12 +174,9 @@ GbtsConnector::GbtsConnector(std::ifstream &inFile) {
 
 GbtsConnector::~GbtsConnector() {
   m_layerGroups.clear();
-  for (std::map<int, std::vector<GbtsConnection *>>::iterator it =
-           m_connMap.begin();
-       it != m_connMap.end(); ++it) {
-    for (std::vector<GbtsConnection *>::iterator cIt = (*it).second.begin();
-         cIt != (*it).second.end(); ++cIt) {
-      delete (*cIt);
+  for (const auto &[_, connections] : m_connMap) {
+    for (auto *conn : connections) {
+      delete conn;
     }
   }
 }
diff --git a/Core/src/TrackFinding/MeasurementSelector.cpp b/Core/src/TrackFinding/MeasurementSelector.cpp
index 946ca981949..2a3c0e2d390 100644
--- a/Core/src/TrackFinding/MeasurementSelector.cpp
+++ b/Core/src/TrackFinding/MeasurementSelector.cpp
@@ -1,28 +1,82 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2021-2024 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include "Acts/TrackFinding/MeasurementSelector.hpp"
 
 #include "Acts/Definitions/Algebra.hpp"
+#include "Acts/Definitions/TrackParametrization.hpp"
 #include "Acts/EventData/MeasurementHelpers.hpp"
+#include "Acts/EventData/SubspaceHelpers.hpp"
+#include "Acts/EventData/Types.hpp"
+#include "Acts/Geometry/GeometryIdentifier.hpp"
 
 #include <algorithm>
+#include <cstddef>
+#include <limits>
+#include <numbers>
 
 namespace Acts {
 
 MeasurementSelector::MeasurementSelector()
-    : m_config{{GeometryIdentifier(), MeasurementSelectorCuts{}}} {}
+    : MeasurementSelector({{GeometryIdentifier(), MeasurementSelectorCuts{}}}) {
+}
 
 MeasurementSelector::MeasurementSelector(const MeasurementSelectorCuts& cuts)
-    : m_config{{GeometryIdentifier(), cuts}} {}
+    : MeasurementSelector({{GeometryIdentifier(), cuts}}) {}
+
+MeasurementSelector::MeasurementSelector(const Config& config) {
+  if (config.empty()) {
+    throw std::invalid_argument(
+        "MeasurementSelector: Configuration must not be empty");
+  }
+
+  std::vector<InternalConfig::InputElement> tmp;
+  tmp.reserve(config.size());
+  for (std::size_t i = 0; i < config.size(); ++i) {
+    GeometryIdentifier geoID = config.idAt(i);
+    MeasurementSelectorCuts cuts = config.valueAt(i);
+
+    InternalCutBins internalCuts = convertCutBins(cuts);
+    tmp.emplace_back(geoID, std::move(internalCuts));
+  }
+  m_config = InternalConfig(std::move(tmp));
+}
 
-MeasurementSelector::MeasurementSelector(Config config)
-    : m_config(std::move(config)) {}
+MeasurementSelector::InternalCutBins MeasurementSelector::convertCutBins(
+    const MeasurementSelectorCuts& config) {
+  InternalCutBins cutBins;
+
+  auto getEtaOrInf = [](const auto& vec, std::size_t bin) {
+    if (bin >= vec.size()) {
+      return std::numeric_limits<double>::infinity();
+    }
+    assert(vec[bin] >= 0 && "Eta bins must be positive");
+    return vec[bin];
+  };
+
+  auto getBinOrBackOrMax = [](const auto& vec, std::size_t bin) {
+    using Value = std::remove_reference_t<decltype(vec[0])>;
+    static constexpr Value max = std::numeric_limits<Value>::max();
+    return vec.empty() ? max : (bin < vec.size() ? vec[bin] : vec.back());
+  };
+
+  for (std::size_t bin = 0; bin < config.etaBins.size() + 1; ++bin) {
+    InternalCutBin cuts;
+    cuts.maxTheta = getEtaOrInf(config.etaBins, bin);
+    cuts.maxNumMeasurements =
+        getBinOrBackOrMax(config.numMeasurementsCutOff, bin);
+    cuts.maxChi2Measurement = getBinOrBackOrMax(config.chi2CutOff, bin);
+    cuts.maxChi2Outlier = getBinOrBackOrMax(config.chi2CutOffOutlier, bin);
+    cutBins.push_back(cuts);
+  }
+
+  return cutBins;
+}
 
 double MeasurementSelector::calculateChi2(
     const double* fullCalibrated, const double* fullCalibratedCovariance,
@@ -30,9 +84,7 @@ double MeasurementSelector::calculateChi2(
                      false>::Parameters predicted,
     TrackStateTraits<MultiTrajectoryTraits::MeasurementSizeMax,
                      false>::Covariance predictedCovariance,
-    TrackStateTraits<MultiTrajectoryTraits::MeasurementSizeMax,
-                     false>::Projector projector,
-    unsigned int calibratedSize) const {
+    BoundSubspaceIndices projector, unsigned int calibratedSize) const {
   return visit_measurement(
       calibratedSize,
       [&fullCalibrated, &fullCalibratedCovariance, &predicted,
@@ -47,21 +99,50 @@ double MeasurementSelector::calculateChi2(
 
         using ParametersVector = ActsVector<kMeasurementSize>;
 
-        // Take the projector (measurement mapping function)
-        const auto H =
-            projector.template topLeftCorner<kMeasurementSize, eBoundSize>()
-                .eval();
+        std::span<std::uint8_t, kMeasurementSize> validSubspaceIndices(
+            projector.begin(), projector.begin() + kMeasurementSize);
+        FixedBoundSubspaceHelper<kMeasurementSize> subspaceHelper(
+            validSubspaceIndices);
 
         // Get the residuals
-        ParametersVector res = calibrated - H * predicted;
+        ParametersVector res =
+            calibrated - subspaceHelper.projectVector(predicted);
 
         // Get the chi2
         return (res.transpose() *
-                (calibratedCovariance + H * predictedCovariance * H.transpose())
+                (calibratedCovariance +
+                 subspaceHelper.projectMatrix(predictedCovariance))
                     .inverse() *
                 res)
             .eval()(0, 0);
       });
 }
 
+MeasurementSelector::Cuts MeasurementSelector::getCutsByTheta(
+    const InternalCutBins& config, double theta) {
+  // since theta is in [0, pi] and we have a symmetric cut in eta, we can just
+  // look at the positive half of the Z axis
+  const double constrainedTheta = std::min(theta, std::numbers::pi - theta);
+
+  auto it = std::ranges::find_if(
+      config, [constrainedTheta](const InternalCutBin& cuts) {
+        return constrainedTheta < cuts.maxTheta;
+      });
+  assert(it != config.end());
+  return {it->maxNumMeasurements, it->maxChi2Measurement, it->maxChi2Outlier};
+}
+
+Result<MeasurementSelector::Cuts> MeasurementSelector::getCuts(
+    const GeometryIdentifier& geoID, double theta) const {
+  // Find the appropriate cuts
+  auto cuts = m_config.find(geoID);
+  if (cuts == m_config.end()) {
+    // for now we consider missing cuts an unrecoverable error
+    // TODO consider other options e.g. do not add measurements at all (not
+    // even as outliers)
+    return CombinatorialKalmanFilterError::MeasurementSelectionFailed;
+  }
+  return getCutsByTheta(*cuts, theta);
+}
+
 }  // namespace Acts
diff --git a/Core/src/TrackFinding/RoiDescriptor.cpp b/Core/src/TrackFinding/RoiDescriptor.cpp
index c76df027082..edf9c36684c 100644
--- a/Core/src/TrackFinding/RoiDescriptor.cpp
+++ b/Core/src/TrackFinding/RoiDescriptor.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2021 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 // TODO: update to C++17 style
 #include "Acts/TrackFinding/RoiDescriptor.hpp"
diff --git a/Core/src/TrackFitting/BetheHeitlerApprox.cpp b/Core/src/TrackFitting/BetheHeitlerApprox.cpp
index 45eca1d0156..272d6e08c8d 100644
--- a/Core/src/TrackFitting/BetheHeitlerApprox.cpp
+++ b/Core/src/TrackFitting/BetheHeitlerApprox.cpp
@@ -1,14 +1,15 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2023 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include "Acts/TrackFitting/BetheHeitlerApprox.hpp"
 
-Acts::AtlasBetheHeitlerApprox<6, 5> Acts::makeDefaultBetheHeitlerApprox() {
+Acts::AtlasBetheHeitlerApprox<6, 5> Acts::makeDefaultBetheHeitlerApprox(
+    bool clampToRange) {
   // Tracking/TrkFitter/TrkGaussianSumFilterUtils/Data/BetheHeitler_cdf_nC6_O5.par
   // clang-format off
   constexpr static AtlasBetheHeitlerApprox<6, 5>::Data cdf_cmps6_order5_data = {{
@@ -51,6 +52,7 @@ Acts::AtlasBetheHeitlerApprox<6, 5> Acts::makeDefaultBetheHeitlerApprox() {
   }};
   // clang-format on
 
-  return AtlasBetheHeitlerApprox<6, 5>(
-      cdf_cmps6_order5_data, cdf_cmps6_order5_data, true, true, 0.2, 0.2);
+  return AtlasBetheHeitlerApprox<6, 5>(cdf_cmps6_order5_data,
+                                       cdf_cmps6_order5_data, true, true, 0.2,
+                                       0.2, clampToRange);
 }
diff --git a/Core/src/TrackFitting/GainMatrixSmoother.cpp b/Core/src/TrackFitting/GainMatrixSmoother.cpp
index d5a79f57d59..711540ff0bf 100644
--- a/Core/src/TrackFitting/GainMatrixSmoother.cpp
+++ b/Core/src/TrackFitting/GainMatrixSmoother.cpp
@@ -1,14 +1,15 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2021-2024 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include "Acts/TrackFitting/GainMatrixSmoother.hpp"
 
 #include "Acts/Definitions/TrackParametrization.hpp"
+#include "Acts/EventData/TrackParameterHelpers.hpp"
 #include "Acts/EventData/detail/CovarianceHelper.hpp"
 #include "Acts/TrackFitting/KalmanFitterError.hpp"
 
@@ -57,7 +58,10 @@ Result<void> GainMatrixSmoother::calculate(
       "Prev. predicted parameters: " << predicted(prev_ts).transpose());
 
   // Calculate the smoothed parameters
-  smoothed(ts) = filtered(ts) + G * (smoothed(prev_ts) - predicted(prev_ts));
+  smoothed(ts) = filtered(ts) + G * subtractBoundParameters(smoothed(prev_ts),
+                                                            predicted(prev_ts));
+  // Normalize phi and theta
+  smoothed(ts) = normalizeBoundParameters(smoothed(ts));
 
   ACTS_VERBOSE("Smoothed parameters are: " << smoothed(ts).transpose());
   ACTS_VERBOSE("Calculate smoothed covariance:");
diff --git a/Core/src/TrackFitting/GainMatrixUpdater.cpp b/Core/src/TrackFitting/GainMatrixUpdater.cpp
index cbb50fcf5c4..5ed9393d1ec 100644
--- a/Core/src/TrackFitting/GainMatrixUpdater.cpp
+++ b/Core/src/TrackFitting/GainMatrixUpdater.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2021-2024 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include "Acts/TrackFitting/GainMatrixUpdater.hpp"
 
diff --git a/Core/src/TrackFitting/GainMatrixUpdaterImpl.cpp.in b/Core/src/TrackFitting/GainMatrixUpdaterImpl.cpp.in
index 245de570cba..76fc6f8e304 100644
--- a/Core/src/TrackFitting/GainMatrixUpdaterImpl.cpp.in
+++ b/Core/src/TrackFitting/GainMatrixUpdaterImpl.cpp.in
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2024 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include "Acts/TrackFitting/detail/GainMatrixUpdaterImpl.hpp"
 
diff --git a/Core/src/TrackFitting/GlobalChiSquareFitter.cpp b/Core/src/TrackFitting/GlobalChiSquareFitter.cpp
index 365a31491d0..50b8b4cab8c 100644
--- a/Core/src/TrackFitting/GlobalChiSquareFitter.cpp
+++ b/Core/src/TrackFitting/GlobalChiSquareFitter.cpp
@@ -1,42 +1,52 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2023 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include "Acts/TrackFitting/GlobalChiSquareFitter.hpp"
 
 #include "Acts/Definitions/TrackParametrization.hpp"
 
-namespace Acts::Experimental {
-
-BoundVector calculateDeltaParams(const BoundMatrix& aMatrix,
-                                 const BoundVector& bVector,
-                                 const std::size_t ndfSystem) {
-  BoundVector deltaParams = BoundVector::Zero();
-  if (ndfSystem == 4) {
-    constexpr std::size_t reducedMatrixSize = 4;
-    deltaParams.topLeftCorner<reducedMatrixSize, 1>() =
-        aMatrix.topLeftCorner<reducedMatrixSize, reducedMatrixSize>()
-            .colPivHouseholderQr()
-            .solve(bVector.topLeftCorner<reducedMatrixSize, 1>());
-  } else if (ndfSystem == 5) {
-    constexpr std::size_t reducedMatrixSize = 5;
-    deltaParams.topLeftCorner<reducedMatrixSize, 1>() =
-        aMatrix.topLeftCorner<reducedMatrixSize, reducedMatrixSize>()
-            .colPivHouseholderQr()
-            .solve(bVector.topLeftCorner<reducedMatrixSize, 1>());
-  } else {
-    constexpr std::size_t reducedMatrixSize = 6;
-    deltaParams.topLeftCorner<reducedMatrixSize, 1>() =
-        aMatrix.topLeftCorner<reducedMatrixSize, reducedMatrixSize>()
-            .colPivHouseholderQr()
-            .solve(bVector.topLeftCorner<reducedMatrixSize, 1>());
+void Acts::Experimental::updateGx2fParams(
+    BoundTrackParameters& params, const Eigen::VectorXd& deltaParamsExtended,
+    const std::size_t nMaterialSurfaces,
+    std::unordered_map<GeometryIdentifier, ScatteringProperties>& scatteringMap,
+    const std::vector<GeometryIdentifier>& geoIdVector) {
+  // update params
+  params.parameters() +=
+      deltaParamsExtended.topLeftCorner<eBoundSize, 1>().eval();
+
+  // update the scattering angles.
+  for (std::size_t matSurface = 0; matSurface < nMaterialSurfaces;
+       matSurface++) {
+    const std::size_t deltaPosition = eBoundSize + 2 * matSurface;
+    const GeometryIdentifier geoId = geoIdVector[matSurface];
+    const auto scatteringMapId = scatteringMap.find(geoId);
+    assert(scatteringMapId != scatteringMap.end() &&
+           "No scattering angles found for material surface.");
+    scatteringMapId->second.scatteringAngles().block<2, 1>(2, 0) +=
+        deltaParamsExtended.block<2, 1>(deltaPosition, 0).eval();
   }
 
-  return deltaParams;
+  return;
 }
 
-}  // namespace Acts::Experimental
+void Acts::Experimental::updateGx2fCovarianceParams(
+    BoundMatrix& fullCovariancePredicted, Gx2fSystem& extendedSystem) {
+  // make invertible
+  for (std::size_t i = 0; i < extendedSystem.nDims(); ++i) {
+    if (extendedSystem.aMatrix()(i, i) == 0.) {
+      extendedSystem.aMatrix()(i, i) = 1.;
+    }
+  }
+
+  visit_measurement(extendedSystem.findRequiredNdf(), [&](auto N) {
+    fullCovariancePredicted.topLeftCorner<N, N>() =
+        extendedSystem.aMatrix().inverse().topLeftCorner<N, N>();
+  });
+
+  return;
+}
diff --git a/Core/src/TrackFitting/GlobalChiSquareFitterError.cpp b/Core/src/TrackFitting/GlobalChiSquareFitterError.cpp
index f1fd9accd3a..3a3cc713173 100644
--- a/Core/src/TrackFitting/GlobalChiSquareFitterError.cpp
+++ b/Core/src/TrackFitting/GlobalChiSquareFitterError.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2023 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include "Acts/TrackFitting/GlobalChiSquareFitterError.hpp"
 
@@ -32,6 +32,8 @@ class GlobalChiSquareFitterErrorCategory : public std::error_category {
         return "Gx2f: Not enough measurements.";
       case GlobalChiSquareFitterError::UpdatePushedToNewVolume:
         return "Gx2f: Update pushed the parameters to a new volume.";
+      case GlobalChiSquareFitterError::UsedUnreachableMeasurements:
+        return "Gx2f: Final fit used unreachable measurements.";
       default:
         return "unknown";
     }
diff --git a/Core/src/TrackFitting/GsfError.cpp b/Core/src/TrackFitting/GsfError.cpp
index 5d11e40e08d..a7712d0ac96 100644
--- a/Core/src/TrackFitting/GsfError.cpp
+++ b/Core/src/TrackFitting/GsfError.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2021 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include "Acts/TrackFitting/GsfError.hpp"
 
diff --git a/Core/src/TrackFitting/GsfMixtureReduction.cpp b/Core/src/TrackFitting/GsfMixtureReduction.cpp
index 6008ad66a81..88e5e9fca1d 100644
--- a/Core/src/TrackFitting/GsfMixtureReduction.cpp
+++ b/Core/src/TrackFitting/GsfMixtureReduction.cpp
@@ -1,15 +1,17 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2023 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include "Acts/TrackFitting/GsfMixtureReduction.hpp"
 
 #include "Acts/TrackFitting/detail/SymmetricKlDistanceMatrix.hpp"
 
+#include <algorithm>
+
 template <typename proj_t, typename angle_desc_t>
 void reduceWithKLDistanceImpl(std::vector<Acts::GsfComponent> &cmpCache,
                               std::size_t maxCmpsAfterMerge, const proj_t &proj,
@@ -35,10 +37,8 @@ void reduceWithKLDistanceImpl(std::vector<Acts::GsfComponent> &cmpCache,
   }
 
   // Remove all components which are labeled with weight -1
-  std::sort(cmpCache.begin(), cmpCache.end(),
-            [&](const auto &a, const auto &b) {
-              return proj(a).weight < proj(b).weight;
-            });
+  std::ranges::sort(cmpCache, {},
+                    [&](const auto &c) { return proj(c).weight; });
   cmpCache.erase(
       std::remove_if(cmpCache.begin(), cmpCache.end(),
                      [&](const auto &a) { return proj(a).weight == -1.0; }),
diff --git a/Core/src/TrackFitting/GsfUtils.cpp b/Core/src/TrackFitting/GsfUtils.cpp
index 56ed204fcd4..ae5b47ca700 100644
--- a/Core/src/TrackFitting/GsfUtils.cpp
+++ b/Core/src/TrackFitting/GsfUtils.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2021 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include "Acts/TrackFitting/detail/GsfUtils.hpp"
 
diff --git a/Core/src/TrackFitting/KalmanFitterError.cpp b/Core/src/TrackFitting/KalmanFitterError.cpp
index 000bcf7242d..b585c52472c 100644
--- a/Core/src/TrackFitting/KalmanFitterError.cpp
+++ b/Core/src/TrackFitting/KalmanFitterError.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2020 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include "Acts/TrackFitting/KalmanFitterError.hpp"
 
diff --git a/Core/src/TrackFitting/MbfSmoother.cpp b/Core/src/TrackFitting/MbfSmoother.cpp
index fe668eb41d8..2614834aadb 100644
--- a/Core/src/TrackFitting/MbfSmoother.cpp
+++ b/Core/src/TrackFitting/MbfSmoother.cpp
@@ -1,78 +1,86 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2024 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include "Acts/TrackFitting/MbfSmoother.hpp"
 
+#include "Acts/EventData/TrackParameterHelpers.hpp"
+
 namespace Acts {
 
 void MbfSmoother::calculateSmoothed(InternalTrackState& ts,
-                                    const BoundMatrix& big_lambda_hat,
-                                    const BoundVector& small_lambda_hat) const {
+                                    const BoundMatrix& bigLambdaHat,
+                                    const BoundVector& smallLambdaHat) const {
   ts.smoothedCovariance = ts.filteredCovariance - ts.filteredCovariance *
-                                                      big_lambda_hat *
+                                                      bigLambdaHat *
                                                       ts.filteredCovariance;
-  ts.smoothed = ts.filtered - ts.filteredCovariance * small_lambda_hat;
+  ts.smoothed = ts.filtered - ts.filteredCovariance * smallLambdaHat;
+  // Normalize phi and theta
+  ts.smoothed = normalizeBoundParameters(ts.smoothed);
 }
 
 void MbfSmoother::visitNonMeasurement(const InternalTrackState& ts,
-                                      BoundMatrix& big_lambda_hat,
-                                      BoundVector& small_lambda_hat) const {
-  const auto F = ts.jacobian;
+                                      BoundMatrix& bigLambdaHat,
+                                      BoundVector& smallLambdaHat) const {
+  const InternalTrackState::Jacobian F = ts.jacobian;
 
-  big_lambda_hat = F.transpose() * big_lambda_hat * F;
-  small_lambda_hat = F.transpose() * small_lambda_hat;
+  bigLambdaHat = F.transpose() * bigLambdaHat * F;
+  smallLambdaHat = F.transpose() * smallLambdaHat;
 }
 
 void MbfSmoother::visitMeasurement(const InternalTrackState& ts,
-                                   BoundMatrix& big_lambda_hat,
-                                   BoundVector& small_lambda_hat) const {
+                                   BoundMatrix& bigLambdaHat,
+                                   BoundVector& smallLambdaHat) const {
   assert(ts.measurement.has_value());
 
-  const auto& measurement = ts.measurement.value();
+  const InternalTrackState::Measurement& measurement = ts.measurement.value();
+  const InternalTrackState::Jacobian F = ts.jacobian;
 
   visit_measurement(measurement.calibratedSize, [&](auto N) -> void {
     constexpr std::size_t kMeasurementSize = decltype(N)::value;
 
+    using MeasurementMatrix =
+        Eigen::Matrix<ActsScalar, kMeasurementSize, eBoundSize>;
+    using CovarianceMatrix =
+        Eigen::Matrix<ActsScalar, kMeasurementSize, kMeasurementSize>;
+    using KalmanGainMatrix =
+        Eigen::Matrix<ActsScalar, eBoundSize, kMeasurementSize>;
+
     typename TrackStateTraits<kMeasurementSize, true>::Calibrated calibrated{
         measurement.calibrated};
     typename TrackStateTraits<kMeasurementSize, true>::CalibratedCovariance
         calibratedCovariance{measurement.calibratedCovariance};
 
     // Measurement matrix
-    const auto H = measurement.projector
-                       .template topLeftCorner<kMeasurementSize, eBoundSize>()
-                       .eval();
+    const MeasurementMatrix H =
+        measurement.projector
+            .template topLeftCorner<kMeasurementSize, eBoundSize>();
 
     // Residual covariance
-    const auto S =
-        (H * ts.predictedCovariance * H.transpose() + calibratedCovariance)
-            .eval();
+    const CovarianceMatrix S =
+        (H * ts.predictedCovariance * H.transpose() + calibratedCovariance);
     // TODO Sinv could be cached by the filter step
-    const auto S_inv = S.inverse().eval();
+    const CovarianceMatrix SInv = S.inverse();
 
     // Kalman gain
     // TODO K could be cached by the filter step
-    const auto K = (ts.predictedCovariance * H.transpose() * S_inv).eval();
-
-    const auto C_hat = (BoundMatrix::Identity() - K * H).eval();
-    const auto y = (calibrated - H * ts.predicted).eval();
+    const KalmanGainMatrix K = (ts.predictedCovariance * H.transpose() * SInv);
 
-    const auto big_lambda_tilde =
-        (H.transpose() * S_inv * H + C_hat.transpose() * big_lambda_hat * C_hat)
-            .eval();
-    const auto small_lambda_tilde =
-        (-H.transpose() * S_inv * y + C_hat.transpose() * small_lambda_hat)
-            .eval();
+    const Acts::BoundMatrix CHat = (Acts::BoundMatrix::Identity() - K * H);
+    const Eigen::Matrix<ActsScalar, kMeasurementSize, 1> y =
+        (calibrated - H * ts.predicted);
 
-    const auto F = ts.jacobian;
+    const Acts::BoundMatrix bigLambdaTilde =
+        (H.transpose() * SInv * H + CHat.transpose() * bigLambdaHat * CHat);
+    const Eigen::Matrix<ActsScalar, eBoundSize, 1> smallLambdaTilde =
+        (-H.transpose() * SInv * y + CHat.transpose() * smallLambdaHat);
 
-    big_lambda_hat = F.transpose() * big_lambda_tilde * F;
-    small_lambda_hat = F.transpose() * small_lambda_tilde;
+    bigLambdaHat = F.transpose() * bigLambdaTilde * F;
+    smallLambdaHat = F.transpose() * smallLambdaTilde;
   });
 }
 
diff --git a/Core/src/Utilities/AnnealingUtility.cpp b/Core/src/Utilities/AnnealingUtility.cpp
index 1b2063324c9..d090af6a193 100644
--- a/Core/src/Utilities/AnnealingUtility.cpp
+++ b/Core/src/Utilities/AnnealingUtility.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2019 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include "Acts/Utilities/AnnealingUtility.hpp"
 
diff --git a/Core/src/Utilities/BinUtility.cpp b/Core/src/Utilities/BinUtility.cpp
deleted file mode 100644
index 4161ccdb4f1..00000000000
--- a/Core/src/Utilities/BinUtility.cpp
+++ /dev/null
@@ -1,15 +0,0 @@
-// This file is part of the Acts project.
-//
-// Copyright (C) 2016-2018 CERN for the benefit of the Acts project
-//
-// This Source Code Form is subject to the terms of the Mozilla Public
-// License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-#include "Acts/Utilities/BinUtility.hpp"
-
-#include <iostream>
-
-std::ostream& Acts::operator<<(std::ostream& sl, const BinUtility& bgen) {
-  return bgen.toStream(sl);
-}
diff --git a/Core/src/Utilities/BinningType.cpp b/Core/src/Utilities/BinningType.cpp
index 08a3dd58ce5..8faa7dcd856 100644
--- a/Core/src/Utilities/BinningType.cpp
+++ b/Core/src/Utilities/BinningType.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2016-2024 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include "Acts/Utilities/BinningType.hpp"
 
@@ -32,8 +32,7 @@ const std::vector<BinningValue>& allBinningValues() {
 }
 
 BinningValue binningValueFromName(const std::string& name) {
-  auto it =
-      std::find(s_binningValueNames.begin(), s_binningValueNames.end(), name);
+  auto it = std::ranges::find(s_binningValueNames, name);
   if (it == s_binningValueNames.end()) {
     throw std::invalid_argument("Unknown binning value name: " + name);
   }
diff --git a/Core/src/Utilities/CMakeLists.txt b/Core/src/Utilities/CMakeLists.txt
index be3a4f83dfe..1fb61813cd3 100644
--- a/Core/src/Utilities/CMakeLists.txt
+++ b/Core/src/Utilities/CMakeLists.txt
@@ -2,10 +2,10 @@ target_sources(
     ActsCore
     PRIVATE
         AnnealingUtility.cpp
-        BinUtility.cpp
         Logger.cpp
         SpacePointUtility.cpp
         TrackHelpers.cpp
         BinningType.cpp
         Intersection.cpp
+        GraphViz.cpp
 )
diff --git a/Core/src/Utilities/GraphViz.cpp b/Core/src/Utilities/GraphViz.cpp
new file mode 100644
index 00000000000..fda1635abd5
--- /dev/null
+++ b/Core/src/Utilities/GraphViz.cpp
@@ -0,0 +1,286 @@
+// This file is part of the ACTS project.
+//
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
+//
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
+
+#include "Acts/Utilities/GraphViz.hpp"
+
+#include <algorithm>
+#include <sstream>
+#include <string>
+
+#include <boost/algorithm/string/join.hpp>
+
+namespace Acts::GraphViz {
+
+std::ostream& operator<<(std::ostream& os, const Shape& shape) {
+  switch (shape) {
+    using enum Shape;
+
+    case Box:
+      os << "box";
+      break;
+    case Polygon:
+      os << "polygon";
+      break;
+    case Ellipse:
+      os << "ellipse";
+      break;
+    case Oval:
+      os << "oval";
+      break;
+    case Circle:
+      os << "circle";
+      break;
+    case Point:
+      os << "point";
+      break;
+    case Egg:
+      os << "egg";
+      break;
+    case Triangle:
+      os << "triangle";
+      break;
+    case Plaintext:
+      os << "plaintext";
+      break;
+    case Plain:
+      os << "plain";
+      break;
+    case Diamond:
+      os << "diamond";
+      break;
+    case Trapezium:
+      os << "trapezium";
+      break;
+    case Parallelogram:
+      os << "parallelogram";
+      break;
+    case House:
+      os << "house";
+      break;
+    case Pentagon:
+      os << "pentagon";
+      break;
+    case Hexagon:
+      os << "hexagon";
+      break;
+    case Septagon:
+      os << "septagon";
+      break;
+    case Octagon:
+      os << "octagon";
+      break;
+    case DoubleCircle:
+      os << "doublecircle";
+      break;
+    case DoubleOctagon:
+      os << "doubleoctagon";
+      break;
+    case TripleOctagon:
+      os << "tripleoctagon";
+      break;
+    case InvTriangle:
+      os << "invtriangle";
+      break;
+    case InvTrapezium:
+      os << "invtrapezium";
+      break;
+    case InvHouse:
+      os << "invhouse";
+      break;
+    case Mdiamond:
+      os << "Mdiamond";
+      break;
+    case Msquare:
+      os << "Msquare";
+      break;
+    case Mcircle:
+      os << "Mcircle";
+      break;
+    case Rect:
+      os << "rect";
+      break;
+    case Rectangle:
+      os << "rectangle";
+      break;
+    case Square:
+      os << "square";
+      break;
+    case Star:
+      os << "star";
+      break;
+    case None:
+      os << "none";
+      break;
+    case Underline:
+      os << "underline";
+      break;
+    case Cylinder:
+      os << "cylinder";
+      break;
+    case Note:
+      os << "note";
+      break;
+    case Tab:
+      os << "tab";
+      break;
+    case Folder:
+      os << "folder";
+      break;
+    case Box3d:
+      os << "box3d";
+      break;
+    case Component:
+      os << "component";
+      break;
+    case Promoter:
+      os << "promoter";
+      break;
+    case Cds:
+      os << "cds";
+      break;
+    case Terminator:
+      os << "terminator";
+      break;
+    case Utr:
+      os << "utr";
+      break;
+    case PrimerSite:
+      os << "primersite";
+      break;
+    case RestrictionSite:
+      os << "restrictionsite";
+      break;
+    case FivePOverhang:
+      os << "fivepoverhang";
+      break;
+    case ThreePOverhang:
+      os << "threepoverhang";
+      break;
+    case NOverhang:
+      os << "noverhang";
+      break;
+    case Assembly:
+      os << "assembly";
+      break;
+    case Signature:
+      os << "signature";
+      break;
+    case Insulator:
+      os << "insulator";
+      break;
+    case Ribosite:
+      os << "ribosite";
+      break;
+    case RNAStab:
+      os << "rnastab";
+      break;
+    case ProteaseSite:
+      os << "proteasesite";
+      break;
+    case ProteinStab:
+      os << "proteinstab";
+      break;
+    case RPromoter:
+      os << "rpromoter";
+      break;
+    case RArrow:
+      os << "rarrow";
+      break;
+    case LArrow:
+      os << "larrow";
+      break;
+    case LPromoter:
+      os << "lpromoter";
+      break;
+    default:
+      std::terminate();
+  }
+
+  return os;
+}
+
+std::ostream& operator<<(std::ostream& os, const Style& style) {
+  switch (style) {
+    using enum Style;
+    case Filled:
+      os << "filled";
+      break;
+    case Invisible:
+      os << "invisible";
+      break;
+    case Diagonals:
+      os << "diagonals";
+      break;
+    case Rounded:
+      os << "rounded";
+      break;
+    case Dashed:
+      os << "dashed";
+      break;
+    case Dotted:
+      os << "dotted";
+      break;
+    case Solid:
+      os << "solid";
+      break;
+    case Bold:
+      os << "bold";
+      break;
+    default:
+      os << "unknown";
+      break;
+  }
+  return os;
+}
+
+std::ostream& operator<<(std::ostream& os, const Node& node) {
+  if (node.id.empty()) {
+    throw std::runtime_error("Node id must not be empty");
+  }
+
+  std::string id = node.id;
+  std::ranges::replace(id, ' ', '_');
+  os << id << " [";
+
+  std::vector<std::string> attributes;
+
+  std::vector<std::string> styles;
+  std::ranges::transform(node.style, std::back_inserter(styles),
+                         [](const Style& style) {
+                           std::stringstream ss;
+                           ss << style;
+                           return ss.str();
+                         });
+
+  if (!node.label.empty()) {
+    attributes.push_back("label=<" + node.label + ">");
+  }
+
+  std::stringstream ss;
+  ss << node.shape;
+  attributes.push_back("shape=" + ss.str());
+
+  attributes.push_back("style=" + boost::algorithm::join(styles, ","));
+
+  os << boost::algorithm::join(attributes, ", ");
+
+  os << "];\n";
+  return os;
+}
+
+std::ostream& operator<<(std::ostream& os, const Edge& node) {
+  os << node.from.id << " -> " << node.to.id << " [";
+
+  os << "style=" << node.style;
+
+  os << "];\n";
+
+  return os;
+}
+
+}  // namespace Acts::GraphViz
diff --git a/Core/src/Utilities/Intersection.cpp b/Core/src/Utilities/Intersection.cpp
index 2c9531bdfdf..23378f0b381 100644
--- a/Core/src/Utilities/Intersection.cpp
+++ b/Core/src/Utilities/Intersection.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2024 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include "Acts/Utilities/Intersection.hpp"
 
diff --git a/Core/src/Utilities/Logger.cpp b/Core/src/Utilities/Logger.cpp
index 584c0477b0e..b63229279c6 100644
--- a/Core/src/Utilities/Logger.cpp
+++ b/Core/src/Utilities/Logger.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2016-2018 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include "Acts/Utilities/Logger.hpp"
 
@@ -100,9 +100,24 @@ class NeverFilterPolicy final : public OutputFilterPolicy {
   }
 };
 
+class DummyPrintPolicy final : public OutputPrintPolicy {
+ public:
+  void flush(const Level& /*lvl*/, const std::string& /*input*/) override {}
+
+  const std::string& name() const override {
+    const static std::string s_name = "Dummy";
+    return s_name;
+  }
+
+  std::unique_ptr<OutputPrintPolicy> clone(
+      const std::string& /*name*/) const override {
+    return std::make_unique<DummyPrintPolicy>();
+  }
+};
+
 std::unique_ptr<const Logger> makeDummyLogger() {
   using namespace Logging;
-  auto output = std::make_unique<DefaultPrintPolicy>(&std::cout);
+  auto output = std::make_unique<DummyPrintPolicy>();
   auto print = std::make_unique<NeverFilterPolicy>();
   return std::make_unique<const Logger>(std::move(output), std::move(print));
 }
diff --git a/Core/src/Utilities/SpacePointUtility.cpp b/Core/src/Utilities/SpacePointUtility.cpp
index 460cd02f43c..7018db37830 100644
--- a/Core/src/Utilities/SpacePointUtility.cpp
+++ b/Core/src/Utilities/SpacePointUtility.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2022 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include "Acts/Utilities/SpacePointUtility.hpp"
 
@@ -15,6 +15,7 @@
 #include "Acts/SpacePointFormation/SpacePointBuilderOptions.hpp"
 #include "Acts/Surfaces/Surface.hpp"
 #include "Acts/Utilities/Helpers.hpp"
+#include "Acts/Utilities/MathHelpers.hpp"
 
 #include <algorithm>
 #include <cmath>
@@ -76,7 +77,7 @@ SpacePointUtility::globalCoords(
   //
   auto x = globalPos[ePos0];
   auto y = globalPos[ePos1];
-  auto scale = 2 / std::hypot(x, y);
+  auto scale = 2 / fastHypot(x, y);
   ActsMatrix<2, 3> jacXyzToRhoZ = ActsMatrix<2, 3>::Zero();
   jacXyzToRhoZ(0, ePos0) = scale * x;
   jacXyzToRhoZ(0, ePos1) = scale * y;
@@ -112,8 +113,9 @@ Vector2 SpacePointUtility::calcRhoZVars(
   const auto var2 = paramCovAccessor(slinkBack).second(0, 0);
 
   // strip1 and strip2 are tilted at +/- theta/2
-  double sigma_x = std::hypot(var1, var2) / (2 * sin(theta * 0.5));
-  double sigma_y = std::hypot(var1, var2) / (2 * cos(theta * 0.5));
+  double sigma = fastHypot(var1, var2);
+  double sigma_x = sigma / (2 * sin(theta * 0.5));
+  double sigma_y = sigma / (2 * cos(theta * 0.5));
 
   // projection to the surface with strip1.
   double sig_x1 = sigma_x * cos(0.5 * theta) + sigma_y * sin(0.5 * theta);
@@ -138,7 +140,7 @@ Vector2 SpacePointUtility::rhoZCovariance(const GeometryContext& gctx,
 
   auto x = globalPos[ePos0];
   auto y = globalPos[ePos1];
-  auto scale = 2 / std::hypot(x, y);
+  auto scale = 2 / globalPos.head<2>().norm();
   ActsMatrix<2, 3> jacXyzToRhoZ = ActsMatrix<2, 3>::Zero();
   jacXyzToRhoZ(0, ePos0) = scale * x;
   jacXyzToRhoZ(0, ePos1) = scale * y;
@@ -202,8 +204,8 @@ Result<void> SpacePointUtility::calculateStripSPPosition(
   }
 
   // Check if m and n can be resolved in the interval (-1, 1)
-  if (fabs(spParams.m) <= spParams.limit &&
-      fabs(spParams.n) <= spParams.limit) {
+  if (std::abs(spParams.m) <= spParams.limit &&
+      std::abs(spParams.n) <= spParams.limit) {
     return Result<void>::success();
   }
   return Result<void>::failure(m_error);
@@ -224,7 +226,7 @@ Result<void> SpacePointUtility::recoverSpacePoint(
       spParams.limit + stripLengthGapTolerance / spParams.mag_firstBtmToTop;
 
   // Check if m is just slightly outside
-  if (fabs(spParams.m) > spParams.limitExtended) {
+  if (std::abs(spParams.m) > spParams.limitExtended) {
     return Result<void>::failure(m_error);
   }
   // Calculate n if not performed previously
@@ -234,7 +236,7 @@ Result<void> SpacePointUtility::recoverSpacePoint(
         spParams.secondBtmToTop.dot(spParams.firstBtmToTopXvtxToFirstMid2);
   }
   // Check if n is just slightly outside
-  if (fabs(spParams.n) > spParams.limitExtended) {
+  if (std::abs(spParams.n) > spParams.limitExtended) {
     return Result<void>::failure(m_error);
   }
   /// The following code considers an overshoot of m and n in the same direction
@@ -273,8 +275,8 @@ Result<void> SpacePointUtility::recoverSpacePoint(
     spParams.n -= (biggerOvershoot / secOnFirstScale);
     // Check if this recovered the space point
 
-    if (fabs(spParams.m) < spParams.limit &&
-        fabs(spParams.n) < spParams.limit) {
+    if (std::abs(spParams.m) < spParams.limit &&
+        std::abs(spParams.n) < spParams.limit) {
       return Result<void>::success();
     } else {
       return Result<void>::failure(m_error);
@@ -292,8 +294,8 @@ Result<void> SpacePointUtility::recoverSpacePoint(
     spParams.m += biggerOvershoot;
     spParams.n += (biggerOvershoot / secOnFirstScale);
     // Check if this recovered the space point
-    if (fabs(spParams.m) < spParams.limit &&
-        fabs(spParams.n) < spParams.limit) {
+    if (std::abs(spParams.m) < spParams.limit &&
+        std::abs(spParams.n) < spParams.limit) {
       return Result<void>::success();
     }
   }
@@ -323,7 +325,7 @@ Result<double> SpacePointUtility::calcPerpendicularProjection(
   double qr = (spParams.firstBtmToTop).dot(spParams.secondBtmToTop);
   double denom = spParams.firstBtmToTop.dot(spParams.firstBtmToTop) - qr * qr;
   // Check for numerical stability
-  if (fabs(denom) > 1e-6) {
+  if (std::abs(denom) > 1e-6) {
     // Return lambda0
     return Result<double>::success(
         (ac.dot(spParams.secondBtmToTop) * qr -
diff --git a/Core/src/Utilities/TrackHelpers.cpp b/Core/src/Utilities/TrackHelpers.cpp
index a20350628ac..9a607a34ecc 100644
--- a/Core/src/Utilities/TrackHelpers.cpp
+++ b/Core/src/Utilities/TrackHelpers.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2024 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include "Acts/Utilities/TrackHelpers.hpp"
 
diff --git a/Core/src/Vertexing/AdaptiveGridDensityVertexFinder.cpp b/Core/src/Vertexing/AdaptiveGridDensityVertexFinder.cpp
index f60ca2f0e09..0db0eeb33c1 100644
--- a/Core/src/Vertexing/AdaptiveGridDensityVertexFinder.cpp
+++ b/Core/src/Vertexing/AdaptiveGridDensityVertexFinder.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2020-2023 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include "Acts/Vertexing/AdaptiveGridDensityVertexFinder.hpp"
 
diff --git a/Core/src/Vertexing/AdaptiveGridTrackDensity.cpp b/Core/src/Vertexing/AdaptiveGridTrackDensity.cpp
index bff02fa8910..3b56aa0a3de 100644
--- a/Core/src/Vertexing/AdaptiveGridTrackDensity.cpp
+++ b/Core/src/Vertexing/AdaptiveGridTrackDensity.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2020-2023 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include "Acts/Vertexing/AdaptiveGridTrackDensity.hpp"
 
@@ -286,7 +286,7 @@ Result<double> AdaptiveGridTrackDensity::estimateSeedWidth(
   bool binFilled = true;
   while (gridValue > maxValue / 2) {
     // Check if we are still operating on continuous z values
-    if (densityMap.count({rhmBin + 1, tMaxBin}) == 0) {
+    if (!densityMap.contains({rhmBin + 1, tMaxBin})) {
       binFilled = false;
       break;
     }
@@ -308,7 +308,7 @@ Result<double> AdaptiveGridTrackDensity::estimateSeedWidth(
   binFilled = true;
   while (gridValue > maxValue / 2) {
     // Check if we are still operating on continuous z values
-    if (densityMap.count({lhmBin - 1, tMaxBin}) == 0) {
+    if (!densityMap.contains({lhmBin - 1, tMaxBin})) {
       binFilled = false;
       break;
     }
diff --git a/Core/src/Vertexing/AdaptiveMultiVertexFinder.cpp b/Core/src/Vertexing/AdaptiveMultiVertexFinder.cpp
index c6308c17152..dddd49e715a 100644
--- a/Core/src/Vertexing/AdaptiveMultiVertexFinder.cpp
+++ b/Core/src/Vertexing/AdaptiveMultiVertexFinder.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2020-2024 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include "Acts/Vertexing/AdaptiveMultiVertexFinder.hpp"
 
@@ -12,6 +12,8 @@
 #include "Acts/Vertexing/IVertexFinder.hpp"
 #include "Acts/Vertexing/VertexingError.hpp"
 
+#include <algorithm>
+
 namespace Acts {
 
 Result<std::vector<Vertex>> AdaptiveMultiVertexFinder::find(
@@ -364,10 +366,7 @@ std::pair<int, bool> AdaptiveMultiVertexFinder::checkVertexAndCompatibleTracks(
          !m_cfg.useFastCompatibility)) {
       // TODO: Understand why looking for compatible tracks only in seed tracks
       // and not also in all tracks
-      auto foundIter =
-          std::find_if(seedTracks.begin(), seedTracks.end(),
-                       [&trk](auto seedTrk) { return trk == seedTrk; });
-      if (foundIter != seedTracks.end()) {
+      if (rangeContainsValue(seedTracks, trk)) {
         nCompatibleTracks++;
         ACTS_DEBUG("Compatible track found.");
 
@@ -399,9 +398,7 @@ auto AdaptiveMultiVertexFinder::removeCompatibleTracksFromSeedTracks(
          trkAtVtx.chi2Track < m_cfg.maxVertexChi2 &&
          !m_cfg.useFastCompatibility)) {
       // Find and remove track from seedTracks
-      auto foundSeedIter =
-          std::find_if(seedTracks.begin(), seedTracks.end(),
-                       [&trk](auto seedTrk) { return trk == seedTrk; });
+      auto foundSeedIter = std::ranges::find(seedTracks, trk);
       if (foundSeedIter != seedTracks.end()) {
         seedTracks.erase(foundSeedIter);
         removedSeedTracks.push_back(trk);
@@ -425,9 +422,7 @@ bool AdaptiveMultiVertexFinder::removeTrackIfIncompatible(
     double compatibility = trkAtVtx.vertexCompatibility;
     if (compatibility > maxCompatibility) {
       // Try to find track in seed tracks
-      auto foundSeedIter =
-          std::find_if(seedTracks.begin(), seedTracks.end(),
-                       [&trk](auto seedTrk) { return trk == seedTrk; });
+      auto foundSeedIter = std::ranges::find(seedTracks, trk);
       if (foundSeedIter != seedTracks.end()) {
         maxCompatibility = compatibility;
         maxCompSeedIt = foundSeedIter;
@@ -594,10 +589,10 @@ Result<void> AdaptiveMultiVertexFinder::deleteLastVertex(
     return removeResult.error();
   }
 
-  for (auto& entry : fitterState.tracksAtVerticesMap) {
+  for (auto& [key, value] : fitterState.tracksAtVerticesMap) {
     // Delete all linearized tracks for current (bad) vertex
-    if (entry.first.second == &vtx) {
-      entry.second.isLinearized = false;
+    if (key.second == &vtx) {
+      value.isLinearized = false;
     }
   }
 
diff --git a/Core/src/Vertexing/AdaptiveMultiVertexFitter.cpp b/Core/src/Vertexing/AdaptiveMultiVertexFitter.cpp
index 6a6a879278a..8cb6e6d8e93 100644
--- a/Core/src/Vertexing/AdaptiveMultiVertexFitter.cpp
+++ b/Core/src/Vertexing/AdaptiveMultiVertexFitter.cpp
@@ -1,14 +1,15 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2019-2023 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include "Acts/Vertexing/AdaptiveMultiVertexFitter.hpp"
 
 #include "Acts/Surfaces/PerigeeSurface.hpp"
+#include "Acts/Utilities/Helpers.hpp"
 #include "Acts/Vertexing/KalmanVertexUpdater.hpp"
 #include "Acts/Vertexing/VertexingError.hpp"
 
@@ -189,7 +190,7 @@ Acts::Result<void> Acts::AdaptiveMultiVertexFitter::addVtxToFit(
 
 bool Acts::AdaptiveMultiVertexFitter::isAlreadyInList(
     Vertex* vtx, const std::vector<Vertex*>& vertices) const {
-  return std::find(vertices.begin(), vertices.end(), vtx) != vertices.end();
+  return rangeContainsValue(vertices, vtx);
 }
 
 Acts::Result<void> Acts::AdaptiveMultiVertexFitter::prepareVertexForFit(
@@ -223,7 +224,7 @@ Acts::Result<void> Acts::AdaptiveMultiVertexFitter::setAllVertexCompatibilities(
     auto& trkAtVtx = state.tracksAtVerticesMap.at(std::make_pair(trk, vtx));
     // Recover from cases where linearization point != 0 but
     // more tracks were added later on
-    if (vtxInfo.impactParams3D.find(trk) == vtxInfo.impactParams3D.end()) {
+    if (!vtxInfo.impactParams3D.contains(trk)) {
       auto res = m_cfg.ipEst.estimate3DImpactParameters(
           vertexingOptions.geoContext, vertexingOptions.magFieldContext,
           m_cfg.extractParameters(trk),
diff --git a/Core/src/Vertexing/FsmwMode1dFinder.cpp b/Core/src/Vertexing/FsmwMode1dFinder.cpp
index d17518be20b..f63433ae08c 100644
--- a/Core/src/Vertexing/FsmwMode1dFinder.cpp
+++ b/Core/src/Vertexing/FsmwMode1dFinder.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2019 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include "Acts/Vertexing/FsmwMode1dFinder.hpp"
 
@@ -28,10 +28,7 @@ Acts::Result<double> Acts::FsmwMode1dFinder::getMode(
 
   // first of all order the vector according to the double value
 
-  std::sort(inputVector.begin(), inputVector.end(),
-            [](std::pair<double, double> a, std::pair<double, double> b) {
-              return a.first < b.first;
-            });
+  std::ranges::sort(inputVector, {}, [](const auto& i) { return i.first; });
 
   // begin to consider a certain number of elements according to the fraction
   auto begin = inputVector.begin();
diff --git a/Core/src/Vertexing/FullBilloirVertexFitter.cpp b/Core/src/Vertexing/FullBilloirVertexFitter.cpp
index 44e9c3267c7..3c5b17121fb 100644
--- a/Core/src/Vertexing/FullBilloirVertexFitter.cpp
+++ b/Core/src/Vertexing/FullBilloirVertexFitter.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2019-2023 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include "Acts/Vertexing/FullBilloirVertexFitter.hpp"
 
diff --git a/Core/src/Vertexing/GaussianGridTrackDensity.cpp b/Core/src/Vertexing/GaussianGridTrackDensity.cpp
index 41796ed8e6b..753461119ba 100644
--- a/Core/src/Vertexing/GaussianGridTrackDensity.cpp
+++ b/Core/src/Vertexing/GaussianGridTrackDensity.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2020-2023 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include "Acts/Vertexing/GaussianGridTrackDensity.hpp"
 
diff --git a/Core/src/Vertexing/GaussianTrackDensity.cpp b/Core/src/Vertexing/GaussianTrackDensity.cpp
index b2e489a04ba..3acf5f6bbfc 100644
--- a/Core/src/Vertexing/GaussianTrackDensity.cpp
+++ b/Core/src/Vertexing/GaussianTrackDensity.cpp
@@ -1,16 +1,17 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2020-2024 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include "Acts/Vertexing/GaussianTrackDensity.hpp"
 
 #include "Acts/Vertexing/VertexingError.hpp"
 
-#include <math.h>
+#include <cmath>
+#include <numbers>
 
 namespace Acts {
 
@@ -124,7 +125,7 @@ Result<void> Acts::GaussianTrackDensity::addTracks(
     discriminant = std::sqrt(discriminant);
     const double zMax = (-linearTerm - discriminant) / (2. * quadraticTerm);
     const double zMin = (-linearTerm + discriminant) / (2. * quadraticTerm);
-    constantTerm -= std::log(2. * M_PI * std::sqrt(covDeterminant));
+    constantTerm -= std::log(2. * std::numbers::pi * std::sqrt(covDeterminant));
 
     state.trackEntries.emplace_back(z0, constantTerm, linearTerm, quadraticTerm,
                                     zMin, zMax);
diff --git a/Core/src/Vertexing/GridDensityVertexFinder.cpp b/Core/src/Vertexing/GridDensityVertexFinder.cpp
index 4eee621843c..a41ac0e4d11 100644
--- a/Core/src/Vertexing/GridDensityVertexFinder.cpp
+++ b/Core/src/Vertexing/GridDensityVertexFinder.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2020-2023 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include "Acts/Vertexing/GridDensityVertexFinder.hpp"
 
diff --git a/Core/src/Vertexing/HelicalTrackLinearizer.cpp b/Core/src/Vertexing/HelicalTrackLinearizer.cpp
index 8a9f59120da..9d529745559 100644
--- a/Core/src/Vertexing/HelicalTrackLinearizer.cpp
+++ b/Core/src/Vertexing/HelicalTrackLinearizer.cpp
@@ -1,15 +1,16 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2019-2023 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include "Acts/Vertexing/HelicalTrackLinearizer.hpp"
 
 #include "Acts/Propagator/PropagatorOptions.hpp"
 #include "Acts/Surfaces/PerigeeSurface.hpp"
+#include "Acts/Utilities/MathHelpers.hpp"
 #include "Acts/Vertexing/LinearizerTrackParameters.hpp"
 
 Acts::Result<Acts::LinearizedTrack>
@@ -85,7 +86,7 @@ Acts::HelicalTrackLinearizer::linearizeTrack(
   ActsScalar p = params.particleHypothesis().extractMomentum(qOvP);
 
   // Speed in units of c
-  ActsScalar beta = p / std::hypot(p, m0);
+  ActsScalar beta = p / fastHypot(p, m0);
   // Transverse speed (i.e., speed in the x-y plane)
   ActsScalar betaT = beta * sinTheta;
 
diff --git a/Core/src/Vertexing/ImpactPointEstimator.cpp b/Core/src/Vertexing/ImpactPointEstimator.cpp
index 9be733ff3a2..3caac09b57b 100644
--- a/Core/src/Vertexing/ImpactPointEstimator.cpp
+++ b/Core/src/Vertexing/ImpactPointEstimator.cpp
@@ -1,18 +1,19 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2019-2023 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include "Acts/Vertexing/ImpactPointEstimator.hpp"
 
 #include "Acts/Definitions/Algebra.hpp"
-#include "Acts/Propagator/Propagator.hpp"
 #include "Acts/Propagator/PropagatorOptions.hpp"
 #include "Acts/Surfaces/PerigeeSurface.hpp"
 #include "Acts/Surfaces/PlaneSurface.hpp"
+#include "Acts/Utilities/AngleHelpers.hpp"
+#include "Acts/Utilities/MathHelpers.hpp"
 #include "Acts/Vertexing/VertexingError.hpp"
 
 namespace Acts {
@@ -207,7 +208,7 @@ Result<std::pair<Vector4, Vector3>> getDistanceAndMomentumImpl(
       ActsScalar p = trkParams.particleHypothesis().extractMomentum(qOvP);
 
       // Speed in units of c
-      ActsScalar beta = p / std::hypot(p, m0);
+      ActsScalar beta = p / fastHypot(p, m0);
 
       pcaStraightTrack[3] = timeOnTrack + distanceToPca / beta;
     }
@@ -282,7 +283,7 @@ Result<std::pair<Vector4, Vector3>> getDistanceAndMomentumImpl(
     ActsScalar p = trkParams.particleHypothesis().extractMomentum(qOvP);
 
     // Speed in units of c
-    ActsScalar beta = p / std::hypot(p, m0);
+    ActsScalar beta = p / fastHypot(p, m0);
 
     pca[3] = tP - rho / (beta * sinTheta) * (phi - phiP);
   }
@@ -525,7 +526,7 @@ Result<std::pair<double, double>> ImpactPointEstimator::getLifetimeSignOfTrack(
   const double theta = params[BoundIndices::eBoundTheta];
 
   double vs = std::sin(std::atan2(direction[1], direction[0]) - phi) * d0;
-  double eta = -std::log(std::tan(theta / 2.));
+  double eta = AngleHelpers::etaFromTheta(theta);
   double dir_eta = VectorHelpers::eta(direction);
 
   double zs = (dir_eta - eta) * z0;
diff --git a/Core/src/Vertexing/IterativeVertexFinder.cpp b/Core/src/Vertexing/IterativeVertexFinder.cpp
index 66cea9bd64a..9c03ba8a8f8 100644
--- a/Core/src/Vertexing/IterativeVertexFinder.cpp
+++ b/Core/src/Vertexing/IterativeVertexFinder.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2019-2023 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include "Acts/Vertexing/IterativeVertexFinder.hpp"
 
@@ -222,10 +222,9 @@ inline void Acts::IterativeVertexFinder::removeTracks(
     const BoundTrackParameters& params = m_cfg.extractParameters(trk);
     // Find track in seedTracks
     auto foundIter =
-        std::find_if(seedTracks.begin(), seedTracks.end(),
-                     [&params, this](const auto seedTrk) {
-                       return params == m_cfg.extractParameters(seedTrk);
-                     });
+        std::ranges::find_if(seedTracks, [&params, this](const auto seedTrk) {
+          return params == m_cfg.extractParameters(seedTrk);
+        });
     if (foundIter != seedTracks.end()) {
       // Remove track from seed tracks
       seedTracks.erase(foundIter);
@@ -284,10 +283,7 @@ Acts::Result<void> Acts::IterativeVertexFinder::removeUsedCompatibleTracks(
     }
     // Find and remove track from seedTracks
     auto foundSeedIter =
-        std::find_if(seedTracks.begin(), seedTracks.end(),
-                     [&trackAtVtx](const auto& seedTrk) {
-                       return trackAtVtx.originalParams == seedTrk;
-                     });
+        std::ranges::find(seedTracks, trackAtVtx.originalParams);
     if (foundSeedIter != seedTracks.end()) {
       seedTracks.erase(foundSeedIter);
     } else {
@@ -296,10 +292,7 @@ Acts::Result<void> Acts::IterativeVertexFinder::removeUsedCompatibleTracks(
 
     // Find and remove track from tracksToFit
     auto foundFitIter =
-        std::find_if(tracksToFit.begin(), tracksToFit.end(),
-                     [&trackAtVtx](const auto& fitTrk) {
-                       return trackAtVtx.originalParams == fitTrk;
-                     });
+        std::ranges::find(tracksToFit, trackAtVtx.originalParams);
     if (foundFitIter != tracksToFit.end()) {
       tracksToFit.erase(foundFitIter);
     } else {
@@ -334,9 +327,7 @@ Acts::Result<void> Acts::IterativeVertexFinder::removeUsedCompatibleTracks(
     // check if sufficiently compatible with last fitted vertex
     // (quite loose constraint)
     if (chi2 < m_cfg.maximumChi2cutForSeeding) {
-      auto foundIter =
-          std::find_if(seedTracks.begin(), seedTracks.end(),
-                       [&trk](const auto& seedTrk) { return trk == seedTrk; });
+      auto foundIter = std::ranges::find(seedTracks, trk);
       if (foundIter != seedTracks.end()) {
         // Remove track from seed tracks
         seedTracks.erase(foundIter);
@@ -345,8 +336,8 @@ Acts::Result<void> Acts::IterativeVertexFinder::removeUsedCompatibleTracks(
     } else {
       // Track not compatible with vertex
       // Remove track from current vertex
-      auto foundIter = std::find_if(
-          tracksAtVertex.begin(), tracksAtVertex.end(),
+      auto foundIter = std::ranges::find_if(
+          tracksAtVertex,
           [&trk](auto trkAtVtx) { return trk == trkAtVtx.originalParams; });
       if (foundIter != tracksAtVertex.end()) {
         // Remove track from seed tracks
@@ -495,8 +486,8 @@ Acts::Result<bool> Acts::IterativeVertexFinder::reassignTracksToNewVertex(
         // delete it later
         // when all tracks used to fit current vertex are deleted
         seedTracks.push_back(tracksIter->originalParams);
-        // seedTracks.push_back(*std::find_if(
-        //     origTracks.begin(), origTracks.end(),
+        // seedTracks.push_back(*std::ranges::find_if(
+        //     origTracks,
         //     [&origParams, this](auto origTrack) {
         //       return origParams == m_extractParameters(*origTrack);
         //     }));
diff --git a/Core/src/Vertexing/KalmanVertexUpdater.cpp b/Core/src/Vertexing/KalmanVertexUpdater.cpp
index 226e1b88d53..b59aa1ddd7a 100644
--- a/Core/src/Vertexing/KalmanVertexUpdater.cpp
+++ b/Core/src/Vertexing/KalmanVertexUpdater.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2023-2024 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include "Acts/Vertexing/KalmanVertexUpdater.hpp"
 
diff --git a/Core/src/Vertexing/KalmanVertexUpdaterImpl3.cpp b/Core/src/Vertexing/KalmanVertexUpdaterImpl3.cpp
index ccd250c887c..f2d47961e71 100644
--- a/Core/src/Vertexing/KalmanVertexUpdaterImpl3.cpp
+++ b/Core/src/Vertexing/KalmanVertexUpdaterImpl3.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2024 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include "Acts/Vertexing/KalmanVertexUpdater.hpp"
 #include "Acts/Vertexing/detail/KalmanVertexUpdaterImpl.hpp"
diff --git a/Core/src/Vertexing/KalmanVertexUpdaterImpl4.cpp b/Core/src/Vertexing/KalmanVertexUpdaterImpl4.cpp
index 4b83ef23e7a..4b28d0fe534 100644
--- a/Core/src/Vertexing/KalmanVertexUpdaterImpl4.cpp
+++ b/Core/src/Vertexing/KalmanVertexUpdaterImpl4.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2024 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include "Acts/Vertexing/KalmanVertexUpdater.hpp"
 #include "Acts/Vertexing/detail/KalmanVertexUpdaterImpl.hpp"
diff --git a/Core/src/Vertexing/NumericalTrackLinearizer.cpp b/Core/src/Vertexing/NumericalTrackLinearizer.cpp
index 2a5f31007da..ca9af5825e4 100644
--- a/Core/src/Vertexing/NumericalTrackLinearizer.cpp
+++ b/Core/src/Vertexing/NumericalTrackLinearizer.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2023-2024 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include "Acts/Vertexing/NumericalTrackLinearizer.hpp"
 
@@ -13,6 +13,8 @@
 #include "Acts/Utilities/UnitVectors.hpp"
 #include "Acts/Vertexing/LinearizerTrackParameters.hpp"
 
+#include <numbers>
+
 Acts::Result<Acts::LinearizedTrack>
 Acts::NumericalTrackLinearizer::linearizeTrack(
     const BoundTrackParameters& params, double linPointTime,
@@ -94,7 +96,7 @@ Acts::NumericalTrackLinearizer::linearizeTrack(
   BoundVector newPerigeeParams;
 
   // Check if wiggled angle theta are within definition range [0, pi]
-  if (paramVec(eLinTheta) + m_cfg.delta > M_PI) {
+  if (paramVec(eLinTheta) + m_cfg.delta > std::numbers::pi) {
     ACTS_ERROR(
         "Wiggled theta outside range, choose a smaller wiggle (i.e., delta)! "
         "You might need to decrease targetTolerance as well.");
@@ -141,7 +143,8 @@ Acts::NumericalTrackLinearizer::linearizeTrack(
     // previously computed value for better readability.
     completeJacobian(eLinPhi, i) =
         Acts::detail::difference_periodic(newPerigeeParams(eLinPhi),
-                                          perigeeParams(eLinPhi), 2 * M_PI) /
+                                          perigeeParams(eLinPhi),
+                                          2 * std::numbers::pi) /
         m_cfg.delta;
   }
 
diff --git a/Core/src/Vertexing/TrackDensityVertexFinder.cpp b/Core/src/Vertexing/TrackDensityVertexFinder.cpp
index 32c2b227678..ae42acae766 100644
--- a/Core/src/Vertexing/TrackDensityVertexFinder.cpp
+++ b/Core/src/Vertexing/TrackDensityVertexFinder.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2020-2024 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include "Acts/Vertexing/TrackDensityVertexFinder.hpp"
 
diff --git a/Core/src/Vertexing/Vertex.cpp b/Core/src/Vertexing/Vertex.cpp
index f8373ba774a..0a8eda8c279 100644
--- a/Core/src/Vertexing/Vertex.cpp
+++ b/Core/src/Vertexing/Vertex.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2019-2024 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include "Acts/Vertexing/Vertex.hpp"
 
@@ -81,11 +81,6 @@ void Vertex::setPosition(const Vector3& position) {
   m_position.head<3>() = position;
 }
 
-void Vertex::setPosition(const Vector3& position, ActsScalar time) {
-  m_position.head<3>() = position;
-  m_position[eTime] = time;
-}
-
 void Vertex::setFullPosition(const Vector4& fullPosition) {
   m_position = fullPosition;
 }
diff --git a/Core/src/Vertexing/VertexingError.cpp b/Core/src/Vertexing/VertexingError.cpp
index 922b8a83dc9..1ce8ad0d202 100644
--- a/Core/src/Vertexing/VertexingError.cpp
+++ b/Core/src/Vertexing/VertexingError.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2020 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include "Acts/Vertexing/VertexingError.hpp"
 
diff --git a/Core/src/Vertexing/ZScanVertexFinder.cpp b/Core/src/Vertexing/ZScanVertexFinder.cpp
index 1960e7b65dc..5dbed65aaa2 100644
--- a/Core/src/Vertexing/ZScanVertexFinder.cpp
+++ b/Core/src/Vertexing/ZScanVertexFinder.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2019-2023 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include "Acts/Vertexing/ZScanVertexFinder.hpp"
 
diff --git a/Core/src/Visualization/CMakeLists.txt b/Core/src/Visualization/CMakeLists.txt
index ea2bd2427e6..567b1e1e236 100644
--- a/Core/src/Visualization/CMakeLists.txt
+++ b/Core/src/Visualization/CMakeLists.txt
@@ -1,4 +1,4 @@
 target_sources(
     ActsCore
-    PRIVATE IVisualization3D.cpp GeometryView3D.cpp EventDataView3D.cpp
+    PRIVATE GeometryView3D.cpp EventDataView3D.cpp ObjVisualization3D.cpp
 )
diff --git a/Core/src/Visualization/EventDataView3D.cpp b/Core/src/Visualization/EventDataView3D.cpp
index 656cb020616..ac3a62a1e79 100644
--- a/Core/src/Visualization/EventDataView3D.cpp
+++ b/Core/src/Visualization/EventDataView3D.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2020-2021 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include "Acts/Visualization/EventDataView3D.hpp"
 
@@ -27,12 +27,13 @@ void Acts::EventDataView3D::drawCovarianceCartesian(
 
   std::vector<Vector3> ellipse = createEllipse(
       lambda0 * locErrorScale, lambda1 * locErrorScale, theta,
-      viewConfig.nSegments, viewConfig.offset, lposition, transform);
+      viewConfig.quarterSegments, viewConfig.offset, lposition, transform);
 
   ellipse.push_back(transform *
                     Vector3(lposition.x(), lposition.y(), viewConfig.offset));
-  auto faces = detail::FacesHelper::convexFaceMesh(ellipse, true);
-  Polyhedron ellipseHedron(ellipse, faces.first, faces.second);
+  auto [faces, triangularMesh] =
+      detail::FacesHelper::convexFaceMesh(ellipse, true);
+  Polyhedron ellipseHedron(ellipse, faces, triangularMesh);
   Acts::GeometryView3D::drawPolyhedron(helper, ellipseHedron, viewConfig);
 }
 
@@ -56,12 +57,13 @@ void Acts::EventDataView3D::drawCovarianceAngular(
   std::vector<Vector3> ellipse =
       createEllipse(angularErrorScale * directionScale * lambda0 * sin(dtheta),
                     angularErrorScale * directionScale * lambda1, theta,
-                    viewConfig.nSegments, 0., {0., 0.}, eplane);
+                    viewConfig.quarterSegments, 0., {0., 0.}, eplane);
 
   std::vector<Vector3> coneTop = ellipse;
   coneTop.push_back(anker);
-  auto coneTopFaces = detail::FacesHelper::convexFaceMesh(coneTop, true);
-  Polyhedron coneTopHedron(coneTop, coneTopFaces.first, coneTopFaces.second);
+  auto [faces, triangularMesh] =
+      detail::FacesHelper::convexFaceMesh(coneTop, true);
+  Polyhedron coneTopHedron(coneTop, faces, triangularMesh);
   GeometryView3D::drawPolyhedron(helper, coneTopHedron, viewConfig);
 
   std::vector<Vector3> cone = ellipse;
@@ -69,7 +71,8 @@ void Acts::EventDataView3D::drawCovarianceAngular(
   // Force triangular
   ViewConfig coneViewConfig = viewConfig;
   coneViewConfig.triangulate = true;
-  auto coneFaces = detail::FacesHelper::convexFaceMesh(cone, true);
-  Polyhedron coneHedron(cone, coneFaces.first, coneFaces.second);
+  auto [facesCone, triangularMeshCone] =
+      detail::FacesHelper::convexFaceMesh(cone, true);
+  Polyhedron coneHedron(cone, facesCone, triangularMeshCone);
   GeometryView3D::drawPolyhedron(helper, coneHedron, coneViewConfig);
 }
diff --git a/Core/src/Visualization/GeometryView3D.cpp b/Core/src/Visualization/GeometryView3D.cpp
index 33822f9ac7d..f16d9e809cc 100644
--- a/Core/src/Visualization/GeometryView3D.cpp
+++ b/Core/src/Visualization/GeometryView3D.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2020 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include "Acts/Visualization/GeometryView3D.hpp"
 
@@ -26,7 +26,6 @@
 #include "Acts/Surfaces/RadialBounds.hpp"
 #include "Acts/Surfaces/Surface.hpp"
 #include "Acts/Surfaces/SurfaceArray.hpp"
-#include "Acts/Utilities/BinnedArray.hpp"
 #include "Acts/Utilities/BinningType.hpp"
 #include "Acts/Utilities/IAxis.hpp"
 #include "Acts/Utilities/UnitVectors.hpp"
@@ -34,77 +33,30 @@
 
 #include <algorithm>
 #include <cmath>
+#include <filesystem>
 #include <memory>
-#include <ostream>
 #include <utility>
 #include <vector>
 
-#include <limits.h>
-#include <unistd.h>
-
-namespace {
-
-std::string joinPaths(const std::string& a, const std::string& b) {
-  if (b.substr(0, 1) == "/" || a.empty()) {
-    return b;
-  }
-
-  if (a.substr(a.size() - 1) == "/") {
-    return a.substr(a.size() - 1) + "/" + b;
-  }
-
-  return a + "/" + b;
-}
-
-std::string getWorkingDirectory() {
-  char buffer[PATH_MAX];
-  return (getcwd(buffer, sizeof(buffer)) != nullptr ? std::string(buffer)
-                                                    : std::string(""));
-}
-
-}  // namespace
-
-namespace Acts::Experimental {
-ViewConfig s_viewSensitive = ViewConfig({0, 180, 240});
-ViewConfig s_viewPassive = ViewConfig({240, 280, 0});
-ViewConfig s_viewVolume = ViewConfig({220, 220, 0});
-ViewConfig s_viewGrid = ViewConfig({220, 0, 0});
-ViewConfig s_viewLine = ViewConfig({0, 0, 220});
-}  // namespace Acts::Experimental
-
 void Acts::GeometryView3D::drawPolyhedron(IVisualization3D& helper,
                                           const Polyhedron& polyhedron,
                                           const ViewConfig& viewConfig) {
-  if (viewConfig.visible) {
-    if (!viewConfig.triangulate) {
-      helper.faces(polyhedron.vertices, polyhedron.faces, viewConfig.color);
-    } else {
-      helper.faces(polyhedron.vertices, polyhedron.triangularMesh,
-                   viewConfig.color);
-    }
-  }
+  polyhedron.visualize(helper, viewConfig);
 }
 
 void Acts::GeometryView3D::drawSurface(IVisualization3D& helper,
                                        const Surface& surface,
                                        const GeometryContext& gctx,
-                                       const Transform3& transform,
+                                       const Transform3& /*transform*/,
                                        const ViewConfig& viewConfig) {
-  Polyhedron surfaceHedron =
-      surface.polyhedronRepresentation(gctx, viewConfig.nSegments);
-  if (!transform.isApprox(Transform3::Identity())) {
-    surfaceHedron.move(transform);
-  }
-  drawPolyhedron(helper, surfaceHedron, viewConfig);
+  surface.visualize(helper, gctx, viewConfig);
 }
 
 void Acts::GeometryView3D::drawSurfaceArray(
     IVisualization3D& helper, const SurfaceArray& surfaceArray,
     const GeometryContext& gctx, const Transform3& transform,
     const ViewConfig& sensitiveConfig, const ViewConfig& passiveConfig,
-    const ViewConfig& gridConfig, const std::string& _outputDir) {
-  std::string outputDir =
-      _outputDir == "." ? getWorkingDirectory() : _outputDir;
+    const ViewConfig& gridConfig, const std::filesystem::path& outputDir) {
   // Draw all the surfaces
   Extent arrayExtent;
   for (const auto& sf : surfaceArray.surfaces()) {
@@ -117,7 +69,7 @@ void Acts::GeometryView3D::drawSurfaceArray(
   }
 
   if (!sensitiveConfig.outputName.empty()) {
-    helper.write(joinPaths(outputDir, sensitiveConfig.outputName));
+    helper.write(outputDir / sensitiveConfig.outputName);
     helper.clear();
   }
 
@@ -133,7 +85,6 @@ void Acts::GeometryView3D::drawSurfaceArray(
       auto phiValues = axes[0]->getBinEdges();
       auto zValues = axes[1]->getBinEdges();
       ViewConfig gridRadConfig = gridConfig;
-      gridRadConfig.nSegments = phiValues.size();
       // Longitudinal lines
       for (auto phi : phiValues) {
         double cphi = std::cos(phi);
@@ -158,7 +109,7 @@ void Acts::GeometryView3D::drawSurfaceArray(
       auto rValues = axes[0]->getBinEdges();
       auto phiValues = axes[1]->getBinEdges();
       ViewConfig gridRadConfig = gridConfig;
-      gridRadConfig.nSegments = phiValues.size();
+      gridRadConfig.quarterSegments = phiValues.size();
       for (auto r : rValues) {
         CylinderVolumeBounds cvb(r - 0.5 * thickness, r + 0.5 * thickness,
                                  0.5 * thickness);
@@ -181,7 +132,7 @@ void Acts::GeometryView3D::drawSurfaceArray(
   }
 
   if (!gridConfig.outputName.empty()) {
-    helper.write(joinPaths(outputDir, gridConfig.outputName));
+    helper.write(outputDir / gridConfig.outputName);
     helper.clear();
   }
 }
@@ -189,12 +140,9 @@ void Acts::GeometryView3D::drawSurfaceArray(
 void Acts::GeometryView3D::drawVolume(IVisualization3D& helper,
                                       const Volume& volume,
                                       const GeometryContext& gctx,
-                                      const Transform3& transform,
+                                      const Transform3& /*transform*/,
                                       const ViewConfig& viewConfig) {
-  auto bSurfaces = volume.volumeBounds().orientedSurfaces(volume.transform());
-  for (const auto& bs : bSurfaces) {
-    drawSurface(helper, *bs.surface, gctx, transform, viewConfig);
-  }
+  volume.visualize(helper, gctx, viewConfig);
 }
 
 void Acts::GeometryView3D::drawPortal(IVisualization3D& helper,
@@ -239,10 +187,7 @@ void Acts::GeometryView3D::drawDetectorVolume(
 void Acts::GeometryView3D::drawLayer(
     IVisualization3D& helper, const Layer& layer, const GeometryContext& gctx,
     const ViewConfig& layerConfig, const ViewConfig& sensitiveConfig,
-    const ViewConfig& gridConfig, const std::string& _outputDir) {
-  std::string outputDir =
-      _outputDir == "." ? getWorkingDirectory() : _outputDir;
-
+    const ViewConfig& gridConfig, const std::filesystem::path& outputDir) {
   if (layerConfig.visible) {
     auto layerVolume = layer.representingVolume();
     if (layerVolume != nullptr) {
@@ -254,7 +199,7 @@ void Acts::GeometryView3D::drawLayer(
                   layerConfig);
     }
     if (!layerConfig.outputName.empty()) {
-      helper.write(joinPaths(outputDir, layerConfig.outputName));
+      helper.write(outputDir / layerConfig.outputName);
       helper.clear();
     }
   }
@@ -273,9 +218,7 @@ void Acts::GeometryView3D::drawTrackingVolume(
     const GeometryContext& gctx, const ViewConfig& containerView,
     const ViewConfig& volumeView, const ViewConfig& layerView,
     const ViewConfig& sensitiveView, const ViewConfig& gridView, bool writeIt,
-    const std::string& tag, const std::string& _outputDir) {
-  std::string outputDir =
-      _outputDir == "." ? getWorkingDirectory() : _outputDir;
+    const std::string& tag, const std::filesystem::path& outputDir) {
   if (tVolume.confinedVolumes() != nullptr) {
     const auto& subVolumes = tVolume.confinedVolumes()->arrayObjects();
     for (const auto& tv : subVolumes) {
@@ -290,13 +233,12 @@ void Acts::GeometryView3D::drawTrackingVolume(
   ViewConfig lConfig = layerView;
   ViewConfig sConfig = sensitiveView;
   ViewConfig gConfig = gridView;
-  gConfig.nSegments = 8;
+  gConfig.quarterSegments = 8;
 
   ViewConfig vcConfig = cConfig;
   std::string vname = tVolume.volumeName();
   if (writeIt) {
     std::vector<std::string> repChar = {"::" /*, "|", " ", "{", "}"*/};
-    // std::cout << "PRE: " << vname << std::endl;
     for (const auto& rchar : repChar) {
       while (vname.find(rchar) != std::string::npos) {
         vname.replace(vname.find(rchar), rchar.size(), std::string("_"));
@@ -304,10 +246,9 @@ void Acts::GeometryView3D::drawTrackingVolume(
     }
     if (tVolume.confinedVolumes() == nullptr) {
       vcConfig = vConfig;
-      vcConfig.outputName = vname + std::string("_boundaries") + tag;
+      vcConfig.outputName =
+          std::filesystem::path(vname + std::string("_boundaries") + tag);
     } else {
-      std::stringstream vs;
-      vs << "Container";
       std::vector<GeometryIdentifier::Value> ids{tVolume.geometryId().volume()};
 
       for (const auto* current = &tVolume; current->motherVolume() != nullptr;
@@ -315,11 +256,14 @@ void Acts::GeometryView3D::drawTrackingVolume(
         ids.push_back(current->motherVolume()->geometryId().volume());
       }
 
-      for (std::size_t i = ids.size() - 1; i < ids.size(); --i) {
-        vs << "_v" << ids[i];
+      std::ranges::reverse(ids);
+      vname = "Container";
+      for (const auto& id : ids) {
+        vname += "_v" + std::to_string(id);
       }
-      vname = vs.str();
-      vcConfig.outputName = vname + std::string("_boundaries") + tag;
+
+      vcConfig.outputName =
+          std::filesystem::path(vname + std::string("_boundaries") + tag);
     }
   }
 
@@ -329,7 +273,7 @@ void Acts::GeometryView3D::drawTrackingVolume(
                 Transform3::Identity(), vcConfig);
   }
   if (writeIt) {
-    std::string outputName = joinPaths(outputDir, vcConfig.outputName);
+    const std::filesystem::path outputName = outputDir / vcConfig.outputName;
     helper.write(outputName);
     helper.clear();
   }
@@ -339,12 +283,12 @@ void Acts::GeometryView3D::drawTrackingVolume(
     std::size_t il = 0;
     for (const auto& tl : layers) {
       if (writeIt) {
-        lConfig.outputName =
-            vname + std::string("_passives_l") + std::to_string(il) + tag;
-        sConfig.outputName =
-            vname + std::string("_sensitives_l") + std::to_string(il) + tag;
-        gConfig.outputName =
-            vname + std::string("_grids_l") + std::to_string(il) + tag;
+        lConfig.outputName = std::filesystem::path(
+            vname + std::string("_passives_l") + std::to_string(il) + tag);
+        sConfig.outputName = std::filesystem::path(
+            vname + std::string("_sensitives_l") + std::to_string(il) + tag);
+        gConfig.outputName = std::filesystem::path(
+            vname + std::string("_grids_l") + std::to_string(il) + tag);
       }
       drawLayer(helper, *tl, gctx, lConfig, sConfig, gConfig, outputDir);
       ++il;
diff --git a/Core/src/Visualization/IVisualization3D.cpp b/Core/src/Visualization/IVisualization3D.cpp
deleted file mode 100644
index aad131a156d..00000000000
--- a/Core/src/Visualization/IVisualization3D.cpp
+++ /dev/null
@@ -1,23 +0,0 @@
-// This file is part of the Acts project.
-//
-// Copyright (C) 2020 CERN for the benefit of the Acts project
-//
-// This Source Code Form is subject to the terms of the Mozilla Public
-// License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-#include "Acts/Visualization/IVisualization3D.hpp"
-
-bool Acts::IVisualization3D::hasExtension(const std::string& path) const {
-  return (path.find(".") != std::string::npos);
-}
-
-void Acts::IVisualization3D::replaceExtension(std::string& path,
-                                              const std::string& suffix) const {
-  auto ppoint = path.find_last_of(".");
-  if (ppoint != std::string::npos) {
-    path.replace(ppoint, path.length(), suffix);
-  } else {
-    path += suffix;
-  }
-}
diff --git a/Core/src/Visualization/ObjVisualization3D.cpp b/Core/src/Visualization/ObjVisualization3D.cpp
new file mode 100644
index 00000000000..777e883b3d3
--- /dev/null
+++ b/Core/src/Visualization/ObjVisualization3D.cpp
@@ -0,0 +1,211 @@
+// This file is part of the ACTS project.
+//
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
+//
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
+
+#include "Acts/Visualization/ObjVisualization3D.hpp"
+
+#include <algorithm>
+#include <fstream>
+#include <stdexcept>
+
+namespace Acts {
+
+void ObjVisualization3D::vertex(const Vector3& vtx, Color color) {
+  auto& o = object();
+  o.vertexColors[o.vertices.size()] = color;
+  o.vertices.push_back(vtx.template cast<ValueType>());
+}
+
+void ObjVisualization3D::line(const Vector3& a, const Vector3& b, Color color) {
+  auto& o = object();
+  if (color != Color{0, 0, 0}) {
+    o.lineColors[o.lines.size()] = color;
+  }
+  // not implemented
+  vertex(a, color);
+  vertex(b, color);
+  o.lines.push_back({o.vertices.size() - 2, o.vertices.size() - 1});
+}
+
+void ObjVisualization3D::face(const std::vector<Vector3>& vtxs, Color color) {
+  auto& o = object();
+  if (color != Color{0, 0, 0}) {
+    o.faceColors[o.faces.size()] = color;
+  }
+  FaceType idxs;
+  idxs.reserve(vtxs.size());
+  for (const auto& vtx : vtxs) {
+    vertex(vtx, color);
+    idxs.push_back(o.vertices.size() - 1);
+  }
+  o.faces.push_back(std::move(idxs));
+}
+
+void ObjVisualization3D::faces(const std::vector<Vector3>& vtxs,
+                               const std::vector<FaceType>& faces,
+                               Color color) {
+  auto& o = object();
+  // No faces given - call the face() method
+  if (faces.empty()) {
+    face(vtxs, color);
+  } else {
+    if (color != Color{0, 0, 0}) {
+      o.faceColors[o.faces.size()] = color;
+    }
+    auto vtxoffs = o.vertices.size();
+    if (color != Color{0, 0, 0}) {
+      o.vertexColors[o.vertices.size()] = color;
+    }
+    o.vertices.insert(o.vertices.end(), vtxs.begin(), vtxs.end());
+    for (const auto& face : faces) {
+      if (face.size() == 2) {
+        o.lines.push_back({face[0] + vtxoffs, face[2] + vtxoffs});
+      } else {
+        FaceType rawFace;
+        std::ranges::transform(
+            face, std::back_inserter(rawFace),
+            [&](unsigned long iv) { return (iv + vtxoffs); });
+        o.faces.push_back(rawFace);
+      }
+    }
+  }
+}
+
+void ObjVisualization3D::write(const std::filesystem::path& path) const {
+  std::ofstream os;
+  std::filesystem::path objectpath = path;
+  if (!objectpath.has_extension()) {
+    objectpath.replace_extension(std::filesystem::path("obj"));
+  }
+  os.open(std::filesystem::absolute(objectpath).string());
+  std::filesystem::path mtlpath = objectpath;
+  mtlpath.replace_extension(std::filesystem::path("mtl"));
+
+  const std::string mtlpathString = std::filesystem::absolute(mtlpath).string();
+  os << "mtllib " << mtlpathString << "\n";
+  std::ofstream mtlos;
+  mtlos.open(mtlpathString);
+
+  write(os, mtlos);
+  os.close();
+  mtlos.close();
+}
+
+void ObjVisualization3D::write(std::ostream& os) const {
+  std::stringstream sterile;
+  write(os, sterile);
+}
+
+void ObjVisualization3D::write(std::ostream& os, std::ostream& mos) const {
+  std::map<std::string, bool, std::less<>> materials;
+
+  auto mixColor = [&](const Color& color) {
+    std::string materialName;
+    materialName = "material_";
+    materialName += std::to_string(color[0]) + std::string("_");
+    materialName += std::to_string(color[1]) + std::string("_");
+    materialName += std::to_string(color[2]);
+
+    if (!materials.contains(materialName)) {
+      mos << "newmtl " << materialName << "\n";
+      std::vector<std::string> shadings = {"Ka", "Kd", "Ks"};
+      for (const auto& shd : shadings) {
+        mos << shd << " " << std::to_string(color[0] / 256.) << " ";
+        mos << std::to_string(color[1] / 256.) << " ";
+        mos << std::to_string(color[2] / 256.) << " " << "\n";
+      }
+      mos << "\n";
+    }
+    return std::string("usemtl ") + materialName;
+  };
+
+  std::size_t vertexOffset = 0;
+  for (const auto& o : m_objects) {
+    if (!o.name.empty()) {
+      os << "o " << o.name << "\n";
+    }
+
+    std::size_t iv = 0;
+    Color lastVertexColor = {0, 0, 0};
+    for (const VertexType& vtx : o.vertices) {
+      if (o.vertexColors.contains(iv)) {
+        auto color = o.vertexColors.find(iv)->second;
+        if (color != lastVertexColor) {
+          os << mixColor(color) << "\n";
+          lastVertexColor = color;
+        }
+      }
+
+      os << "v " << std::setprecision(m_outputPrecision)
+         << m_outputScalor * vtx.x() << " " << m_outputScalor * vtx.y() << " "
+         << m_outputScalor * vtx.z() << "\n";
+      ++iv;
+    }
+    std::size_t il = 0;
+    Color lastLineColor = {0, 0, 0};
+    for (const auto& [start, end] : o.lines) {
+      if (o.lineColors.contains(il)) {
+        auto color = o.lineColors.find(il)->second;
+        if (color != lastLineColor) {
+          os << mixColor(color) << "\n";
+          lastLineColor = color;
+        }
+      }
+      os << "l " << vertexOffset + start + 1 << " " << vertexOffset + end + 1
+         << "\n";
+      ++il;
+    }
+    std::size_t is = 0;
+    Color lastFaceColor = {0, 0, 0};
+    for (const FaceType& fc : o.faces) {
+      if (o.faceColors.contains(is)) {
+        auto color = o.faceColors.find(is)->second;
+        if (color != lastFaceColor) {
+          os << mixColor(color) << "\n";
+          lastFaceColor = color;
+        }
+      }
+      os << "f";
+      for (std::size_t fi : fc) {
+        os << " " << vertexOffset + fi + 1;
+      }
+      os << "\n";
+      ++is;
+    }
+
+    vertexOffset += iv;
+  }
+}
+
+void ObjVisualization3D::clear() {
+  m_objects.clear();
+}
+
+void ObjVisualization3D::object(const std::string& name) {
+  if (name.empty()) {
+    throw std::invalid_argument{"Object name can not be empty"};
+  }
+  m_objects.push_back(Object{.name = name});
+}
+
+ObjVisualization3D::Object& ObjVisualization3D::object() {
+  if (m_objects.empty()) {
+    m_objects.push_back(Object{.name = ""});
+  }
+
+  return m_objects.back();
+}
+
+const ObjVisualization3D::Object& ObjVisualization3D::object() const {
+  if (m_objects.empty()) {
+    throw std::runtime_error{"No objects present"};
+  }
+
+  return m_objects.back();
+}
+
+}  // namespace Acts
diff --git a/Examples/Algorithms/Alignment/include/ActsExamples/Alignment/AlignmentAlgorithm.hpp b/Examples/Algorithms/Alignment/include/ActsExamples/Alignment/AlignmentAlgorithm.hpp
index 3d37e59f813..db5833e5549 100644
--- a/Examples/Algorithms/Alignment/include/ActsExamples/Alignment/AlignmentAlgorithm.hpp
+++ b/Examples/Algorithms/Alignment/include/ActsExamples/Alignment/AlignmentAlgorithm.hpp
@@ -1,17 +1,16 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2019 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
 #include "Acts/Geometry/GeometryHierarchyMap.hpp"
 #include "Acts/TrackFitting/KalmanFitter.hpp"
 #include "ActsAlignment/Kernel/Alignment.hpp"
-#include "ActsExamples/EventData/IndexSourceLink.hpp"
 #include "ActsExamples/EventData/Measurement.hpp"
 #include "ActsExamples/EventData/ProtoTrack.hpp"
 #include "ActsExamples/EventData/Track.hpp"
@@ -88,8 +87,6 @@ class AlignmentAlgorithm final : public IAlgorithm {
   struct Config {
     /// Input measurements collection.
     std::string inputMeasurements;
-    /// Input source links collection.
-    std::string inputSourceLinks;
     /// Input proto tracks collection, i.e. groups of hit indices.
     std::string inputProtoTracks;
     /// Input initial track parameter estimates for for each proto track.
@@ -133,8 +130,6 @@ class AlignmentAlgorithm final : public IAlgorithm {
 
   ReadDataHandle<MeasurementContainer> m_inputMeasurements{this,
                                                            "InputMeasurements"};
-  ReadDataHandle<IndexSourceLinkContainer> m_inputSourceLinks{
-      this, "InputSourceLinks"};
   ReadDataHandle<TrackParametersContainer> m_inputInitialTrackParameters{
       this, "InputInitialTrackParameters"};
   ReadDataHandle<ProtoTrackContainer> m_inputProtoTracks{this,
diff --git a/Examples/Algorithms/Alignment/src/AlignmentAlgorithm.cpp b/Examples/Algorithms/Alignment/src/AlignmentAlgorithm.cpp
index 444b818233d..2f1f450e23c 100644
--- a/Examples/Algorithms/Alignment/src/AlignmentAlgorithm.cpp
+++ b/Examples/Algorithms/Alignment/src/AlignmentAlgorithm.cpp
@@ -1,16 +1,17 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2020 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include "ActsExamples/Alignment/AlignmentAlgorithm.hpp"
 
 #include "Acts/Surfaces/PerigeeSurface.hpp"
 #include "Acts/TrackFitting/GainMatrixSmoother.hpp"
 #include "Acts/TrackFitting/GainMatrixUpdater.hpp"
+#include "ActsExamples/EventData/IndexSourceLink.hpp"
 #include "ActsExamples/EventData/MeasurementCalibration.hpp"
 #include "ActsExamples/EventData/ProtoTrack.hpp"
 #include "ActsExamples/EventData/Trajectories.hpp"
@@ -23,9 +24,6 @@ ActsExamples::AlignmentAlgorithm::AlignmentAlgorithm(Config cfg,
   if (m_cfg.inputMeasurements.empty()) {
     throw std::invalid_argument("Missing input measurement collection");
   }
-  if (m_cfg.inputSourceLinks.empty()) {
-    throw std::invalid_argument("Missing input source links collection");
-  }
   if (m_cfg.inputProtoTracks.empty()) {
     throw std::invalid_argument("Missing input proto tracks collection");
   }
@@ -39,7 +37,6 @@ ActsExamples::AlignmentAlgorithm::AlignmentAlgorithm(Config cfg,
   }
 
   m_inputMeasurements.initialize(m_cfg.inputMeasurements);
-  m_inputSourceLinks.initialize(m_cfg.inputSourceLinks);
   m_inputProtoTracks.initialize(m_cfg.inputProtoTracks);
   m_inputInitialTrackParameters.initialize(m_cfg.inputInitialTrackParameters);
   m_outputAlignmentParameters.initialize(m_cfg.outputAlignmentParameters);
@@ -49,7 +46,6 @@ ActsExamples::ProcessCode ActsExamples::AlignmentAlgorithm::execute(
     const ActsExamples::AlgorithmContext& ctx) const {
   // Read input data
   const auto& measurements = m_inputMeasurements(ctx);
-  const auto& sourceLinks = m_inputSourceLinks(ctx);
   const auto& protoTracks = m_inputProtoTracks(ctx);
   const auto& initialParameters = m_inputInitialTrackParameters(ctx);
 
@@ -79,14 +75,11 @@ ActsExamples::ProcessCode ActsExamples::AlignmentAlgorithm::execute(
     trackSourceLinks.reserve(protoTrack.size());
 
     // Fill the source links via their indices from the container
-    for (auto hitIndex : protoTrack) {
-      auto sourceLink = sourceLinks.nth(hitIndex);
-      if (sourceLink == sourceLinks.end()) {
-        ACTS_FATAL("Proto track " << itrack << " contains invalid hit index"
-                                  << hitIndex);
-        return ProcessCode::ABORT;
-      }
-      trackSourceLinks.push_back(*sourceLink);
+    for (auto measIndex : protoTrack) {
+      const ConstVariableBoundMeasurementProxy measurement =
+          measurements.getMeasurement(measIndex);
+      IndexSourceLink sourceLink(measurement.geometryId(), measIndex);
+      trackSourceLinks.push_back(sourceLink);
     }
     sourceLinkTrackContainer.push_back(trackSourceLinks);
   }
diff --git a/Examples/Algorithms/Alignment/src/AlignmentAlgorithmFunction.cpp b/Examples/Algorithms/Alignment/src/AlignmentAlgorithmFunction.cpp
index 17ca082f88c..de6780d817b 100644
--- a/Examples/Algorithms/Alignment/src/AlignmentAlgorithmFunction.cpp
+++ b/Examples/Algorithms/Alignment/src/AlignmentAlgorithmFunction.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2020 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include "Acts/Definitions/TrackParametrization.hpp"
 #include "Acts/Geometry/GeometryIdentifier.hpp"
@@ -31,7 +31,7 @@ struct AlignmentFunctionImpl
     : public ActsExamples::AlignmentAlgorithm::AlignmentFunction {
   Alignment align;
 
-  AlignmentFunctionImpl(Alignment&& a) : align(std::move(a)) {}
+  explicit AlignmentFunctionImpl(Alignment&& a) : align(std::move(a)) {}
 
   ActsExamples::AlignmentAlgorithm::AlignmentResult operator()(
       const std::vector<std::vector<ActsExamples::IndexSourceLink>>&
diff --git a/Examples/Algorithms/AmbiguityResolution/include/ActsExamples/AmbiguityResolution/GreedyAmbiguityResolutionAlgorithm.hpp b/Examples/Algorithms/AmbiguityResolution/include/ActsExamples/AmbiguityResolution/GreedyAmbiguityResolutionAlgorithm.hpp
index 36010fda472..af4e0d1045f 100644
--- a/Examples/Algorithms/AmbiguityResolution/include/ActsExamples/AmbiguityResolution/GreedyAmbiguityResolutionAlgorithm.hpp
+++ b/Examples/Algorithms/AmbiguityResolution/include/ActsExamples/AmbiguityResolution/GreedyAmbiguityResolutionAlgorithm.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2022-2023 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
diff --git a/Examples/Algorithms/AmbiguityResolution/include/ActsExamples/AmbiguityResolution/ScoreBasedAmbiguityResolutionAlgorithm.hpp b/Examples/Algorithms/AmbiguityResolution/include/ActsExamples/AmbiguityResolution/ScoreBasedAmbiguityResolutionAlgorithm.hpp
index 9f8c50d9a93..b63100f8751 100644
--- a/Examples/Algorithms/AmbiguityResolution/include/ActsExamples/AmbiguityResolution/ScoreBasedAmbiguityResolutionAlgorithm.hpp
+++ b/Examples/Algorithms/AmbiguityResolution/include/ActsExamples/AmbiguityResolution/ScoreBasedAmbiguityResolutionAlgorithm.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2024 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
@@ -16,6 +16,7 @@
 #include "ActsExamples/Framework/IAlgorithm.hpp"
 #include "ActsExamples/Framework/ProcessCode.hpp"
 
+#include <numbers>
 #include <string>
 
 namespace ActsExamples {
@@ -56,8 +57,8 @@ class ScoreBasedAmbiguityResolutionAlgorithm final : public IAlgorithm {
     double pTMin = 0 * Acts::UnitConstants::GeV;
     double pTMax = 1e5 * Acts::UnitConstants::GeV;
 
-    double phiMin = -M_PI * Acts::UnitConstants::rad;
-    double phiMax = M_PI * Acts::UnitConstants::rad;
+    double phiMin = -std::numbers::pi * Acts::UnitConstants::rad;
+    double phiMax = std::numbers::pi * Acts::UnitConstants::rad;
 
     double etaMin = -5;
     double etaMax = 5;
diff --git a/Examples/Algorithms/AmbiguityResolution/src/GreedyAmbiguityResolutionAlgorithm.cpp b/Examples/Algorithms/AmbiguityResolution/src/GreedyAmbiguityResolutionAlgorithm.cpp
index 7af33230b8d..5808fe89987 100644
--- a/Examples/Algorithms/AmbiguityResolution/src/GreedyAmbiguityResolutionAlgorithm.cpp
+++ b/Examples/Algorithms/AmbiguityResolution/src/GreedyAmbiguityResolutionAlgorithm.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2022 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include "ActsExamples/AmbiguityResolution/GreedyAmbiguityResolutionAlgorithm.hpp"
 
diff --git a/Examples/Algorithms/AmbiguityResolution/src/ScoreBasedAmbiguityResolutionAlgorithm.cpp b/Examples/Algorithms/AmbiguityResolution/src/ScoreBasedAmbiguityResolutionAlgorithm.cpp
index f3c7b99219c..bd3584fa4b2 100644
--- a/Examples/Algorithms/AmbiguityResolution/src/ScoreBasedAmbiguityResolutionAlgorithm.cpp
+++ b/Examples/Algorithms/AmbiguityResolution/src/ScoreBasedAmbiguityResolutionAlgorithm.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2024 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include "ActsExamples/AmbiguityResolution/ScoreBasedAmbiguityResolutionAlgorithm.hpp"
 
@@ -124,9 +124,7 @@ ActsExamples::ScoreBasedAmbiguityResolutionAlgorithm::execute(
   measurementsPerTracks = m_ambi.computeInitialState(
       tracks, &sourceLinkHash, &sourceLinkEquality, trackFeaturesVectors);
 
-  Acts::ScoreBasedAmbiguityResolution::OptionalCuts<
-      Acts::ConstVectorTrackContainer, Acts::ConstVectorMultiTrajectory,
-      std::shared_ptr, true>
+  Acts::ScoreBasedAmbiguityResolution::OptionalCuts<ConstTrackProxy>
       optionalCuts;
   optionalCuts.cuts.push_back(doubleHolesFilter);
   std::vector<int> goodTracks = m_ambi.solveAmbiguity(
diff --git a/Examples/Algorithms/CMakeLists.txt b/Examples/Algorithms/CMakeLists.txt
index bdfc0195b7a..01cc0beaf7f 100644
--- a/Examples/Algorithms/CMakeLists.txt
+++ b/Examples/Algorithms/CMakeLists.txt
@@ -9,6 +9,7 @@ add_subdirectory(Geometry)
 add_subdirectory(MaterialMapping)
 add_subdirectory(Printers)
 add_subdirectory(Propagation)
+add_subdirectory_if(Traccc ACTS_BUILD_PLUGIN_TRACCC)
 add_subdirectory(TrackFinding)
 add_subdirectory_if(TrackFindingExaTrkX ACTS_BUILD_EXAMPLES_EXATRKX)
 add_subdirectory_if(TrackFindingML ACTS_BUILD_PLUGIN_ONNX)
diff --git a/Examples/Algorithms/Digitization/CMakeLists.txt b/Examples/Algorithms/Digitization/CMakeLists.txt
index 14729f2784f..de98c7e74d4 100644
--- a/Examples/Algorithms/Digitization/CMakeLists.txt
+++ b/Examples/Algorithms/Digitization/CMakeLists.txt
@@ -3,6 +3,7 @@ add_library(
     SHARED
     src/DigitizationAlgorithm.cpp
     src/DigitizationConfig.cpp
+    src/DigitizationCoordinatesConverter.cpp
     src/MeasurementCreation.cpp
     src/DigitizationConfigurator.cpp
     src/ModuleClusters.cpp
diff --git a/Examples/Algorithms/Digitization/include/ActsExamples/Digitization/DigitizationAlgorithm.hpp b/Examples/Algorithms/Digitization/include/ActsExamples/Digitization/DigitizationAlgorithm.hpp
index 9fafaf0af21..fd8937bd300 100644
--- a/Examples/Algorithms/Digitization/include/ActsExamples/Digitization/DigitizationAlgorithm.hpp
+++ b/Examples/Algorithms/Digitization/include/ActsExamples/Digitization/DigitizationAlgorithm.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2021 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
@@ -18,7 +18,6 @@
 #include "ActsExamples/Digitization/SmearingConfig.hpp"
 #include "ActsExamples/EventData/Cluster.hpp"
 #include "ActsExamples/EventData/Index.hpp"
-#include "ActsExamples/EventData/IndexSourceLink.hpp"
 #include "ActsExamples/EventData/Measurement.hpp"
 #include "ActsExamples/EventData/SimHit.hpp"
 #include "ActsExamples/Framework/DataHandle.hpp"
@@ -96,13 +95,15 @@ class DigitizationAlgorithm final : public IAlgorithm {
   /// Geometric digtizer
   ActsFatras::Channelizer m_channelizer;
 
+  using CellsMap =
+      std::map<Acts::GeometryIdentifier, std::vector<Cluster::Cell>>;
+
   ReadDataHandle<SimHitContainer> m_simContainerReadHandle{this,
                                                            "SimHitContainer"};
 
-  WriteDataHandle<IndexSourceLinkContainer> m_sourceLinkWriteHandle{
-      this, "SourceLinks"};
   WriteDataHandle<MeasurementContainer> m_measurementWriteHandle{
       this, "Measurements"};
+  WriteDataHandle<CellsMap> m_cellsWriteHandle{this, "Cells"};
   WriteDataHandle<ClusterContainer> m_clusterWriteHandle{this, "Clusters"};
   WriteDataHandle<IndexMultimap<ActsFatras::Barcode>>
       m_measurementParticlesMapWriteHandle{this, "MeasurementParticlesMap"};
diff --git a/Examples/Algorithms/Digitization/include/ActsExamples/Digitization/DigitizationConfig.hpp b/Examples/Algorithms/Digitization/include/ActsExamples/Digitization/DigitizationConfig.hpp
index 5f1088d4c58..6a933f50075 100644
--- a/Examples/Algorithms/Digitization/include/ActsExamples/Digitization/DigitizationConfig.hpp
+++ b/Examples/Algorithms/Digitization/include/ActsExamples/Digitization/DigitizationConfig.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2021 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
@@ -130,15 +130,15 @@ class DigitizationConfig {
       bool doMerge, double mergeNsigma, bool mergeCommonCorner,
       Acts::GeometryHierarchyMap<DigiComponentsConfig> &&digiCfgs);
 
-  DigitizationConfig(
+  explicit DigitizationConfig(
       Acts::GeometryHierarchyMap<DigiComponentsConfig> &&digiCfgs);
 
   /// Input collection of simulated hits.
   std::string inputSimHits = "simhits";
-  /// Output source links collection.
-  std::string outputSourceLinks = "sourcelinks";
   /// Output measurements collection.
   std::string outputMeasurements = "measurements";
+  /// Output cells map (geoID -> collection of cells).
+  std::string outputCells = "cells";
   /// Output cluster collection.
   std::string outputClusters = "clusters";
   /// Output collection to map measured hits to contributing particles.
@@ -150,6 +150,12 @@ class DigitizationConfig {
       surfaceByIdentifier;
   /// Random numbers tool.
   std::shared_ptr<const RandomNumbers> randomNumbers = nullptr;
+  /// Flag to determine whether cell data should be written to the
+  /// `outputCells` collection; if true, writes (rather voluminous) cell data.
+  bool doOutputCells = false;
+  /// Flag to determine whether or not to run the clusterization; if true,
+  /// clusters, measurements, and sim-hit-maps are output.
+  bool doClusterization = true;
   /// Do we merge hits or not
   bool doMerge;
   /// How close do parameters have to be to consider merged
diff --git a/Examples/Algorithms/Digitization/include/ActsExamples/Digitization/DigitizationConfigurator.hpp b/Examples/Algorithms/Digitization/include/ActsExamples/Digitization/DigitizationConfigurator.hpp
index 0c6fb6a906e..55754eb79f7 100644
--- a/Examples/Algorithms/Digitization/include/ActsExamples/Digitization/DigitizationConfigurator.hpp
+++ b/Examples/Algorithms/Digitization/include/ActsExamples/Digitization/DigitizationConfigurator.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2020-2021 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
diff --git a/Examples/Algorithms/Digitization/include/ActsExamples/Digitization/DigitizationCoordinatesConverter.hpp b/Examples/Algorithms/Digitization/include/ActsExamples/Digitization/DigitizationCoordinatesConverter.hpp
new file mode 100644
index 00000000000..21c4f619b8a
--- /dev/null
+++ b/Examples/Algorithms/Digitization/include/ActsExamples/Digitization/DigitizationCoordinatesConverter.hpp
@@ -0,0 +1,39 @@
+// This file is part of the ACTS project.
+//
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
+//
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
+
+#pragma once
+
+#include "ActsExamples/Digitization/DigitizationConfig.hpp"
+
+namespace ActsExamples {
+
+/// Utility that converts hit coordinates.
+class DigitizationCoordinatesConverter final {
+ public:
+  /// Construct the converter
+  ///
+  /// @param config is the configuration
+  explicit DigitizationCoordinatesConverter(DigitizationConfig config);
+
+  /// Get const access to the config
+  const DigitizationConfig& config() const { return m_cfg; }
+
+  /// Convert the hit coordinates to the local frame.
+  std::tuple<double, double> globalToLocal(std::uint64_t moduleId, double x,
+                                           double y, double z) const;
+
+  /// Convert the hit coordinates to the global frame.
+  std::tuple<double, double, double> localToGlobal(std::uint64_t moduleId,
+                                                   double x, double y) const;
+
+ private:
+  /// Configuration
+  DigitizationConfig m_cfg;
+};
+
+}  // namespace ActsExamples
diff --git a/Examples/Algorithms/Digitization/include/ActsExamples/Digitization/MeasurementCreation.hpp b/Examples/Algorithms/Digitization/include/ActsExamples/Digitization/MeasurementCreation.hpp
index 3d9476815c9..667e0c9f4c3 100644
--- a/Examples/Algorithms/Digitization/include/ActsExamples/Digitization/MeasurementCreation.hpp
+++ b/Examples/Algorithms/Digitization/include/ActsExamples/Digitization/MeasurementCreation.hpp
@@ -1,17 +1,17 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2021 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
 #include "Acts/Definitions/Algebra.hpp"
 #include "Acts/Definitions/TrackParametrization.hpp"
+#include "Acts/Geometry/GeometryIdentifier.hpp"
 #include "ActsExamples/EventData/Cluster.hpp"
-#include "ActsExamples/EventData/IndexSourceLink.hpp"
 #include "ActsExamples/EventData/Measurement.hpp"
 
 #include <array>
@@ -20,7 +20,6 @@
 #include <vector>
 
 namespace ActsExamples {
-class IndexSourceLink;
 
 /// Struct to identify digitized parameters
 ///
@@ -35,14 +34,16 @@ struct DigitizedParameters {
 
 /// Helper method for created a measurement from digitized parameters
 ///
+/// @param container The measurement container to insert into
+/// @param geometryId The geometry ID of the measurement surface
 /// @param dParams The digitized parameters of variable size
-/// @param isl The indexed source link for the measurement
 ///
 /// To be used also by the e I/O system
 ///
-/// @return a variant measurement
-Measurement createMeasurement(const DigitizedParameters& dParams,
-                              const IndexSourceLink& isl) noexcept(false);
+/// @return the measurement proxy
+ActsExamples::VariableBoundMeasurementProxy createMeasurement(
+    MeasurementContainer& container, Acts::GeometryIdentifier geometryId,
+    const DigitizedParameters& dParams) noexcept(false);
 
 /// Construct the constituents of a measurement.
 ///
diff --git a/Examples/Algorithms/Digitization/include/ActsExamples/Digitization/ModuleClusters.hpp b/Examples/Algorithms/Digitization/include/ActsExamples/Digitization/ModuleClusters.hpp
index c5f7a4e8f88..675f86af07d 100644
--- a/Examples/Algorithms/Digitization/include/ActsExamples/Digitization/ModuleClusters.hpp
+++ b/Examples/Algorithms/Digitization/include/ActsExamples/Digitization/ModuleClusters.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2021 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
diff --git a/Examples/Algorithms/Digitization/include/ActsExamples/Digitization/Smearers.hpp b/Examples/Algorithms/Digitization/include/ActsExamples/Digitization/Smearers.hpp
index 416a9a85abe..c51b8e26b64 100644
--- a/Examples/Algorithms/Digitization/include/ActsExamples/Digitization/Smearers.hpp
+++ b/Examples/Algorithms/Digitization/include/ActsExamples/Digitization/Smearers.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2020-2024 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
diff --git a/Examples/Algorithms/Digitization/include/ActsExamples/Digitization/SmearingConfig.hpp b/Examples/Algorithms/Digitization/include/ActsExamples/Digitization/SmearingConfig.hpp
index de32254e6d2..4c46f029f93 100644
--- a/Examples/Algorithms/Digitization/include/ActsExamples/Digitization/SmearingConfig.hpp
+++ b/Examples/Algorithms/Digitization/include/ActsExamples/Digitization/SmearingConfig.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2021 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
diff --git a/Examples/Algorithms/Digitization/scripts/smearing-config.py b/Examples/Algorithms/Digitization/scripts/smearing-config.py
index 504f364f4c0..5c176d86318 100644
--- a/Examples/Algorithms/Digitization/scripts/smearing-config.py
+++ b/Examples/Algorithms/Digitization/scripts/smearing-config.py
@@ -1,10 +1,10 @@
-# This file is part of the Acts project.
+# This file is part of the ACTS project.
 #
-# Copyright (C) 2021 CERN for the benefit of the Acts project
+# Copyright (C) 2016 CERN for the benefit of the ACTS project
 #
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http:#mozilla.org/MPL/2.0/.
+# file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 
 # each volume configuration is one logical block
diff --git a/Examples/Algorithms/Digitization/src/DigitizationAlgorithm.cpp b/Examples/Algorithms/Digitization/src/DigitizationAlgorithm.cpp
index f3b04ac0aff..72f3905ab57 100644
--- a/Examples/Algorithms/Digitization/src/DigitizationAlgorithm.cpp
+++ b/Examples/Algorithms/Digitization/src/DigitizationAlgorithm.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2021 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include "ActsExamples/Digitization/DigitizationAlgorithm.hpp"
 
@@ -18,7 +18,6 @@
 #include "ActsExamples/Digitization/ModuleClusters.hpp"
 #include "ActsExamples/EventData/GeometryContainers.hpp"
 #include "ActsExamples/EventData/Index.hpp"
-#include "ActsExamples/EventData/IndexSourceLink.hpp"
 #include "ActsExamples/EventData/SimHit.hpp"
 #include "ActsExamples/Framework/AlgorithmContext.hpp"
 #include "ActsExamples/Utilities/GroupBy.hpp"
@@ -44,39 +43,49 @@ ActsExamples::DigitizationAlgorithm::DigitizationAlgorithm(
   if (m_cfg.inputSimHits.empty()) {
     throw std::invalid_argument("Missing simulated hits input collection");
   }
-  if (m_cfg.outputMeasurements.empty()) {
-    throw std::invalid_argument("Missing measurements output collection");
-  }
-  if (m_cfg.outputSourceLinks.empty()) {
-    throw std::invalid_argument("Missing source links output collection");
-  }
-  if (m_cfg.outputMeasurementParticlesMap.empty()) {
-    throw std::invalid_argument(
-        "Missing hit-to-particles map output collection");
-  }
-  if (m_cfg.outputMeasurementSimHitsMap.empty()) {
-    throw std::invalid_argument(
-        "Missing hit-to-simulated-hits map output collection");
-  }
   if (m_cfg.surfaceByIdentifier.empty()) {
     throw std::invalid_argument("Missing Surface-GeometryID association map");
   }
   if (!m_cfg.randomNumbers) {
     throw std::invalid_argument("Missing random numbers tool");
   }
-
   if (m_cfg.digitizationConfigs.empty()) {
     throw std::invalid_argument("Missing digitization configuration");
   }
 
+  if (m_cfg.doClusterization) {
+    if (m_cfg.outputMeasurements.empty()) {
+      throw std::invalid_argument("Missing measurements output collection");
+    }
+    if (m_cfg.outputClusters.empty()) {
+      throw std::invalid_argument("Missing cluster output collection");
+    }
+    if (m_cfg.outputMeasurementParticlesMap.empty()) {
+      throw std::invalid_argument(
+          "Missing hit-to-particles map output collection");
+    }
+    if (m_cfg.outputMeasurementSimHitsMap.empty()) {
+      throw std::invalid_argument(
+          "Missing hit-to-simulated-hits map output collection");
+    }
+
+    m_measurementWriteHandle.initialize(m_cfg.outputMeasurements);
+    m_clusterWriteHandle.initialize(m_cfg.outputClusters);
+    m_measurementParticlesMapWriteHandle.initialize(
+        m_cfg.outputMeasurementParticlesMap);
+    m_measurementSimHitsMapWriteHandle.initialize(
+        m_cfg.outputMeasurementSimHitsMap);
+  }
+
+  if (m_cfg.doOutputCells) {
+    if (m_cfg.outputCells.empty()) {
+      throw std::invalid_argument("Missing cell output collection");
+    }
+
+    m_cellsWriteHandle.initialize(m_cfg.outputCells);
+  }
+
   m_simContainerReadHandle.initialize(m_cfg.inputSimHits);
-  m_sourceLinkWriteHandle.initialize(m_cfg.outputSourceLinks);
-  m_measurementWriteHandle.initialize(m_cfg.outputMeasurements);
-  m_clusterWriteHandle.initialize(m_cfg.outputClusters);
-  m_measurementParticlesMapWriteHandle.initialize(
-      m_cfg.outputMeasurementParticlesMap);
-  m_measurementSimHitsMapWriteHandle.initialize(
-      m_cfg.outputMeasurementSimHitsMap);
 
   // Create the digitizers from the configuration
   std::vector<std::pair<Acts::GeometryIdentifier, Digitizer>> digitizerInput;
@@ -98,7 +107,7 @@ ActsExamples::DigitizationAlgorithm::DigitizationAlgorithm(
                    geoCfg.indices.end());
 
     // Make sure the configured input parameter indices are sorted and unique
-    std::sort(indices.begin(), indices.end());
+    std::ranges::sort(indices);
 
     auto dup = std::adjacent_find(indices.begin(), indices.end());
     if (dup != indices.end()) {
@@ -138,12 +147,10 @@ ActsExamples::ProcessCode ActsExamples::DigitizationAlgorithm::execute(
 
   // Prepare output containers
   // need list here for stable addresses
-  IndexSourceLinkContainer sourceLinks;
   MeasurementContainer measurements;
   ClusterContainer clusters;
   IndexMultimap<ActsFatras::Barcode> measurementParticlesMap;
   IndexMultimap<Index> measurementSimHitsMap;
-  sourceLinks.reserve(simHits.size());
   measurements.reserve(simHits.size());
   measurementParticlesMap.reserve(simHits.size());
   measurementSimHitsMap.reserve(simHits.size());
@@ -154,6 +161,10 @@ ActsExamples::ProcessCode ActsExamples::DigitizationAlgorithm::execute(
   // Some statistics
   std::size_t skippedHits = 0;
 
+  // Some algorithms do the clusterization themselves such as the traccc chain.
+  // Thus we need to store the cell data from the simulation.
+  CellsMap cellsMap;
+
   ACTS_DEBUG("Starting loop over modules ...");
   for (const auto& simHitsGroup : groupByModule(simHits)) {
     // Manual pair unpacking instead of using
@@ -255,30 +266,37 @@ ActsExamples::ProcessCode ActsExamples::DigitizationAlgorithm::execute(
             moduleClusters.add(std::move(dParameters), simHitIdx);
           }
 
-          for (auto& [dParameters, simhits] :
-               moduleClusters.digitizedParameters()) {
-            // The measurement container is unordered and the index under which
-            // the measurement will be stored is known before adding it.
-            Index measurementIdx = measurements.size();
-            IndexSourceLink sourceLink{moduleGeoId, measurementIdx};
-
-            // Add to output containers:
-            // index map and source link container are geometry-ordered.
-            // since the input is also geometry-ordered, new items can
-            // be added at the end.
-            sourceLinks.insert(sourceLinks.end(), sourceLink);
-
-            measurements.emplace_back(
-                createMeasurement(dParameters, sourceLink));
-            clusters.emplace_back(std::move(dParameters.cluster));
-            // this digitization does hit merging so there can be more than one
-            // mapping entry for each digitized hit.
-            for (auto simHitIdx : simhits) {
-              measurementParticlesMap.emplace_hint(
-                  measurementParticlesMap.end(), measurementIdx,
-                  simHits.nth(simHitIdx)->particleId());
-              measurementSimHitsMap.emplace_hint(measurementSimHitsMap.end(),
-                                                 measurementIdx, simHitIdx);
+          auto digitizeParametersResult = moduleClusters.digitizedParameters();
+
+          // Store the cell data into a map.
+          if (m_cfg.doOutputCells) {
+            std::vector<Cluster::Cell> cells;
+            for (const auto& [dParameters, simhits] :
+                 digitizeParametersResult) {
+              for (const auto& cell : dParameters.cluster.channels) {
+                cells.push_back(cell);
+              }
+            }
+            cellsMap.insert({moduleGeoId, std::move(cells)});
+          }
+
+          if (m_cfg.doClusterization) {
+            for (auto& [dParameters, simhits] : digitizeParametersResult) {
+              // The measurement container is unordered and the index under
+              // which the measurement will be stored is known before adding it.
+              Index measurementIdx = measurements.size();
+
+              createMeasurement(measurements, moduleGeoId, dParameters);
+              clusters.emplace_back(std::move(dParameters.cluster));
+              // this digitization does hit merging so there can be more than
+              // one mapping entry for each digitized hit.
+              for (auto simHitIdx : simhits) {
+                measurementParticlesMap.emplace_hint(
+                    measurementParticlesMap.end(), measurementIdx,
+                    simHits.nth(simHitIdx)->particleId());
+                measurementSimHitsMap.emplace_hint(measurementSimHitsMap.end(),
+                                                   measurementIdx, simHitIdx);
+              }
             }
           }
         },
@@ -291,11 +309,18 @@ ActsExamples::ProcessCode ActsExamples::DigitizationAlgorithm::execute(
         << " skipped in Digitization. Enable DEBUG mode to see more details.");
   }
 
-  m_sourceLinkWriteHandle(ctx, std::move(sourceLinks));
-  m_measurementWriteHandle(ctx, std::move(measurements));
-  m_clusterWriteHandle(ctx, std::move(clusters));
-  m_measurementParticlesMapWriteHandle(ctx, std::move(measurementParticlesMap));
-  m_measurementSimHitsMapWriteHandle(ctx, std::move(measurementSimHitsMap));
+  if (m_cfg.doOutputCells) {
+    m_cellsWriteHandle(ctx, std::move(cellsMap));
+  }
+
+  if (m_cfg.doClusterization) {
+    m_measurementWriteHandle(ctx, std::move(measurements));
+    m_clusterWriteHandle(ctx, std::move(clusters));
+    m_measurementParticlesMapWriteHandle(ctx,
+                                         std::move(measurementParticlesMap));
+    m_measurementSimHitsMapWriteHandle(ctx, std::move(measurementSimHitsMap));
+  }
+
   return ProcessCode::SUCCESS;
 }
 
diff --git a/Examples/Algorithms/Digitization/src/DigitizationConfig.cpp b/Examples/Algorithms/Digitization/src/DigitizationConfig.cpp
index b1962468d85..e19452d1e7a 100644
--- a/Examples/Algorithms/Digitization/src/DigitizationConfig.cpp
+++ b/Examples/Algorithms/Digitization/src/DigitizationConfig.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2020-2021 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include "ActsExamples/Digitization/DigitizationConfig.hpp"
 
@@ -66,7 +66,7 @@ std::vector<Acts::ActsScalar> ActsExamples::GeometricConfig::variances(
   std::vector<Acts::ActsScalar> rVariances;
   for (const auto& bIndex : indices) {
     Acts::ActsScalar var = 0.;
-    if (varianceMap.find(bIndex) != varianceMap.end()) {
+    if (varianceMap.contains(bIndex)) {
       // Try to find the variance for this cluster size
       std::size_t lsize =
           std::min(csizes[bIndex], varianceMap.at(bIndex).size());
diff --git a/Examples/Algorithms/Digitization/src/DigitizationConfigurator.cpp b/Examples/Algorithms/Digitization/src/DigitizationConfigurator.cpp
index 4415d735b5c..e7bd2ddfa09 100644
--- a/Examples/Algorithms/Digitization/src/DigitizationConfigurator.cpp
+++ b/Examples/Algorithms/Digitization/src/DigitizationConfigurator.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2023 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include "ActsExamples/Digitization/DigitizationConfigurator.hpp"
 
diff --git a/Examples/Algorithms/Digitization/src/DigitizationCoordinatesConverter.cpp b/Examples/Algorithms/Digitization/src/DigitizationCoordinatesConverter.cpp
new file mode 100644
index 00000000000..e83e7be995b
--- /dev/null
+++ b/Examples/Algorithms/Digitization/src/DigitizationCoordinatesConverter.cpp
@@ -0,0 +1,63 @@
+// This file is part of the ACTS project.
+//
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
+//
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
+
+#include "ActsExamples/Digitization/DigitizationCoordinatesConverter.hpp"
+
+#include "Acts/Definitions/Algebra.hpp"
+#include "Acts/Geometry/GeometryContext.hpp"
+
+#include <cmath>
+#include <stdexcept>
+#include <utility>
+
+ActsExamples::DigitizationCoordinatesConverter::
+    DigitizationCoordinatesConverter(DigitizationConfig config)
+    : m_cfg(std::move(config)) {
+  if (m_cfg.surfaceByIdentifier.empty()) {
+    throw std::invalid_argument("Missing Surface-GeometryID association map");
+  }
+}
+
+std::tuple<double, double>
+ActsExamples::DigitizationCoordinatesConverter::globalToLocal(
+    std::uint64_t moduleId, double x, double y, double z) const {
+  const Acts::GeometryIdentifier moduleGeoId = moduleId;
+  auto surfaceItr = m_cfg.surfaceByIdentifier.find(moduleGeoId);
+  if (surfaceItr == m_cfg.surfaceByIdentifier.end()) {
+    throw std::runtime_error("Surface not found for moduleGeoId");
+  }
+
+  // Transform the position into the local surface frame
+  const Acts::Surface* surfacePtr = surfaceItr->second;
+  const auto& invTransform =
+      surfacePtr->transform(Acts::GeometryContext()).inverse();
+
+  const Acts::Vector3 pos(x, y, z);
+  Acts::Vector2 pos2Local = (invTransform * pos).segment<2>(0);
+
+  return {pos2Local.x(), pos2Local.y()};
+}
+
+std::tuple<double, double, double>
+ActsExamples::DigitizationCoordinatesConverter::localToGlobal(
+    std::uint64_t moduleId, double x, double y) const {
+  const Acts::GeometryIdentifier moduleGeoId = moduleId;
+  auto surfaceItr = m_cfg.surfaceByIdentifier.find(moduleGeoId);
+  if (surfaceItr == m_cfg.surfaceByIdentifier.end()) {
+    throw std::runtime_error("Surface not found for moduleGeoId");
+  }
+
+  // Transform the position into the global frame
+  const Acts::Surface* surfacePtr = surfaceItr->second;
+  const auto& transform = surfacePtr->transform(Acts::GeometryContext());
+
+  const Acts::Vector3 pos(x, y, 0);
+  Acts::Vector3 pos2Global = (transform * pos);
+
+  return {pos2Global.x(), pos2Global.y(), pos2Global.z()};
+}
diff --git a/Examples/Algorithms/Digitization/src/MeasurementCreation.cpp b/Examples/Algorithms/Digitization/src/MeasurementCreation.cpp
index 7338b431f8c..066901cc0cf 100644
--- a/Examples/Algorithms/Digitization/src/MeasurementCreation.cpp
+++ b/Examples/Algorithms/Digitization/src/MeasurementCreation.cpp
@@ -1,43 +1,36 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2021 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include "ActsExamples/Digitization/MeasurementCreation.hpp"
 
+#include "Acts/EventData/MeasurementHelpers.hpp"
 #include "Acts/EventData/SourceLink.hpp"
+#include "Acts/Geometry/GeometryIdentifier.hpp"
 #include "ActsExamples/EventData/IndexSourceLink.hpp"
+#include "ActsExamples/EventData/Measurement.hpp"
 
 #include <stdexcept>
 #include <string>
 #include <utility>
 
-ActsExamples::Measurement ActsExamples::createMeasurement(
-    const DigitizedParameters& dParams, const IndexSourceLink& isl) {
-  Acts::SourceLink sl{isl};
-  switch (dParams.indices.size()) {
-    case 1u: {
-      auto [indices, par, cov] = measurementConstituents<1>(dParams);
-      return ActsExamples::Measurement(std::move(sl), indices, par, cov);
-    }
-    case 2u: {
-      auto [indices, par, cov] = measurementConstituents<2>(dParams);
-      return ActsExamples::Measurement(std::move(sl), indices, par, cov);
-    };
-    case 3u: {
-      auto [indices, par, cov] = measurementConstituents<3>(dParams);
-      return ActsExamples::Measurement(std::move(sl), indices, par, cov);
-    };
-    case 4u: {
-      auto [indices, par, cov] = measurementConstituents<4>(dParams);
-      return ActsExamples::Measurement(std::move(sl), indices, par, cov);
-    };
-    default:
-      std::string errorMsg = "Invalid/mismatching measurement dimension: " +
-                             std::to_string(dParams.indices.size());
-      throw std::runtime_error(errorMsg.c_str());
+ActsExamples::VariableBoundMeasurementProxy ActsExamples::createMeasurement(
+    MeasurementContainer& container, Acts::GeometryIdentifier geometryId,
+    const DigitizedParameters& dParams) {
+  if (dParams.indices.size() > 4u) {
+    std::string errorMsg = "Invalid/mismatching measurement dimension: " +
+                           std::to_string(dParams.indices.size());
+    throw std::runtime_error(errorMsg.c_str());
   }
+
+  return Acts::visit_measurement(
+      dParams.indices.size(), [&](auto dim) -> VariableBoundMeasurementProxy {
+        auto [indices, par, cov] = measurementConstituents<dim>(dParams);
+        return VariableBoundMeasurementProxy{
+            container.emplaceMeasurement<dim>(geometryId, indices, par, cov)};
+      });
 }
diff --git a/Examples/Algorithms/Digitization/src/ModuleClusters.cpp b/Examples/Algorithms/Digitization/src/ModuleClusters.cpp
index f82ec7063c4..fbe7bb2a901 100644
--- a/Examples/Algorithms/Digitization/src/ModuleClusters.cpp
+++ b/Examples/Algorithms/Digitization/src/ModuleClusters.cpp
@@ -1,14 +1,15 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2021 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include "ActsExamples/Digitization/ModuleClusters.hpp"
 
 #include "Acts/Clusterization/Clusterization.hpp"
+#include "Acts/Utilities/Helpers.hpp"
 #include "ActsExamples/Digitization/MeasurementCreation.hpp"
 #include "ActsFatras/Digitization/Channelizer.hpp"
 
@@ -139,8 +140,7 @@ std::vector<std::size_t> ModuleClusters::nonGeoEntries(
   std::vector<std::size_t> retv;
   for (std::size_t i = 0; i < indices.size(); i++) {
     auto idx = indices.at(i);
-    if (std::find(m_geoIndices.begin(), m_geoIndices.end(), idx) ==
-        m_geoIndices.end()) {
+    if (!rangeContainsValue(m_geoIndices, idx)) {
       retv.push_back(i);
     }
   }
@@ -245,10 +245,8 @@ ModuleValue ModuleClusters::squash(std::vector<ModuleValue>& values) {
     ModuleValue& other = values.at(i);
     for (std::size_t j = 0; j < other.paramIndices.size(); j++) {
       auto idx = other.paramIndices.at(j);
-      if (std::find(m_geoIndices.begin(), m_geoIndices.end(), idx) ==
-          m_geoIndices.end()) {
-        if (std::find(mval.paramIndices.begin(), mval.paramIndices.end(),
-                      idx) == mval.paramIndices.end()) {
+      if (!rangeContainsValue(m_geoIndices, idx)) {
+        if (!rangeContainsValue(mval.paramIndices, idx)) {
           mval.paramIndices.push_back(idx);
         }
         if (mval.paramValues.size() < (j + 1)) {
diff --git a/Examples/Algorithms/Fatras/include/ActsExamples/Fatras/FatrasSimulation.hpp b/Examples/Algorithms/Fatras/include/ActsExamples/Fatras/FatrasSimulation.hpp
index 86e9a01c2eb..75395218a9e 100644
--- a/Examples/Algorithms/Fatras/include/ActsExamples/Fatras/FatrasSimulation.hpp
+++ b/Examples/Algorithms/Fatras/include/ActsExamples/Fatras/FatrasSimulation.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2017-2021 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
@@ -43,10 +43,8 @@ class FatrasSimulation final : public IAlgorithm {
   struct Config {
     /// The particles input collection.
     std::string inputParticles;
-    /// The simulated particles initial state collection.
-    std::string outputParticlesInitial;
-    /// The simulated particles final state collection.
-    std::string outputParticlesFinal;
+    /// The simulated particles collection.
+    std::string outputParticles;
     /// The simulated hits output collection.
     std::string outputSimHits;
     /// Parametrisation of nuclear interaction
@@ -110,10 +108,8 @@ class FatrasSimulation final : public IAlgorithm {
 
   WriteDataHandle<SimHitContainer> m_outputSimHits{this, "OutputSimHits"};
 
-  WriteDataHandle<SimParticleContainer> m_outputParticlesInitial{
-      this, "OutputParticlesInitial"};
-  WriteDataHandle<SimParticleContainer> m_outputParticlesFinal{
-      this, "OutputParticlesFinal"};
+  WriteDataHandle<SimParticleContainer> m_outputParticles{this,
+                                                          "OutputParticles"};
 
  private:
   Config m_cfg;
diff --git a/Examples/Algorithms/Fatras/src/FatrasSimulation.cpp b/Examples/Algorithms/Fatras/src/FatrasSimulation.cpp
index 513082320b0..f9e627f482a 100644
--- a/Examples/Algorithms/Fatras/src/FatrasSimulation.cpp
+++ b/Examples/Algorithms/Fatras/src/FatrasSimulation.cpp
@@ -1,15 +1,13 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2017-2024 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include "ActsExamples/Fatras/FatrasSimulation.hpp"
 
-#include "Acts/Definitions/Direction.hpp"
-#include "Acts/EventData/TrackParameters.hpp"
 #include "Acts/Geometry/GeometryContext.hpp"
 #include "Acts/MagneticField/MagneticFieldContext.hpp"
 #include "Acts/Propagator/Navigator.hpp"
@@ -24,20 +22,17 @@
 #include "ActsExamples/Framework/AlgorithmContext.hpp"
 #include "ActsExamples/Framework/IAlgorithm.hpp"
 #include "ActsExamples/Framework/RandomNumbers.hpp"
-#include "ActsFatras/EventData/Barcode.hpp"
+#include "ActsFatras/EventData/Hit.hpp"
 #include "ActsFatras/EventData/Particle.hpp"
 #include "ActsFatras/Kernel/InteractionList.hpp"
 #include "ActsFatras/Kernel/Simulation.hpp"
 #include "ActsFatras/Physics/Decay/NoDecay.hpp"
 #include "ActsFatras/Physics/ElectroMagnetic/PhotonConversion.hpp"
-#include "ActsFatras/Physics/NuclearInteraction/NuclearInteractionParameters.hpp"
 #include "ActsFatras/Physics/StandardInteractions.hpp"
 #include "ActsFatras/Selectors/SelectorHelpers.hpp"
 #include "ActsFatras/Selectors/SurfaceSelectors.hpp"
 
 #include <algorithm>
-#include <array>
-#include <map>
 #include <ostream>
 #include <stdexcept>
 #include <system_error>
@@ -73,10 +68,9 @@ struct ActsExamples::detail::FatrasSimulation {
   virtual ~FatrasSimulation() = default;
   virtual Acts::Result<std::vector<ActsFatras::FailedParticle>> simulate(
       const Acts::GeometryContext &, const Acts::MagneticFieldContext &,
-      ActsExamples::RandomEngine &, const ActsExamples::SimParticleContainer &,
-      ActsExamples::SimParticleContainer::sequence_type &,
-      ActsExamples::SimParticleContainer::sequence_type &,
-      ActsExamples::SimHitContainer::sequence_type &) const = 0;
+      ActsExamples::RandomEngine &, const std::vector<ActsFatras::Particle> &,
+      std::vector<ActsFatras::Particle> &, std::vector<ActsFatras::Particle> &,
+      std::vector<ActsFatras::Hit> &) const = 0;
 };
 
 namespace {
@@ -172,12 +166,10 @@ struct FatrasSimulationT final : ActsExamples::detail::FatrasSimulation {
   Acts::Result<std::vector<ActsFatras::FailedParticle>> simulate(
       const Acts::GeometryContext &geoCtx,
       const Acts::MagneticFieldContext &magCtx, ActsExamples::RandomEngine &rng,
-      const ActsExamples::SimParticleContainer &inputParticles,
-      ActsExamples::SimParticleContainer::sequence_type
-          &simulatedParticlesInitial,
-      ActsExamples::SimParticleContainer::sequence_type
-          &simulatedParticlesFinal,
-      ActsExamples::SimHitContainer::sequence_type &simHits) const final {
+      const std::vector<ActsFatras::Particle> &inputParticles,
+      std::vector<ActsFatras::Particle> &simulatedParticlesInitial,
+      std::vector<ActsFatras::Particle> &simulatedParticlesFinal,
+      std::vector<ActsFatras::Hit> &simHits) const final {
     return simulation.simulate(geoCtx, magCtx, rng, inputParticles,
                                simulatedParticlesInitial,
                                simulatedParticlesFinal, simHits);
@@ -212,8 +204,7 @@ ActsExamples::FatrasSimulation::FatrasSimulation(Config cfg,
   m_sim = std::make_unique<FatrasSimulationT>(m_cfg, lvl);
 
   m_inputParticles.initialize(m_cfg.inputParticles);
-  m_outputParticlesInitial.initialize(m_cfg.outputParticlesInitial);
-  m_outputParticlesFinal.initialize(m_cfg.outputParticlesFinal);
+  m_outputParticles.initialize(m_cfg.outputParticles);
   m_outputSimHits.initialize(m_cfg.outputSimHits);
 }
 
@@ -227,10 +218,17 @@ ActsExamples::ProcessCode ActsExamples::FatrasSimulation::execute(
 
   ACTS_DEBUG(inputParticles.size() << " input particles");
 
+  // prepare input container
+  std::vector<ActsFatras::Particle> particlesInput;
+  particlesInput.reserve(inputParticles.size());
+  for (const auto &p : inputParticles) {
+    particlesInput.push_back(p.initial());
+  }
+
   // prepare output containers
-  SimParticleContainer::sequence_type particlesInitialUnordered;
-  SimParticleContainer::sequence_type particlesFinalUnordered;
-  SimHitContainer::sequence_type simHitsUnordered;
+  std::vector<ActsFatras::Particle> particlesInitialUnordered;
+  std::vector<ActsFatras::Particle> particlesFinalUnordered;
+  std::vector<ActsFatras::Hit> simHitsUnordered;
   // reserve appropriate resources
   particlesInitialUnordered.reserve(inputParticles.size());
   particlesFinalUnordered.reserve(inputParticles.size());
@@ -240,7 +238,7 @@ ActsExamples::ProcessCode ActsExamples::FatrasSimulation::execute(
   // run the simulation w/ a local random generator
   auto rng = m_cfg.randomNumbers->spawnGenerator(ctx);
   auto ret = m_sim->simulate(ctx.geoContext, ctx.magFieldContext, rng,
-                             inputParticles, particlesInitialUnordered,
+                             particlesInput, particlesInitialUnordered,
                              particlesFinalUnordered, simHitsUnordered);
   // fatal error leads to panic
   if (!ret.ok()) {
@@ -263,19 +261,23 @@ ActsExamples::ProcessCode ActsExamples::FatrasSimulation::execute(
              << " simulated particles (final state)");
   ACTS_DEBUG(simHitsUnordered.size() << " simulated hits");
 
+  if (particlesInitialUnordered.size() != particlesFinalUnordered.size()) {
+    ACTS_ERROR("number of initial and final state particles differ");
+  }
+
   // order output containers
 #if BOOST_VERSION >= 107800
-  SimParticleContainer particlesInitial(particlesInitialUnordered.begin(),
-                                        particlesInitialUnordered.end());
-  SimParticleContainer particlesFinal(particlesFinalUnordered.begin(),
-                                      particlesFinalUnordered.end());
+  SimParticleStateContainer particlesInitial(particlesInitialUnordered.begin(),
+                                             particlesInitialUnordered.end());
+  SimParticleStateContainer particlesFinal(particlesFinalUnordered.begin(),
+                                           particlesFinalUnordered.end());
   SimHitContainer simHits(simHitsUnordered.begin(), simHitsUnordered.end());
 #else
   // working around a nasty boost bug
   // https://github.com/boostorg/container/issues/244
 
-  SimParticleContainer particlesInitial;
-  SimParticleContainer particlesFinal;
+  SimParticleStateContainer particlesInitial;
+  SimParticleStateContainer particlesFinal;
   SimHitContainer simHits;
 
   particlesInitial.reserve(particlesInitialUnordered.size());
@@ -293,9 +295,24 @@ ActsExamples::ProcessCode ActsExamples::FatrasSimulation::execute(
   }
 #endif
 
+  SimParticleContainer particlesSimulated;
+  particlesSimulated.reserve(particlesInitial.size());
+  for (const auto &particleInitial : particlesInitial) {
+    SimParticle particleSimulated(particleInitial, particleInitial);
+
+    if (auto it = particlesFinal.find(particleInitial.particleId());
+        it != particlesFinal.end()) {
+      particleSimulated.final() = *it;
+    } else {
+      ACTS_ERROR("particle " << particleInitial.particleId()
+                             << " has no final state");
+    }
+
+    particlesSimulated.insert(particleSimulated);
+  }
+
   // store ordered output containers
-  m_outputParticlesInitial(ctx, std::move(particlesInitial));
-  m_outputParticlesFinal(ctx, std::move(particlesFinal));
+  m_outputParticles(ctx, std::move(particlesSimulated));
   m_outputSimHits(ctx, std::move(simHits));
 
   return ActsExamples::ProcessCode::SUCCESS;
diff --git a/Examples/Algorithms/Geant4/include/ActsExamples/DDG4/DDG4DetectorConstruction.hpp b/Examples/Algorithms/Geant4/include/ActsExamples/DDG4/DDG4DetectorConstruction.hpp
index 85237e94811..529a3725980 100644
--- a/Examples/Algorithms/Geant4/include/ActsExamples/DDG4/DDG4DetectorConstruction.hpp
+++ b/Examples/Algorithms/Geant4/include/ActsExamples/DDG4/DDG4DetectorConstruction.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2017-2024 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
diff --git a/Examples/Algorithms/Geant4/include/ActsExamples/Geant4/DetectorConstructionFactory.hpp b/Examples/Algorithms/Geant4/include/ActsExamples/Geant4/DetectorConstructionFactory.hpp
index ddf3a635d52..a0f5b3e41cd 100644
--- a/Examples/Algorithms/Geant4/include/ActsExamples/Geant4/DetectorConstructionFactory.hpp
+++ b/Examples/Algorithms/Geant4/include/ActsExamples/Geant4/DetectorConstructionFactory.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2023 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
diff --git a/Examples/Algorithms/Geant4/include/ActsExamples/Geant4/EventStore.hpp b/Examples/Algorithms/Geant4/include/ActsExamples/Geant4/EventStore.hpp
index 37202aaac52..a46512ce299 100644
--- a/Examples/Algorithms/Geant4/include/ActsExamples/Geant4/EventStore.hpp
+++ b/Examples/Algorithms/Geant4/include/ActsExamples/Geant4/EventStore.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2021-2024 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
@@ -33,11 +33,13 @@ struct EventStore {
   /// Use a std::set here because it allows for fast insertion and ensures
   /// uniqueness. Thus particle collisions are detected early.
   using ParticleContainer =
-      std::set<ActsFatras::Particle, ActsExamples::detail::CompareParticleId>;
+      std::set<SimParticle, ActsExamples::detail::CompareParticleId>;
 
-  /// Initial and final particle collections
+  /// Initial particle collection
   ParticleContainer particlesInitial;
-  ParticleContainer particlesFinal;
+
+  /// Simulated particle collection
+  ParticleContainer particlesSimulated;
 
   /// The hits in sensitive detectors
   SimHitContainer::sequence_type hits;
diff --git a/Examples/Algorithms/Geant4/include/ActsExamples/Geant4/GdmlDetectorConstruction.hpp b/Examples/Algorithms/Geant4/include/ActsExamples/Geant4/GdmlDetectorConstruction.hpp
index 5ce29404a01..24924bd7867 100644
--- a/Examples/Algorithms/Geant4/include/ActsExamples/Geant4/GdmlDetectorConstruction.hpp
+++ b/Examples/Algorithms/Geant4/include/ActsExamples/Geant4/GdmlDetectorConstruction.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2017-2024 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
diff --git a/Examples/Algorithms/Geant4/include/ActsExamples/Geant4/Geant4Manager.hpp b/Examples/Algorithms/Geant4/include/ActsExamples/Geant4/Geant4Manager.hpp
index b9d6f427547..c3db1c3f2fe 100644
--- a/Examples/Algorithms/Geant4/include/ActsExamples/Geant4/Geant4Manager.hpp
+++ b/Examples/Algorithms/Geant4/include/ActsExamples/Geant4/Geant4Manager.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2023 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
@@ -37,12 +37,11 @@ class Geant4Manager;
 /// and loading the Geant4 library which should reset it to its original state.
 struct Geant4Handle {
   std::mutex mutex;
-  int logLevel{};
   std::unique_ptr<G4RunManager> runManager;
   G4VUserPhysicsList *physicsList;
   std::string physicsListName;
 
-  Geant4Handle(int logLevel, std::unique_ptr<G4RunManager> runManager,
+  Geant4Handle(std::unique_ptr<G4RunManager> runManager,
                std::unique_ptr<G4VUserPhysicsList> physicsList,
                std::string physicsListName);
   Geant4Handle(const Geant4Handle &) = delete;
@@ -66,12 +65,11 @@ class Geant4Manager {
   std::shared_ptr<Geant4Handle> currentHandle() const;
 
   /// This can only be called once due to Geant4 limitations
-  std::shared_ptr<Geant4Handle> createHandle(int logLevel,
-                                             const std::string &physicsList);
+  std::shared_ptr<Geant4Handle> createHandle(const std::string &physicsList);
 
   /// This can only be called once due to Geant4 limitations
   std::shared_ptr<Geant4Handle> createHandle(
-      int logLevel, std::unique_ptr<G4VUserPhysicsList> physicsList,
+      std::unique_ptr<G4VUserPhysicsList> physicsList,
       std::string physicsListName);
 
   /// Registers a named physics list factory to the manager for easy
diff --git a/Examples/Algorithms/Geant4/include/ActsExamples/Geant4/Geant4Simulation.hpp b/Examples/Algorithms/Geant4/include/ActsExamples/Geant4/Geant4Simulation.hpp
index 5a9dc05bd04..f735dcd3859 100644
--- a/Examples/Algorithms/Geant4/include/ActsExamples/Geant4/Geant4Simulation.hpp
+++ b/Examples/Algorithms/Geant4/include/ActsExamples/Geant4/Geant4Simulation.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2017-2021 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
@@ -118,11 +118,8 @@ class Geant4Simulation final : public Geant4SimulationBase {
     /// Name of the output collection : hits
     std::string outputSimHits = "simhits";
 
-    /// Name of the output collection : initial particles
-    std::string outputParticlesInitial = "particles_initial";
-
-    /// Name of the output collection : final particles
-    std::string outputParticlesFinal = "particles_final";
+    /// Name of the output collection : simulated particles
+    std::string outputParticles = "particles_simulated";
 
     /// The ACTS sensitive surfaces in a mapper, used for hit creation
     std::shared_ptr<const SensitiveSurfaceMapper> sensitiveSurfaceMapper =
@@ -134,14 +131,12 @@ class Geant4Simulation final : public Geant4SimulationBase {
     /// If a physics list has to be instantiated this one is chosen.
     std::string physicsList = "FTFP_BERT";
 
-    std::vector<std::string> volumeMappings;
-
-    std::vector<std::string> materialMappings = {"Silicon"};
-
     std::shared_ptr<const Acts::Volume> killVolume;
     double killAfterTime = std::numeric_limits<double>::infinity();
     bool killSecondaries = false;
 
+    bool recordHitsOfNeutrals = false;
+
     bool recordHitsOfSecondaries = true;
 
     bool keepParticlesWithoutHits = true;
@@ -172,10 +167,8 @@ class Geant4Simulation final : public Geant4SimulationBase {
   std::unique_ptr<G4MagneticField> m_magneticField;
   std::unique_ptr<G4FieldManager> m_fieldManager;
 
-  WriteDataHandle<SimParticleContainer> m_outputParticlesInitial{
-      this, "OutputParticlesInitial"};
-  WriteDataHandle<SimParticleContainer> m_outputParticlesFinal{
-      this, "OutputParticlesFinal"};
+  WriteDataHandle<SimParticleContainer> m_outputParticles{this,
+                                                          "OutputParticles"};
   WriteDataHandle<SimHitContainer> m_outputSimHits{this, "OutputSimHIts"};
 };
 
diff --git a/Examples/Algorithms/Geant4/include/ActsExamples/Geant4/MagneticFieldWrapper.hpp b/Examples/Algorithms/Geant4/include/ActsExamples/Geant4/MagneticFieldWrapper.hpp
index 84e4060ed33..a73663fb503 100644
--- a/Examples/Algorithms/Geant4/include/ActsExamples/Geant4/MagneticFieldWrapper.hpp
+++ b/Examples/Algorithms/Geant4/include/ActsExamples/Geant4/MagneticFieldWrapper.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2021 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
diff --git a/Examples/Algorithms/Geant4/include/ActsExamples/Geant4/MaterialPhysicsList.hpp b/Examples/Algorithms/Geant4/include/ActsExamples/Geant4/MaterialPhysicsList.hpp
index 79861cac819..9cfb45d0453 100644
--- a/Examples/Algorithms/Geant4/include/ActsExamples/Geant4/MaterialPhysicsList.hpp
+++ b/Examples/Algorithms/Geant4/include/ActsExamples/Geant4/MaterialPhysicsList.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2021 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
@@ -29,9 +29,9 @@ class MaterialPhysicsList final : public G4VUserPhysicsList {
   ///
   /// @param cfg the configuration struct for this Stepping action
   /// @param logger is an Acts::Logger for unique logging
-  MaterialPhysicsList(std::unique_ptr<const Acts::Logger> logger =
-                          Acts::getDefaultLogger("MaterialPhysicsList",
-                                                 Acts::Logging::INFO));
+  explicit MaterialPhysicsList(std::unique_ptr<const Acts::Logger> logger =
+                                   Acts::getDefaultLogger("MaterialPhysicsList",
+                                                          Acts::Logging::INFO));
   ~MaterialPhysicsList() override = default;
 
   /// @brief Interface particle construction method
diff --git a/Examples/Algorithms/Geant4/include/ActsExamples/Geant4/MaterialSteppingAction.hpp b/Examples/Algorithms/Geant4/include/ActsExamples/Geant4/MaterialSteppingAction.hpp
index 9713f427b21..8b21c41a7ce 100644
--- a/Examples/Algorithms/Geant4/include/ActsExamples/Geant4/MaterialSteppingAction.hpp
+++ b/Examples/Algorithms/Geant4/include/ActsExamples/Geant4/MaterialSteppingAction.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2017-2021 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
diff --git a/Examples/Algorithms/Geant4/include/ActsExamples/Geant4/ParticleKillAction.hpp b/Examples/Algorithms/Geant4/include/ActsExamples/Geant4/ParticleKillAction.hpp
index 7802760e739..4eb45d4f6ec 100644
--- a/Examples/Algorithms/Geant4/include/ActsExamples/Geant4/ParticleKillAction.hpp
+++ b/Examples/Algorithms/Geant4/include/ActsExamples/Geant4/ParticleKillAction.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2023-2024 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
diff --git a/Examples/Algorithms/Geant4/include/ActsExamples/Geant4/ParticleTrackingAction.hpp b/Examples/Algorithms/Geant4/include/ActsExamples/Geant4/ParticleTrackingAction.hpp
index 1c724cad7c7..acf07ec75dc 100644
--- a/Examples/Algorithms/Geant4/include/ActsExamples/Geant4/ParticleTrackingAction.hpp
+++ b/Examples/Algorithms/Geant4/include/ActsExamples/Geant4/ParticleTrackingAction.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2021 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
@@ -62,11 +62,12 @@ class ParticleTrackingAction : public G4UserTrackingAction {
   Config m_cfg;
 
  private:
-  /// Convert a G4Track to a SimParticle
+  /// Convert a G4Track to a SimParticleState
   ///
   /// @param aTrack the current Geant4 track
   /// @param particleId the particle ID the particle will have
-  SimParticle convert(const G4Track& aTrack, SimBarcode particleId) const;
+  /// @return SimParticleState the converted particle state
+  SimParticleState convert(const G4Track& aTrack, SimBarcode particleId) const;
 
   /// Make the particle id
   std::optional<SimBarcode> makeParticleId(G4int trackId, G4int parentId) const;
diff --git a/Examples/Algorithms/Geant4/include/ActsExamples/Geant4/PhysicsListFactory.hpp b/Examples/Algorithms/Geant4/include/ActsExamples/Geant4/PhysicsListFactory.hpp
index a69ea9da91a..6bbc39b4f04 100644
--- a/Examples/Algorithms/Geant4/include/ActsExamples/Geant4/PhysicsListFactory.hpp
+++ b/Examples/Algorithms/Geant4/include/ActsExamples/Geant4/PhysicsListFactory.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2023 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
@@ -28,7 +28,7 @@ class PhysicsListFactoryFunction final : public PhysicsListFactory {
  public:
   using Function = std::function<std::unique_ptr<G4VUserPhysicsList>()>;
 
-  PhysicsListFactoryFunction(Function function);
+  explicit PhysicsListFactoryFunction(Function function);
 
   std::unique_ptr<G4VUserPhysicsList> factorize() const final;
 
diff --git a/Examples/Algorithms/Geant4/include/ActsExamples/Geant4/RegionCreator.hpp b/Examples/Algorithms/Geant4/include/ActsExamples/Geant4/RegionCreator.hpp
index 873859a27b1..b141948ec90 100644
--- a/Examples/Algorithms/Geant4/include/ActsExamples/Geant4/RegionCreator.hpp
+++ b/Examples/Algorithms/Geant4/include/ActsExamples/Geant4/RegionCreator.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2024 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
diff --git a/Examples/Algorithms/Geant4/include/ActsExamples/Geant4/SensitiveSteppingAction.hpp b/Examples/Algorithms/Geant4/include/ActsExamples/Geant4/SensitiveSteppingAction.hpp
index 0d7ceaf96f6..664522349df 100644
--- a/Examples/Algorithms/Geant4/include/ActsExamples/Geant4/SensitiveSteppingAction.hpp
+++ b/Examples/Algorithms/Geant4/include/ActsExamples/Geant4/SensitiveSteppingAction.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2021 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
diff --git a/Examples/Algorithms/Geant4/include/ActsExamples/Geant4/SensitiveSurfaceMapper.hpp b/Examples/Algorithms/Geant4/include/ActsExamples/Geant4/SensitiveSurfaceMapper.hpp
index bdb1f3753a0..60f86d0d4e3 100644
--- a/Examples/Algorithms/Geant4/include/ActsExamples/Geant4/SensitiveSurfaceMapper.hpp
+++ b/Examples/Algorithms/Geant4/include/ActsExamples/Geant4/SensitiveSurfaceMapper.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2021 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
@@ -28,34 +28,37 @@ class Surface;
 
 namespace ActsExamples {
 
-// Helper struct to find the sensitive surface candidates
-struct SensitiveCandidates {
-  std::shared_ptr<const Acts::TrackingGeometry> trackingGeometry = nullptr;
-  /// Find the sensitive surfaces for a given position
+struct SensitiveCandidatesBase {
+  /// Get the sensitive surfaces for a given position
   ///
-  /// This fulfills the concept of a SensitiveCandidates
+  /// @param gctx the geometry context
+  /// @param position the position to look for sensitive surfaces
+  ///
+  /// @return a vector of sensitive surfaces
+  virtual std::vector<const Acts::Surface*> queryPosition(
+      const Acts::GeometryContext& gctx,
+      const Acts::Vector3& position) const = 0;
+
+  /// Get all sensitive surfaces
   ///
   /// @param gctx the geometry context
   /// @param position the position to look for sensitive surfaces
   ///
   /// @return a vector of sensitive surfaces
-  std::vector<const Acts::Surface*> operator()(
-      const Acts::GeometryContext& gctx, const Acts::Vector3& position) const {
-    std::vector<const Acts::Surface*> surfaces;
-
-    if (trackingGeometry != nullptr) {
-      auto layer = trackingGeometry->associatedLayer(gctx, position);
-
-      if (layer->surfaceArray() != nullptr) {
-        for (const auto& surface : layer->surfaceArray()->surfaces()) {
-          if (surface->associatedDetectorElement() != nullptr) {
-            surfaces.push_back(surface);
-          }
-        }
-      }
-    }
-    return surfaces;
-  }
+  virtual std::vector<const Acts::Surface*> queryAll() const = 0;
+
+  virtual ~SensitiveCandidatesBase() = default;
+};
+
+/// Implementation of the SensitiveCandidates for Gen1 geometry
+struct SensitiveCandidates : public SensitiveCandidatesBase {
+  std::shared_ptr<const Acts::TrackingGeometry> trackingGeometry = nullptr;
+
+  std::vector<const Acts::Surface*> queryPosition(
+      const Acts::GeometryContext& gctx,
+      const Acts::Vector3& position) const override;
+
+  std::vector<const Acts::Surface*> queryAll() const override;
 };
 
 /// This Mapper takes a (non-const) Geant4 geometry and maps
@@ -72,9 +75,6 @@ class SensitiveSurfaceMapper {
   /// This prefix is used to indicate a sensitive volume that is matched
   constexpr static std::string_view mappingPrefix = "ActsSensitive#";
 
-  using SensitiveCandidates = std::function<std::vector<const Acts::Surface*>(
-      const Acts::GeometryContext&, const Acts::Vector3&)>;
-
   /// Configuration struct for the surface mapper
   struct Config {
     /// For which G4 material names we try to find a mapping
@@ -84,7 +84,7 @@ class SensitiveSurfaceMapper {
     std::vector<std::string> volumeMappings;
 
     /// The sensitive surfaces that are being mapped to
-    SensitiveCandidates candidateSurfaces;
+    std::shared_ptr<SensitiveCandidatesBase> candidateSurfaces;
   };
 
   /// State object that coutns the assignments and makes
@@ -94,6 +94,10 @@ class SensitiveSurfaceMapper {
     /// there can be replicas)
     std::multimap<const G4VPhysicalVolume*, const Acts::Surface*>
         g4VolumeToSurfaces;
+
+    /// Record of the missing volumes
+    std::vector<std::pair<const G4VPhysicalVolume*, Acts::Transform3>>
+        missingVolumes;
   };
 
   /// Constructor with:
@@ -118,6 +122,20 @@ class SensitiveSurfaceMapper {
                            G4VPhysicalVolume* g4PhysicalVolume,
                            const Acts::Transform3& motherTransform) const;
 
+  /// Function that checks the success of the mapping, and exposes
+  /// some additional information for debugging
+  ///
+  /// @param state state object after a call to remapSensitiveNames
+  /// @param gctx the geometry context
+  /// @param writeMissingG4VolsAsObj write the Geant4 volumes that are
+  /// not mapped to 'missing_g4_volumes.obj' in the working directory
+  /// @param writeMissingSurfacesAsObj write the sensitive surfaces that
+  /// where not mapped to 'missing_acts_surfaces.obj' in the working directory
+  /// @return Returns true only if all sensitive surfaces where mapped
+  bool checkMapping(const State& state, const Acts::GeometryContext& gctx,
+                    bool writeMissingG4VolsAsObj = false,
+                    bool writeMissingSurfacesAsObj = false) const;
+
  protected:
   /// Configuration object
   Config m_cfg;
diff --git a/Examples/Algorithms/Geant4/include/ActsExamples/Geant4/SimParticleTranslation.hpp b/Examples/Algorithms/Geant4/include/ActsExamples/Geant4/SimParticleTranslation.hpp
index 9dbd29771c3..8a20f91ae39 100644
--- a/Examples/Algorithms/Geant4/include/ActsExamples/Geant4/SimParticleTranslation.hpp
+++ b/Examples/Algorithms/Geant4/include/ActsExamples/Geant4/SimParticleTranslation.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2017-2021 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
diff --git a/Examples/Algorithms/Geant4/include/ActsExamples/Geant4/SteppingActionList.hpp b/Examples/Algorithms/Geant4/include/ActsExamples/Geant4/SteppingActionList.hpp
index fab420cce26..b4a6d7e5d68 100644
--- a/Examples/Algorithms/Geant4/include/ActsExamples/Geant4/SteppingActionList.hpp
+++ b/Examples/Algorithms/Geant4/include/ActsExamples/Geant4/SteppingActionList.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2023 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
@@ -28,7 +28,7 @@ class SteppingActionList : public G4UserSteppingAction {
     std::vector<std::shared_ptr<G4UserSteppingAction>> actions;
   };
 
-  SteppingActionList(const Config &cfg) : m_cfg(cfg) {}
+  explicit SteppingActionList(const Config &cfg) : m_cfg(cfg) {}
 
   void UserSteppingAction(const G4Step *step) override {
     for (const auto &action : m_cfg.actions) {
diff --git a/Examples/Algorithms/Geant4/include/ActsExamples/GeoModelG4/GeoModelDetectorConstruction.hpp b/Examples/Algorithms/Geant4/include/ActsExamples/GeoModelG4/GeoModelDetectorConstruction.hpp
index 38bfef2ef8e..a919d2866b0 100644
--- a/Examples/Algorithms/Geant4/include/ActsExamples/GeoModelG4/GeoModelDetectorConstruction.hpp
+++ b/Examples/Algorithms/Geant4/include/ActsExamples/GeoModelG4/GeoModelDetectorConstruction.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2024 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
diff --git a/Examples/Algorithms/Geant4/include/ActsExamples/TelescopeDetector/TelescopeG4DetectorConstruction.hpp b/Examples/Algorithms/Geant4/include/ActsExamples/TelescopeDetector/TelescopeG4DetectorConstruction.hpp
index cc3583a53c5..66fc363fe53 100644
--- a/Examples/Algorithms/Geant4/include/ActsExamples/TelescopeDetector/TelescopeG4DetectorConstruction.hpp
+++ b/Examples/Algorithms/Geant4/include/ActsExamples/TelescopeDetector/TelescopeG4DetectorConstruction.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2022-2024 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
diff --git a/Examples/Algorithms/Geant4/src/DDG4DetectorConstruction.cpp b/Examples/Algorithms/Geant4/src/DDG4DetectorConstruction.cpp
index a09314c919c..ae6a4609180 100644
--- a/Examples/Algorithms/Geant4/src/DDG4DetectorConstruction.cpp
+++ b/Examples/Algorithms/Geant4/src/DDG4DetectorConstruction.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2017-2024 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include "ActsExamples/DDG4/DDG4DetectorConstruction.hpp"
 
diff --git a/Examples/Algorithms/Geant4/src/GdmlDetectorConstruction.cpp b/Examples/Algorithms/Geant4/src/GdmlDetectorConstruction.cpp
index b2846f33a3b..5a10933bb3f 100644
--- a/Examples/Algorithms/Geant4/src/GdmlDetectorConstruction.cpp
+++ b/Examples/Algorithms/Geant4/src/GdmlDetectorConstruction.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2017-2024 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include "ActsExamples/Geant4/GdmlDetectorConstruction.hpp"
 
diff --git a/Examples/Algorithms/Geant4/src/Geant4Manager.cpp b/Examples/Algorithms/Geant4/src/Geant4Manager.cpp
index ffadf6e2b18..fb981704561 100644
--- a/Examples/Algorithms/Geant4/src/Geant4Manager.cpp
+++ b/Examples/Algorithms/Geant4/src/Geant4Manager.cpp
@@ -1,13 +1,14 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2023-2024 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include "ActsExamples/Geant4/Geant4Manager.hpp"
 
+#include "ActsExamples/Geant4/MaterialPhysicsList.hpp"
 #include "ActsExamples/Geant4/PhysicsListFactory.hpp"
 
 #include <memory>
@@ -31,12 +32,10 @@
 
 namespace ActsExamples {
 
-Geant4Handle::Geant4Handle(int _logLevel,
-                           std::unique_ptr<G4RunManager> _runManager,
+Geant4Handle::Geant4Handle(std::unique_ptr<G4RunManager> _runManager,
                            std::unique_ptr<G4VUserPhysicsList> _physicsList,
                            std::string _physicsListName)
-    : logLevel(_logLevel),
-      runManager(std::move(_runManager)),
+    : runManager(std::move(_runManager)),
       physicsList(_physicsList.release()),
       physicsListName(std::move(_physicsListName)) {
   if (runManager == nullptr) {
@@ -81,12 +80,12 @@ std::shared_ptr<Geant4Handle> Geant4Manager::currentHandle() const {
 }
 
 std::shared_ptr<Geant4Handle> Geant4Manager::createHandle(
-    int logLevel, const std::string& physicsList) {
-  return createHandle(logLevel, createPhysicsList(physicsList), physicsList);
+    const std::string& physicsList) {
+  return createHandle(createPhysicsList(physicsList), physicsList);
 }
 
 std::shared_ptr<Geant4Handle> Geant4Manager::createHandle(
-    int logLevel, std::unique_ptr<G4VUserPhysicsList> physicsList,
+    std::unique_ptr<G4VUserPhysicsList> physicsList,
     std::string physicsListName) {
   if (!m_handle.expired()) {
     throw std::runtime_error("creating a second handle is prohibited");
@@ -100,7 +99,7 @@ std::shared_ptr<Geant4Handle> Geant4Manager::createHandle(
   auto runManager = std::unique_ptr<G4RunManager>(
       G4RunManagerFactory::CreateRunManager(G4RunManagerType::SerialOnly));
 
-  auto handle = std::make_shared<Geant4Handle>(logLevel, std::move(runManager),
+  auto handle = std::make_shared<Geant4Handle>(std::move(runManager),
                                                std::move(physicsList),
                                                std::move(physicsListName));
 
@@ -111,7 +110,7 @@ std::shared_ptr<Geant4Handle> Geant4Manager::createHandle(
 
 void Geant4Manager::registerPhysicsListFactory(
     std::string name, std::shared_ptr<PhysicsListFactory> physicsListFactory) {
-  if (m_physicsListFactories.find(name) != m_physicsListFactories.end()) {
+  if (m_physicsListFactories.contains(name)) {
     throw std::invalid_argument("name already mapped");
   }
   m_physicsListFactories.emplace(std::move(name),
@@ -139,6 +138,10 @@ Geant4Manager::Geant4Manager() {
   registerPhysicsListFactory(
       "FTFP_BERT_ATL", std::make_shared<PhysicsListFactoryFunction>(
                            []() { return std::make_unique<FTFP_BERT_ATL>(); }));
+  registerPhysicsListFactory("MaterialPhysicsList",
+                             std::make_shared<PhysicsListFactoryFunction>([]() {
+                               return std::make_unique<MaterialPhysicsList>();
+                             }));
 }
 
 Geant4Manager::~Geant4Manager() = default;
diff --git a/Examples/Algorithms/Geant4/src/Geant4Simulation.cpp b/Examples/Algorithms/Geant4/src/Geant4Simulation.cpp
index bf13136e376..795ddad78fa 100644
--- a/Examples/Algorithms/Geant4/src/Geant4Simulation.cpp
+++ b/Examples/Algorithms/Geant4/src/Geant4Simulation.cpp
@@ -1,17 +1,16 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2021-2024 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include "ActsExamples/Geant4/Geant4Simulation.hpp"
 
 #include "Acts/Definitions/Algebra.hpp"
 #include "Acts/Plugins/FpeMonitoring/FpeMonitor.hpp"
 #include "Acts/Utilities/Logger.hpp"
-#include "Acts/Utilities/MultiIndex.hpp"
 #include "ActsExamples/Framework/AlgorithmContext.hpp"
 #include "ActsExamples/Framework/IAlgorithm.hpp"
 #include "ActsExamples/Framework/RandomNumbers.hpp"
@@ -28,12 +27,8 @@
 #include "ActsExamples/Geant4/SensitiveSurfaceMapper.hpp"
 #include "ActsExamples/Geant4/SimParticleTranslation.hpp"
 #include "ActsExamples/Geant4/SteppingActionList.hpp"
-#include "ActsFatras/EventData/Barcode.hpp"
 
-#include <cassert>
-#include <cstddef>
 #include <iostream>
-#include <map>
 #include <stdexcept>
 #include <utility>
 
@@ -90,6 +85,8 @@ void ActsExamples::Geant4SimulationBase::commonInitialization() {
     runManager().SetUserInitialization(m_detectorConstruction);
     runManager().InitializeGeometry();
   }
+
+  m_geant4Instance->tweakLogging(m_geant4Level);
 }
 
 G4RunManager& ActsExamples::Geant4SimulationBase::runManager() const {
@@ -133,14 +130,6 @@ ActsExamples::ProcessCode ActsExamples::Geant4SimulationBase::execute(
     runManager().BeamOn(1);
   }
 
-  // Since these are std::set, this ensures that each particle is in both sets
-  throw_assert(
-      eventStore().particlesInitial.size() ==
-          eventStore().particlesFinal.size(),
-      "initial and final particle collections does not have the same size: "
-          << eventStore().particlesInitial.size() << " vs "
-          << eventStore().particlesFinal.size());
-
   // Print out warnings about possible particle collision if happened
   if (eventStore().particleIdCollisionsInitial > 0 ||
       eventStore().particleIdCollisionsFinal > 0 ||
@@ -175,10 +164,10 @@ ActsExamples::Geant4SimulationBase::geant4Handle() const {
 ActsExamples::Geant4Simulation::Geant4Simulation(const Config& cfg,
                                                  Acts::Logging::Level level)
     : Geant4SimulationBase(cfg, "Geant4Simulation", level), m_cfg(cfg) {
-  m_geant4Instance = m_cfg.geant4Handle
-                         ? m_cfg.geant4Handle
-                         : Geant4Manager::instance().createHandle(
-                               m_geant4Level, m_cfg.physicsList);
+  m_geant4Instance =
+      m_cfg.geant4Handle
+          ? m_cfg.geant4Handle
+          : Geant4Manager::instance().createHandle(m_cfg.physicsList);
   if (m_geant4Instance->physicsListName != m_cfg.physicsList) {
     throw std::runtime_error("inconsistent physics list");
   }
@@ -232,7 +221,7 @@ ActsExamples::Geant4Simulation::Geant4Simulation(const Config& cfg,
     SensitiveSteppingAction::Config stepCfg;
     stepCfg.eventStore = m_eventStore;
     stepCfg.charged = true;
-    stepCfg.neutral = false;
+    stepCfg.neutral = cfg.recordHitsOfNeutrals;
     stepCfg.primary = true;
     stepCfg.secondary = cfg.recordHitsOfSecondaries;
 
@@ -282,8 +271,13 @@ ActsExamples::Geant4Simulation::Geant4Simulation(const Config& cfg,
         "Remapping selected volumes from Geant4 to Acts::Surface::GeometryID");
     cfg.sensitiveSurfaceMapper->remapSensitiveNames(
         sState, Acts::GeometryContext{}, g4World, Acts::Transform3::Identity());
-    ACTS_INFO("Remapping successful for " << sState.g4VolumeToSurfaces.size()
-                                          << " selected volumes.");
+
+    auto allSurfacesMapped = cfg.sensitiveSurfaceMapper->checkMapping(
+        sState, Acts::GeometryContext{}, false, false);
+    if (!allSurfacesMapped) {
+      ACTS_WARNING(
+          "Not all sensitive surfaces have been mapped to Geant4 volumes!");
+    }
 
     sensitiveSteppingActionAccess->assignSurfaceMapping(
         sState.g4VolumeToSurfaces);
@@ -291,23 +285,22 @@ ActsExamples::Geant4Simulation::Geant4Simulation(const Config& cfg,
 
   m_inputParticles.initialize(cfg.inputParticles);
   m_outputSimHits.initialize(cfg.outputSimHits);
-  m_outputParticlesInitial.initialize(cfg.outputParticlesInitial);
-  m_outputParticlesFinal.initialize(cfg.outputParticlesFinal);
+  m_outputParticles.initialize(cfg.outputParticles);
 }
 
 ActsExamples::Geant4Simulation::~Geant4Simulation() = default;
 
 ActsExamples::ProcessCode ActsExamples::Geant4Simulation::execute(
     const ActsExamples::AlgorithmContext& ctx) const {
-  Geant4SimulationBase::execute(ctx);
+  auto ret = Geant4SimulationBase::execute(ctx);
+  if (ret != ProcessCode::SUCCESS) {
+    return ret;
+  }
 
   // Output handling: Simulation
-  m_outputParticlesInitial(
-      ctx, SimParticleContainer(eventStore().particlesInitial.begin(),
-                                eventStore().particlesInitial.end()));
-  m_outputParticlesFinal(
-      ctx, SimParticleContainer(eventStore().particlesFinal.begin(),
-                                eventStore().particlesFinal.end()));
+  m_outputParticles(
+      ctx, SimParticleContainer(eventStore().particlesSimulated.begin(),
+                                eventStore().particlesSimulated.end()));
 
 #if BOOST_VERSION < 107800
   SimHitContainer container;
@@ -331,7 +324,6 @@ ActsExamples::Geant4MaterialRecording::Geant4MaterialRecording(
       m_cfg.geant4Handle
           ? m_cfg.geant4Handle
           : Geant4Manager::instance().createHandle(
-                m_geant4Level,
                 std::make_unique<MaterialPhysicsList>(
                     m_logger->cloneWithSuffix("MaterialPhysicsList")),
                 physicsListName);
@@ -401,7 +393,10 @@ ActsExamples::Geant4MaterialRecording::~Geant4MaterialRecording() = default;
 
 ActsExamples::ProcessCode ActsExamples::Geant4MaterialRecording::execute(
     const ActsExamples::AlgorithmContext& ctx) const {
-  Geant4SimulationBase::execute(ctx);
+  const auto ret = Geant4SimulationBase::execute(ctx);
+  if (ret != ProcessCode::SUCCESS) {
+    return ret;
+  }
 
   // Output handling: Material tracks
   m_outputMaterialTracks(
diff --git a/Examples/Algorithms/Geant4/src/GeoModelDetectorConstruction.cpp b/Examples/Algorithms/Geant4/src/GeoModelDetectorConstruction.cpp
index 0447d6acf19..c3ad0eea6de 100644
--- a/Examples/Algorithms/Geant4/src/GeoModelDetectorConstruction.cpp
+++ b/Examples/Algorithms/Geant4/src/GeoModelDetectorConstruction.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2024 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include "ActsExamples/GeoModelG4/GeoModelDetectorConstruction.hpp"
 
diff --git a/Examples/Algorithms/Geant4/src/MagneticFieldWrapper.cpp b/Examples/Algorithms/Geant4/src/MagneticFieldWrapper.cpp
index 580d75f03ed..33f15fa6586 100644
--- a/Examples/Algorithms/Geant4/src/MagneticFieldWrapper.cpp
+++ b/Examples/Algorithms/Geant4/src/MagneticFieldWrapper.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2021 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include "ActsExamples/Geant4/MagneticFieldWrapper.hpp"
 
diff --git a/Examples/Algorithms/Geant4/src/MaterialPhysicsList.cpp b/Examples/Algorithms/Geant4/src/MaterialPhysicsList.cpp
index f91da093ccb..d115e9e1794 100644
--- a/Examples/Algorithms/Geant4/src/MaterialPhysicsList.cpp
+++ b/Examples/Algorithms/Geant4/src/MaterialPhysicsList.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2021 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include "ActsExamples/Geant4/MaterialPhysicsList.hpp"
 
diff --git a/Examples/Algorithms/Geant4/src/MaterialSteppingAction.cpp b/Examples/Algorithms/Geant4/src/MaterialSteppingAction.cpp
index f95b50a19a0..c4f0e6528bd 100644
--- a/Examples/Algorithms/Geant4/src/MaterialSteppingAction.cpp
+++ b/Examples/Algorithms/Geant4/src/MaterialSteppingAction.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2021 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include "ActsExamples/Geant4/MaterialSteppingAction.hpp"
 
@@ -97,7 +97,7 @@ void ActsExamples::MaterialSteppingAction::UserSteppingAction(
   G4Track* g4Track = step->GetTrack();
   std::size_t trackID = g4Track->GetTrackID();
   auto& materialTracks = eventStore().materialTracks;
-  if (materialTracks.find(trackID - 1) == materialTracks.end()) {
+  if (!materialTracks.contains(trackID - 1)) {
     Acts::RecordedMaterialTrack rmTrack;
     const auto& g4Vertex = g4Track->GetVertexPosition();
     Acts::Vector3 vertex(g4Vertex[0], g4Vertex[1], g4Vertex[2]);
diff --git a/Examples/Algorithms/Geant4/src/ParticleKillAction.cpp b/Examples/Algorithms/Geant4/src/ParticleKillAction.cpp
index c27aeb87fd9..5090a74dafa 100644
--- a/Examples/Algorithms/Geant4/src/ParticleKillAction.cpp
+++ b/Examples/Algorithms/Geant4/src/ParticleKillAction.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2021-2024 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include "ActsExamples/Geant4/ParticleKillAction.hpp"
 
diff --git a/Examples/Algorithms/Geant4/src/ParticleTrackingAction.cpp b/Examples/Algorithms/Geant4/src/ParticleTrackingAction.cpp
index f8e0e2139eb..ba59debc893 100644
--- a/Examples/Algorithms/Geant4/src/ParticleTrackingAction.cpp
+++ b/Examples/Algorithms/Geant4/src/ParticleTrackingAction.cpp
@@ -1,19 +1,19 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2021-2024 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include "ActsExamples/Geant4/ParticleTrackingAction.hpp"
 
 #include "Acts/Definitions/PdgParticle.hpp"
 #include "Acts/Definitions/Units.hpp"
 #include "Acts/Utilities/MultiIndex.hpp"
+#include "ActsExamples/EventData/SimParticle.hpp"
 #include "ActsExamples/Geant4/EventStore.hpp"
 #include "ActsFatras/EventData/Barcode.hpp"
-#include "ActsFatras/EventData/Particle.hpp"
 
 #include <cassert>
 #include <ostream>
@@ -50,7 +50,8 @@ void ActsExamples::ParticleTrackingAction::PreUserTrackingAction(
     return;
   }
 
-  auto particle = convert(*aTrack, *barcode);
+  auto fatrasParticle = convert(*aTrack, *barcode);
+  SimParticle particle(fatrasParticle, fatrasParticle);
   auto [it, success] = eventStore().particlesInitial.insert(particle);
 
   // Only register particle at the initial state AND if there is no particle ID
@@ -67,10 +68,9 @@ void ActsExamples::ParticleTrackingAction::PreUserTrackingAction(
 
 void ActsExamples::ParticleTrackingAction::PostUserTrackingAction(
     const G4Track* aTrack) {
-  // The initial particle maybe was not registered because a particle ID
+  // The initial particle maybe was not registered because of a particle ID
   // collision
-  if (eventStore().trackIdMapping.find(aTrack->GetTrackID()) ==
-      eventStore().trackIdMapping.end()) {
+  if (!eventStore().trackIdMapping.contains(aTrack->GetTrackID())) {
     ACTS_WARNING("Particle ID for track ID " << aTrack->GetTrackID()
                                              << " not registered. Skip");
     return;
@@ -78,19 +78,26 @@ void ActsExamples::ParticleTrackingAction::PostUserTrackingAction(
 
   const auto barcode = eventStore().trackIdMapping.at(aTrack->GetTrackID());
 
-  auto hasHits = eventStore().particleHitCount.find(barcode) !=
-                     eventStore().particleHitCount.end() &&
+  auto hasHits = eventStore().particleHitCount.contains(barcode) &&
                  eventStore().particleHitCount.at(barcode) > 0;
 
   if (!m_cfg.keepParticlesWithoutHits && !hasHits) {
-    [[maybe_unused]] auto n = eventStore().particlesInitial.erase(
-        ActsExamples::SimParticle{barcode, Acts::PdgParticle::eInvalid});
+    [[maybe_unused]] auto n = eventStore().particlesSimulated.erase(
+        ActsExamples::SimParticle(barcode, Acts::PdgParticle::eInvalid));
     assert(n == 1);
     return;
   }
 
-  auto particle = convert(*aTrack, barcode);
-  auto [it, success] = eventStore().particlesFinal.insert(particle);
+  auto particleIt = eventStore().particlesInitial.find(barcode);
+  if (particleIt == eventStore().particlesInitial.end()) {
+    ACTS_WARNING("Particle ID " << barcode
+                                << " not found in initial particles");
+    return;
+  }
+  SimParticle particle = *particleIt;
+  particle.final() = convert(*aTrack, barcode);
+
+  auto [it, success] = eventStore().particlesSimulated.insert(particle);
 
   if (!success) {
     eventStore().particleIdCollisionsFinal++;
@@ -100,7 +107,7 @@ void ActsExamples::ParticleTrackingAction::PostUserTrackingAction(
   }
 }
 
-ActsExamples::SimParticle ActsExamples::ParticleTrackingAction::convert(
+ActsExamples::SimParticleState ActsExamples::ParticleTrackingAction::convert(
     const G4Track& aTrack, SimBarcode particleId) const {
   // Unit conversions G4->::ACTS
   constexpr double convertTime = Acts::UnitConstants::ns / CLHEP::ns;
@@ -131,8 +138,7 @@ ActsExamples::SimParticle ActsExamples::ParticleTrackingAction::convert(
   }
 
   // Now create the Particle
-  ActsExamples::SimParticle aParticle(particleId, Acts::PdgParticle{pdg},
-                                      charge, mass);
+  SimParticleState aParticle(particleId, Acts::PdgParticle{pdg}, charge, mass);
   aParticle.setPosition4(pPosition[0], pPosition[1], pPosition[2], pTime);
   aParticle.setDirection(pDirection[0], pDirection[1], pDirection[2]);
   aParticle.setAbsoluteMomentum(p);
@@ -146,13 +152,11 @@ ActsExamples::ParticleTrackingAction::makeParticleId(G4int trackId,
                                                      G4int parentId) const {
   // We already have this particle registered (it is one of the input particles
   // or we are making a final particle state)
-  if (eventStore().trackIdMapping.find(trackId) !=
-      eventStore().trackIdMapping.end()) {
+  if (eventStore().trackIdMapping.contains(trackId)) {
     return std::nullopt;
   }
 
-  if (eventStore().trackIdMapping.find(parentId) ==
-      eventStore().trackIdMapping.end()) {
+  if (!eventStore().trackIdMapping.contains(parentId)) {
     ACTS_DEBUG("Parent particle " << parentId
                                   << " not registered, cannot build barcode");
     eventStore().parentIdNotFound++;
diff --git a/Examples/Algorithms/Geant4/src/PhysicsListFactory.cpp b/Examples/Algorithms/Geant4/src/PhysicsListFactory.cpp
index 137046c543a..95866efa188 100644
--- a/Examples/Algorithms/Geant4/src/PhysicsListFactory.cpp
+++ b/Examples/Algorithms/Geant4/src/PhysicsListFactory.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2023 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include "ActsExamples/Geant4/PhysicsListFactory.hpp"
 
diff --git a/Examples/Algorithms/Geant4/src/RegionCreator.cpp b/Examples/Algorithms/Geant4/src/RegionCreator.cpp
index f5d5fe3d7d4..4e3384a98b7 100644
--- a/Examples/Algorithms/Geant4/src/RegionCreator.cpp
+++ b/Examples/Algorithms/Geant4/src/RegionCreator.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2024 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include "ActsExamples/Geant4/RegionCreator.hpp"
 
diff --git a/Examples/Algorithms/Geant4/src/SensitiveSteppingAction.cpp b/Examples/Algorithms/Geant4/src/SensitiveSteppingAction.cpp
index ec07dc5f3a6..17df42bdb21 100644
--- a/Examples/Algorithms/Geant4/src/SensitiveSteppingAction.cpp
+++ b/Examples/Algorithms/Geant4/src/SensitiveSteppingAction.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2021 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include "ActsExamples/Geant4/SensitiveSteppingAction.hpp"
 
@@ -18,6 +18,7 @@
 #include "ActsExamples/Geant4/SensitiveSurfaceMapper.hpp"
 #include "ActsFatras/EventData/Barcode.hpp"
 
+#include <algorithm>
 #include <cstddef>
 #include <string>
 #include <unordered_map>
@@ -132,8 +133,7 @@ void ActsExamples::SensitiveSteppingAction::UserSteppingAction(
   // Get the physical volume & check if it has the sensitive string name
   const G4VPhysicalVolume* volume = track->GetVolume();
   if (volume == nullptr) {
-    ACTS_ERROR("No volume found for track " << track->GetTrackID());
-    std::terminate();
+    throw std::runtime_error("No volume found, terminate simulation");
   }
   std::string volumeName = volume->GetName();
 
@@ -183,8 +183,7 @@ void ActsExamples::SensitiveSteppingAction::UserSteppingAction(
   }
 
   // This is not the case if we have a particle-ID collision
-  if (eventStore().trackIdMapping.find(track->GetTrackID()) ==
-      eventStore().trackIdMapping.end()) {
+  if (!eventStore().trackIdMapping.contains(track->GetTrackID())) {
     return;
   }
 
@@ -193,8 +192,7 @@ void ActsExamples::SensitiveSteppingAction::UserSteppingAction(
   ACTS_VERBOSE("Step of " << particleId << " in sensitive volume " << geoId);
 
   // Set particle hit count to zero, so we have this entry in the map later
-  if (eventStore().particleHitCount.find(particleId) ==
-      eventStore().particleHitCount.end()) {
+  if (!eventStore().particleHitCount.contains(particleId)) {
     eventStore().particleHitCount[particleId] = 0;
   }
 
@@ -257,11 +255,10 @@ void ActsExamples::SensitiveSteppingAction::UserSteppingAction(
         buffer.back().momentum4After(),
         eventStore().particleHitCount.at(particleId) - 1);
 
-    assert(std::all_of(buffer.begin(), buffer.end(),
-                       [&](const auto& h) { return h.geometryId() == geoId; }));
-    assert(std::all_of(buffer.begin(), buffer.end(), [&](const auto& h) {
-      return h.particleId() == particleId;
-    }));
+    assert(std::ranges::all_of(
+        buffer, [&](const auto& h) { return h.geometryId() == geoId; }));
+    assert(std::ranges::all_of(
+        buffer, [&](const auto& h) { return h.particleId() == particleId; }));
 
     eventStore().numberGeantSteps += buffer.size();
     eventStore().maxStepsForHit =
diff --git a/Examples/Algorithms/Geant4/src/SensitiveSurfaceMapper.cpp b/Examples/Algorithms/Geant4/src/SensitiveSurfaceMapper.cpp
index 731aa79ac1e..2fd1a924d94 100644
--- a/Examples/Algorithms/Geant4/src/SensitiveSurfaceMapper.cpp
+++ b/Examples/Algorithms/Geant4/src/SensitiveSurfaceMapper.cpp
@@ -1,23 +1,134 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2021 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include "ActsExamples/Geant4/SensitiveSurfaceMapper.hpp"
 
 #include "Acts/Definitions/Units.hpp"
+#include "Acts/Surfaces/AnnulusBounds.hpp"
+#include "Acts/Surfaces/ConvexPolygonBounds.hpp"
+#include "Acts/Utilities/Helpers.hpp"
+#include "Acts/Visualization/GeometryView3D.hpp"
+#include "Acts/Visualization/ObjVisualization3D.hpp"
 
 #include <algorithm>
 #include <ostream>
+#include <ranges>
 #include <stdexcept>
+#include <type_traits>
 #include <utility>
 
 #include <G4LogicalVolume.hh>
 #include <G4Material.hh>
+#include <G4Polyhedron.hh>
 #include <G4VPhysicalVolume.hh>
+#include <G4VSolid.hh>
+#include <boost/container/flat_set.hpp>
+#include <boost/geometry.hpp>
+
+// Add some type traits for boost::geometry, so we can use the machinery
+// directly with Acts::Vector2 / Eigen::Matrix
+namespace boost::geometry::traits {
+
+template <typename T, int D>
+struct tag<Eigen::Matrix<T, D, 1>> {
+  using type = point_tag;
+};
+template <typename T, int D>
+struct dimension<Eigen::Matrix<T, D, 1>> : std::integral_constant<int, D> {};
+template <typename T, int D>
+struct coordinate_type<Eigen::Matrix<T, D, 1>> {
+  using type = T;
+};
+template <typename T, int D>
+struct coordinate_system<Eigen::Matrix<T, D, 1>> {
+  using type = boost::geometry::cs::cartesian;
+};
+
+template <typename T, int D, std::size_t Index>
+struct access<Eigen::Matrix<T, D, 1>, Index> {
+  static_assert(Index < D, "Out of range");
+  using Point = Eigen::Matrix<T, D, 1>;
+  using CoordinateType = typename coordinate_type<Point>::type;
+  static inline CoordinateType get(Point const& p) { return p[Index]; }
+  static inline void set(Point& p, CoordinateType const& value) {
+    p[Index] = value;
+  }
+};
+
+}  // namespace boost::geometry::traits
+
+namespace {
+void writeG4Polyhedron(
+    Acts::IVisualization3D& visualizer, const G4Polyhedron& polyhedron,
+    const Acts::Transform3& trafo = Acts::Transform3::Identity(),
+    Acts::Color color = {0, 0, 0}) {
+  constexpr double convertLength = CLHEP::mm / Acts::UnitConstants::mm;
+
+  for (int i = 1; i <= polyhedron.GetNoFacets(); ++i) {
+    // This is a bit ugly but I didn't find an easy way to compute this
+    // beforehand.
+    constexpr std::size_t maxPoints = 1000;
+    G4Point3D points[maxPoints];
+    int nPoints = 0;
+    polyhedron.GetFacet(i, nPoints, points);
+    assert(static_cast<std::size_t>(nPoints) < maxPoints);
+
+    std::vector<Acts::Vector3> faces;
+    for (int j = 0; j < nPoints; ++j) {
+      faces.emplace_back(points[j][0] * convertLength,
+                         points[j][1] * convertLength,
+                         points[j][2] * convertLength);
+      faces.back() = trafo * faces.back();
+    }
+
+    visualizer.face(faces, color);
+  }
+}
+}  // namespace
+
+std::vector<const Acts::Surface*>
+ActsExamples::SensitiveCandidates::queryPosition(
+    const Acts::GeometryContext& gctx, const Acts::Vector3& position) const {
+  std::vector<const Acts::Surface*> surfaces;
+
+  if (trackingGeometry == nullptr) {
+    return surfaces;
+  }
+
+  // In case we do not find a layer at this position for whatever reason
+  const auto layer = trackingGeometry->associatedLayer(gctx, position);
+  if (layer == nullptr) {
+    return surfaces;
+  }
+
+  const auto surfaceArray = layer->surfaceArray();
+  if (surfaceArray == nullptr) {
+    return surfaces;
+  }
+
+  for (const auto& surface : surfaceArray->surfaces()) {
+    if (surface->associatedDetectorElement() != nullptr) {
+      surfaces.push_back(surface);
+    }
+  }
+  return surfaces;
+}
+
+std::vector<const Acts::Surface*> ActsExamples::SensitiveCandidates::queryAll()
+    const {
+  std::vector<const Acts::Surface*> surfaces;
+
+  const bool restrictToSensitives = true;
+  trackingGeometry->visitSurfaces(
+      [&](auto surface) { surfaces.push_back(surface); }, restrictToSensitives);
+
+  return surfaces;
+}
 
 ActsExamples::SensitiveSurfaceMapper::SensitiveSurfaceMapper(
     const Config& cfg, std::unique_ptr<const Acts::Logger> logger)
@@ -30,33 +141,44 @@ void ActsExamples::SensitiveSurfaceMapper::remapSensitiveNames(
   // Make sure the unit conversion is correct
   constexpr double convertLength = CLHEP::mm / Acts::UnitConstants::mm;
 
+  auto g4ToActsVector = [](const G4ThreeVector& g4vec) {
+    return Acts::Vector3(g4vec[0] * convertLength, g4vec[1] * convertLength,
+                         g4vec[2] * convertLength);
+  };
+
+  auto actsToG4Vec = [](const Acts::Vector3& actsVec) {
+    return G4ThreeVector(actsVec[0] / convertLength, actsVec[1] / convertLength,
+                         actsVec[2] / convertLength);
+  };
+
   auto g4LogicalVolume = g4PhysicalVolume->GetLogicalVolume();
   auto g4SensitiveDetector = g4LogicalVolume->GetSensitiveDetector();
 
   // Get the transform of the G4 object
-  auto g4Translation = g4PhysicalVolume->GetTranslation();
-  auto g4Rotation = g4PhysicalVolume->GetRotation();
-  Acts::Vector3 g4RelPosition(g4Translation[0] * convertLength,
-                              g4Translation[1] * convertLength,
-                              g4Translation[2] * convertLength);
-  Acts::Translation3 translation(g4RelPosition);
-  Acts::Transform3 transform;
-  if (g4Rotation == nullptr) {
-    transform = motherTransform * translation;
-  } else {
-    Acts::RotationMatrix3 rotation;
-    rotation << g4Rotation->xx(), g4Rotation->yx(), g4Rotation->zx(),
-        g4Rotation->xy(), g4Rotation->yy(), g4Rotation->zy(), g4Rotation->xz(),
-        g4Rotation->yz(), g4Rotation->zz();
-    transform = motherTransform * (translation * rotation);
-  }
-  Acts::Vector3 g4AbsPosition = transform * Acts::Vector3::Zero();
+  Acts::Transform3 localG4ToGlobal;
+  {
+    auto g4Translation = g4PhysicalVolume->GetTranslation();
+    auto g4Rotation = g4PhysicalVolume->GetRotation();
+    Acts::Vector3 g4RelPosition = g4ToActsVector(g4Translation);
+    Acts::Translation3 translation(g4RelPosition);
+    if (g4Rotation == nullptr) {
+      localG4ToGlobal = motherTransform * translation;
+    } else {
+      Acts::RotationMatrix3 rotation;
+      rotation << g4Rotation->xx(), g4Rotation->yx(), g4Rotation->zx(),
+          g4Rotation->xy(), g4Rotation->yy(), g4Rotation->zy(),
+          g4Rotation->xz(), g4Rotation->yz(), g4Rotation->zz();
+      localG4ToGlobal = motherTransform * (translation * rotation);
+    }
+  }
+
+  Acts::Vector3 g4AbsPosition = localG4ToGlobal * Acts::Vector3::Zero();
 
   if (G4int nDaughters = g4LogicalVolume->GetNoDaughters(); nDaughters > 0) {
     // Step down to all daughters
     for (G4int id = 0; id < nDaughters; ++id) {
       remapSensitiveNames(state, gctx, g4LogicalVolume->GetDaughter(id),
-                          transform);
+                          localG4ToGlobal);
     }
     return;
   }
@@ -64,53 +186,160 @@ void ActsExamples::SensitiveSurfaceMapper::remapSensitiveNames(
   std::string volumeName = g4LogicalVolume->GetName();
   std::string volumeMaterialName = g4LogicalVolume->GetMaterial()->GetName();
 
-  bool isSensitive = g4SensitiveDetector != nullptr;
-  bool isMappedMaterial =
-      std::find(m_cfg.materialMappings.begin(), m_cfg.materialMappings.end(),
-                volumeMaterialName) != m_cfg.materialMappings.end();
-  bool isMappedVolume =
-      std::find(m_cfg.volumeMappings.begin(), m_cfg.volumeMappings.end(),
-                volumeName) != m_cfg.volumeMappings.end();
-
-  if (isSensitive || isMappedMaterial || isMappedVolume) {
-    // Prepare the mapped surface
-    const Acts::Surface* mappedSurface = nullptr;
-
-    // Get the candidate surfaces
-    auto candidateSurfaces = m_cfg.candidateSurfaces(gctx, g4AbsPosition);
-    for (const auto& candidateSurface : candidateSurfaces) {
-      // Check for center matching at the moment (needs to be extended)
-      if (candidateSurface->center(gctx).isApprox(g4AbsPosition)) {
-        mappedSurface = candidateSurface;
-        break;
-      }
-    }
+  const bool isSensitive = g4SensitiveDetector != nullptr;
+  const bool isMappedMaterial =
+      Acts::rangeContainsValue(m_cfg.materialMappings, volumeMaterialName);
+  const bool isMappedVolume =
+      Acts::rangeContainsValue(m_cfg.volumeMappings, volumeName);
 
-    // A mapped surface was found, a new name will be set that G4PhysVolume
-    if (mappedSurface != nullptr) {
-      ACTS_VERBOSE("Found matching surface " << mappedSurface->geometryId()
-                                             << " at position "
-                                             << g4RelPosition.transpose());
-      // Check if the prefix is not yet assigned
-      if (volumeName.find(mappingPrefix) == std::string::npos) {
-        // Set the new name
-        std::string mappedName = std::string(mappingPrefix) + volumeName;
-        g4PhysicalVolume->SetName(mappedName);
-      }
-      // Insert into the multi-map
-      state.g4VolumeToSurfaces.insert({g4PhysicalVolume, mappedSurface});
-    } else {
-      ACTS_VERBOSE("No mapping found for '"
-                   << volumeName << "' with material '" << volumeMaterialName
-                   << "' at position " << g4RelPosition.transpose());
-    }
-  } else {
+  if (!(isSensitive || isMappedMaterial || isMappedVolume)) {
     ACTS_VERBOSE("Did not try mapping '"
                  << g4PhysicalVolume->GetName() << "' at "
-                 << g4RelPosition.transpose()
+                 << g4AbsPosition.transpose()
                  << " because g4SensitiveDetector (=" << g4SensitiveDetector
                  << ") is null and volume name (=" << volumeName
                  << ") and material name (=" << volumeMaterialName
                  << ") were not found");
+    return;
   }
+
+  // Prepare the mapped surface
+  const Acts::Surface* mappedSurface = nullptr;
+
+  std::vector<const Acts::Surface*> candidateSurfaces;
+  const auto g4Polyhedron = g4LogicalVolume->GetSolid()->GetPolyhedron();
+  for (int i = 1; i < g4Polyhedron->GetNoVertices(); ++i) {
+    auto vtx = g4ToActsVector(g4Polyhedron->GetVertex(i));
+    auto vtxGlobal = localG4ToGlobal * vtx;
+
+    candidateSurfaces = m_cfg.candidateSurfaces->queryPosition(gctx, vtxGlobal);
+
+    if (!candidateSurfaces.empty()) {
+      break;
+    }
+  }
+
+  // Fall back to query all surfaces
+  if (candidateSurfaces.empty()) {
+    ACTS_DEBUG("No candidate surfaces for volume '" << volumeName << "' at "
+                                                    << g4AbsPosition.transpose()
+                                                    << ", query all surfaces");
+    candidateSurfaces = m_cfg.candidateSurfaces->queryAll();
+  }
+
+  ACTS_VERBOSE("Found " << candidateSurfaces.size()
+                        << " candidate surfaces for " << volumeName);
+
+  for (const auto& candidateSurface : candidateSurfaces) {
+    if (candidateSurface->center(gctx).isApprox(g4AbsPosition)) {
+      ACTS_VERBOSE("Successful match with center matching");
+      mappedSurface = candidateSurface;
+      break;
+    } else if (candidateSurface->bounds().type() ==
+               Acts::SurfaceBounds::eAnnulus) {
+      const auto& bounds =
+          *static_cast<const Acts::AnnulusBounds*>(&candidateSurface->bounds());
+
+      const auto vertices = bounds.vertices(0);
+
+      constexpr bool clockwise = false;
+      constexpr bool closed = false;
+      using Polygon =
+          boost::geometry::model::polygon<Acts::Vector2, clockwise, closed>;
+
+      Polygon poly;
+      boost::geometry::assign_points(poly, vertices);
+
+      Acts::Vector2 boundsCentroidSurfaceFrame = Acts::Vector2::Zero();
+      boost::geometry::centroid(poly, boundsCentroidSurfaceFrame);
+
+      Acts::Vector3 boundsCentroidGlobal{boundsCentroidSurfaceFrame[0],
+                                         boundsCentroidSurfaceFrame[1], 0.0};
+      boundsCentroidGlobal =
+          candidateSurface->transform(gctx) * boundsCentroidGlobal;
+
+      const auto boundsCentroidG4Frame =
+          localG4ToGlobal.inverse() * boundsCentroidGlobal;
+
+      if (g4LogicalVolume->GetSolid()->Inside(
+              actsToG4Vec(boundsCentroidG4Frame)) != EInside::kOutside) {
+        ACTS_VERBOSE("Successful match with centroid matching");
+        mappedSurface = candidateSurface;
+        break;
+      }
+    }
+  }
+
+  if (mappedSurface == nullptr) {
+    ACTS_DEBUG("No mapping found for '"
+               << volumeName << "' with material '" << volumeMaterialName
+               << "' at position " << g4AbsPosition.transpose());
+    state.missingVolumes.emplace_back(g4PhysicalVolume, localG4ToGlobal);
+    return;
+  }
+
+  // A mapped surface was found, a new name will be set that G4PhysVolume
+  ACTS_DEBUG("Matched " << volumeName << " to " << mappedSurface->geometryId()
+                        << " at position " << g4AbsPosition.transpose());
+  // Check if the prefix is not yet assigned
+  if (volumeName.find(mappingPrefix) == std::string::npos) {
+    // Set the new name
+    std::string mappedName = std::string(mappingPrefix) + volumeName;
+    g4PhysicalVolume->SetName(mappedName);
+  }
+  // Insert into the multi-map
+  state.g4VolumeToSurfaces.insert({g4PhysicalVolume, mappedSurface});
+}
+
+bool ActsExamples::SensitiveSurfaceMapper::checkMapping(
+    const State& state, const Acts::GeometryContext& gctx,
+    bool writeMissingG4VolsAsObj, bool writeMissingSurfacesAsObj) const {
+  auto allSurfaces = m_cfg.candidateSurfaces->queryAll();
+  std::ranges::sort(allSurfaces);
+
+  std::vector<const Acts::Surface*> found;
+  for (const auto [_, surfacePtr] : state.g4VolumeToSurfaces) {
+    found.push_back(surfacePtr);
+  }
+  std::ranges::sort(found);
+  auto newEnd = std::unique(found.begin(), found.end());
+  found.erase(newEnd, found.end());
+
+  std::vector<const Acts::Surface*> missing;
+  std::set_difference(allSurfaces.begin(), allSurfaces.end(), found.begin(),
+                      found.end(), std::back_inserter(missing));
+
+  ACTS_INFO("Number of overall sensitive surfaces: " << allSurfaces.size());
+  ACTS_INFO("Number of mapped volume->surface mappings: "
+            << state.g4VolumeToSurfaces.size());
+  ACTS_INFO(
+      "Number of sensitive surfaces that are not mapped: " << missing.size());
+  ACTS_INFO("Number of G4 volumes without a matching Surface: "
+            << state.missingVolumes.size());
+
+  if (writeMissingG4VolsAsObj) {
+    Acts::ObjVisualization3D visualizer;
+    for (const auto& [g4vol, trafo] : state.missingVolumes) {
+      auto polyhedron = g4vol->GetLogicalVolume()->GetSolid()->GetPolyhedron();
+      writeG4Polyhedron(visualizer, *polyhedron, trafo);
+    }
+
+    std::ofstream os("missing_g4_volumes.obj");
+    visualizer.write(os);
+  }
+
+  if (writeMissingSurfacesAsObj) {
+    Acts::ObjVisualization3D visualizer;
+    Acts::ViewConfig vcfg;
+    vcfg.quarterSegments = 720;
+    for (auto srf : missing) {
+      Acts::GeometryView3D::drawSurface(visualizer, *srf, gctx,
+                                        Acts::Transform3::Identity(), vcfg);
+    }
+
+    std::ofstream os("missing_acts_surfaces.obj");
+    visualizer.write(os);
+  }
+
+  return missing.empty();
 }
diff --git a/Examples/Algorithms/Geant4/src/SimParticleTranslation.cpp b/Examples/Algorithms/Geant4/src/SimParticleTranslation.cpp
index 1f02fd10151..8b8156ff3e4 100644
--- a/Examples/Algorithms/Geant4/src/SimParticleTranslation.cpp
+++ b/Examples/Algorithms/Geant4/src/SimParticleTranslation.cpp
@@ -1,25 +1,21 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2021 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include "ActsExamples/Geant4/SimParticleTranslation.hpp"
 
 #include "Acts/Definitions/Algebra.hpp"
 #include "Acts/Definitions/Units.hpp"
-#include "ActsExamples/EventData/SimHit.hpp"
 #include "ActsExamples/EventData/SimParticle.hpp"
 #include "ActsExamples/Framework/DataHandle.hpp"
 #include "ActsExamples/Framework/WhiteBoard.hpp"
 #include "ActsExamples/Geant4/EventStore.hpp"
-#include "ActsFatras/EventData/Barcode.hpp"
-#include "ActsFatras/EventData/Particle.hpp"
 
 #include <ostream>
-#include <string>
 #include <unordered_map>
 #include <utility>
 
diff --git a/Examples/Algorithms/Geant4/src/TelescopeG4DetectorConstruction.cpp b/Examples/Algorithms/Geant4/src/TelescopeG4DetectorConstruction.cpp
index dfc837889b4..423acf7e2a5 100644
--- a/Examples/Algorithms/Geant4/src/TelescopeG4DetectorConstruction.cpp
+++ b/Examples/Algorithms/Geant4/src/TelescopeG4DetectorConstruction.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2022-2024 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include "ActsExamples/TelescopeDetector/TelescopeG4DetectorConstruction.hpp"
 
diff --git a/Examples/Algorithms/Geant4HepMC/include/ActsExamples/Geant4HepMC/EventRecording.hpp b/Examples/Algorithms/Geant4HepMC/include/ActsExamples/Geant4HepMC/EventRecording.hpp
index be3c569e5b2..256a82a4471 100644
--- a/Examples/Algorithms/Geant4HepMC/include/ActsExamples/Geant4HepMC/EventRecording.hpp
+++ b/Examples/Algorithms/Geant4HepMC/include/ActsExamples/Geant4HepMC/EventRecording.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2020 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
diff --git a/Examples/Algorithms/Geant4HepMC/src/EventAction.cpp b/Examples/Algorithms/Geant4HepMC/src/EventAction.cpp
index b9e5b07c22f..590b6482ae8 100644
--- a/Examples/Algorithms/Geant4HepMC/src/EventAction.cpp
+++ b/Examples/Algorithms/Geant4HepMC/src/EventAction.cpp
@@ -1,13 +1,15 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2020 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include "EventAction.hpp"
 
+#include "Acts/Utilities/Helpers.hpp"
+
 #include <stdexcept>
 
 #include <G4Event.hh>
@@ -32,8 +34,7 @@ bool findAttribute(const HepMC3::ConstGenVertexPtr& vertex,
     const std::vector<std::string> vertexAttributes = vertex->attribute_names();
     for (const auto& att : vertexAttributes) {
       const std::string process = vertex->attribute_as_string(att);
-      if (std::find(processFilter.begin(), processFilter.end(), process) !=
-          processFilter.end()) {
+      if (Acts::rangeContainsValue(processFilter, process)) {
         return true;
       }
     }
diff --git a/Examples/Algorithms/Geant4HepMC/src/EventAction.hpp b/Examples/Algorithms/Geant4HepMC/src/EventAction.hpp
index 67b77bb6e30..dcf82b9543f 100644
--- a/Examples/Algorithms/Geant4HepMC/src/EventAction.hpp
+++ b/Examples/Algorithms/Geant4HepMC/src/EventAction.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2020 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
@@ -28,7 +28,7 @@ class EventAction final : public G4UserEventAction {
   static EventAction* instance();
 
   /// Construct the action and ensure singleton usage.
-  EventAction(std::vector<std::string> processFilter);
+  explicit EventAction(std::vector<std::string> processFilter);
   ~EventAction() override;
 
   /// Interface method for begin of the event
diff --git a/Examples/Algorithms/Geant4HepMC/src/EventRecording.cpp b/Examples/Algorithms/Geant4HepMC/src/EventRecording.cpp
index 858de3fdee6..e4900f63c05 100644
--- a/Examples/Algorithms/Geant4HepMC/src/EventRecording.cpp
+++ b/Examples/Algorithms/Geant4HepMC/src/EventRecording.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2020 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include "ActsExamples/Geant4HepMC/EventRecording.hpp"
 
diff --git a/Examples/Algorithms/Geant4HepMC/src/PrimaryGeneratorAction.cpp b/Examples/Algorithms/Geant4HepMC/src/PrimaryGeneratorAction.cpp
index becdc680187..7e14589283b 100644
--- a/Examples/Algorithms/Geant4HepMC/src/PrimaryGeneratorAction.cpp
+++ b/Examples/Algorithms/Geant4HepMC/src/PrimaryGeneratorAction.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2020 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include "PrimaryGeneratorAction.hpp"
 
diff --git a/Examples/Algorithms/Geant4HepMC/src/PrimaryGeneratorAction.hpp b/Examples/Algorithms/Geant4HepMC/src/PrimaryGeneratorAction.hpp
index aca41fb7e37..c0451c76bf1 100644
--- a/Examples/Algorithms/Geant4HepMC/src/PrimaryGeneratorAction.hpp
+++ b/Examples/Algorithms/Geant4HepMC/src/PrimaryGeneratorAction.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2020 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
diff --git a/Examples/Algorithms/Geant4HepMC/src/RunAction.cpp b/Examples/Algorithms/Geant4HepMC/src/RunAction.cpp
index b41c9d6d699..7fde34e8d02 100644
--- a/Examples/Algorithms/Geant4HepMC/src/RunAction.cpp
+++ b/Examples/Algorithms/Geant4HepMC/src/RunAction.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2020 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include "RunAction.hpp"
 
diff --git a/Examples/Algorithms/Geant4HepMC/src/RunAction.hpp b/Examples/Algorithms/Geant4HepMC/src/RunAction.hpp
index fa48ad5f11c..abe77d13d1f 100644
--- a/Examples/Algorithms/Geant4HepMC/src/RunAction.hpp
+++ b/Examples/Algorithms/Geant4HepMC/src/RunAction.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2020 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
diff --git a/Examples/Algorithms/Geant4HepMC/src/SteppingAction.cpp b/Examples/Algorithms/Geant4HepMC/src/SteppingAction.cpp
index ad9b91ac7b4..7ccb3924eb7 100644
--- a/Examples/Algorithms/Geant4HepMC/src/SteppingAction.cpp
+++ b/Examples/Algorithms/Geant4HepMC/src/SteppingAction.cpp
@@ -1,13 +1,15 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2020 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include "SteppingAction.hpp"
 
+#include "Acts/Utilities/Helpers.hpp"
+
 #include <stdexcept>
 
 #include <G4RunManager.hh>
@@ -43,10 +45,10 @@ SteppingAction::~SteppingAction() {
 
 void SteppingAction::UserSteppingAction(const G4Step* step) {
   // Test if the event should be aborted
-  if (std::find(m_eventRejectionProcess.begin(), m_eventRejectionProcess.end(),
-                step->GetPostStepPoint()
-                    ->GetProcessDefinedStep()
-                    ->GetProcessName()) != m_eventRejectionProcess.end()) {
+  if (Acts::rangeContainsValue(m_eventRejectionProcess,
+                               step->GetPostStepPoint()
+                                   ->GetProcessDefinedStep()
+                                   ->GetProcessName())) {
     m_eventAborted = true;
     G4RunManager::GetRunManager()->AbortEvent();
     return;
diff --git a/Examples/Algorithms/Geant4HepMC/src/SteppingAction.hpp b/Examples/Algorithms/Geant4HepMC/src/SteppingAction.hpp
index 8233b5adc5a..c19ed0a8560 100644
--- a/Examples/Algorithms/Geant4HepMC/src/SteppingAction.hpp
+++ b/Examples/Algorithms/Geant4HepMC/src/SteppingAction.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2020 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
@@ -20,7 +20,7 @@ namespace ActsExamples::Geant4::HepMC3 {
 /// Collects the particles history.
 class SteppingAction : public G4UserSteppingAction {
  public:
-  SteppingAction(std::vector<std::string> eventRejectionProcess);
+  explicit SteppingAction(std::vector<std::string> eventRejectionProcess);
   ~SteppingAction() override;
 
   /// Static access method to the instance
diff --git a/Examples/Algorithms/Generators/ActsExamples/Generators/EventGenerator.cpp b/Examples/Algorithms/Generators/ActsExamples/Generators/EventGenerator.cpp
index 16b575b4529..a11d62c928f 100644
--- a/Examples/Algorithms/Generators/ActsExamples/Generators/EventGenerator.cpp
+++ b/Examples/Algorithms/Generators/ActsExamples/Generators/EventGenerator.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2019-2024 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include "ActsExamples/Generators/EventGenerator.hpp"
 
@@ -80,7 +80,9 @@ ActsExamples::ProcessCode ActsExamples::EventGenerator::read(
         const auto pos4 = (vertexPosition + particle.fourPosition()).eval();
         ACTS_VERBOSE(" - particle at " << pos4.transpose());
         // `withParticleId` returns a copy because it changes the identity
-        particle = particle.withParticleId(pid).setPosition4(pos4);
+        particle = particle.withParticleId(pid);
+        particle.initial().setPosition4(pos4);
+        particle.final().setPosition4(pos4);
       };
       for (auto& vertexParticle : newParticles) {
         updateParticleInPlace(vertexParticle);
diff --git a/Examples/Algorithms/Generators/ActsExamples/Generators/EventGenerator.hpp b/Examples/Algorithms/Generators/ActsExamples/Generators/EventGenerator.hpp
index 90ecece72bb..46720b9fff1 100644
--- a/Examples/Algorithms/Generators/ActsExamples/Generators/EventGenerator.hpp
+++ b/Examples/Algorithms/Generators/ActsExamples/Generators/EventGenerator.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2019-2020 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
diff --git a/Examples/Algorithms/Generators/ActsExamples/Generators/MultiplicityGenerators.hpp b/Examples/Algorithms/Generators/ActsExamples/Generators/MultiplicityGenerators.hpp
index c859f24de4f..32c6d708235 100644
--- a/Examples/Algorithms/Generators/ActsExamples/Generators/MultiplicityGenerators.hpp
+++ b/Examples/Algorithms/Generators/ActsExamples/Generators/MultiplicityGenerators.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2019-2020 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
@@ -19,7 +19,7 @@ struct FixedMultiplicityGenerator
     : public EventGenerator::MultiplicityGenerator {
   std::size_t n = 1;
 
-  FixedMultiplicityGenerator(std::size_t _n) : n{_n} {}
+  explicit FixedMultiplicityGenerator(std::size_t _n) : n{_n} {}
   FixedMultiplicityGenerator() = default;
 
   std::size_t operator()(RandomEngine& /*rng*/) const override { return n; }
@@ -28,7 +28,7 @@ struct FixedMultiplicityGenerator
 struct PoissonMultiplicityGenerator
     : public EventGenerator::MultiplicityGenerator {
   double mean = 1;
-  PoissonMultiplicityGenerator(double _mean) : mean{_mean} {}
+  explicit PoissonMultiplicityGenerator(double _mean) : mean{_mean} {}
   PoissonMultiplicityGenerator() = default;
 
   std::size_t operator()(RandomEngine& rng) const override {
diff --git a/Examples/Algorithms/Generators/ActsExamples/Generators/ParametricParticleGenerator.cpp b/Examples/Algorithms/Generators/ActsExamples/Generators/ParametricParticleGenerator.cpp
index 11f70002d17..34363410f42 100644
--- a/Examples/Algorithms/Generators/ActsExamples/Generators/ParametricParticleGenerator.cpp
+++ b/Examples/Algorithms/Generators/ActsExamples/Generators/ParametricParticleGenerator.cpp
@@ -1,23 +1,21 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2017-2020 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include "ActsExamples/Generators/ParametricParticleGenerator.hpp"
 
 #include "Acts/Definitions/Algebra.hpp"
-#include "Acts/Definitions/Common.hpp"
 #include "Acts/Definitions/ParticleData.hpp"
-#include "ActsExamples/EventData/SimHit.hpp"
+#include "Acts/Utilities/AngleHelpers.hpp"
+#include "ActsExamples/EventData/SimParticle.hpp"
 #include "ActsFatras/EventData/Barcode.hpp"
 #include "ActsFatras/EventData/Particle.hpp"
 
-#include <cstdint>
 #include <limits>
-#include <random>
 #include <utility>
 
 namespace ActsExamples {
@@ -25,47 +23,77 @@ namespace ActsExamples {
 ParametricParticleGenerator::ParametricParticleGenerator(const Config& cfg)
     : m_cfg(cfg),
       m_charge(cfg.charge.value_or(Acts::findCharge(m_cfg.pdg).value_or(0))),
-      m_mass(cfg.mass.value_or(Acts::findMass(m_cfg.pdg).value_or(0))),
-      // since we want to draw the direction uniform on the unit sphere, we must
-      // draw from cos(theta) instead of theta. see e.g.
-      // https://mathworld.wolfram.com/SpherePointPicking.html
-      m_cosThetaMin(std::cos(m_cfg.thetaMin)),
-      // ensure upper bound is included. see e.g.
-      // https://en.cppreference.com/w/cpp/numeric/random/uniform_real_distribution
-      m_cosThetaMax(std::nextafter(std::cos(m_cfg.thetaMax),
-                                   std::numeric_limits<double>::max())),
-      // in case we force uniform eta generation
-      m_etaMin(-std::log(std::tan(0.5 * m_cfg.thetaMin))),
-      m_etaMax(-std::log(std::tan(0.5 * m_cfg.thetaMax))) {}
-
-std::pair<SimVertexContainer, SimParticleContainer>
-ParametricParticleGenerator::operator()(RandomEngine& rng) {
-  using UniformIndex = std::uniform_int_distribution<std::uint8_t>;
-  using UniformReal = std::uniform_real_distribution<double>;
-
-  // choose between particle/anti-particle if requested
-  // the upper limit of the distribution is inclusive
-  UniformIndex particleTypeChoice(0u, m_cfg.randomizeCharge ? 1u : 0u);
-  // (anti-)particle choice is one random draw but defines two properties
-  const Acts::PdgParticle pdgChoices[] = {
+      m_mass(cfg.mass.value_or(Acts::findMass(m_cfg.pdg).value_or(0))) {
+  m_pdgChoices = {
       m_cfg.pdg,
       static_cast<Acts::PdgParticle>(-m_cfg.pdg),
   };
-  const double qChoices[] = {
+  m_qChoices = {
       m_charge,
       -m_charge,
   };
-  UniformReal phiDist(m_cfg.phiMin, m_cfg.phiMax);
-  UniformReal cosThetaDist(m_cosThetaMin, m_cosThetaMax);
-  UniformReal etaDist(m_etaMin, m_etaMax);
-  UniformReal pDist(m_cfg.pMin, m_cfg.pMax);
 
+  // choose between particle/anti-particle if requested
+  // the upper limit of the distribution is inclusive
+  m_particleTypeChoice = UniformIndex(0u, m_cfg.randomizeCharge ? 1u : 0u);
+  m_phiDist = UniformReal(m_cfg.phiMin, m_cfg.phiMax);
+
+  if (m_cfg.etaUniform) {
+    double etaMin = Acts::AngleHelpers::etaFromTheta(m_cfg.thetaMin);
+    double etaMax = Acts::AngleHelpers::etaFromTheta(m_cfg.thetaMax);
+
+    UniformReal etaDist(etaMin, etaMax);
+
+    m_sinCosThetaDist =
+        [=](RandomEngine& rng) mutable -> std::pair<double, double> {
+      const double eta = etaDist(rng);
+      const double theta = Acts::AngleHelpers::thetaFromEta(eta);
+      return {std::sin(theta), std::cos(theta)};
+    };
+  } else {
+    // since we want to draw the direction uniform on the unit sphere, we must
+    // draw from cos(theta) instead of theta. see e.g.
+    // https://mathworld.wolfram.com/SpherePointPicking.html
+    double cosThetaMin = std::cos(m_cfg.thetaMin);
+    // ensure upper bound is included. see e.g.
+    // https://en.cppreference.com/w/cpp/numeric/random/uniform_real_distribution
+    double cosThetaMax = std::nextafter(std::cos(m_cfg.thetaMax),
+                                        std::numeric_limits<double>::max());
+
+    UniformReal cosThetaDist(cosThetaMin, cosThetaMax);
+
+    m_sinCosThetaDist =
+        [=](RandomEngine& rng) mutable -> std::pair<double, double> {
+      const double cosTheta = cosThetaDist(rng);
+      return {std::sqrt(1 - cosTheta * cosTheta), cosTheta};
+    };
+  }
+
+  if (m_cfg.pLogUniform) {
+    // distributes p or pt uniformly in log space
+    UniformReal dist(std::log(m_cfg.pMin), std::log(m_cfg.pMax));
+
+    m_somePDist = [=](RandomEngine& rng) mutable -> double {
+      return std::exp(dist(rng));
+    };
+  } else {
+    // distributes p or pt uniformly
+    UniformReal dist(m_cfg.pMin, m_cfg.pMax);
+
+    m_somePDist = [=](RandomEngine& rng) mutable -> double {
+      return dist(rng);
+    };
+  }
+}
+
+std::pair<SimVertexContainer, SimParticleContainer>
+ParametricParticleGenerator::operator()(RandomEngine& rng) {
   SimVertexContainer::sequence_type vertices;
   SimParticleContainer::sequence_type particles;
 
   // create the primary vertex
-  auto& primaryVertex =
-      vertices.emplace_back(0, SimVertex::Vector4(0., 0., 0., 0.));
+  auto& primaryVertex = vertices.emplace_back(
+      SimVertexBarcode{0}, SimVertex::Vector4(0., 0., 0., 0.));
 
   // counter will be reused as barcode particle number which must be non-zero.
   for (std::size_t ip = 1; ip <= m_cfg.numParticles; ++ip) {
@@ -74,37 +102,26 @@ ParametricParticleGenerator::operator()(RandomEngine& rng) {
     primaryVertex.outgoing.insert(pid);
 
     // draw parameters
-    const unsigned int type = particleTypeChoice(rng);
-    const Acts::PdgParticle pdg = pdgChoices[type];
-    const double q = qChoices[type];
-    const double phi = phiDist(rng);
-    double p = pDist(rng);
-
-    // we already have sin/cos theta. they can be used directly to
-    Acts::Vector3 dir;
-    double cosTheta = 0.;
-    double sinTheta = 0.;
-    if (!m_cfg.etaUniform) {
-      cosTheta = cosThetaDist(rng);
-      sinTheta = std::sqrt(1 - cosTheta * cosTheta);
-    } else {
-      const double eta = etaDist(rng);
-      const double theta = 2 * std::atan(std::exp(-eta));
-      sinTheta = std::sin(theta);
-      cosTheta = std::cos(theta);
-    }
-    dir[Acts::eMom0] = sinTheta * std::cos(phi);
-    dir[Acts::eMom1] = sinTheta * std::sin(phi);
-    dir[Acts::eMom2] = cosTheta;
+    const unsigned int type = m_particleTypeChoice(rng);
+    const Acts::PdgParticle pdg = m_pdgChoices[type];
+    const double q = m_qChoices[type];
+    const double phi = m_phiDist(rng);
+    const double someP = m_somePDist(rng);
+
+    const auto [sinTheta, cosTheta] = m_sinCosThetaDist(rng);
+    // we already have sin/cos theta. they can be used directly
+    const Acts::Vector3 dir = {sinTheta * std::cos(phi),
+                               sinTheta * std::sin(phi), cosTheta};
+
+    const double p = someP * (m_cfg.pTransverse ? 1. / sinTheta : 1.);
 
     // construct the particle;
-    ActsFatras::Particle particle(pid, pdg, q, m_mass);
+    SimParticleState particle(pid, pdg, q, m_mass);
     particle.setDirection(dir);
-    p *= m_cfg.pTransverse ? 1. / sinTheta : 1.;
     particle.setAbsoluteMomentum(p);
 
     // generated particle ids are already ordered and should end up at the end
-    particles.insert(particles.end(), std::move(particle));
+    particles.insert(particles.end(), SimParticle(particle, particle));
   }
 
   std::pair<SimVertexContainer, SimParticleContainer> out;
diff --git a/Examples/Algorithms/Generators/ActsExamples/Generators/ParametricParticleGenerator.hpp b/Examples/Algorithms/Generators/ActsExamples/Generators/ParametricParticleGenerator.hpp
index 0130a8d5d67..b671e597d66 100644
--- a/Examples/Algorithms/Generators/ActsExamples/Generators/ParametricParticleGenerator.hpp
+++ b/Examples/Algorithms/Generators/ActsExamples/Generators/ParametricParticleGenerator.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2017-2020 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
@@ -15,10 +15,11 @@
 #include "ActsExamples/Generators/EventGenerator.hpp"
 
 #include <array>
-#include <cmath>
 #include <cstddef>
 #include <limits>
+#include <numbers>
 #include <optional>
+#include <random>
 
 namespace ActsExamples {
 
@@ -32,8 +33,8 @@ class ParametricParticleGenerator : public EventGenerator::ParticlesGenerator {
  public:
   struct Config {
     /// Low, high (exclusive) for the transverse direction angle.
-    double phiMin = -M_PI;
-    double phiMax = M_PI;
+    double phiMin = -std::numbers::pi;
+    double phiMax = std::numbers::pi;
     /// Low, high (inclusive) for  the longitudinal direction angle.
     ///
     /// This intentionally uses theta instead of eta so it can represent the
@@ -44,13 +45,15 @@ class ParametricParticleGenerator : public EventGenerator::ParticlesGenerator {
     /// this can be set by the etaUniform flag;
     ///
     double thetaMin = std::numeric_limits<double>::min();
-    double thetaMax = M_PI - std::numeric_limits<double>::epsilon();
+    double thetaMax = std::numbers::pi - std::numeric_limits<double>::epsilon();
     bool etaUniform = false;
     /// Low, high (exclusive) for absolute/transverse momentum.
     double pMin = 1 * Acts::UnitConstants::GeV;
     double pMax = 10 * Acts::UnitConstants::GeV;
-    /// Indicate if the momentum referse to transverse momentum
+    /// Indicate if the momentum refers to transverse momentum.
     bool pTransverse = false;
+    /// Indicate if the momentum should be uniformly distributed in log space.
+    bool pLogUniform = false;
     /// (Absolute) PDG particle number to identify the particle type.
     Acts::PdgParticle pdg = Acts::PdgParticle::eMuon;
     /// Randomize the charge and flip the PDG particle number sign accordingly.
@@ -64,21 +67,30 @@ class ParametricParticleGenerator : public EventGenerator::ParticlesGenerator {
     std::optional<double> mass;
   };
 
-  ParametricParticleGenerator(const Config& cfg);
+  explicit ParametricParticleGenerator(const Config& cfg);
 
   /// Generate a single primary vertex with the given number of particles.
   std::pair<SimVertexContainer, SimParticleContainer> operator()(
       RandomEngine& rng) override;
 
  private:
+  using UniformIndex = std::uniform_int_distribution<std::uint8_t>;
+  using UniformReal = std::uniform_real_distribution<double>;
+
   Config m_cfg;
+
   // will be automatically set from PDG data tables
-  double m_charge;
-  double m_mass;
-  double m_cosThetaMin;
-  double m_cosThetaMax;
-  double m_etaMin;
-  double m_etaMax;
+  double m_charge{};
+  double m_mass{};
+
+  // (anti-)particle choice is one random draw but defines two properties
+  std::array<Acts::PdgParticle, 2> m_pdgChoices{};
+  std::array<double, 2> m_qChoices{};
+
+  UniformIndex m_particleTypeChoice;
+  UniformReal m_phiDist;
+  std::function<std::pair<double, double>(RandomEngine& rng)> m_sinCosThetaDist;
+  std::function<double(RandomEngine& rng)> m_somePDist;
 };
 
 }  // namespace ActsExamples
diff --git a/Examples/Algorithms/Generators/ActsExamples/Generators/VertexGenerators.hpp b/Examples/Algorithms/Generators/ActsExamples/Generators/VertexGenerators.hpp
index 9602c0815ba..6060e9bcc6a 100644
--- a/Examples/Algorithms/Generators/ActsExamples/Generators/VertexGenerators.hpp
+++ b/Examples/Algorithms/Generators/ActsExamples/Generators/VertexGenerators.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2019-2020 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
@@ -12,6 +12,7 @@
 #include "ActsExamples/Framework/RandomNumbers.hpp"
 #include "ActsExamples/Generators/EventGenerator.hpp"
 
+#include <numbers>
 #include <random>
 
 namespace ActsExamples {
@@ -46,4 +47,37 @@ struct GaussianPrimaryVertexPositionGenerator
   }
 };
 
+//
+struct GaussianDisplacedVertexPositionGenerator
+    : public EventGenerator::PrimaryVertexPositionGenerator {
+  double rMean = 0;
+  double rStdDev = 1;
+  double zMean = 0;
+  double zStdDev = 1;
+  double tMean = 0;
+  double tStdDev = 1;
+
+  Acts::Vector4 operator()(RandomEngine& rng) const override {
+    double min_value = -std::numbers::pi;
+    double max_value = std::numbers::pi;
+
+    std::uniform_real_distribution<> uniform(min_value, max_value);
+
+    std::normal_distribution<double> rDist(rMean, rStdDev);
+    std::normal_distribution<double> zDist(zMean, zStdDev);
+    std::normal_distribution<double> tDist(tMean, tStdDev);
+
+    // Generate random values from normal distributions
+    double r = rDist(rng);
+    double phi = uniform(rng);  // Random angle in radians
+    double z = zDist(rng);
+    double t = tDist(rng);
+
+    // Convert cylindrical coordinates to Cartesian coordinates
+    double x = r * std::cos(phi);
+    double y = r * std::sin(phi);
+
+    return Acts::Vector4(x, y, z, t);
+  }
+};
 }  // namespace ActsExamples
diff --git a/Examples/Algorithms/GeneratorsPythia8/ActsExamples/Generators/Pythia8ProcessGenerator.cpp b/Examples/Algorithms/GeneratorsPythia8/ActsExamples/Generators/Pythia8ProcessGenerator.cpp
index 0293443d17c..cd80d64bf08 100644
--- a/Examples/Algorithms/GeneratorsPythia8/ActsExamples/Generators/Pythia8ProcessGenerator.cpp
+++ b/Examples/Algorithms/GeneratorsPythia8/ActsExamples/Generators/Pythia8ProcessGenerator.cpp
@@ -1,13 +1,14 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2017-2024 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include "ActsExamples/Generators/Pythia8ProcessGenerator.hpp"
 
+#include "Acts/Utilities/MathHelpers.hpp"
 #include "ActsExamples/EventData/SimVertex.hpp"
 #include "ActsFatras/EventData/Barcode.hpp"
 #include "ActsFatras/EventData/Particle.hpp"
@@ -120,7 +121,8 @@ Pythia8Generator::operator()(RandomEngine& rng) {
   }
 
   // create the primary vertex
-  vertices.emplace_back(0, SimVertex::Vector4(0., 0., 0., 0.));
+  vertices.emplace_back(SimVertexBarcode{0},
+                        SimVertex::Vector4(0., 0., 0., 0.));
 
   // convert generated final state particles into internal format
   for (int ip = 0; ip < m_pythia8->event.size(); ++ip) {
@@ -139,9 +141,8 @@ Pythia8Generator::operator()(RandomEngine& rng) {
     }
 
     // production vertex. Pythia8 time uses units mm/c, and we use c=1
-    SimParticle::Vector4 pos4(
-        genParticle.xProd() * 1_mm, genParticle.yProd() * 1_mm,
-        genParticle.zProd() * 1_mm, genParticle.tProd() * 1_mm);
+    Acts::Vector4 pos4(genParticle.xProd() * 1_mm, genParticle.yProd() * 1_mm,
+                       genParticle.zProd() * 1_mm, genParticle.tProd() * 1_mm);
 
     // define the particle identifier including possible secondary vertices
 
@@ -154,11 +155,10 @@ Pythia8Generator::operator()(RandomEngine& rng) {
 
       // check if an existing vertex is close enough
       auto it =
-          std::find_if(vertices.begin(), vertices.end(),
-                       [&pos4, this](const SimVertex& other) {
-                         return (pos4.head<3>() - other.position()).norm() <
-                                m_cfg.spatialVertexThreshold;
-                       });
+          std::ranges::find_if(vertices, [&pos4, this](const SimVertex& v) {
+            return (pos4.head<3>() - v.position()).norm() <
+                   m_cfg.spatialVertexThreshold;
+          });
 
       if (it != vertices.end()) {
         particleId.setVertexSecondary(std::distance(vertices.begin(), it));
@@ -166,7 +166,8 @@ Pythia8Generator::operator()(RandomEngine& rng) {
       } else {
         // no matching secondary vertex exists -> create new one
         particleId.setVertexSecondary(vertices.size());
-        auto& vertex = vertices.emplace_back(particleId.vertexId(), pos4);
+        auto& vertex = vertices.emplace_back(
+            static_cast<SimVertexBarcode>(particleId.vertexId()), pos4);
         vertex.outgoing.insert(particleId);
         ACTS_VERBOSE("created new secondary vertex " << pos4.transpose());
       }
@@ -179,15 +180,15 @@ Pythia8Generator::operator()(RandomEngine& rng) {
     const auto pdg = static_cast<Acts::PdgParticle>(genParticle.id());
     const auto charge = genParticle.charge() * 1_e;
     const auto mass = genParticle.m0() * 1_GeV;
-    ActsFatras::Particle particle(particleId, pdg, charge, mass);
+    SimParticleState particle(particleId, pdg, charge, mass);
     particle.setPosition4(pos4);
     // normalization/ units are not import for the direction
     particle.setDirection(genParticle.px(), genParticle.py(), genParticle.pz());
     particle.setAbsoluteMomentum(
-        std::hypot(genParticle.px(), genParticle.py(), genParticle.pz()) *
+        Acts::fastHypot(genParticle.px(), genParticle.py(), genParticle.pz()) *
         1_GeV);
 
-    particles.push_back(std::move(particle));
+    particles.push_back(SimParticle(particle, particle));
   }
 
   std::pair<SimVertexContainer, SimParticleContainer> out;
diff --git a/Examples/Algorithms/GeneratorsPythia8/ActsExamples/Generators/Pythia8ProcessGenerator.hpp b/Examples/Algorithms/GeneratorsPythia8/ActsExamples/Generators/Pythia8ProcessGenerator.hpp
index 033d0cd789d..6f1fe4c486f 100644
--- a/Examples/Algorithms/GeneratorsPythia8/ActsExamples/Generators/Pythia8ProcessGenerator.hpp
+++ b/Examples/Algorithms/GeneratorsPythia8/ActsExamples/Generators/Pythia8ProcessGenerator.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2017-2024 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
diff --git a/Examples/Algorithms/Geometry/include/ActsExamples/Geometry/VolumeAssociationTest.hpp b/Examples/Algorithms/Geometry/include/ActsExamples/Geometry/VolumeAssociationTest.hpp
index 897415af846..c86720c340a 100644
--- a/Examples/Algorithms/Geometry/include/ActsExamples/Geometry/VolumeAssociationTest.hpp
+++ b/Examples/Algorithms/Geometry/include/ActsExamples/Geometry/VolumeAssociationTest.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2023 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
diff --git a/Examples/Algorithms/Geometry/src/VolumeAssociationTest.cpp b/Examples/Algorithms/Geometry/src/VolumeAssociationTest.cpp
index b1bb86dd278..353bcf94bac 100644
--- a/Examples/Algorithms/Geometry/src/VolumeAssociationTest.cpp
+++ b/Examples/Algorithms/Geometry/src/VolumeAssociationTest.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2023 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include "ActsExamples/Geometry/VolumeAssociationTest.hpp"
 
@@ -14,6 +14,7 @@
 
 #include <exception>
 #include <memory>
+#include <numbers>
 #include <string>
 #include <vector>
 
@@ -37,7 +38,8 @@ ActsExamples::ProcessCode ActsExamples::VolumeAssociationTest::execute(
   auto rng = m_cfg.randomNumbers->spawnGenerator(ctx);
 
   // Setup random number distributions for some quantities
-  std::uniform_real_distribution<Acts::ActsScalar> phiDist(-M_PI, M_PI);
+  std::uniform_real_distribution<Acts::ActsScalar> phiDist(-std::numbers::pi,
+                                                           std::numbers::pi);
   std::uniform_real_distribution<Acts::ActsScalar> rDist(0.,
                                                          m_cfg.randomRange[0u]);
   std::uniform_real_distribution<Acts::ActsScalar> zDist(-m_cfg.randomRange[1u],
diff --git a/Examples/Algorithms/HepMC/include/ActsExamples/HepMC/HepMCProcessExtractor.hpp b/Examples/Algorithms/HepMC/include/ActsExamples/HepMC/HepMCProcessExtractor.hpp
index c89aa551346..47f192d59c6 100644
--- a/Examples/Algorithms/HepMC/include/ActsExamples/HepMC/HepMCProcessExtractor.hpp
+++ b/Examples/Algorithms/HepMC/include/ActsExamples/HepMC/HepMCProcessExtractor.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2020 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
diff --git a/Examples/Algorithms/HepMC/src/HepMCProcessExtractor.cpp b/Examples/Algorithms/HepMC/src/HepMCProcessExtractor.cpp
index 5dfbdcbcf73..6cc00f77430 100644
--- a/Examples/Algorithms/HepMC/src/HepMCProcessExtractor.cpp
+++ b/Examples/Algorithms/HepMC/src/HepMCProcessExtractor.cpp
@@ -1,22 +1,25 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2020 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include "ActsExamples/HepMC/HepMCProcessExtractor.hpp"
 
 #include "ActsExamples/Framework/WhiteBoard.hpp"
 #include "ActsExamples/Io/HepMC3/HepMC3Particle.hpp"
 
+#include <algorithm>
 #include <stdexcept>
 
 #include <HepMC3/GenEvent.h>
 #include <HepMC3/GenParticle.h>
 #include <HepMC3/GenVertex.h>
 
+namespace ActsExamples {
+
 namespace {
 
 /// @brief This method searches for an outgoing particle from a vertex
@@ -46,7 +49,7 @@ HepMC3::ConstGenParticlePtr searchProcessParticleById(
 /// @param [in] id The track ID
 /// @param [in, out] particle The particle that get the passed material attached
 void setPassedMaterial(const HepMC3::ConstGenVertexPtr& vertex, const int id,
-                       ActsExamples::SimParticle& particle) {
+                       SimParticle& particle) {
   double x0 = 0.;
   double l0 = 0.;
   HepMC3::ConstGenParticlePtr currentParticle = nullptr;
@@ -73,7 +76,7 @@ void setPassedMaterial(const HepMC3::ConstGenVertexPtr& vertex, const int id,
     currentVertex = currentParticle->production_vertex();
   }
   // Assign the passed material to the particle
-  particle.setMaterialPassed(x0, l0);
+  particle.final().setMaterialPassed(x0, l0);
 }
 
 /// @brief This function collects outgoing particles from a vertex while keeping
@@ -83,9 +86,9 @@ void setPassedMaterial(const HepMC3::ConstGenVertexPtr& vertex, const int id,
 /// @param [in] trackID The track ID of the ingoing particle
 ///
 /// @return Vector containing the outgoing particles from a vertex
-std::vector<ActsExamples::SimParticle> selectOutgoingParticles(
+std::vector<SimParticle> selectOutgoingParticles(
     const HepMC3::ConstGenVertexPtr& vertex, const int trackID) {
-  std::vector<ActsExamples::SimParticle> finalStateParticles;
+  std::vector<SimParticle> finalStateParticles;
 
   // Identify the ingoing particle in the outgoing particles
   HepMC3::ConstGenParticlePtr procPart =
@@ -98,8 +101,7 @@ std::vector<ActsExamples::SimParticle> selectOutgoingParticles(
                                                std::to_string(trackID))
           ->value() != "Death") {
     // Store the particle if it survives
-    finalStateParticles.push_back(
-        ActsExamples::HepMC3Particle::particle(procPart));
+    finalStateParticles.push_back(HepMC3Particle::particle(procPart));
   } else {
     // Store the leftovers if it dies
     for (const HepMC3::ConstGenParticlePtr& procPartOut :
@@ -109,8 +111,7 @@ std::vector<ActsExamples::SimParticle> selectOutgoingParticles(
           procPartOut->end_vertex()) {
         for (const HepMC3::ConstGenParticlePtr& dyingPartOut :
              procPartOut->end_vertex()->particles_out()) {
-          finalStateParticles.push_back(
-              ActsExamples::HepMC3Particle::particle(dyingPartOut));
+          finalStateParticles.push_back(HepMC3Particle::particle(dyingPartOut));
         }
       }
     }
@@ -131,14 +132,14 @@ std::vector<ActsExamples::SimParticle> selectOutgoingParticles(
       auto pid = static_cast<Acts::PdgParticle>(genParticle->pid());
 
       // Build an Acts particle out of the data
-      ActsExamples::SimParticle simParticle(barcode, pid);
+      SimParticleState simParticle(barcode, pid);
       simParticle.setPosition4(pos4.x(), pos4.y(), pos4.z(), pos4.t());
       Acts::Vector3 mom3(mom4[0], mom4[1], mom4[2]);
       simParticle.setDirection(mom3.normalized());
       simParticle.setAbsoluteMomentum(mom3.norm());
 
       // Store the particle
-      finalStateParticles.push_back(simParticle);
+      finalStateParticles.push_back(SimParticle(simParticle, simParticle));
     }
   }
 
@@ -149,9 +150,8 @@ std::vector<ActsExamples::SimParticle> selectOutgoingParticles(
 ///
 /// @param [in] cfg Configuration of the filtering
 /// @param [in, out] interactions The recorded interactions
-void filterAndSort(
-    const ActsExamples::HepMCProcessExtractor::Config& cfg,
-    ActsExamples::ExtractedSimulationProcessContainer& interactions) {
+void filterAndSort(const HepMCProcessExtractor::Config& cfg,
+                   ExtractedSimulationProcessContainer& interactions) {
   for (auto& interaction : interactions) {
     for (auto cit = interaction.after.cbegin();
          cit != interaction.after.cend();) {
@@ -167,21 +167,18 @@ void filterAndSort(
 
   // Sort the particles based on their momentum
   for (auto& interaction : interactions) {
-    std::sort(interaction.after.begin(), interaction.after.end(),
-              [](ActsExamples::SimParticle& a, ActsExamples::SimParticle& b) {
-                return a.absoluteMomentum() > b.absoluteMomentum();
-              });
+    std::ranges::sort(interaction.after, std::greater{},
+                      [](const auto& a) { return a.absoluteMomentum(); });
   }
 }
+
 }  // namespace
 
-ActsExamples::HepMCProcessExtractor::~HepMCProcessExtractor() = default;
+HepMCProcessExtractor::~HepMCProcessExtractor() = default;
 
-ActsExamples::HepMCProcessExtractor::HepMCProcessExtractor(
-    ActsExamples::HepMCProcessExtractor::Config config,
-    Acts::Logging::Level level)
-    : ActsExamples::IAlgorithm("HepMCProcessExtractor", level),
-      m_cfg(std::move(config)) {
+HepMCProcessExtractor::HepMCProcessExtractor(
+    HepMCProcessExtractor::Config config, Acts::Logging::Level level)
+    : IAlgorithm("HepMCProcessExtractor", level), m_cfg(std::move(config)) {
   if (m_cfg.inputEvents.empty()) {
     throw std::invalid_argument("Missing input event collection");
   }
@@ -196,12 +193,12 @@ ActsExamples::HepMCProcessExtractor::HepMCProcessExtractor(
   m_outputSimulationProcesses.initialize(m_cfg.outputSimulationProcesses);
 }
 
-ActsExamples::ProcessCode ActsExamples::HepMCProcessExtractor::execute(
-    const ActsExamples::AlgorithmContext& context) const {
+ProcessCode HepMCProcessExtractor::execute(
+    const AlgorithmContext& context) const {
   // Retrieve the initial particles
   const auto events = m_inputEvents(context);
 
-  ActsExamples::ExtractedSimulationProcessContainer fractions;
+  ExtractedSimulationProcessContainer fractions;
   for (const HepMC3::GenEvent& event : events) {
     // Fast exit
     if (event.particles().empty() || event.vertices().empty()) {
@@ -210,12 +207,11 @@ ActsExamples::ProcessCode ActsExamples::HepMCProcessExtractor::execute(
 
     // Get the initial particle
     HepMC3::ConstGenParticlePtr initialParticle = event.particles()[0];
-    ActsExamples::SimParticle simParticle =
-        HepMC3Particle::particle(initialParticle);
+    SimParticle simParticle = HepMC3Particle::particle(initialParticle);
 
     // Get the final state particles
-    ActsExamples::SimParticle particleToInteraction;
-    std::vector<ActsExamples::SimParticle> finalStateParticles;
+    SimParticle particleToInteraction;
+    std::vector<SimParticle> finalStateParticles;
     // Search the process vertex
     bool vertexFound = false;
     for (const auto& vertex : event.vertices()) {
@@ -239,7 +235,7 @@ ActsExamples::ProcessCode ActsExamples::HepMCProcessExtractor::execute(
         break;
       }
     }
-    fractions.push_back(ActsExamples::ExtractedSimulationProcess{
+    fractions.push_back(ExtractedSimulationProcess{
         simParticle, particleToInteraction, finalStateParticles});
   }
 
@@ -251,5 +247,7 @@ ActsExamples::ProcessCode ActsExamples::HepMCProcessExtractor::execute(
   // Write the recorded material to the event store
   m_outputSimulationProcesses(context, std::move(fractions));
 
-  return ActsExamples::ProcessCode::SUCCESS;
+  return ProcessCode::SUCCESS;
 }
+
+}  // namespace ActsExamples
diff --git a/Examples/Algorithms/MaterialMapping/include/ActsExamples/MaterialMapping/CoreMaterialMapping.hpp b/Examples/Algorithms/MaterialMapping/include/ActsExamples/MaterialMapping/CoreMaterialMapping.hpp
index 9233f67ad5b..8fa2e31f831 100644
--- a/Examples/Algorithms/MaterialMapping/include/ActsExamples/MaterialMapping/CoreMaterialMapping.hpp
+++ b/Examples/Algorithms/MaterialMapping/include/ActsExamples/MaterialMapping/CoreMaterialMapping.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2024 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
diff --git a/Examples/Algorithms/MaterialMapping/include/ActsExamples/MaterialMapping/IMaterialWriter.hpp b/Examples/Algorithms/MaterialMapping/include/ActsExamples/MaterialMapping/IMaterialWriter.hpp
index 94d7c178cbc..2596b537052 100644
--- a/Examples/Algorithms/MaterialMapping/include/ActsExamples/MaterialMapping/IMaterialWriter.hpp
+++ b/Examples/Algorithms/MaterialMapping/include/ActsExamples/MaterialMapping/IMaterialWriter.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2019 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
diff --git a/Examples/Algorithms/MaterialMapping/include/ActsExamples/MaterialMapping/MappingMaterialDecorator.hpp b/Examples/Algorithms/MaterialMapping/include/ActsExamples/MaterialMapping/MappingMaterialDecorator.hpp
index 2231e8c7e6b..e61d6e6ba5a 100644
--- a/Examples/Algorithms/MaterialMapping/include/ActsExamples/MaterialMapping/MappingMaterialDecorator.hpp
+++ b/Examples/Algorithms/MaterialMapping/include/ActsExamples/MaterialMapping/MappingMaterialDecorator.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2017-2022 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
@@ -20,9 +20,11 @@
 #include <Acts/Surfaces/SurfaceBounds.hpp>
 #include <Acts/Surfaces/TrapezoidBounds.hpp>
 
+#include <algorithm>
 #include <fstream>
 #include <map>
 #include <mutex>
+#include <numbers>
 
 // Convenience shorthand
 
@@ -93,20 +95,16 @@ class MappingMaterialDecorator : public IMaterialDecorator {
   ///
   /// @param volume to be looped onto
   void volumeLoop(const Acts::TrackingVolume* tVolume) {
-    auto sameId =
-        [tVolume](
-            const std::pair<Acts::GeometryIdentifier,
-                            std::shared_ptr<const IVolumeMaterial>>& pair) {
-          return (tVolume->geometryId() == pair.first);
-        };
-    if (std::find_if(m_volumeMaterialMap.begin(), m_volumeMaterialMap.end(),
-                     sameId) != m_volumeMaterialMap.end()) {
+    auto sameId = [tVolume](const auto& pair) {
+      return (tVolume->geometryId() == pair.first);
+    };
+    if (std::ranges::any_of(m_volumeMaterialMap, sameId)) {
       // this volume was already visited
       return;
     }
     if (tVolume->volumeMaterial() != nullptr) {
       m_volumeMaterialMap.insert(
-          {tVolume->geometryId(), tVolume->volumeMaterialSharedPtr()});
+          {tVolume->geometryId(), tVolume->volumeMaterialPtr()});
     }
     // there are confined volumes
     if (tVolume->confinedVolumes() != nullptr) {
@@ -200,8 +198,8 @@ class MappingMaterialDecorator : public IMaterialDecorator {
                 radialBounds->get(Acts::RadialBounds::eHalfPhiSector),
             radialBounds->get(Acts::RadialBounds::eAveragePhi) +
                 radialBounds->get(Acts::RadialBounds::eHalfPhiSector),
-            (radialBounds->get(Acts::RadialBounds::eHalfPhiSector) - M_PI) <
-                    Acts::s_epsilon
+            (radialBounds->get(Acts::RadialBounds::eHalfPhiSector) -
+             std::numbers::pi) < Acts::s_epsilon
                 ? Acts::closed
                 : Acts::open,
             Acts::BinningValue::binPhi);
@@ -217,8 +215,8 @@ class MappingMaterialDecorator : public IMaterialDecorator {
                 cylinderBounds->get(Acts::CylinderBounds::eHalfPhiSector),
             cylinderBounds->get(Acts::CylinderBounds::eAveragePhi) +
                 cylinderBounds->get(Acts::CylinderBounds::eHalfPhiSector),
-            (cylinderBounds->get(Acts::CylinderBounds::eHalfPhiSector) - M_PI) <
-                    Acts::s_epsilon
+            (cylinderBounds->get(Acts::CylinderBounds::eHalfPhiSector) -
+             std::numbers::pi) < Acts::s_epsilon
                 ? Acts::closed
                 : Acts::open,
             Acts::BinningValue::binPhi);
diff --git a/Examples/Algorithms/MaterialMapping/include/ActsExamples/MaterialMapping/MaterialMapping.hpp b/Examples/Algorithms/MaterialMapping/include/ActsExamples/MaterialMapping/MaterialMapping.hpp
index 2f1e1e7334e..762187683f7 100644
--- a/Examples/Algorithms/MaterialMapping/include/ActsExamples/MaterialMapping/MaterialMapping.hpp
+++ b/Examples/Algorithms/MaterialMapping/include/ActsExamples/MaterialMapping/MaterialMapping.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2017-2019 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
diff --git a/Examples/Algorithms/MaterialMapping/include/ActsExamples/MaterialMapping/MaterialMappingOptions.hpp b/Examples/Algorithms/MaterialMapping/include/ActsExamples/MaterialMapping/MaterialMappingOptions.hpp
index 96152b87c77..86ed9778e45 100644
--- a/Examples/Algorithms/MaterialMapping/include/ActsExamples/MaterialMapping/MaterialMappingOptions.hpp
+++ b/Examples/Algorithms/MaterialMapping/include/ActsExamples/MaterialMapping/MaterialMappingOptions.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2019-2020 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
diff --git a/Examples/Algorithms/MaterialMapping/include/ActsExamples/MaterialMapping/MaterialValidation.hpp b/Examples/Algorithms/MaterialMapping/include/ActsExamples/MaterialMapping/MaterialValidation.hpp
index 35d73ba4ab4..ad1a7a93dff 100644
--- a/Examples/Algorithms/MaterialMapping/include/ActsExamples/MaterialMapping/MaterialValidation.hpp
+++ b/Examples/Algorithms/MaterialMapping/include/ActsExamples/MaterialMapping/MaterialValidation.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2024 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
@@ -19,6 +19,8 @@
 #include "ActsExamples/Framework/RandomNumbers.hpp"
 #include "ActsExamples/MaterialMapping/IMaterialWriter.hpp"
 
+#include <numbers>
+
 namespace ActsExamples {
 
 /// @class MaterialValidation
@@ -35,7 +37,8 @@ class MaterialValidation : public IAlgorithm {
     Acts::Vector3 startPosition = Acts::Vector3(0., 0., 0.);
 
     /// Start direction for the scan: phi
-    std::pair<Acts::ActsScalar, Acts::ActsScalar> phiRange = {-M_PI, M_PI};
+    std::pair<Acts::ActsScalar, Acts::ActsScalar> phiRange = {-std::numbers::pi,
+                                                              std::numbers::pi};
 
     /// Start direction for the scan: eta
     std::pair<Acts::ActsScalar, Acts::ActsScalar> etaRange = {-4., 4.};
diff --git a/Examples/Algorithms/MaterialMapping/src/CoreMaterialMapping.cpp b/Examples/Algorithms/MaterialMapping/src/CoreMaterialMapping.cpp
index b8d4e5df30d..e15a641bedc 100644
--- a/Examples/Algorithms/MaterialMapping/src/CoreMaterialMapping.cpp
+++ b/Examples/Algorithms/MaterialMapping/src/CoreMaterialMapping.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2017-2020 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include "ActsExamples/MaterialMapping/CoreMaterialMapping.hpp"
 
diff --git a/Examples/Algorithms/MaterialMapping/src/MaterialMapping.cpp b/Examples/Algorithms/MaterialMapping/src/MaterialMapping.cpp
index 6e40e27c5b9..c08d7d39456 100644
--- a/Examples/Algorithms/MaterialMapping/src/MaterialMapping.cpp
+++ b/Examples/Algorithms/MaterialMapping/src/MaterialMapping.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2017-2020 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include "ActsExamples/MaterialMapping/MaterialMapping.hpp"
 
diff --git a/Examples/Algorithms/MaterialMapping/src/MaterialValidation.cpp b/Examples/Algorithms/MaterialMapping/src/MaterialValidation.cpp
index 19d5841ef09..c75c654ed2b 100644
--- a/Examples/Algorithms/MaterialMapping/src/MaterialValidation.cpp
+++ b/Examples/Algorithms/MaterialMapping/src/MaterialValidation.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2017-2020 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include "ActsExamples/MaterialMapping/MaterialValidation.hpp"
 
diff --git a/Examples/Algorithms/Printers/ActsExamples/Printers/ParticlesPrinter.cpp b/Examples/Algorithms/Printers/ActsExamples/Printers/ParticlesPrinter.cpp
index ef09a37a65d..3f0e9de0d7b 100644
--- a/Examples/Algorithms/Printers/ActsExamples/Printers/ParticlesPrinter.cpp
+++ b/Examples/Algorithms/Printers/ActsExamples/Printers/ParticlesPrinter.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2020 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include "ParticlesPrinter.hpp"
 
@@ -12,12 +12,10 @@
 #include "Acts/Utilities/Logger.hpp"
 #include "ActsExamples/EventData/SimParticle.hpp"
 #include "ActsExamples/Framework/AlgorithmContext.hpp"
-#include "ActsFatras/EventData/Particle.hpp"
 #include "ActsFatras/EventData/ProcessType.hpp"
 
 #include <ostream>
 #include <stdexcept>
-#include <utility>
 
 ActsExamples::ParticlesPrinter::ParticlesPrinter(const Config& cfg,
                                                  Acts::Logging::Level lvl)
diff --git a/Examples/Algorithms/Printers/ActsExamples/Printers/ParticlesPrinter.hpp b/Examples/Algorithms/Printers/ActsExamples/Printers/ParticlesPrinter.hpp
index 59983b8e0f7..6aa4fd785a9 100644
--- a/Examples/Algorithms/Printers/ActsExamples/Printers/ParticlesPrinter.hpp
+++ b/Examples/Algorithms/Printers/ActsExamples/Printers/ParticlesPrinter.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2020 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
diff --git a/Examples/Algorithms/Printers/ActsExamples/Printers/TrackParametersPrinter.cpp b/Examples/Algorithms/Printers/ActsExamples/Printers/TrackParametersPrinter.cpp
index 1b90ad08ce0..25660c04212 100644
--- a/Examples/Algorithms/Printers/ActsExamples/Printers/TrackParametersPrinter.cpp
+++ b/Examples/Algorithms/Printers/ActsExamples/Printers/TrackParametersPrinter.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2020 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include "TrackParametersPrinter.hpp"
 
diff --git a/Examples/Algorithms/Printers/ActsExamples/Printers/TrackParametersPrinter.hpp b/Examples/Algorithms/Printers/ActsExamples/Printers/TrackParametersPrinter.hpp
index 247ae668796..b5f031694ff 100644
--- a/Examples/Algorithms/Printers/ActsExamples/Printers/TrackParametersPrinter.hpp
+++ b/Examples/Algorithms/Printers/ActsExamples/Printers/TrackParametersPrinter.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2020 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
diff --git a/Examples/Algorithms/Propagation/CMakeLists.txt b/Examples/Algorithms/Propagation/CMakeLists.txt
index c9b2b68ca36..26c5a23f654 100644
--- a/Examples/Algorithms/Propagation/CMakeLists.txt
+++ b/Examples/Algorithms/Propagation/CMakeLists.txt
@@ -1,4 +1,9 @@
-add_library(ActsExamplesPropagation SHARED src/PropagationAlgorithm.cpp)
+add_library(
+    ActsExamplesPropagation
+    SHARED
+    src/PropagationAlgorithm.cpp
+    src/SimHitToSummaryConversion.cpp
+)
 
 target_include_directories(
     ActsExamplesPropagation
diff --git a/Examples/Algorithms/Propagation/include/ActsExamples/Propagation/PropagationAlgorithm.hpp b/Examples/Algorithms/Propagation/include/ActsExamples/Propagation/PropagationAlgorithm.hpp
index bbebf9b8625..cc1ebe6815d 100644
--- a/Examples/Algorithms/Propagation/include/ActsExamples/Propagation/PropagationAlgorithm.hpp
+++ b/Examples/Algorithms/Propagation/include/ActsExamples/Propagation/PropagationAlgorithm.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2017-2024 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
@@ -23,10 +23,6 @@
 #include <string>
 #include <unordered_map>
 
-namespace Acts {
-class Surface;
-}
-
 namespace ActsExamples {
 
 class PropagatorInterface;
diff --git a/Examples/Algorithms/Propagation/include/ActsExamples/Propagation/PropagatorInterface.hpp b/Examples/Algorithms/Propagation/include/ActsExamples/Propagation/PropagatorInterface.hpp
index cc13142616f..2aa3b2292ac 100644
--- a/Examples/Algorithms/Propagation/include/ActsExamples/Propagation/PropagatorInterface.hpp
+++ b/Examples/Algorithms/Propagation/include/ActsExamples/Propagation/PropagatorInterface.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2021-2024 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
@@ -50,7 +50,7 @@ class PropagatorInterface {
 template <typename propagator_t>
 class ConcretePropagator : public PropagatorInterface {
  public:
-  ConcretePropagator(propagator_t propagator)
+  explicit ConcretePropagator(propagator_t propagator)
       : m_propagator{std::move(propagator)} {}
 
   Acts::Result<PropagationOutput> execute(
@@ -67,11 +67,11 @@ class ConcretePropagator : public PropagatorInterface {
     using SteppingLogger = Acts::detail::SteppingLogger;
     using EndOfWorld = Acts::EndOfWorldReached;
 
-    // Action list and abort list
-    using ActionList = Acts::ActionList<SteppingLogger, MaterialInteractor>;
-    using AbortList = Acts::AbortList<EndOfWorld>;
+    // Actor list
+    using ActorList =
+        Acts::ActorList<SteppingLogger, MaterialInteractor, EndOfWorld>;
     using PropagatorOptions =
-        typename propagator_t::template Options<ActionList, AbortList>;
+        typename propagator_t::template Options<ActorList>;
 
     PropagatorOptions options(context.geoContext, context.magFieldContext);
     // Activate loop protection at some pt value
@@ -79,13 +79,13 @@ class ConcretePropagator : public PropagatorInterface {
         startParameters.transverseMomentum() < cfg.ptLoopers;
 
     // Switch the material interaction on/off & eventually into logging mode
-    auto& mInteractor = options.actionList.template get<MaterialInteractor>();
+    auto& mInteractor = options.actorList.template get<MaterialInteractor>();
     mInteractor.multipleScattering = cfg.multipleScattering;
     mInteractor.energyLoss = cfg.energyLoss;
     mInteractor.recordInteractions = cfg.recordMaterialInteractions;
 
     // Switch the logger to sterile, e.g. for timing checks
-    auto& sLogger = options.actionList.template get<SteppingLogger>();
+    auto& sLogger = options.actorList.template get<SteppingLogger>();
     sLogger.sterile = cfg.sterileLogger;
     // Set a maximum step size
     options.stepping.maxStepSize = cfg.maxStepSize;
diff --git a/Examples/Algorithms/Propagation/include/ActsExamples/Propagation/SimHitToSummaryConversion.hpp b/Examples/Algorithms/Propagation/include/ActsExamples/Propagation/SimHitToSummaryConversion.hpp
new file mode 100644
index 00000000000..60cf993c29f
--- /dev/null
+++ b/Examples/Algorithms/Propagation/include/ActsExamples/Propagation/SimHitToSummaryConversion.hpp
@@ -0,0 +1,70 @@
+// This file is part of the ACTS project.
+//
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
+//
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
+
+#pragma once
+
+#include "Acts/Geometry/GeometryContext.hpp"
+#include "Acts/Utilities/Logger.hpp"
+#include "ActsExamples/EventData/PropagationSummary.hpp"
+#include "ActsExamples/EventData/SimHit.hpp"
+#include "ActsExamples/Framework/DataHandle.hpp"
+#include "ActsExamples/Framework/IAlgorithm.hpp"
+#include "ActsExamples/Framework/ProcessCode.hpp"
+
+#include <string>
+
+namespace ActsExamples {
+
+class PropagatorInterface;
+struct AlgorithmContext;
+
+/// @brief This simple algorithm takes the SimHits and input particles
+/// and converts them into a PropagationSummary object.
+///
+/// This allows for simulation and propagation to be compared at
+/// the same output format.
+class SimHitToSummaryConversion : public IAlgorithm {
+ public:
+  struct Config {
+    /// The input collection
+    std::string inputSimHits = "SimHitContainer";
+
+    /// The input particles (for geometric matching)
+    std::string inputParticles = "SimParticleContainer";
+
+    /// The step collection to be stored
+    std::string outputSummaryCollection = "PropagationSummary";
+
+    /// Map of surface by identifier to allow local - to global
+    std::unordered_map<Acts::GeometryIdentifier, const Acts::Surface*>
+        surfaceByIdentifier;
+  };
+
+  /// Constructor
+  /// @param [in] config is the configuration struct
+  /// @param [in] loglevel is the logging level
+  SimHitToSummaryConversion(const Config& config, Acts::Logging::Level level);
+
+  /// Framework execute method
+  /// @param [in] the algorithm context for event consistency
+  /// @return is a process code indicating success or not
+  ActsExamples::ProcessCode execute(
+      const AlgorithmContext& context) const override;
+
+  /// Get const access to the config
+  const Config& config() const { return m_cfg; }
+
+ private:
+  Config m_cfg;
+  ReadDataHandle<SimHitContainer> m_inputSimHits{this, "SimHitContainer"};
+  ReadDataHandle<SimParticleContainer> m_inputParticles{this,
+                                                        "SimParticleContainer"};
+  WriteDataHandle<PropagationSummaries> m_outputSummary{this, "OutputSummary"};
+};
+
+}  // namespace ActsExamples
diff --git a/Examples/Algorithms/Propagation/src/PropagationAlgorithm.cpp b/Examples/Algorithms/Propagation/src/PropagationAlgorithm.cpp
index 7c426557b56..1acd1de0814 100644
--- a/Examples/Algorithms/Propagation/src/PropagationAlgorithm.cpp
+++ b/Examples/Algorithms/Propagation/src/PropagationAlgorithm.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2021-2024 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include "ActsExamples/Propagation/PropagationAlgorithm.hpp"
 
diff --git a/Examples/Algorithms/Propagation/src/SimHitToSummaryConversion.cpp b/Examples/Algorithms/Propagation/src/SimHitToSummaryConversion.cpp
new file mode 100644
index 00000000000..2d90a2bc8ac
--- /dev/null
+++ b/Examples/Algorithms/Propagation/src/SimHitToSummaryConversion.cpp
@@ -0,0 +1,149 @@
+// This file is part of the ACTS project.
+//
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
+//
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
+
+#include "ActsExamples/Propagation/SimHitToSummaryConversion.hpp"
+
+#include "ActsExamples/EventData/GeometryContainers.hpp"
+
+namespace {
+/// Helper method to cancatenate the steps and push them onto the surface
+///
+/// @param gctx is the geometry context
+/// @param steps is the vector of steps to concatenate
+/// @param surface is the surface to push the steps onto
+///
+/// @return the concatenated step
+Acts::detail::Step concatenateSteps(
+    const Acts::GeometryContext& gctx,
+    const std::vector<Acts::detail::Step>& steps,
+    const Acts::Surface& surface) {
+  // Average the position and direction
+  Acts::detail::Step concatStep;
+  if (steps.size() > 1) {
+    for (const Acts::detail::Step& step : steps) {
+      concatStep.position += step.position;
+      concatStep.momentum += step.momentum;
+    }
+    Acts::ActsScalar weight = 1.0 / static_cast<Acts::ActsScalar>(steps.size());
+    concatStep.position *= weight;
+    concatStep.momentum *= weight;
+  } else {
+    concatStep = steps.front();
+  }
+  // Re-evaulate the position with a surface intersection
+  auto intersection =
+      surface.intersect(gctx, concatStep.position, concatStep.momentum);
+  for (const auto& rsIntersection : intersection.split()) {
+    if (rsIntersection.isValid()) {
+      concatStep.position = rsIntersection.position();
+      break;
+    }
+  }
+  // Set the surface identifier
+  concatStep.geoID = surface.geometryId();
+  return concatStep;
+}
+}  // namespace
+
+ActsExamples::SimHitToSummaryConversion::SimHitToSummaryConversion(
+    const Config& config, Acts::Logging::Level level)
+    : IAlgorithm("SimHitToSummaryConversion", level), m_cfg(config) {
+  if (m_cfg.inputSimHits.empty()) {
+    throw std::invalid_argument("Missing simulated hits input collection");
+  }
+  if (m_cfg.inputParticles.empty()) {
+    throw std::invalid_argument("Missing simulated particles input collection");
+  }
+  m_inputSimHits.initialize(m_cfg.inputSimHits);
+  m_inputParticles.initialize(m_cfg.inputParticles);
+  m_outputSummary.initialize(m_cfg.outputSummaryCollection);
+}
+
+ActsExamples::ProcessCode ActsExamples::SimHitToSummaryConversion::execute(
+    const AlgorithmContext& context) const {
+  // Retrieve the simulated hits
+  const auto& simHits = m_inputSimHits(context);
+  // Retrieve the particles at its basis
+  const auto& particles = m_inputParticles(context);
+
+  PropagationSummaries propagationSummaries;
+  propagationSummaries.reserve(particles.size());
+
+  // Prepare and sort
+  std::unordered_map<unsigned long,
+                     std::vector<std::vector<Acts::detail::Step>>>
+      trackSteps;
+  for (const auto& simHitsGroup : groupByModule(simHits)) {
+    // Manual pair unpacking instead of using
+    //   auto [moduleGeoId, moduleSimHits] : ...
+    // otherwise clang on macos complains that it is unable to capture the local
+    // binding in the lambda used for visiting the smearer below.
+    Acts::GeometryIdentifier moduleGeoId = simHitsGroup.first;
+    const auto& moduleSimHits = simHitsGroup.second;
+    std::unordered_map<unsigned long, std::vector<Acts::detail::Step>>
+        moduleSteps;
+    for (const auto& simHit : moduleSimHits) {
+      unsigned long paritcleId = simHit.particleId().value();
+      if (!moduleSteps.contains(paritcleId)) {
+        moduleSteps[paritcleId] = std::vector<Acts::detail::Step>();
+      }
+      Acts::ActsScalar hx = simHit.fourPosition().x() / Acts::UnitConstants::mm;
+      Acts::ActsScalar hy = simHit.fourPosition().y() / Acts::UnitConstants::mm;
+      Acts::ActsScalar hz = simHit.fourPosition().z() / Acts::UnitConstants::mm;
+      Acts::detail::Step step;
+      step.position = Acts::Vector3(hx, hy, hz);
+      step.momentum = simHit.direction();
+      step.geoID = moduleGeoId;
+      step.navDir = Acts::Direction::Forward;
+      moduleSteps[paritcleId].push_back(step);
+    }
+    // Loop over and fill into the trackSteps
+    for (const auto& [particleId, steps] : moduleSteps) {
+      if (!trackSteps.contains(particleId)) {
+        trackSteps[particleId] = std::vector<std::vector<Acts::detail::Step>>();
+      }
+      trackSteps[particleId].push_back(steps);
+    }
+  }
+
+  // Loop over the particles and create the propagation summaries
+  for (const auto& particle : particles) {
+    // Create the propagation summary
+    Acts::CurvilinearTrackParameters start(
+        particle.fourPosition(), particle.direction(),
+        particle.charge() / particle.momentum().norm(), std::nullopt,
+        particle.hypothesis());
+    PropagationSummary propagationSummary(start);
+    // Find the associated steps
+    auto steps = trackSteps.find(particle.particleId().value());
+    if (steps != trackSteps.end()) {
+      for (const std::vector<Acts::detail::Step>& moduleSteps : steps->second) {
+        // Get the GeometryIdentifier of the surface
+        Acts::GeometryIdentifier surface = moduleSteps.front().geoID;
+        // Find the surface
+        auto surfaceIt = m_cfg.surfaceByIdentifier.find(surface);
+        if (surfaceIt == m_cfg.surfaceByIdentifier.end()) {
+          throw std::invalid_argument("Surface not found, should not happen");
+        }
+        Acts::detail::Step concatStep = concatenateSteps(
+            context.geoContext, moduleSteps, *surfaceIt->second);
+        propagationSummary.steps.push_back(concatStep);
+      }
+    } else {
+      ACTS_WARNING("No steps found for particle "
+                   << particle.particleId().value());
+    }
+
+    propagationSummaries.push_back(std::move(propagationSummary));
+  }
+
+  // Write the propagation step data to the event store
+  m_outputSummary(context, std::move(propagationSummaries));
+
+  return ProcessCode::SUCCESS;
+}
diff --git a/Examples/Algorithms/Traccc/CMakeLists.txt b/Examples/Algorithms/Traccc/CMakeLists.txt
new file mode 100644
index 00000000000..11837f12298
--- /dev/null
+++ b/Examples/Algorithms/Traccc/CMakeLists.txt
@@ -0,0 +1,17 @@
+add_library(ActsExamplesTraccc INTERFACE)
+
+target_include_directories(
+    ActsExamplesTraccc
+    INTERFACE $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
+)
+
+target_link_libraries(
+    ActsExamplesTraccc
+    INTERFACE
+        ActsCore
+        ActsExamplesFramework
+        ActsExamplesPropagation
+        ActsPluginDetray
+)
+
+install(TARGETS ActsExamplesTraccc LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR})
diff --git a/Examples/Algorithms/Traccc/include/ActsExamples/Traccc/DetrayPropagator.hpp b/Examples/Algorithms/Traccc/include/ActsExamples/Traccc/DetrayPropagator.hpp
new file mode 100644
index 00000000000..d27902c7739
--- /dev/null
+++ b/Examples/Algorithms/Traccc/include/ActsExamples/Traccc/DetrayPropagator.hpp
@@ -0,0 +1,167 @@
+// This file is part of the ACTS project.
+//
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
+//
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
+
+#pragma once
+
+#include "Acts/Geometry/GeometryIdentifier.hpp"
+#include "Acts/Utilities/Logger.hpp"
+#include "Acts/Utilities/Result.hpp"
+#include "ActsExamples/EventData/PropagationSummary.hpp"
+#include "ActsExamples/Propagation/PropagationAlgorithm.hpp"
+#include "ActsExamples/Propagation/PropagatorInterface.hpp"
+#include "ActsExamples/Traccc/DetrayStore.hpp"
+
+#include <detray/navigation/navigator.hpp>
+#include <detray/propagator/actor_chain.hpp>
+#include <detray/propagator/propagator.hpp>
+#include <detray/test/utils/inspectors.hpp>
+
+namespace ActsExamples {
+
+/// Define the algebra type
+using DetrayAlgebraType = typename Acts::DetrayHostDetector::algebra_type;
+
+/// Type that holds the intersection information
+using DetrayIntersection =
+    detray::intersection2D<typename Acts::DetrayHostDetector::surface_type,
+                           DetrayAlgebraType>;
+
+/// Inspector that records all encountered surfaces
+using DetrayObjectTracer =
+    detray::navigation::object_tracer<DetrayIntersection, detray::dvector,
+                                      detray::navigation::status::e_on_module,
+                                      detray::navigation::status::e_on_portal>;
+
+template <typename stepper_t, typename detray_store_t>
+class DetrayPropagator : public PropagatorInterface {
+ public:
+  /// Configuration struct
+  struct Config {
+    /// The detray store
+    std::shared_ptr<const detray_store_t> detrayStore = nullptr;
+    /// Switch to sterile
+    bool sterile = false;
+  };
+
+  /// Create a DetrayPropagator
+  ///
+  /// @param cfg configuration struct
+  /// @param logger The logger instance
+  DetrayPropagator(const Config& cfg,
+                   std::unique_ptr<const Acts::Logger> logger =
+                       Acts::getDefaultLogger("DetrayPropagator",
+                                              Acts::Logging::INFO))
+      : PropagatorInterface(), m_cfg(cfg), m_logger(std::move(logger)) {}
+
+  ///@brief  Execute a propagation for charged particle parameters
+  ///
+  ///@param context The algorithm context
+  ///@param cfg  The propagation algorithm configuration
+  ///@param logger A logger wrapper instance
+  ///@param startParameters The start parameters
+  ///@return PropagationOutput
+  Acts::Result<PropagationOutput> execute(
+      const AlgorithmContext& context,
+      [[maybe_unused]] const PropagationAlgorithm::Config& cfg,
+      const Acts::Logger& logger,
+      const Acts::BoundTrackParameters& startParameters) const final {
+    // Get the geometry context form the algorithm context
+    const auto& geoContext = context.geoContext;
+    // Get the track information
+    const Acts::Vector3 position = startParameters.position(geoContext);
+    const Acts::Vector3 direction = startParameters.momentum().normalized();
+
+    ACTS_VERBOSE("Starting propagation at " << position.transpose()
+                                            << " with direction "
+                                            << direction.transpose());
+
+    // Now follow that ray with the same track and check, if we find
+    // the same volumes and distances along the way
+    detray::free_track_parameters<DetrayAlgebraType> track(
+        {position.x(), position.y(), position.z()}, 0.f,
+        {direction.x(), direction.y(), direction.z()},
+        startParameters.charge());
+
+    // Return material
+    RecordedMaterial recordedMaterial;
+    PropagationSummary summary(startParameters);
+
+    if (!m_cfg.sterile) {
+      /// Aggregation of multiple inspectors
+      using DetrayInspector = detray::aggregate_inspector<DetrayObjectTracer>;
+
+      // Navigation with inspection
+      using DetrayNavigator =
+          detray::navigator<Acts::DetrayHostDetector,
+                            detray::navigation::default_cache_size,
+                            DetrayInspector>;
+
+      // Propagator with empty actor chain (for the moment)
+      using Propagator =
+          detray::propagator<stepper_t, DetrayNavigator, detray::actor_chain<>>;
+
+      typename Propagator::state propagation(track,
+                                             m_cfg.detrayStore->detector);
+
+      Propagator propagator;
+
+      // Run the actual propagation
+      propagator.propagate(propagation);
+
+      // Retrieve navigation information
+      auto& inspector = propagation._navigation.inspector();
+      auto& objectTracer = inspector.template get<DetrayObjectTracer>();
+
+      // Translate the objects into the steps
+      for (const auto& object : objectTracer.object_trace) {
+        // Get the position of the object
+        const auto& dposition = object.pos;
+        const auto& sfDesription = object.intersection.sf_desc;
+        const auto sf =
+            detray::tracking_surface{m_cfg.detrayStore->detector, sfDesription};
+        Acts::GeometryIdentifier geoID{sf.source()};
+        // Create a step from the object
+        Acts::detail::Step step;
+        step.position = Acts::Vector3(dposition[0], dposition[1], dposition[2]);
+        step.geoID = geoID;
+        step.navDir = object.intersection.direction ? Acts::Direction::Forward
+                                                    : Acts::Direction::Backward;
+        summary.steps.emplace_back(step);
+      }
+    } else {
+      // Navigation with inspection
+      using DetrayNavigator =
+          detray::navigator<Acts::DetrayHostDetector,
+                            detray::navigation::default_cache_size>;
+
+      // Propagator with empty actor chain (for the moment)
+      using Propagator =
+          detray::propagator<stepper_t, DetrayNavigator, detray::actor_chain<>>;
+
+      typename Propagator::state propagation(track,
+                                             m_cfg.detrayStore->detector);
+
+      Propagator propagator;
+      // Run the actual propagation
+      propagator.propagate(propagation);
+    }
+
+    return std::pair{std::move(summary), std::move(recordedMaterial)};
+  }
+
+ private:
+  /// The detray detector store and memory resource
+  Config m_cfg;
+
+  /// The logging instance
+  std::unique_ptr<const Acts::Logger> m_logger = nullptr;
+
+  const Acts::Logger& logger() const { return *m_logger; }
+};
+
+}  // namespace ActsExamples
diff --git a/Examples/Algorithms/Traccc/include/ActsExamples/Traccc/DetrayStore.hpp b/Examples/Algorithms/Traccc/include/ActsExamples/Traccc/DetrayStore.hpp
new file mode 100644
index 00000000000..199a0dbc5c1
--- /dev/null
+++ b/Examples/Algorithms/Traccc/include/ActsExamples/Traccc/DetrayStore.hpp
@@ -0,0 +1,55 @@
+// This file is part of the ACTS project.
+//
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
+//
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
+
+#pragma once
+
+#include "Acts/Plugins/Detray/DetrayConversionUtils.hpp"
+#include "Acts/Plugins/Detray/DetrayConverter.hpp"
+
+#include <memory>
+
+#include <vecmem/memory/host_memory_resource.hpp>
+#include <vecmem/memory/memory_resource.hpp>
+
+namespace ActsExamples {
+
+// The Detray host store that is used to store the detector
+// and the associated memory resource
+template <typename memory_source_t>
+struct DetrayStore {
+  // Constructor from arguments
+  DetrayStore(std::shared_ptr<memory_source_t> mSource,
+              Acts::DetrayHostDetector&& det)
+      : memoryResource(std::move(mSource)), detector(std::move(det)) {}
+
+  // The memory resource
+  std::shared_ptr<memory_source_t> memoryResource = nullptr;
+  // The detray detector instance
+  Acts::DetrayHostDetector detector;
+
+  // Create a Detray detector and store it with its memory Source in
+  ///
+  /// @param gctx the geometry context
+  /// @param detector the detector to be converted
+  /// @param options the conversion options
+  static inline std::shared_ptr<const DetrayStore<memory_source_t>> create(
+      const Acts::GeometryContext& gctx,
+      const Acts::Experimental::Detector& detector,
+      const Acts::DetrayConverter::Options& options) {
+    auto memoryResource = std::make_shared<memory_source_t>();
+    auto DetrayHostDetector = Acts::DetrayConverter().convert<>(
+        gctx, detector, *memoryResource, options);
+
+    return std::make_shared<DetrayStore<memory_source_t>>(
+        memoryResource, std::move(DetrayHostDetector));
+  }
+};
+
+using DetrayHostStore = DetrayStore<vecmem::host_memory_resource>;
+
+}  // namespace ActsExamples
diff --git a/Examples/Algorithms/TrackFinding/CMakeLists.txt b/Examples/Algorithms/TrackFinding/CMakeLists.txt
index d030529d18c..38781494068 100644
--- a/Examples/Algorithms/TrackFinding/CMakeLists.txt
+++ b/Examples/Algorithms/TrackFinding/CMakeLists.txt
@@ -27,6 +27,16 @@ target_link_libraries(
     PRIVATE ROOT::Core ROOT::Geom ROOT::Graf ROOT::Hist ROOT::Gpad
 )
 
+# If Hashing examples are enabled, add them to the build
+if(ACTS_BUILD_EXAMPLES_HASHING)
+    target_sources(
+        ActsExamplesTrackFinding
+        PRIVATE src/SeedingAlgorithmHashing.cpp
+    )
+
+    target_link_libraries(ActsExamplesTrackFinding PUBLIC ActsPluginHashing)
+endif()
+
 install(
     TARGETS ActsExamplesTrackFinding
     LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
diff --git a/Examples/Algorithms/TrackFinding/include/ActsExamples/TrackFinding/DefaultHoughFunctions.hpp b/Examples/Algorithms/TrackFinding/include/ActsExamples/TrackFinding/DefaultHoughFunctions.hpp
index f158d736f61..a60c1dfb470 100644
--- a/Examples/Algorithms/TrackFinding/include/ActsExamples/TrackFinding/DefaultHoughFunctions.hpp
+++ b/Examples/Algorithms/TrackFinding/include/ActsExamples/TrackFinding/DefaultHoughFunctions.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2020-2021 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include "Acts/Utilities/Result.hpp"
 
diff --git a/Examples/Algorithms/TrackFinding/include/ActsExamples/TrackFinding/GbtsSeedingAlgorithm.hpp b/Examples/Algorithms/TrackFinding/include/ActsExamples/TrackFinding/GbtsSeedingAlgorithm.hpp
index 44a46d6191e..b422eab9e85 100644
--- a/Examples/Algorithms/TrackFinding/include/ActsExamples/TrackFinding/GbtsSeedingAlgorithm.hpp
+++ b/Examples/Algorithms/TrackFinding/include/ActsExamples/TrackFinding/GbtsSeedingAlgorithm.hpp
@@ -1,16 +1,15 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2020 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 // basing off of SeedingOrtho
 
 #pragma once
 
-#include "Acts/Seeding/InternalSeed.hpp"
 #include "Acts/Seeding/SeedFilterConfig.hpp"
 #include "Acts/Seeding/SeedFinderGbts.hpp"
 #include "Acts/Seeding/SeedFinderGbtsConfig.hpp"
@@ -45,8 +44,6 @@ class GbtsSeedingAlgorithm final : public IAlgorithm {
 
     std::vector<Acts::GeometryIdentifier> geometrySelection;
 
-    std::string inputSourceLinks;
-
     std::shared_ptr<const Acts::TrackingGeometry> trackingGeometry;
 
     std::map<std::pair<int, int>, std::pair<int, int>> ActsGbtsMap;
@@ -89,9 +86,6 @@ class GbtsSeedingAlgorithm final : public IAlgorithm {
 
   WriteDataHandle<SimSeedContainer> m_outputSeeds{this, "OutputSeeds"};
 
-  ReadDataHandle<IndexSourceLinkContainer> m_inputSourceLinks{
-      this, "InputSourceLinks"};
-
   ReadDataHandle<ClusterContainer> m_inputClusters{this, "InputClusters"};
 };
 
diff --git a/Examples/Algorithms/TrackFinding/include/ActsExamples/TrackFinding/HoughTransformSeeder.hpp b/Examples/Algorithms/TrackFinding/include/ActsExamples/TrackFinding/HoughTransformSeeder.hpp
index a081db6f763..b8fd5ef3f75 100644
--- a/Examples/Algorithms/TrackFinding/include/ActsExamples/TrackFinding/HoughTransformSeeder.hpp
+++ b/Examples/Algorithms/TrackFinding/include/ActsExamples/TrackFinding/HoughTransformSeeder.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2022 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 // @file HoughTransformSeeder.hpp
 // @author Riley Xu then modified to ACTS by Jahred Adelman
@@ -72,20 +72,20 @@
 
 #include "Acts/Geometry/GeometryIdentifier.hpp"
 #include "Acts/Utilities/Delegate.hpp"
+#include "Acts/Utilities/Grid.hpp"
 #include "Acts/Utilities/Logger.hpp"
 #include "Acts/Utilities/Result.hpp"
 #include "ActsExamples/EventData/Index.hpp"
-#include "ActsExamples/EventData/IndexSourceLink.hpp"
 #include "ActsExamples/EventData/Measurement.hpp"
 #include "ActsExamples/EventData/ProtoTrack.hpp"
 #include "ActsExamples/EventData/SimSpacePoint.hpp"
 #include "ActsExamples/Framework/DataHandle.hpp"
 #include "ActsExamples/Framework/IAlgorithm.hpp"
 #include "ActsExamples/Framework/ProcessCode.hpp"
-#include "ActsExamples/TrackFinding/HoughVectors.hpp"
 
 #include <cstddef>
 #include <memory>
+#include <numbers>
 #include <string>
 #include <unordered_set>
 #include <utility>
@@ -128,8 +128,10 @@ namespace ActsExamples {
 /// each bin. Size m_houghHistSize_y * m_houghHistSize_x. (NOTE y is row
 /// coordinate) For now, what is stored is actually the index of the object in
 /// the vectors, so we can get the Index layer
+using Axis =
+    Acts::Axis<Acts::AxisType::Equidistant, Acts::AxisBoundaryType::Bound>;
 using HoughHist =
-    MultiIndexedVector2D<std::pair<int, std::unordered_set<unsigned>>>;
+    Acts::Grid<std::pair<int, std::unordered_set<unsigned>>, Axis, Axis>;
 
 enum HoughHitType { SP = 0, MEASUREMENT = 1 };
 
@@ -166,8 +168,6 @@ class HoughTransformSeeder final : public IAlgorithm {
     std::string outputSeeds;
     /// Output hough track collection.
     std::string outputProtoTracks;
-    /// Input source links collection.
-    std::string inputSourceLinks;
     /// Tracking geometry required to access global-to-local transforms.
     std::shared_ptr<const Acts::TrackingGeometry> trackingGeometry;
     /// For which part of the detector geometry should space points be created.
@@ -195,10 +195,10 @@ class HoughTransformSeeder final : public IAlgorithm {
 
     unsigned nLayers = 10;  // total number of layers
 
-    float xMin = 0;            // minphi
-    float xMax = 2 * 3.14159;  // maxphi
-    float yMin = -1.0;         // min q/pt, -1/1 GeV
-    float yMax = 1.0;          // max q/pt, +1/1 GeV
+    float xMin = 0.;                    // minphi
+    float xMax = 2 * std::numbers::pi;  // maxphi
+    float yMin = -1.;                   // min q/pt, -1/1 GeV
+    float yMax = 1.;                    // max q/pt, +1/1 GeV
 
     /// Size of the houghHists. One obvious concern with this being too big is
     /// that it will take up more memory But the bins of the houghHist are
@@ -279,9 +279,6 @@ class HoughTransformSeeder final : public IAlgorithm {
   ReadDataHandle<MeasurementContainer> m_inputMeasurements{this,
                                                            "InputMeasurements"};
 
-  ReadDataHandle<IndexSourceLinkContainer> m_inputSourceLinks{
-      this, "InputSourceLinks"};
-
   ////////////////////////////////////////////////////////////////////////
   /// Convenience
 
diff --git a/Examples/Algorithms/TrackFinding/include/ActsExamples/TrackFinding/HoughVectors.hpp b/Examples/Algorithms/TrackFinding/include/ActsExamples/TrackFinding/HoughVectors.hpp
index 11ceff86057..3e0e54a41e1 100644
--- a/Examples/Algorithms/TrackFinding/include/ActsExamples/TrackFinding/HoughVectors.hpp
+++ b/Examples/Algorithms/TrackFinding/include/ActsExamples/TrackFinding/HoughVectors.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2021 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
diff --git a/Examples/Algorithms/TrackFinding/include/ActsExamples/TrackFinding/MuonHoughSeeder.hpp b/Examples/Algorithms/TrackFinding/include/ActsExamples/TrackFinding/MuonHoughSeeder.hpp
index 8be6d4722ff..588e7dbda51 100644
--- a/Examples/Algorithms/TrackFinding/include/ActsExamples/TrackFinding/MuonHoughSeeder.hpp
+++ b/Examples/Algorithms/TrackFinding/include/ActsExamples/TrackFinding/MuonHoughSeeder.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2021 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
diff --git a/Examples/Algorithms/TrackFinding/include/ActsExamples/TrackFinding/SeedingAlgorithm.hpp b/Examples/Algorithms/TrackFinding/include/ActsExamples/TrackFinding/SeedingAlgorithm.hpp
index 8c2b9c6beb9..73bb81d5d7f 100644
--- a/Examples/Algorithms/TrackFinding/include/ActsExamples/TrackFinding/SeedingAlgorithm.hpp
+++ b/Examples/Algorithms/TrackFinding/include/ActsExamples/TrackFinding/SeedingAlgorithm.hpp
@@ -1,13 +1,14 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2024 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
+#include "Acts/EventData/SpacePointContainer.hpp"
 #include "Acts/Seeding/SeedFilterConfig.hpp"
 #include "Acts/Seeding/SeedFinder.hpp"
 #include "Acts/Seeding/SeedFinderConfig.hpp"
@@ -17,6 +18,7 @@
 #include "ActsExamples/EventData/ProtoTrack.hpp"
 #include "ActsExamples/EventData/SimSeed.hpp"
 #include "ActsExamples/EventData/SimSpacePoint.hpp"
+#include "ActsExamples/EventData/SpacePointContainer.hpp"
 #include "ActsExamples/Framework/DataHandle.hpp"
 #include "ActsExamples/Framework/IAlgorithm.hpp"
 #include "ActsExamples/Framework/ProcessCode.hpp"
@@ -50,9 +52,14 @@ class SeedingAlgorithm final : public IAlgorithm {
     std::string outputSeeds;
 
     Acts::SeedFilterConfig seedFilterConfig;
-    Acts::SeedFinderConfig<SimSpacePoint> seedFinderConfig;
+
+    Acts::SeedFinderConfig<typename Acts::SpacePointContainer<
+        ActsExamples::SpacePointContainer<std::vector<const SimSpacePoint*>>,
+        Acts::detail::RefHolder>::SpacePointProxyType>
+        seedFinderConfig;
     Acts::CylindricalSpacePointGridConfig gridConfig;
     Acts::CylindricalSpacePointGridOptions gridOptions;
+
     Acts::SeedFinderOptions seedFinderOptions;
 
     // allow for different values of rMax in gridConfig and seedFinderConfig
@@ -86,11 +93,15 @@ class SeedingAlgorithm final : public IAlgorithm {
   const Config& config() const { return m_cfg; }
 
  private:
-  Acts::SeedFinder<SimSpacePoint,
-                   Acts::CylindricalSpacePointGrid<SimSpacePoint>>
+  using SpacePointProxy_t = typename Acts::SpacePointContainer<
+      ActsExamples::SpacePointContainer<std::vector<const SimSpacePoint*>>,
+      Acts::detail::RefHolder>::SpacePointProxyType;
+
+  Acts::SeedFinder<SpacePointProxy_t,
+                   Acts::CylindricalSpacePointGrid<SpacePointProxy_t>>
       m_seedFinder;
-  std::unique_ptr<const Acts::GridBinFinder<2ul>> m_bottomBinFinder;
-  std::unique_ptr<const Acts::GridBinFinder<2ul>> m_topBinFinder;
+  std::unique_ptr<const Acts::GridBinFinder<3ul>> m_bottomBinFinder{nullptr};
+  std::unique_ptr<const Acts::GridBinFinder<3ul>> m_topBinFinder{nullptr};
 
   Config m_cfg;
 
@@ -100,19 +111,19 @@ class SeedingAlgorithm final : public IAlgorithm {
   WriteDataHandle<SimSeedContainer> m_outputSeeds{this, "OutputSeeds"};
 
   static inline bool itkFastTrackingCuts(float bottomRadius, float cotTheta) {
-    float RMin = 50.;
-    float CotThetaMax = 1.5;
+    static float rMin = 50.;
+    static float cotThetaMax = 1.5;
 
-    if (bottomRadius < RMin &&
-        (cotTheta > CotThetaMax || cotTheta < -CotThetaMax)) {
+    if (bottomRadius < rMin &&
+        (cotTheta > cotThetaMax || cotTheta < -cotThetaMax)) {
       return false;
     }
     return true;
   }
 
-  static inline bool itkFastTrackingSPselect(const SimSpacePoint& sp) {
+  static inline bool itkFastTrackingSPselect(const SpacePointProxy_t& sp) {
     // At small r we remove points beyond |z| > 200.
-    float r = sp.r();
+    float r = sp.radius();
     float zabs = std::abs(sp.z());
     if (zabs > 200. && r < 50.) {
       return false;
diff --git a/Examples/Algorithms/TrackFinding/include/ActsExamples/TrackFinding/SeedingAlgorithmHashing.hpp b/Examples/Algorithms/TrackFinding/include/ActsExamples/TrackFinding/SeedingAlgorithmHashing.hpp
new file mode 100644
index 00000000000..78a0ef2ae89
--- /dev/null
+++ b/Examples/Algorithms/TrackFinding/include/ActsExamples/TrackFinding/SeedingAlgorithmHashing.hpp
@@ -0,0 +1,184 @@
+// This file is part of the ACTS project.
+//
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
+//
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
+
+#pragma once
+
+#include "Acts/EventData/SpacePointContainer.hpp"
+#include "Acts/Plugins/Hashing/HashingAlgorithm.hpp"
+#include "Acts/Plugins/Hashing/HashingAlgorithmConfig.hpp"
+#include "Acts/Plugins/Hashing/HashingTraining.hpp"
+#include "Acts/Plugins/Hashing/HashingTrainingConfig.hpp"
+#include "Acts/Seeding/SeedFilter.hpp"
+#include "Acts/Seeding/SeedFilterConfig.hpp"
+#include "Acts/Seeding/SeedFinder.hpp"
+#include "Acts/Seeding/SeedFinderConfig.hpp"
+#include "Acts/Seeding/SpacePointGrid.hpp"
+#include "Acts/Utilities/GridBinFinder.hpp"
+#include "Acts/Utilities/Logger.hpp"
+#include "ActsExamples/EventData/ProtoTrack.hpp"
+#include "ActsExamples/EventData/SimSeed.hpp"
+#include "ActsExamples/EventData/SimSpacePoint.hpp"
+#include "ActsExamples/EventData/SpacePointContainer.hpp"
+#include "ActsExamples/Framework/DataHandle.hpp"
+#include "ActsExamples/Framework/IAlgorithm.hpp"
+#include "ActsExamples/Framework/ProcessCode.hpp"
+
+#include <algorithm>
+#include <iterator>
+#include <memory>
+#include <set>
+#include <string>
+#include <utility>
+#include <vector>
+
+// Custom seed comparison function
+template <typename external_spacepoint_t>
+struct SeedComparison {
+  bool operator()(const Acts::Seed<external_spacepoint_t>& seed1,
+                  const Acts::Seed<external_spacepoint_t>& seed2) const {
+    const auto& sp1 = seed1.sp();
+    const auto& sp2 = seed2.sp();
+
+    for (std::size_t i = 0; i < sp1.size(); ++i) {
+      if (sp1[i]->z() != sp2[i]->z()) {
+        return sp1[i]->z() < sp2[i]->z();
+      }
+    }
+
+    for (std::size_t i = 0; i < sp1.size(); ++i) {
+      if (sp1[i]->x() != sp2[i]->x()) {
+        return sp1[i]->x() < sp2[i]->x();
+      }
+    }
+
+    for (std::size_t i = 0; i < sp1.size(); ++i) {
+      if (sp1[i]->y() != sp2[i]->y()) {
+        return sp1[i]->y() < sp2[i]->y();
+      }
+    }
+
+    return false;
+  }
+};
+
+namespace ActsExamples {
+struct AlgorithmContext;
+
+/// Construct track seeds from space points.
+class SeedingAlgorithmHashing final : public IAlgorithm {
+ public:
+  struct Config {
+    /// Input space point collections.
+    ///
+    /// We allow multiple space point collections to allow different parts of
+    /// the detector to use different algorithms for space point construction,
+    /// e.g. single-hit space points for pixel-like detectors or double-hit
+    /// space points for strip-like detectors.
+    std::vector<std::string> inputSpacePoints;
+    /// Output track seed collection.
+    std::string outputSeeds;
+    /// Output space point buckets.
+    std::string outputBuckets;
+
+    Acts::SeedFilterConfig seedFilterConfig;
+    Acts::SeedFinderConfig<typename Acts::SpacePointContainer<
+        ActsExamples::SpacePointContainer<std::vector<const SimSpacePoint*>>,
+        Acts::detail::RefHolder>::SpacePointProxyType>
+        seedFinderConfig;
+
+    Acts::CylindricalSpacePointGridConfig gridConfig;
+    Acts::CylindricalSpacePointGridOptions gridOptions;
+    Acts::SeedFinderOptions seedFinderOptions;
+    Acts::HashingAlgorithmConfig hashingConfig;
+    Acts::HashingTrainingConfig hashingTrainingConfig;
+
+    // allow for different values of rMax in gridConfig and seedFinderConfig
+    bool allowSeparateRMax = false;
+
+    // vector containing the map of z bins in the top and bottom layers
+    std::vector<std::pair<int, int>> zBinNeighborsTop;
+    std::vector<std::pair<int, int>> zBinNeighborsBottom;
+    // number of phiBin neighbors at each side of the current bin that will be
+    // used to search for SPs
+    int numPhiNeighbors = 1;
+
+    // Connect custom selections on the space points or to the doublet
+    // compatibility
+    bool useExtraCuts = false;
+  };
+
+  /// Construct the seeding algorithm.
+  ///
+  /// @param cfg is the algorithm configuration
+  /// @param lvl is the logging level
+  SeedingAlgorithmHashing(Config cfg, Acts::Logging::Level lvl);
+
+  /// Run the seeding algorithm.
+  ///
+  /// @param ctx is the algorithm context with event information
+  /// @return a process code indication success or failure
+  ProcessCode execute(const AlgorithmContext& ctx) const override;
+
+  /// Const access to the config
+  const Config& config() const { return m_cfg; }
+
+ private:
+  using SpacePointProxy_t = typename Acts::SpacePointContainer<
+      ActsExamples::SpacePointContainer<std::vector<const SimSpacePoint*>>,
+      Acts::detail::RefHolder>::SpacePointProxyType;
+
+  Acts::SeedFinder<SpacePointProxy_t,
+                   Acts::CylindricalSpacePointGrid<SpacePointProxy_t>>
+      m_seedFinder;
+  std::unique_ptr<const Acts::GridBinFinder<3ul>> m_bottomBinFinder{nullptr};
+  std::unique_ptr<const Acts::GridBinFinder<3ul>> m_topBinFinder{nullptr};
+
+  Config m_cfg;
+
+  std::vector<std::unique_ptr<ReadDataHandle<SimSpacePointContainer>>>
+      m_inputSpacePoints{};
+
+  WriteDataHandle<SimSeedContainer> m_outputSeeds{this, "OutputSeeds"};
+  WriteDataHandle<std::vector<SimSpacePointContainer>> m_outputBuckets{
+      this, "OutputBuckets"};
+  Acts::HashingAlgorithm<const SimSpacePoint*,
+                         std::vector<const SimSpacePoint*>>
+      m_hashing;
+  Acts::HashingTrainingAlgorithm<std::vector<const SimSpacePoint*>>
+      m_hashingTraining;
+
+  static inline bool itkFastTrackingCuts(float bottomRadius, float cotTheta) {
+    static float rMin = 50.;
+    static float cotThetaMax = 1.5;
+
+    if (bottomRadius < rMin &&
+        (cotTheta > cotThetaMax || cotTheta < -cotThetaMax)) {
+      return false;
+    }
+    return true;
+  }
+
+  static inline bool itkFastTrackingSPselect(const SpacePointProxy_t& sp) {
+    // At small r we remove points beyond |z| > 200.
+    float r = sp.radius();
+    float zabs = std::abs(sp.z());
+    if (zabs > 200. && r < 50.) {
+      return false;
+    }
+
+    /// Remove space points beyond eta=4 if their z is
+    /// larger than the max seed z0 (150.)
+    float cotTheta = 27.2899;  // corresponds to eta=4
+    if ((zabs - 150.) > cotTheta * r) {
+      return false;
+    }
+    return true;
+  }
+};
+
+}  // namespace ActsExamples
diff --git a/Examples/Algorithms/TrackFinding/include/ActsExamples/TrackFinding/SeedingOrthogonalAlgorithm.hpp b/Examples/Algorithms/TrackFinding/include/ActsExamples/TrackFinding/SeedingOrthogonalAlgorithm.hpp
index adecb0e5883..963c179476b 100644
--- a/Examples/Algorithms/TrackFinding/include/ActsExamples/TrackFinding/SeedingOrthogonalAlgorithm.hpp
+++ b/Examples/Algorithms/TrackFinding/include/ActsExamples/TrackFinding/SeedingOrthogonalAlgorithm.hpp
@@ -1,14 +1,14 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2022 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
-#include "Acts/Seeding/InternalSeed.hpp"
+#include "Acts/EventData/SpacePointContainer.hpp"
 #include "Acts/Seeding/SeedFilterConfig.hpp"
 #include "Acts/Seeding/SeedFinderConfig.hpp"
 #include "Acts/Seeding/SeedFinderOrthogonal.hpp"
@@ -17,6 +17,7 @@
 #include "Acts/Utilities/Logger.hpp"
 #include "ActsExamples/EventData/SimSeed.hpp"
 #include "ActsExamples/EventData/SimSpacePoint.hpp"
+#include "ActsExamples/EventData/SpacePointContainer.hpp"
 #include "ActsExamples/Framework/DataHandle.hpp"
 #include "ActsExamples/Framework/IAlgorithm.hpp"
 #include "ActsExamples/Framework/ProcessCode.hpp"
@@ -32,6 +33,10 @@ struct AlgorithmContext;
 /// Construct track seeds from space points.
 class SeedingOrthogonalAlgorithm final : public IAlgorithm {
  public:
+  using proxy_type = typename Acts::SpacePointContainer<
+      ActsExamples::SpacePointContainer<std::vector<const SimSpacePoint*>>,
+      Acts::detail::RefHolder>::SpacePointProxyType;
+
   struct Config {
     /// Input space point collections.
     ///
@@ -44,7 +49,7 @@ class SeedingOrthogonalAlgorithm final : public IAlgorithm {
     std::string outputSeeds;
 
     Acts::SeedFilterConfig seedFilterConfig;
-    Acts::SeedFinderOrthogonalConfig<SimSpacePoint> seedFinderConfig;
+    Acts::SeedFinderOrthogonalConfig<proxy_type> seedFinderConfig;
     Acts::SeedFinderOptions seedFinderOptions;
   };
 
@@ -65,7 +70,7 @@ class SeedingOrthogonalAlgorithm final : public IAlgorithm {
 
  private:
   Config m_cfg;
-  Acts::SeedFinderOrthogonal<SimSpacePoint> m_finder;
+  std::unique_ptr<Acts::SeedFinderOrthogonal<proxy_type>> m_finder{nullptr};
 
   std::vector<std::unique_ptr<ReadDataHandle<SimSpacePointContainer>>>
       m_inputSpacePoints{};
diff --git a/Examples/Algorithms/TrackFinding/include/ActsExamples/TrackFinding/SpacePointMaker.hpp b/Examples/Algorithms/TrackFinding/include/ActsExamples/TrackFinding/SpacePointMaker.hpp
index 80add3cc4f2..db4678a6200 100644
--- a/Examples/Algorithms/TrackFinding/include/ActsExamples/TrackFinding/SpacePointMaker.hpp
+++ b/Examples/Algorithms/TrackFinding/include/ActsExamples/TrackFinding/SpacePointMaker.hpp
@@ -1,17 +1,16 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2020 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
 #include "Acts/Geometry/GeometryIdentifier.hpp"
 #include "Acts/SpacePointFormation/SpacePointBuilder.hpp"
 #include "Acts/Utilities/Logger.hpp"
-#include "ActsExamples/EventData/IndexSourceLink.hpp"
 #include "ActsExamples/EventData/Measurement.hpp"
 #include "ActsExamples/EventData/SimSpacePoint.hpp"
 #include "ActsExamples/Framework/DataHandle.hpp"
@@ -46,8 +45,6 @@ struct AlgorithmContext;
 class SpacePointMaker final : public IAlgorithm {
  public:
   struct Config {
-    /// Input source links collection.
-    std::string inputSourceLinks;
     /// Input measurements collection.
     std::string inputMeasurements;
     /// Output space points collection.
@@ -86,9 +83,6 @@ class SpacePointMaker final : public IAlgorithm {
 
   Acts::SpacePointBuilder<SimSpacePoint> m_spacePointBuilder;
 
-  ReadDataHandle<IndexSourceLinkContainer> m_inputSourceLinks{
-      this, "InputSourceLinks"};
-
   ReadDataHandle<MeasurementContainer> m_inputMeasurements{this,
                                                            "InputMeasurements"};
 
diff --git a/Examples/Algorithms/TrackFinding/include/ActsExamples/TrackFinding/TrackFindingAlgorithm.hpp b/Examples/Algorithms/TrackFinding/include/ActsExamples/TrackFinding/TrackFindingAlgorithm.hpp
index 8d31a99b0f8..0f532be2d28 100644
--- a/Examples/Algorithms/TrackFinding/include/ActsExamples/TrackFinding/TrackFindingAlgorithm.hpp
+++ b/Examples/Algorithms/TrackFinding/include/ActsExamples/TrackFinding/TrackFindingAlgorithm.hpp
@@ -1,19 +1,17 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2020-2024 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
-#include "Acts/EventData/MultiTrajectory.hpp"
 #include "Acts/EventData/SourceLink.hpp"
 #include "Acts/EventData/TrackContainer.hpp"
 #include "Acts/EventData/TrackProxy.hpp"
 #include "Acts/EventData/VectorMultiTrajectory.hpp"
-#include "Acts/EventData/VectorTrackContainer.hpp"
 #include "Acts/Geometry/TrackingGeometry.hpp"
 #include "Acts/TrackFinding/CombinatorialKalmanFilter.hpp"
 #include "Acts/TrackFinding/MeasurementSelector.hpp"
@@ -28,11 +26,9 @@
 #include "ActsExamples/Framework/DataHandle.hpp"
 #include "ActsExamples/Framework/IAlgorithm.hpp"
 #include "ActsExamples/Framework/ProcessCode.hpp"
-#include "ActsExamples/MagneticField/MagneticField.hpp"
 
 #include <atomic>
 #include <cstddef>
-#include <functional>
 #include <limits>
 #include <memory>
 #include <optional>
@@ -41,7 +37,10 @@
 #include <variant>
 #include <vector>
 
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wold-style-cast"
 #include <tbb/combinable.h>
+#pragma GCC diagnostic pop
 
 namespace Acts {
 class MagneticFieldProvider;
@@ -69,7 +68,7 @@ class TrackFindingAlgorithm final : public IAlgorithm {
     virtual ~TrackFinderFunction() = default;
     virtual TrackFinderResult operator()(const TrackParameters&,
                                          const TrackFinderOptions&,
-                                         TrackContainer&) const = 0;
+                                         TrackContainer&, TrackProxy) const = 0;
   };
 
   /// Create the track finder function implementation.
@@ -84,8 +83,6 @@ class TrackFindingAlgorithm final : public IAlgorithm {
   struct Config {
     /// Input measurements collection.
     std::string inputMeasurements;
-    /// Input source links collection.
-    std::string inputSourceLinks;
     /// Input initial track parameter estimates for for each proto track.
     std::string inputInitialTrackParameters;
     /// Input seeds. These are optional and allow for seed deduplication.
@@ -126,14 +123,21 @@ class TrackFindingAlgorithm final : public IAlgorithm {
     bool stayOnSeed = false;
     /// Compute shared hit information
     bool computeSharedHits = false;
+    /// Whether to trim the tracks
+    bool trimTracks = true;
 
     // Pixel and strip volume ids to be used for maxPixel/StripHoles cuts
-    std::set<Acts::GeometryIdentifier::Value> pixelVolumes;
-    std::set<Acts::GeometryIdentifier::Value> stripVolumes;
+    std::vector<std::uint32_t> pixelVolumeIds;
+    std::vector<std::uint32_t> stripVolumeIds;
 
-    /// additional track selector settings
+    // additional track selector settings
     std::size_t maxPixelHoles = std::numeric_limits<std::size_t>::max();
     std::size_t maxStripHoles = std::numeric_limits<std::size_t>::max();
+
+    /// The volume ids to constrain the track finding to
+    std::vector<std::uint32_t> constrainToVolumeIds;
+    /// The volume ids to stop the track finding at
+    std::vector<std::uint32_t> endOfWorldVolumeIds;
   };
 
   /// Constructor of the track finding algorithm
@@ -153,9 +157,8 @@ class TrackFindingAlgorithm final : public IAlgorithm {
   const Config& config() const { return m_cfg; }
 
  private:
-  template <typename source_link_accessor_container_t>
-  void computeSharedHits(const source_link_accessor_container_t& sourcelinks,
-                         TrackContainer& tracks) const;
+  void computeSharedHits(TrackContainer& tracks,
+                         const MeasurementContainer& measurements) const;
 
   ActsExamples::ProcessCode finalize() override;
 
@@ -165,8 +168,6 @@ class TrackFindingAlgorithm final : public IAlgorithm {
 
   ReadDataHandle<MeasurementContainer> m_inputMeasurements{this,
                                                            "InputMeasurements"};
-  ReadDataHandle<IndexSourceLinkContainer> m_inputSourceLinks{
-      this, "InputSourceLinks"};
   ReadDataHandle<TrackParametersContainer> m_inputInitialTrackParameters{
       this, "InputInitialTrackParameters"};
   ReadDataHandle<SimSeedContainer> m_inputSeeds{this, "InputSeeds"};
@@ -181,6 +182,7 @@ class TrackFindingAlgorithm final : public IAlgorithm {
   mutable std::atomic<std::size_t> m_nFoundTracks{0};
   mutable std::atomic<std::size_t> m_nSelectedTracks{0};
   mutable std::atomic<std::size_t> m_nStoppedBranches{0};
+  mutable std::atomic<std::size_t> m_nSkippedSecondPass{0};
 
   mutable tbb::combinable<Acts::VectorMultiTrajectory::Statistics>
       m_memoryStatistics{[]() {
@@ -189,56 +191,4 @@ class TrackFindingAlgorithm final : public IAlgorithm {
       }};
 };
 
-// TODO this is somewhat duplicated in AmbiguityResolutionAlgorithm.cpp
-// TODO we should make a common implementation in the core at some point
-template <typename source_link_accessor_container_t>
-void TrackFindingAlgorithm::computeSharedHits(
-    const source_link_accessor_container_t& sourceLinks,
-    TrackContainer& tracks) const {
-  // Compute shared hits from all the reconstructed tracks
-  // Compute nSharedhits and Update ckf results
-  // hit index -> list of multi traj indexes [traj, meas]
-
-  std::vector<std::size_t> firstTrackOnTheHit(
-      sourceLinks.size(), std::numeric_limits<std::size_t>::max());
-  std::vector<std::size_t> firstStateOnTheHit(
-      sourceLinks.size(), std::numeric_limits<std::size_t>::max());
-
-  for (auto track : tracks) {
-    for (auto state : track.trackStatesReversed()) {
-      if (!state.typeFlags().test(Acts::TrackStateFlag::MeasurementFlag)) {
-        continue;
-      }
-
-      std::size_t hitIndex = state.getUncalibratedSourceLink()
-                                 .template get<IndexSourceLink>()
-                                 .index();
-
-      // Check if hit not already used
-      if (firstTrackOnTheHit.at(hitIndex) ==
-          std::numeric_limits<std::size_t>::max()) {
-        firstTrackOnTheHit.at(hitIndex) = track.index();
-        firstStateOnTheHit.at(hitIndex) = state.index();
-        continue;
-      }
-
-      // if already used, control if first track state has been marked
-      // as shared
-      int indexFirstTrack = firstTrackOnTheHit.at(hitIndex);
-      int indexFirstState = firstStateOnTheHit.at(hitIndex);
-
-      auto firstState = tracks.getTrack(indexFirstTrack)
-                            .container()
-                            .trackStateContainer()
-                            .getTrackState(indexFirstState);
-      if (!firstState.typeFlags().test(Acts::TrackStateFlag::SharedHitFlag)) {
-        firstState.typeFlags().set(Acts::TrackStateFlag::SharedHitFlag);
-      }
-
-      // Decorate this track state
-      state.typeFlags().set(Acts::TrackStateFlag::SharedHitFlag);
-    }
-  }
-}
-
 }  // namespace ActsExamples
diff --git a/Examples/Algorithms/TrackFinding/include/ActsExamples/TrackFinding/TrackParamsEstimationAlgorithm.hpp b/Examples/Algorithms/TrackFinding/include/ActsExamples/TrackFinding/TrackParamsEstimationAlgorithm.hpp
index 0111aa7fbcd..1df8dc87700 100644
--- a/Examples/Algorithms/TrackFinding/include/ActsExamples/TrackFinding/TrackParamsEstimationAlgorithm.hpp
+++ b/Examples/Algorithms/TrackFinding/include/ActsExamples/TrackFinding/TrackParamsEstimationAlgorithm.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2021 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
diff --git a/Examples/Algorithms/TrackFinding/src/GbtsSeedingAlgorithm.cpp b/Examples/Algorithms/TrackFinding/src/GbtsSeedingAlgorithm.cpp
index 821592cb6d3..677ba2b4c10 100644
--- a/Examples/Algorithms/TrackFinding/src/GbtsSeedingAlgorithm.cpp
+++ b/Examples/Algorithms/TrackFinding/src/GbtsSeedingAlgorithm.cpp
@@ -1,15 +1,14 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2020 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include "ActsExamples/TrackFinding/GbtsSeedingAlgorithm.hpp"
 
 #include "Acts/Geometry/GeometryIdentifier.hpp"
-#include "Acts/Seeding/Seed.hpp"
 #include "Acts/Seeding/SeedFilter.hpp"
 #include "ActsExamples/EventData/IndexSourceLink.hpp"
 #include "ActsExamples/EventData/Measurement.hpp"
@@ -20,6 +19,7 @@
 #include <fstream>
 #include <iostream>
 #include <map>
+#include <numbers>
 #include <random>
 #include <sstream>
 #include <vector>
@@ -62,14 +62,8 @@ ActsExamples::GbtsSeedingAlgorithm::GbtsSeedingAlgorithm(
 
   m_outputSeeds.initialize(m_cfg.outputSeeds);
 
-  m_inputSourceLinks.initialize(m_cfg.inputSourceLinks);
-
   m_inputClusters.initialize(m_cfg.inputClusters);
 
-  m_cfg.seedFinderConfig.seedFilter =
-      std::make_unique<Acts::SeedFilter<SimSpacePoint>>(
-          Acts::SeedFilter<SimSpacePoint>(m_cfg.seedFilterConfig));
-
   // map
   m_cfg.ActsGbtsMap = makeActsGbtsMap();
   // input trig vector
@@ -94,51 +88,32 @@ ActsExamples::ProcessCode ActsExamples::GbtsSeedingAlgorithm::execute(
   std::vector<Acts::GbtsSP<SimSpacePoint>> GbtsSpacePoints =
       MakeGbtsSpacePoints(ctx, m_cfg.ActsGbtsMap);
 
-  // cluster width
-  //  const ClusterContainer* clusters = &m_inputClusters(ctx) ;
-
-  // for (const auto& sp : GbtsSpacePoints){
-  //   const auto& sl = sp.SP->sourceLinks().front().get<IndexSourceLink>() ;
-  //   const auto& cluster = clusters->at(sl.index()) ;
-  //   std::cout << "testing 0: " << cluster.sizeLoc0 << " 1: " <<
-  //   cluster.sizeLoc1 << std::endl ;
-
-  // }
-
   for (auto sp : GbtsSpacePoints) {
-    ACTS_DEBUG("Gbts space points: " << " Gbts_id: " << sp.gbtsID << " z: "
-                                     << sp.SP->z() << " r: " << sp.SP->r()
-                                     << " ACTS volume:  "
-                                     << sp.SP->sourceLinks()
-                                            .front()
-                                            .get<IndexSourceLink>()
-                                            .geometryId()
-                                            .volume()
-                                     << "\n");
+    ACTS_DEBUG("Gbts space points:  Gbts_id: "
+               << sp.gbtsID << " z: " << sp.SP->z() << " r: " << sp.SP->r()
+               << " ACTS volume:  "
+               << sp.SP->sourceLinks()
+                      .front()
+                      .get<IndexSourceLink>()
+                      .geometryId()
+                      .volume());
   }
 
   // this is now calling on a core algorithm
-  Acts::SeedFinderGbts<SimSpacePoint> finder(m_cfg.seedFinderConfig,
-                                             *m_gbtsGeo);
-
-  // need this function as create_coords is needed for seeds
-  std::function<std::pair<Acts::Vector3, Acts::Vector2>(
-      const SimSpacePoint *sp)>
-      create_coordinates = [](const SimSpacePoint *sp) {
-        Acts::Vector3 position(sp->x(), sp->y(), sp->z());
-        Acts::Vector2 variance(sp->varianceR(), sp->varianceZ());
-        return std::make_pair(position, variance);
-      };
+  Acts::SeedFinderGbts<SimSpacePoint> finder(
+      m_cfg.seedFinderConfig, *m_gbtsGeo,
+      logger().cloneWithSuffix("GbtdFinder"));
+
   // output of function needed for seed
 
   finder.loadSpacePoints(GbtsSpacePoints);
 
   // trigGbts file :
-  Acts::RoiDescriptor internalRoi(0, -4.5, 4.5, 0, -M_PI, M_PI, 0, -150.0,
-                                  150.0);
+  Acts::RoiDescriptor internalRoi(0, -4.5, 4.5, 0, -std::numbers::pi,
+                                  std::numbers::pi, 0, -150., 150.);
   // ROI file:
-  //  Acts::RoiDescriptor internalRoi(0, -5, 5, 0, -M_PI, M_PI, 0, -225.0,
-  //                                  225.0);
+  //  Acts::RoiDescriptor internalRoi(0, -5, 5, 0, -std::numbers::pi,
+  //  std::numbers::pi, 0, -225., 225.);
 
   // new version returns seeds
   SimSeedContainer seeds = finder.createSeeds(internalRoi, *m_gbtsGeo);
@@ -184,7 +159,6 @@ ActsExamples::GbtsSeedingAlgorithm::MakeGbtsSpacePoints(
     const AlgorithmContext &ctx,
     std::map<std::pair<int, int>, std::pair<int, int>> map) const {
   // create space point vectors
-  std::vector<const ActsExamples::SimSpacePoint *> spacePoints;
   std::vector<Acts::GbtsSP<ActsExamples::SimSpacePoint>> gbtsSpacePoints;
   gbtsSpacePoints.reserve(
       m_inputSpacePoints.size());  // not sure if this is enough
@@ -192,24 +166,20 @@ ActsExamples::GbtsSeedingAlgorithm::MakeGbtsSpacePoints(
   // for loop filling space
   for (const auto &isp : m_inputSpacePoints) {
     for (const auto &spacePoint : (*isp)(ctx)) {
-      // fill original space point vector
-      spacePoints.push_back(&spacePoint);
-
       // Gbts space point vector
       // loop over space points, call on map
-      const auto &source_link = spacePoint.sourceLinks();
-      const auto &index_source_link =
-          source_link.front().get<IndexSourceLink>();
+      const auto &sourceLink = spacePoint.sourceLinks();
+      const auto &indexSourceLink = sourceLink.front().get<IndexSourceLink>();
 
       // warning if source link empty
-      if (source_link.empty()) {
+      if (sourceLink.empty()) {
         // warning in officaial acts format
         ACTS_WARNING("warning source link vector is empty");
         continue;
       }
-      int ACTS_vol_id = index_source_link.geometryId().volume();
-      int ACTS_lay_id = index_source_link.geometryId().layer();
-      int ACTS_mod_id = index_source_link.geometryId().sensitive();
+      int ACTS_vol_id = indexSourceLink.geometryId().volume();
+      int ACTS_lay_id = indexSourceLink.geometryId().layer();
+      int ACTS_mod_id = indexSourceLink.geometryId().sensitive();
 
       // dont want strips or HGTD
       if (ACTS_vol_id == 2 || ACTS_vol_id == 22 || ACTS_vol_id == 23 ||
diff --git a/Examples/Algorithms/TrackFinding/src/HoughTransformSeeder.cpp b/Examples/Algorithms/TrackFinding/src/HoughTransformSeeder.cpp
index f458b33795a..c8126773194 100644
--- a/Examples/Algorithms/TrackFinding/src/HoughTransformSeeder.cpp
+++ b/Examples/Algorithms/TrackFinding/src/HoughTransformSeeder.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2020 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include "ActsExamples/TrackFinding/HoughTransformSeeder.hpp"
 
@@ -15,6 +15,7 @@
 #include "Acts/Geometry/TrackingGeometry.hpp"
 #include "Acts/Surfaces/Surface.hpp"
 #include "Acts/Utilities/Enumerate.hpp"
+#include "Acts/Utilities/MathHelpers.hpp"
 #include "ActsExamples/EventData/GeometryContainers.hpp"
 #include "ActsExamples/EventData/Index.hpp"
 #include "ActsExamples/EventData/IndexSourceLink.hpp"
@@ -75,13 +76,7 @@ ActsExamples::HoughTransformSeeder::HoughTransformSeeder(
         "HoughTransformSeeder: Missing hough track seeds output collection");
   }
 
-  if (m_cfg.inputSourceLinks.empty()) {
-    throw std::invalid_argument(
-        "HoughTransformSeeder: Missing source link input collection");
-  }
-
   m_outputProtoTracks.initialize(m_cfg.outputProtoTracks);
-  m_inputSourceLinks.initialize(m_cfg.inputSourceLinks);
   m_inputMeasurements.initialize(m_cfg.inputMeasurements);
 
   if (!m_cfg.trackingGeometry) {
@@ -121,10 +116,11 @@ ActsExamples::HoughTransformSeeder::HoughTransformSeeder(
     // within the same volume hierarchy only consider layers
     return (ref.layer() == cmp.layer());
   };
+  // sort geometry selection so the unique filtering works
+  std::ranges::sort(m_cfg.geometrySelection,
+                    std::less<Acts::GeometryIdentifier>{});
   auto geoSelBeg = m_cfg.geometrySelection.begin();
   auto geoSelEnd = m_cfg.geometrySelection.end();
-  // sort geometry selection so the unique filtering works
-  std::sort(geoSelBeg, geoSelEnd);
   auto geoSelLastUnique = std::unique(geoSelBeg, geoSelEnd, isDuplicate);
   if (geoSelLastUnique != geoSelEnd) {
     ACTS_WARNING("Removed " << std::distance(geoSelLastUnique, geoSelEnd)
@@ -185,7 +181,7 @@ ActsExamples::ProcessCode ActsExamples::HoughTransformSeeder::execute(
           std::vector<std::vector<std::vector<Index>>> hitIndicesAll(
               m_cfg.nLayers);  // [layer,vector<Index]
           std::vector<std::size_t> nHitsPerLayer(m_cfg.nLayers);
-          for (auto measurementIndex : m_houghHist(y, x).second) {
+          for (auto measurementIndex : m_houghHist.atLocalBins({y, x}).second) {
             HoughMeasurementStruct* meas =
                 houghMeasurementStructs[measurementIndex].get();
             hitIndicesAll[meas->layer].push_back(meas->indices);
@@ -221,9 +217,9 @@ ActsExamples::ProcessCode ActsExamples::HoughTransformSeeder::execute(
 ActsExamples::HoughHist
 ActsExamples::HoughTransformSeeder::createLayerHoughHist(unsigned layer,
                                                          int subregion) const {
-  ActsExamples::HoughHist houghHist(m_cfg.houghHistSize_y,
-                                    m_cfg.houghHistSize_x);
-
+  ActsExamples::HoughHist houghHist(
+      Axis(0, m_cfg.houghHistSize_y, m_cfg.houghHistSize_y),
+      Axis(0, m_cfg.houghHistSize_x, m_cfg.houghHistSize_x));
   for (unsigned index = 0; index < houghMeasurementStructs.size(); index++) {
     HoughMeasurementStruct* meas = houghMeasurementStructs[index].get();
     if (meas->layer != layer) {
@@ -244,8 +240,8 @@ ActsExamples::HoughTransformSeeder::createLayerHoughHist(unsigned layer,
       // Update the houghHist
       for (unsigned y = y_bin_min; y < y_bin_max; y++) {
         for (unsigned x = xBins.first; x < xBins.second; x++) {
-          houghHist(y, x).first++;
-          houghHist(y, x).second.insert(index);
+          houghHist.atLocalBins({y, x}).first++;
+          houghHist.atLocalBins({y, x}).second.insert(index);
         }
       }
     }
@@ -256,17 +252,19 @@ ActsExamples::HoughTransformSeeder::createLayerHoughHist(unsigned layer,
 
 ActsExamples::HoughHist ActsExamples::HoughTransformSeeder::createHoughHist(
     int subregion) const {
-  ActsExamples::HoughHist houghHist(m_cfg.houghHistSize_y,
-                                    m_cfg.houghHistSize_x);
+  ActsExamples::HoughHist houghHist(
+      Axis(0, m_cfg.houghHistSize_y, m_cfg.houghHistSize_y),
+      Axis(0, m_cfg.houghHistSize_x, m_cfg.houghHistSize_x));
 
   for (unsigned i = 0; i < m_cfg.nLayers; i++) {
     HoughHist layerHoughHist = createLayerHoughHist(i, subregion);
     for (unsigned x = 0; x < m_cfg.houghHistSize_x; ++x) {
       for (unsigned y = 0; y < m_cfg.houghHistSize_y; ++y) {
-        if (layerHoughHist(y, x).first > 0) {
-          houghHist(y, x).first++;
-          houghHist(y, x).second.insert(layerHoughHist(y, x).second.begin(),
-                                        layerHoughHist(y, x).second.end());
+        if (layerHoughHist.atLocalBins({y, x}).first > 0) {
+          houghHist.atLocalBins({y, x}).first++;
+          houghHist.atLocalBins({y, x}).second.insert(
+              layerHoughHist.atLocalBins({y, x}).second.begin(),
+              layerHoughHist.atLocalBins({y, x}).second.end());
         }
       }
     }
@@ -279,11 +277,11 @@ bool ActsExamples::HoughTransformSeeder::passThreshold(
     HoughHist const& houghHist, unsigned x, unsigned y) const {
   // Pass window threshold
   unsigned width = m_cfg.threshold.size() / 2;
-  if (x < width || (houghHist.size(1) - x) < width) {
+  if (x < width || m_cfg.houghHistSize_x - x < width) {
     return false;
   }
   for (unsigned i = 0; i < m_cfg.threshold.size(); i++) {
-    if (houghHist(y, x - width + i).first < m_cfg.threshold[i]) {
+    if (houghHist.atLocalBins({y, x - width + i}).first < m_cfg.threshold[i]) {
       return false;
     }
   }
@@ -297,17 +295,19 @@ bool ActsExamples::HoughTransformSeeder::passThreshold(
         if (i == 0 && j == 0) {
           continue;
         }
-        if (y + j < houghHist.size(0) && x + i < houghHist.size(1)) {
-          if (houghHist(y + j, x + i).first > houghHist(y, x).first) {
+        if (y + j < m_cfg.houghHistSize_y && x + i < m_cfg.houghHistSize_x) {
+          if (houghHist.atLocalBins({y + j, x + i}).first >
+              houghHist.atLocalBins({y, x}).first) {
             return false;
           }
-          if (houghHist(y + j, x + i).first == houghHist(y, x).first) {
-            if (houghHist(y + j, x + i).second.size() >
-                houghHist(y, x).second.size()) {
+          if (houghHist.atLocalBins({y + j, x + i}).first ==
+              houghHist.atLocalBins({y, x}).first) {
+            if (houghHist.atLocalBins({y + j, x + i}).second.size() >
+                houghHist.atLocalBins({y, x}).second.size()) {
               return false;
             }
-            if (houghHist(y + j, x + i).second.size() ==
-                    houghHist(y, x).second.size() &&
+            if (houghHist.atLocalBins({y + j, x + i}).second.size() ==
+                    houghHist.atLocalBins({y, x}).second.size() &&
                 j <= 0 && i <= 0) {
               return false;  // favor bottom-left (low phi, low neg q/pt)
             }
@@ -473,7 +473,7 @@ void ActsExamples::HoughTransformSeeder::addSpacePoints(
     ACTS_DEBUG("Inserting " << spContainer.size() << " space points from "
                             << isp->key());
     for (auto& sp : spContainer) {
-      double r = std::hypot(sp.x(), sp.y());
+      double r = Acts::fastHypot(sp.x(), sp.y());
       double z = sp.z();
       float phi = std::atan2(sp.y(), sp.x());
       ResultUnsigned hitlayer = m_cfg.layerIDFinder(r).value();
@@ -497,14 +497,14 @@ void ActsExamples::HoughTransformSeeder::addSpacePoints(
 void ActsExamples::HoughTransformSeeder::addMeasurements(
     const AlgorithmContext& ctx) const {
   const auto& measurements = m_inputMeasurements(ctx);
-  const auto& sourceLinks = m_inputSourceLinks(ctx);
 
   ACTS_DEBUG("Inserting " << measurements.size() << " space points from "
                           << m_cfg.inputMeasurements);
 
   for (Acts::GeometryIdentifier geoId : m_cfg.geometrySelection) {
     // select volume/layer depending on what is set in the geometry id
-    auto range = selectLowestNonZeroGeometryObject(sourceLinks, geoId);
+    auto range =
+        selectLowestNonZeroGeometryObject(measurements.orderedIndices(), geoId);
     // groupByModule only works with geometry containers, not with an
     // arbitrary range. do the equivalent grouping manually
     auto groupedByModule = makeGroupBy(range, detail::GeometryIdGetter());
@@ -525,24 +525,25 @@ void ActsExamples::HoughTransformSeeder::addMeasurements(
         // are transformed to the bound space where we do know their location.
         // if the local parameters are not measured, this results in a
         // zero location, which is a reasonable default fall-back.
-        const auto& measurement = measurements[sourceLink.index()];
+        const ConstVariableBoundMeasurementProxy measurement =
+            measurements.getMeasurement(sourceLink.index());
 
         assert(measurement.contains(Acts::eBoundLoc0) &&
                "Measurement does not contain the required bound loc0");
         assert(measurement.contains(Acts::eBoundLoc1) &&
                "Measurement does not contain the required bound loc1");
 
-        auto boundLoc0 = measurement.subspace().indexOf(Acts::eBoundLoc0);
-        auto boundLoc1 = measurement.subspace().indexOf(Acts::eBoundLoc1);
+        auto boundLoc0 = measurement.indexOf(Acts::eBoundLoc0);
+        auto boundLoc1 = measurement.indexOf(Acts::eBoundLoc1);
 
-        Acts::Vector2 localPos{measurement.effectiveParameters()[boundLoc0],
-                               measurement.effectiveParameters()[boundLoc1]};
+        Acts::Vector2 localPos{measurement.parameters()[boundLoc0],
+                               measurement.parameters()[boundLoc1]};
 
         // transform local position to global coordinates
         Acts::Vector3 globalFakeMom(1, 1, 1);
         Acts::Vector3 globalPos =
             surface->localToGlobal(ctx.geoContext, localPos, globalFakeMom);
-        double r = std::hypot(globalPos[Acts::ePos0], globalPos[Acts::ePos1]);
+        double r = globalPos.head<2>().norm();
         double phi = std::atan2(globalPos[Acts::ePos1], globalPos[Acts::ePos0]);
         double z = globalPos[Acts::ePos2];
         ResultUnsigned hitlayer = m_cfg.layerIDFinder(r);
diff --git a/Examples/Algorithms/TrackFinding/src/MuonHoughSeeder.cpp b/Examples/Algorithms/TrackFinding/src/MuonHoughSeeder.cpp
index 79553cbd89d..b074d14ab91 100644
--- a/Examples/Algorithms/TrackFinding/src/MuonHoughSeeder.cpp
+++ b/Examples/Algorithms/TrackFinding/src/MuonHoughSeeder.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2020 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include "ActsExamples/TrackFinding/MuonHoughSeeder.hpp"
 
diff --git a/Examples/Algorithms/TrackFinding/src/SeedingAlgorithm.cpp b/Examples/Algorithms/TrackFinding/src/SeedingAlgorithm.cpp
index 69bb87b2581..2cea4b7b505 100644
--- a/Examples/Algorithms/TrackFinding/src/SeedingAlgorithm.cpp
+++ b/Examples/Algorithms/TrackFinding/src/SeedingAlgorithm.cpp
@@ -1,18 +1,17 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2024 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include "ActsExamples/TrackFinding/SeedingAlgorithm.hpp"
 
 #include "Acts/Definitions/Algebra.hpp"
+#include "Acts/EventData/Seed.hpp"
 #include "Acts/EventData/SpacePointData.hpp"
-#include "Acts/Geometry/Extent.hpp"
 #include "Acts/Seeding/BinnedGroup.hpp"
-#include "Acts/Seeding/InternalSpacePoint.hpp"
 #include "Acts/Seeding/SeedFilter.hpp"
 #include "Acts/Utilities/BinningType.hpp"
 #include "Acts/Utilities/Delegate.hpp"
@@ -29,6 +28,8 @@
 #include <ostream>
 #include <stdexcept>
 
+using namespace Acts::HashedStringLiteral;
+
 namespace ActsExamples {
 struct AlgorithmContext;
 }  // namespace ActsExamples
@@ -36,12 +37,16 @@ struct AlgorithmContext;
 ActsExamples::SeedingAlgorithm::SeedingAlgorithm(
     ActsExamples::SeedingAlgorithm::Config cfg, Acts::Logging::Level lvl)
     : ActsExamples::IAlgorithm("SeedingAlgorithm", lvl), m_cfg(std::move(cfg)) {
+  using SpacePointProxy_type = typename Acts::SpacePointContainer<
+      ActsExamples::SpacePointContainer<std::vector<const SimSpacePoint*>>,
+      Acts::detail::RefHolder>::SpacePointProxyType;
+
   // Seed Finder config requires Seed Filter object before conversion to
   // internal units
   m_cfg.seedFilterConfig = m_cfg.seedFilterConfig.toInternalUnits();
   m_cfg.seedFinderConfig.seedFilter =
-      std::make_unique<Acts::SeedFilter<SimSpacePoint>>(m_cfg.seedFilterConfig);
-
+      std::make_unique<Acts::SeedFilter<SpacePointProxy_type>>(
+          m_cfg.seedFilterConfig, logger().cloneWithSuffix("SeedFilter"));
   m_cfg.seedFinderConfig =
       m_cfg.seedFinderConfig.toInternalUnits().calculateDerivedQuantities();
   m_cfg.seedFinderOptions =
@@ -171,38 +176,6 @@ ActsExamples::SeedingAlgorithm::SeedingAlgorithm(
     }
   }
 
-  if (m_cfg.seedFinderConfig.useDetailedDoubleMeasurementInfo) {
-    m_cfg.seedFinderConfig.getTopHalfStripLength.connect(
-        [](const void*, const SimSpacePoint& sp) -> float {
-          return sp.topHalfStripLength();
-        });
-
-    m_cfg.seedFinderConfig.getBottomHalfStripLength.connect(
-        [](const void*, const SimSpacePoint& sp) -> float {
-          return sp.bottomHalfStripLength();
-        });
-
-    m_cfg.seedFinderConfig.getTopStripDirection.connect(
-        [](const void*, const SimSpacePoint& sp) -> Acts::Vector3 {
-          return sp.topStripDirection();
-        });
-
-    m_cfg.seedFinderConfig.getBottomStripDirection.connect(
-        [](const void*, const SimSpacePoint& sp) -> Acts::Vector3 {
-          return sp.bottomStripDirection();
-        });
-
-    m_cfg.seedFinderConfig.getStripCenterDistance.connect(
-        [](const void*, const SimSpacePoint& sp) -> Acts::Vector3 {
-          return sp.stripCenterDistance();
-        });
-
-    m_cfg.seedFinderConfig.getTopStripCenterPosition.connect(
-        [](const void*, const SimSpacePoint& sp) -> Acts::Vector3 {
-          return sp.topStripCenterPosition();
-        });
-  }
-
   if (m_cfg.useExtraCuts) {
     // This function will be applied to select space points during grid filling
     m_cfg.seedFinderConfig.spacePointSelector
@@ -212,17 +185,19 @@ ActsExamples::SeedingAlgorithm::SeedingAlgorithm(
     m_cfg.seedFinderConfig.experimentCuts.connect<itkFastTrackingCuts>();
   }
 
-  m_bottomBinFinder = std::make_unique<const Acts::GridBinFinder<2ul>>(
-      m_cfg.numPhiNeighbors, m_cfg.zBinNeighborsBottom);
-  m_topBinFinder = std::make_unique<const Acts::GridBinFinder<2ul>>(
-      m_cfg.numPhiNeighbors, m_cfg.zBinNeighborsTop);
+  using SpacePointProxy_type = typename Acts::SpacePointContainer<
+      ActsExamples::SpacePointContainer<std::vector<const SimSpacePoint*>>,
+      Acts::detail::RefHolder>::SpacePointProxyType;
+
+  m_bottomBinFinder = std::make_unique<const Acts::GridBinFinder<3ul>>(
+      m_cfg.numPhiNeighbors, cfg.zBinNeighborsBottom, 0);
+  m_topBinFinder = std::make_unique<const Acts::GridBinFinder<3ul>>(
+      m_cfg.numPhiNeighbors, m_cfg.zBinNeighborsTop, 0);
 
-  m_cfg.seedFinderConfig.seedFilter =
-      std::make_unique<Acts::SeedFilter<SimSpacePoint>>(m_cfg.seedFilterConfig);
   m_seedFinder =
-      Acts::SeedFinder<SimSpacePoint,
-                       Acts::CylindricalSpacePointGrid<SimSpacePoint>>(
-          m_cfg.seedFinderConfig);
+      Acts::SeedFinder<SpacePointProxy_type,
+                       Acts::CylindricalSpacePointGrid<SpacePointProxy_type>>(
+          m_cfg.seedFinderConfig, logger().cloneWithSuffix("SeedFinder"));
 }
 
 ActsExamples::ProcessCode ActsExamples::SeedingAlgorithm::execute(
@@ -246,78 +221,65 @@ ActsExamples::ProcessCode ActsExamples::SeedingAlgorithm::execute(
     }
   }
 
-  // construct the seeding tools
-  // covariance tool, extracts covariances per spacepoint as required
-  auto extractGlobalQuantities = [=](const SimSpacePoint& sp, float, float,
-                                     float) {
-    Acts::Vector3 position{sp.x(), sp.y(), sp.z()};
-    Acts::Vector2 covariance{sp.varianceR(), sp.varianceZ()};
-    return std::make_tuple(position, covariance, sp.t());
-  };
-
-  // extent used to store r range for middle spacepoint
-  Acts::Extent rRangeSPExtent;
-
-  Acts::CylindricalSpacePointGrid<SimSpacePoint> grid =
-      Acts::CylindricalSpacePointGridCreator::createGrid<SimSpacePoint>(
-          m_cfg.gridConfig, m_cfg.gridOptions);
-  Acts::CylindricalSpacePointGridCreator::fillGrid(
-      m_cfg.seedFinderConfig, m_cfg.seedFinderOptions, grid,
-      spacePointPtrs.begin(), spacePointPtrs.end(), extractGlobalQuantities,
-      rRangeSPExtent);
-
-  std::array<std::vector<std::size_t>, 2ul> navigation;
+  // Config
+  Acts::SpacePointContainerConfig spConfig;
+  spConfig.useDetailedDoubleMeasurementInfo =
+      m_cfg.seedFinderConfig.useDetailedDoubleMeasurementInfo;
+  // Options
+  Acts::SpacePointContainerOptions spOptions;
+  spOptions.beamPos = {0., 0.};
+
+  // Prepare interface SpacePoint backend-ACTS
+  ActsExamples::SpacePointContainer container(spacePointPtrs);
+  // Prepare Acts API
+  Acts::SpacePointContainer<decltype(container), Acts::detail::RefHolder>
+      spContainer(spConfig, spOptions, container);
+
+  using value_type = typename decltype(spContainer)::SpacePointProxyType;
+  using seed_type = Acts::Seed<value_type>;
+
+  Acts::CylindricalSpacePointGrid<value_type> grid =
+      Acts::CylindricalSpacePointGridCreator::createGrid<value_type>(
+          m_cfg.gridConfig, m_cfg.gridOptions, logger());
+
+  Acts::CylindricalSpacePointGridCreator::fillGrid<value_type>(
+      m_cfg.seedFinderConfig, m_cfg.seedFinderOptions, grid, spContainer,
+      logger());
+
+  // Compute radius Range
+  // we rely on the fact the grid is storing the proxies
+  // with a sorting in the radius
+  float minRange = std::numeric_limits<float>::max();
+  float maxRange = std::numeric_limits<float>::lowest();
+  for (const auto& coll : grid) {
+    if (coll.empty()) {
+      continue;
+    }
+    const auto* firstEl = coll.front();
+    const auto* lastEl = coll.back();
+    minRange = std::min(firstEl->radius(), minRange);
+    maxRange = std::max(lastEl->radius(), maxRange);
+  }
+
+  std::array<std::vector<std::size_t>, 3ul> navigation;
   navigation[1ul] = m_cfg.seedFinderConfig.zBinsCustomLooping;
 
-  auto spacePointsGrouping = Acts::CylindricalBinnedGroup<SimSpacePoint>(
+  auto spacePointsGrouping = Acts::CylindricalBinnedGroup<value_type>(
       std::move(grid), *m_bottomBinFinder, *m_topBinFinder,
       std::move(navigation));
 
-  // safely clamp double to float
-  float up = Acts::clampValue<float>(
-      std::floor(rRangeSPExtent.max(Acts::BinningValue::binR) / 2) * 2);
-
   /// variable middle SP radial region of interest
   const Acts::Range1D<float> rMiddleSPRange(
-      std::floor(rRangeSPExtent.min(Acts::BinningValue::binR) / 2) * 2 +
+      std::floor(minRange / 2) * 2 +
           m_cfg.seedFinderConfig.deltaRMiddleMinSPRange,
-      up - m_cfg.seedFinderConfig.deltaRMiddleMaxSPRange);
+      std::floor(maxRange / 2) * 2 -
+          m_cfg.seedFinderConfig.deltaRMiddleMaxSPRange);
 
   // run the seeding
-  static thread_local SimSeedContainer seeds;
+  static thread_local std::vector<seed_type> seeds;
   seeds.clear();
   static thread_local decltype(m_seedFinder)::SeedingState state;
-  state.spacePointData.resize(
-      spacePointPtrs.size(),
-      m_cfg.seedFinderConfig.useDetailedDoubleMeasurementInfo);
-
-  if (m_cfg.seedFinderConfig.useDetailedDoubleMeasurementInfo) {
-    for (std::size_t grid_glob_bin(0);
-         grid_glob_bin < spacePointsGrouping.grid().size(); ++grid_glob_bin) {
-      const auto& collection = spacePointsGrouping.grid().at(grid_glob_bin);
-      for (const auto& sp : collection) {
-        std::size_t index = sp->index();
-
-        const float topHalfStripLength =
-            m_cfg.seedFinderConfig.getTopHalfStripLength(sp->sp());
-        const float bottomHalfStripLength =
-            m_cfg.seedFinderConfig.getBottomHalfStripLength(sp->sp());
-        const Acts::Vector3 topStripDirection =
-            m_cfg.seedFinderConfig.getTopStripDirection(sp->sp());
-        const Acts::Vector3 bottomStripDirection =
-            m_cfg.seedFinderConfig.getBottomStripDirection(sp->sp());
-
-        state.spacePointData.setTopStripVector(
-            index, topHalfStripLength * topStripDirection);
-        state.spacePointData.setBottomStripVector(
-            index, bottomHalfStripLength * bottomStripDirection);
-        state.spacePointData.setStripCenterDistance(
-            index, m_cfg.seedFinderConfig.getStripCenterDistance(sp->sp()));
-        state.spacePointData.setTopStripCenterPosition(
-            index, m_cfg.seedFinderConfig.getTopStripCenterPosition(sp->sp()));
-      }
-    }
-  }
+  state.spacePointMutableData.resize(spContainer.size());
 
   for (const auto [bottom, middle, top] : spacePointsGrouping) {
     m_seedFinder.createSeedsForGroup(m_cfg.seedFinderOptions, state,
@@ -328,6 +290,19 @@ ActsExamples::ProcessCode ActsExamples::SeedingAlgorithm::execute(
   ACTS_DEBUG("Created " << seeds.size() << " track seeds from "
                         << spacePointPtrs.size() << " space points");
 
-  m_outputSeeds(ctx, SimSeedContainer{seeds});
+  // we have seeds of proxies
+  // convert them to seed of external space points
+  SimSeedContainer SeedContainerForStorage;
+  SeedContainerForStorage.reserve(seeds.size());
+  for (const auto& seed : seeds) {
+    const auto& sps = seed.sp();
+    SeedContainerForStorage.emplace_back(*sps[0]->externalSpacePoint(),
+                                         *sps[1]->externalSpacePoint(),
+                                         *sps[2]->externalSpacePoint());
+    SeedContainerForStorage.back().setVertexZ(seed.z());
+    SeedContainerForStorage.back().setQuality(seed.seedQuality());
+  }
+
+  m_outputSeeds(ctx, std::move(SeedContainerForStorage));
   return ActsExamples::ProcessCode::SUCCESS;
 }
diff --git a/Examples/Algorithms/TrackFinding/src/SeedingAlgorithmHashing.cpp b/Examples/Algorithms/TrackFinding/src/SeedingAlgorithmHashing.cpp
new file mode 100644
index 00000000000..c722a9e5a2b
--- /dev/null
+++ b/Examples/Algorithms/TrackFinding/src/SeedingAlgorithmHashing.cpp
@@ -0,0 +1,354 @@
+// This file is part of the ACTS project.
+//
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
+//
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
+
+#include "ActsExamples/TrackFinding/SeedingAlgorithmHashing.hpp"
+
+#include "Acts/Definitions/Algebra.hpp"
+#include "Acts/EventData/Seed.hpp"
+#include "Acts/EventData/SpacePointData.hpp"
+#include "Acts/Plugins/Hashing/HashingAlgorithm.hpp"
+#include "Acts/Plugins/Hashing/HashingTraining.hpp"
+#include "Acts/Seeding/BinnedGroup.hpp"
+#include "Acts/Seeding/SeedFilter.hpp"
+#include "Acts/Seeding/SeedFinder.hpp"
+#include "Acts/Surfaces/Surface.hpp"
+#include "Acts/Utilities/BinningType.hpp"
+#include "Acts/Utilities/Delegate.hpp"
+#include "Acts/Utilities/Grid.hpp"
+#include "Acts/Utilities/GridBinFinder.hpp"
+#include "Acts/Utilities/Helpers.hpp"
+#include "ActsExamples/EventData/ProtoTrack.hpp"
+#include "ActsExamples/EventData/SimSeed.hpp"
+#include "ActsExamples/Framework/WhiteBoard.hpp"
+
+#include <cmath>
+#include <csignal>
+
+namespace ActsExamples {
+struct AlgorithmContext;
+}  // namespace ActsExamples
+
+ActsExamples::SeedingAlgorithmHashing::SeedingAlgorithmHashing(
+    ActsExamples::SeedingAlgorithmHashing::Config cfg, Acts::Logging::Level lvl)
+    : ActsExamples::IAlgorithm("SeedingAlgorithmHashing", lvl),
+      m_cfg(std::move(cfg)) {
+  using SpacePointProxy_type = typename Acts::SpacePointContainer<
+      ActsExamples::SpacePointContainer<std::vector<const SimSpacePoint*>>,
+      Acts::detail::RefHolder>::SpacePointProxyType;
+
+  // Seed Finder config requires Seed Filter object before conversion to
+  // internal units
+  m_cfg.seedFilterConfig = m_cfg.seedFilterConfig.toInternalUnits();
+  m_cfg.seedFinderConfig.seedFilter =
+      std::make_unique<Acts::SeedFilter<SpacePointProxy_type>>(
+          m_cfg.seedFilterConfig);
+
+  m_cfg.seedFinderConfig =
+      m_cfg.seedFinderConfig.toInternalUnits().calculateDerivedQuantities();
+  m_cfg.seedFinderOptions =
+      m_cfg.seedFinderOptions.toInternalUnits().calculateDerivedQuantities(
+          m_cfg.seedFinderConfig);
+  m_cfg.gridConfig = m_cfg.gridConfig.toInternalUnits();
+  m_cfg.gridOptions = m_cfg.gridOptions.toInternalUnits();
+  if (m_cfg.inputSpacePoints.empty()) {
+    throw std::invalid_argument("Missing space point input collections");
+  }
+
+  for (const auto& spName : m_cfg.inputSpacePoints) {
+    if (spName.empty()) {
+      throw std::invalid_argument("Invalid space point input collection");
+    }
+
+    auto& handle = m_inputSpacePoints.emplace_back(
+        std::make_unique<ReadDataHandle<SimSpacePointContainer>>(
+            this,
+            "InputSpacePoints#" + std::to_string(m_inputSpacePoints.size())));
+    handle->initialize(spName);
+  }
+  if (m_cfg.outputSeeds.empty()) {
+    throw std::invalid_argument("Missing seeds output collection");
+  }
+
+  m_outputSeeds.initialize(m_cfg.outputSeeds);
+  m_outputBuckets.initialize(m_cfg.outputBuckets);
+
+  if (m_cfg.gridConfig.rMax != m_cfg.seedFinderConfig.rMax &&
+      m_cfg.allowSeparateRMax == false) {
+    throw std::invalid_argument(
+        "Inconsistent config rMax: using different values in gridConfig and "
+        "seedFinderConfig. If values are intentional set allowSeparateRMax to "
+        "true");
+  }
+
+  if (m_cfg.seedFilterConfig.deltaRMin != m_cfg.seedFinderConfig.deltaRMin) {
+    throw std::invalid_argument("Inconsistent config deltaRMin");
+  }
+
+  if (m_cfg.gridConfig.deltaRMax != m_cfg.seedFinderConfig.deltaRMax) {
+    throw std::invalid_argument("Inconsistent config deltaRMax");
+  }
+
+  static_assert(
+      std::numeric_limits<
+          decltype(m_cfg.seedFinderConfig.deltaRMaxTopSP)>::has_quiet_NaN,
+      "Value of deltaRMaxTopSP must support NaN values");
+
+  static_assert(
+      std::numeric_limits<
+          decltype(m_cfg.seedFinderConfig.deltaRMinTopSP)>::has_quiet_NaN,
+      "Value of deltaRMinTopSP must support NaN values");
+
+  static_assert(
+      std::numeric_limits<
+          decltype(m_cfg.seedFinderConfig.deltaRMaxBottomSP)>::has_quiet_NaN,
+      "Value of deltaRMaxBottomSP must support NaN values");
+
+  static_assert(
+      std::numeric_limits<
+          decltype(m_cfg.seedFinderConfig.deltaRMinBottomSP)>::has_quiet_NaN,
+      "Value of deltaRMinBottomSP must support NaN values");
+
+  if (std::isnan(m_cfg.seedFinderConfig.deltaRMaxTopSP)) {
+    m_cfg.seedFinderConfig.deltaRMaxTopSP = m_cfg.seedFinderConfig.deltaRMax;
+  }
+
+  if (std::isnan(m_cfg.seedFinderConfig.deltaRMinTopSP)) {
+    m_cfg.seedFinderConfig.deltaRMinTopSP = m_cfg.seedFinderConfig.deltaRMin;
+  }
+
+  if (std::isnan(m_cfg.seedFinderConfig.deltaRMaxBottomSP)) {
+    m_cfg.seedFinderConfig.deltaRMaxBottomSP = m_cfg.seedFinderConfig.deltaRMax;
+  }
+
+  if (std::isnan(m_cfg.seedFinderConfig.deltaRMinBottomSP)) {
+    m_cfg.seedFinderConfig.deltaRMinBottomSP = m_cfg.seedFinderConfig.deltaRMin;
+  }
+
+  if (m_cfg.gridConfig.zMin != m_cfg.seedFinderConfig.zMin) {
+    throw std::invalid_argument("Inconsistent config zMin");
+  }
+
+  if (m_cfg.gridConfig.zMax != m_cfg.seedFinderConfig.zMax) {
+    throw std::invalid_argument("Inconsistent config zMax");
+  }
+
+  if (m_cfg.seedFilterConfig.maxSeedsPerSpM !=
+      m_cfg.seedFinderConfig.maxSeedsPerSpM) {
+    throw std::invalid_argument("Inconsistent config maxSeedsPerSpM");
+  }
+
+  if (m_cfg.gridConfig.cotThetaMax != m_cfg.seedFinderConfig.cotThetaMax) {
+    throw std::invalid_argument("Inconsistent config cotThetaMax");
+  }
+
+  if (m_cfg.gridConfig.minPt != m_cfg.seedFinderConfig.minPt) {
+    throw std::invalid_argument("Inconsistent config minPt");
+  }
+
+  if (m_cfg.gridOptions.bFieldInZ != m_cfg.seedFinderOptions.bFieldInZ) {
+    throw std::invalid_argument("Inconsistent config bFieldInZ");
+  }
+
+  if (m_cfg.gridConfig.zBinEdges.size() - 1 != m_cfg.zBinNeighborsTop.size() &&
+      m_cfg.zBinNeighborsTop.empty() == false) {
+    throw std::invalid_argument("Inconsistent config zBinNeighborsTop");
+  }
+
+  if (m_cfg.gridConfig.zBinEdges.size() - 1 !=
+          m_cfg.zBinNeighborsBottom.size() &&
+      m_cfg.zBinNeighborsBottom.empty() == false) {
+    throw std::invalid_argument("Inconsistent config zBinNeighborsBottom");
+  }
+
+  if (m_cfg.useExtraCuts) {
+    // This function will be applied to select space points during grid filling
+    m_cfg.seedFinderConfig.spacePointSelector
+        .connect<itkFastTrackingSPselect>();
+
+    // This function will be applied to the doublet compatibility selection
+    m_cfg.seedFinderConfig.experimentCuts.connect<itkFastTrackingCuts>();
+  }
+
+  m_bottomBinFinder = std::make_unique<const Acts::GridBinFinder<3ul>>(
+      m_cfg.numPhiNeighbors, m_cfg.zBinNeighborsBottom, 0);
+  m_topBinFinder = std::make_unique<const Acts::GridBinFinder<3ul>>(
+      m_cfg.numPhiNeighbors, m_cfg.zBinNeighborsTop, 0);
+
+  m_cfg.seedFinderConfig.seedFilter =
+      std::make_unique<Acts::SeedFilter<SpacePointProxy_type>>(
+          m_cfg.seedFilterConfig);
+  m_seedFinder =
+      Acts::SeedFinder<SpacePointProxy_type,
+                       Acts::CylindricalSpacePointGrid<SpacePointProxy_type>>(
+          m_cfg.seedFinderConfig);
+  m_hashing = Acts::HashingAlgorithm<const SimSpacePoint*,
+                                     std::vector<const SimSpacePoint*>>(
+      m_cfg.hashingConfig);
+  m_hashingTraining =
+      Acts::HashingTrainingAlgorithm<std::vector<const SimSpacePoint*>>(
+          m_cfg.hashingTrainingConfig);
+}
+
+ActsExamples::ProcessCode ActsExamples::SeedingAlgorithmHashing::execute(
+    const AlgorithmContext& ctx) const {
+  ACTS_DEBUG("Start of SeedingAlgorithmHashing execute");
+  using SpacePointPtrVector = std::vector<const SimSpacePoint*>;
+
+  // construct the combined input container of space point pointers from all
+  // configured input sources.
+  // pre-compute the total size required so we only need to allocate once
+  std::size_t nSpacePoints = 0;
+  for (const auto& isp : m_inputSpacePoints) {
+    nSpacePoints += (*isp)(ctx).size();
+  }
+
+  SpacePointPtrVector spacePointPtrs;
+  spacePointPtrs.reserve(nSpacePoints);
+  for (const auto& isp : m_inputSpacePoints) {
+    for (const SimSpacePoint& spacePoint : (*isp)(ctx)) {
+      // since the event store owns the space
+      // points, their pointers should be stable and
+      // we do not need to create local copies.
+      spacePointPtrs.push_back(&spacePoint);
+    }
+  }
+
+  // Config
+  Acts::SpacePointContainerConfig spConfig;
+  spConfig.useDetailedDoubleMeasurementInfo =
+      m_cfg.seedFinderConfig.useDetailedDoubleMeasurementInfo;
+  // Options
+  Acts::SpacePointContainerOptions spOptions;
+  spOptions.beamPos = {0., 0.};
+
+  // Hashing Training
+  Acts::AnnoyModel annoyModel = m_hashingTraining.execute(spacePointPtrs);
+  // Hashing
+  static thread_local std::vector<SpacePointPtrVector> bucketsPtrs;
+  bucketsPtrs.clear();
+  m_hashing.execute(spacePointPtrs, &annoyModel, bucketsPtrs);
+
+  // pre-compute the maximum size required so we only need to allocate once
+  // doesn't combine the input containers of space point pointers
+  std::size_t maxNSpacePoints = 0;
+  std::size_t inSpacePoints = 0;
+  for (const SpacePointPtrVector& bucket : bucketsPtrs) {
+    inSpacePoints = bucket.size();
+    if (inSpacePoints > maxNSpacePoints) {
+      maxNSpacePoints = inSpacePoints;
+    }
+  }
+
+  using value_type = typename Acts::SpacePointContainer<
+      ActsExamples::SpacePointContainer<std::vector<const SimSpacePoint*>>,
+      Acts::detail::RefHolder>::SpacePointProxyType;
+  using seed_type = Acts::Seed<value_type>;
+
+  // Create the set with custom comparison function
+  static thread_local std::set<ActsExamples::SimSeed,
+                               SeedComparison<SimSpacePoint>>
+      seedsSet;
+  seedsSet.clear();
+  static thread_local decltype(m_seedFinder)::SeedingState state;
+  state.spacePointMutableData.resize(maxNSpacePoints);
+
+  for (SpacePointPtrVector& bucket : bucketsPtrs) {
+    std::set<seed_type, SeedComparison<value_type>> seedsSetForBucket;
+    state.spacePointMutableData.clear();
+    state.spacePointMutableData.resize(maxNSpacePoints);
+
+    // Prepare interface SpacePoint backend-ACTS
+    ActsExamples::SpacePointContainer<SpacePointPtrVector> container(bucket);
+    // Prepare Acts API
+    Acts::SpacePointContainer<decltype(container), Acts::detail::RefHolder>
+        spContainer(spConfig, spOptions, container);
+
+    // construct the seeding tools
+    Acts::CylindricalSpacePointGrid<value_type> grid =
+        Acts::CylindricalSpacePointGridCreator::createGrid<value_type>(
+            m_cfg.gridConfig, m_cfg.gridOptions);
+    Acts::CylindricalSpacePointGridCreator::fillGrid(
+        m_cfg.seedFinderConfig, m_cfg.seedFinderOptions, grid,
+        spContainer.begin(), spContainer.end());
+
+    // Compute radius Range
+    // we rely on the fact the grid is storing the proxies
+    // with a sorting in the radius
+    float minRange = std::numeric_limits<float>::max();
+    float maxRange = std::numeric_limits<float>::lowest();
+    for (const auto& coll : grid) {
+      if (coll.empty()) {
+        continue;
+      }
+      const auto* firstEl = coll.front();
+      const auto* lastEl = coll.back();
+      minRange = std::min(firstEl->radius(), minRange);
+      maxRange = std::max(lastEl->radius(), maxRange);
+    }
+
+    std::array<std::vector<std::size_t>, 3ul> navigation;
+    navigation[1ul] = m_cfg.seedFinderConfig.zBinsCustomLooping;
+
+    // groups spacepoints
+    auto spacePointsGrouping = Acts::CylindricalBinnedGroup<value_type>(
+        std::move(grid), *m_bottomBinFinder, *m_topBinFinder,
+        std::move(navigation));
+
+    /// variable middle SP radial region of interest
+    const Acts::Range1D<float> rMiddleSPRange(
+        minRange + m_cfg.seedFinderConfig.deltaRMiddleMinSPRange,
+        maxRange - m_cfg.seedFinderConfig.deltaRMiddleMaxSPRange);
+
+    // this creates seeds of proxy, we need to convert it to seed of space
+    // points
+    for (const auto [bottom, middle, top] : spacePointsGrouping) {
+      m_seedFinder.createSeedsForGroup(
+          m_cfg.seedFinderOptions, state, spacePointsGrouping.grid(),
+          seedsSetForBucket, bottom, middle, top, rMiddleSPRange);
+    }
+
+    // proxies die when the Acts::SpacePointContainer dies, so we need to
+    // convert the seeds of space points proxies to seeds of space points
+    for (const seed_type& seed : seedsSetForBucket) {
+      const std::array<const value_type*, 3>& sps = seed.sp();
+      const SimSpacePoint* bottom = sps[0]->externalSpacePoint();
+      const SimSpacePoint* middle = sps[1]->externalSpacePoint();
+      const SimSpacePoint* top = sps[2]->externalSpacePoint();
+
+      ActsExamples::SimSeed toAdd(*bottom, *middle, *top);
+      toAdd.setVertexZ(seed.z());
+      toAdd.setQuality(seed.seedQuality());
+
+      seedsSet.insert(toAdd);
+    }
+  }
+
+  // convert the set to a simseed collection
+  ActsExamples::SimSeedContainer seeds;
+  seeds.reserve(seedsSet.size());
+  for (const ActsExamples::SimSeed& seed : seedsSet) {
+    seeds.push_back(seed);
+  }
+
+  ACTS_INFO("Created " << seeds.size() << " track seeds from "
+                       << spacePointPtrs.size() << " space points");
+
+  m_outputSeeds(ctx, SimSeedContainer{seeds});
+  std::vector<SimSpacePointContainer> buckets;
+  for (const SpacePointPtrVector& bucket : bucketsPtrs) {
+    SimSpacePointContainer bucketSP;
+    for (const SimSpacePoint* spacePoint : bucket) {
+      bucketSP.push_back(*spacePoint);
+    }
+    buckets.push_back(bucketSP);
+  }
+  m_outputBuckets(ctx, std::vector<SimSpacePointContainer>{buckets});
+
+  ACTS_DEBUG("End of SeedingAlgorithmHashing execute");
+  return ActsExamples::ProcessCode::SUCCESS;
+}
diff --git a/Examples/Algorithms/TrackFinding/src/SeedingOrthogonalAlgorithm.cpp b/Examples/Algorithms/TrackFinding/src/SeedingOrthogonalAlgorithm.cpp
index 70b833a9527..6a1673fe6f6 100644
--- a/Examples/Algorithms/TrackFinding/src/SeedingOrthogonalAlgorithm.cpp
+++ b/Examples/Algorithms/TrackFinding/src/SeedingOrthogonalAlgorithm.cpp
@@ -1,14 +1,15 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2022 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include "ActsExamples/TrackFinding/SeedingOrthogonalAlgorithm.hpp"
 
 #include "Acts/Definitions/Algebra.hpp"
+#include "Acts/EventData/Seed.hpp"
 #include "Acts/Seeding/SeedFilter.hpp"
 #include "ActsExamples/EventData/SimSeed.hpp"
 
@@ -66,10 +67,11 @@ ActsExamples::SeedingOrthogonalAlgorithm::SeedingOrthogonalAlgorithm(
 
   // construct seed filter
   m_cfg.seedFinderConfig.seedFilter =
-      std::make_unique<Acts::SeedFilter<SimSpacePoint>>(
-          Acts::SeedFilter<SimSpacePoint>(m_cfg.seedFilterConfig));
+      std::make_unique<Acts::SeedFilter<proxy_type>>(
+          m_cfg.seedFilterConfig, logger().cloneWithSuffix("Filter"));
 
-  m_finder = Acts::SeedFinderOrthogonal<SimSpacePoint>(m_cfg.seedFinderConfig);
+  m_finder = std::make_unique<Acts::SeedFinderOrthogonal<proxy_type>>(
+      m_cfg.seedFinderConfig, logger().cloneWithSuffix("Finder"));
 }
 
 ActsExamples::ProcessCode ActsExamples::SeedingOrthogonalAlgorithm::execute(
@@ -82,24 +84,39 @@ ActsExamples::ProcessCode ActsExamples::SeedingOrthogonalAlgorithm::execute(
     }
   }
 
-  Acts::SeedFinderOrthogonal<SimSpacePoint> finder(m_cfg.seedFinderConfig);
+  // Config
+  Acts::SpacePointContainerConfig spConfig;
 
-  std::function<
-      std::tuple<Acts::Vector3, Acts::Vector2, std::optional<Acts::ActsScalar>>(
-          const SimSpacePoint *sp)>
-      create_coordinates = [](const SimSpacePoint *sp) {
-        Acts::Vector3 position(sp->x(), sp->y(), sp->z());
-        Acts::Vector2 variance(sp->varianceR(), sp->varianceZ());
-        return std::make_tuple(position, variance, sp->t());
-      };
+  // Options
+  Acts::SpacePointContainerOptions spOptions;
+  spOptions.beamPos = {0., 0.};
 
-  SimSeedContainer seeds = finder.createSeeds(m_cfg.seedFinderOptions,
-                                              spacePoints, create_coordinates);
+  ActsExamples::SpacePointContainer container(spacePoints);
+  Acts::SpacePointContainer<decltype(container), Acts::detail::RefHolder>
+      spContainer(spConfig, spOptions, container);
 
-  ACTS_DEBUG("Created " << seeds.size() << " track seeds from "
-                        << spacePoints.size() << " space points");
+  ACTS_INFO("About to process " << spContainer.size() << " space points ...");
 
-  m_outputSeeds(ctx, std::move(seeds));
+  std::vector<Acts::Seed<proxy_type>> seeds =
+      m_finder->createSeeds(m_cfg.seedFinderOptions, spContainer);
+
+  ACTS_INFO("Created " << seeds.size() << " track seeds from "
+                       << spacePoints.size() << " space points");
+
+  // need to convert here from seed of proxies to seed of sps
+  SimSeedContainer seedsToAdd;
+  seedsToAdd.reserve(seeds.size());
+
+  for (const auto &seed : seeds) {
+    const auto &sps = seed.sp();
+    seedsToAdd.emplace_back(*sps[0]->externalSpacePoint(),
+                            *sps[1]->externalSpacePoint(),
+                            *sps[2]->externalSpacePoint());
+    seedsToAdd.back().setVertexZ(seed.z());
+    seedsToAdd.back().setQuality(seed.seedQuality());
+  }
+
+  m_outputSeeds(ctx, std::move(seedsToAdd));
 
   return ActsExamples::ProcessCode::SUCCESS;
 }
diff --git a/Examples/Algorithms/TrackFinding/src/SpacePointMaker.cpp b/Examples/Algorithms/TrackFinding/src/SpacePointMaker.cpp
index 49802b57087..673ffa8b103 100644
--- a/Examples/Algorithms/TrackFinding/src/SpacePointMaker.cpp
+++ b/Examples/Algorithms/TrackFinding/src/SpacePointMaker.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2020-2022 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include "ActsExamples/TrackFinding/SpacePointMaker.hpp"
 
@@ -32,9 +32,6 @@
 ActsExamples::SpacePointMaker::SpacePointMaker(Config cfg,
                                                Acts::Logging::Level lvl)
     : IAlgorithm("SpacePointMaker", lvl), m_cfg(std::move(cfg)) {
-  if (m_cfg.inputSourceLinks.empty()) {
-    throw std::invalid_argument("Missing source link input collection");
-  }
   if (m_cfg.inputMeasurements.empty()) {
     throw std::invalid_argument("Missing measurement input collection");
   }
@@ -48,7 +45,6 @@ ActsExamples::SpacePointMaker::SpacePointMaker(Config cfg,
     throw std::invalid_argument("Missing space point maker geometry selection");
   }
 
-  m_inputSourceLinks.initialize(m_cfg.inputSourceLinks);
   m_inputMeasurements.initialize(m_cfg.inputMeasurements);
   m_outputSpacePoints.initialize(m_cfg.outputSpacePoints);
 
@@ -80,10 +76,11 @@ ActsExamples::SpacePointMaker::SpacePointMaker(Config cfg,
     // within the same volume hierarchy only consider layers
     return (ref.layer() == cmp.layer());
   };
+  // sort geometry selection so the unique filtering works
+  std::ranges::sort(m_cfg.geometrySelection,
+                    std::less<Acts::GeometryIdentifier>{});
   auto geoSelBeg = m_cfg.geometrySelection.begin();
   auto geoSelEnd = m_cfg.geometrySelection.end();
-  // sort geometry selection so the unique filtering works
-  std::sort(geoSelBeg, geoSelEnd);
   auto geoSelLastUnique = std::unique(geoSelBeg, geoSelEnd, isDuplicate);
   if (geoSelLastUnique != geoSelEnd) {
     ACTS_WARNING("Removed " << std::distance(geoSelLastUnique, geoSelEnd)
@@ -118,7 +115,6 @@ ActsExamples::SpacePointMaker::SpacePointMaker(Config cfg,
 
 ActsExamples::ProcessCode ActsExamples::SpacePointMaker::execute(
     const AlgorithmContext& ctx) const {
-  const auto& sourceLinks = m_inputSourceLinks(ctx);
   const auto& measurements = m_inputMeasurements(ctx);
 
   // TODO Support strip measurements
@@ -126,7 +122,8 @@ ActsExamples::ProcessCode ActsExamples::SpacePointMaker::execute(
 
   spOpt.paramCovAccessor = [&measurements](Acts::SourceLink slink) {
     const auto islink = slink.get<IndexSourceLink>();
-    const auto& meas = measurements[islink.index()];
+    const ConstVariableBoundMeasurementProxy meas =
+        measurements.getMeasurement(islink.index());
 
     return std::make_pair(meas.fullParameters(), meas.fullCovariance());
   };
@@ -134,7 +131,8 @@ ActsExamples::ProcessCode ActsExamples::SpacePointMaker::execute(
   SimSpacePointContainer spacePoints;
   for (Acts::GeometryIdentifier geoId : m_cfg.geometrySelection) {
     // select volume/layer depending on what is set in the geometry id
-    auto range = selectLowestNonZeroGeometryObject(sourceLinks, geoId);
+    auto range =
+        selectLowestNonZeroGeometryObject(measurements.orderedIndices(), geoId);
     // groupByModule only works with geometry containers, not with an
     // arbitrary range. do the equivalent grouping manually
     auto groupedByModule = makeGroupBy(range, detail::GeometryIdGetter());
diff --git a/Examples/Algorithms/TrackFinding/src/TrackFindingAlgorithm.cpp b/Examples/Algorithms/TrackFinding/src/TrackFindingAlgorithm.cpp
index f4352ea46ce..b1ef900c5b9 100644
--- a/Examples/Algorithms/TrackFinding/src/TrackFindingAlgorithm.cpp
+++ b/Examples/Algorithms/TrackFinding/src/TrackFindingAlgorithm.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2020-2024 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include "ActsExamples/TrackFinding/TrackFindingAlgorithm.hpp"
 
@@ -19,7 +19,6 @@
 #include "Acts/EventData/VectorMultiTrajectory.hpp"
 #include "Acts/EventData/VectorTrackContainer.hpp"
 #include "Acts/Geometry/GeometryIdentifier.hpp"
-#include "Acts/Propagator/AbortList.hpp"
 #include "Acts/Propagator/MaterialInteractor.hpp"
 #include "Acts/Propagator/Navigator.hpp"
 #include "Acts/Propagator/Propagator.hpp"
@@ -29,8 +28,6 @@
 #include "Acts/Surfaces/Surface.hpp"
 #include "Acts/TrackFinding/CombinatorialKalmanFilter.hpp"
 #include "Acts/TrackFitting/GainMatrixUpdater.hpp"
-#include "Acts/TrackFitting/KalmanFitter.hpp"
-#include "Acts/Utilities/Delegate.hpp"
 #include "Acts/Utilities/Enumerate.hpp"
 #include "Acts/Utilities/Logger.hpp"
 #include "Acts/Utilities/TrackHelpers.hpp"
@@ -178,13 +175,13 @@ class BranchStopper {
   using BranchStopperResult =
       Acts::CombinatorialKalmanFilterBranchStopperResult;
 
-  struct BrachState {
+  struct BranchState {
     std::size_t nPixelHoles = 0;
     std::size_t nStripHoles = 0;
   };
 
-  static constexpr Acts::ProxyAccessor<BrachState> branchStateAccessor =
-      Acts::ProxyAccessor<BrachState>(Acts::hashString("MyBranchState"));
+  static constexpr Acts::ProxyAccessor<BranchState> branchStateAccessor =
+      Acts::ProxyAccessor<BranchState>(Acts::hashString("MyBranchState"));
 
   mutable std::atomic<std::size_t> m_nStoppedBranches{0};
 
@@ -206,7 +203,7 @@ class BranchStopper {
           } else if constexpr (std::is_same_v<
                                    T, Acts::TrackSelector::EtaBinnedConfig>) {
             double theta = trackState.parameters()[Acts::eBoundTheta];
-            double eta = -std::log(std::tan(0.5 * theta));
+            double eta = Acts::AngleHelpers::etaFromTheta(theta);
             return config.hasCuts(eta) ? &config.getCuts(eta) : nullptr;
           }
         },
@@ -218,17 +215,18 @@ class BranchStopper {
     }
 
     bool tooManyHolesPS = false;
-    if (!(m_cfg.pixelVolumes.empty() && m_cfg.stripVolumes.empty())) {
+    if (!(m_cfg.pixelVolumeIds.empty() && m_cfg.stripVolumeIds.empty())) {
       auto& branchState = branchStateAccessor(track);
       // count both holes and outliers as holes for pixel/strip counts
       if (trackState.typeFlags().test(Acts::TrackStateFlag::HoleFlag) ||
           trackState.typeFlags().test(Acts::TrackStateFlag::OutlierFlag)) {
-        if (m_cfg.pixelVolumes.count(
-                trackState.referenceSurface().geometryId().volume()) >= 1) {
+        auto volumeId = trackState.referenceSurface().geometryId().volume();
+        if (std::find(m_cfg.pixelVolumeIds.begin(), m_cfg.pixelVolumeIds.end(),
+                      volumeId) != m_cfg.pixelVolumeIds.end()) {
           ++branchState.nPixelHoles;
-        } else if (m_cfg.stripVolumes.count(
-                       trackState.referenceSurface().geometryId().volume()) >=
-                   1) {
+        } else if (std::find(m_cfg.stripVolumeIds.begin(),
+                             m_cfg.stripVolumeIds.end(),
+                             volumeId) != m_cfg.stripVolumeIds.end()) {
           ++branchState.nStripHoles;
         }
       }
@@ -241,8 +239,10 @@ class BranchStopper {
     bool tooManyHoles =
         track.nHoles() > singleConfig->maxHoles || tooManyHolesPS;
     bool tooManyOutliers = track.nOutliers() > singleConfig->maxOutliers;
+    bool tooManyHolesAndOutliers = (track.nHoles() + track.nOutliers()) >
+                                   singleConfig->maxHolesAndOutliers;
 
-    if (tooManyHoles || tooManyOutliers) {
+    if (tooManyHoles || tooManyOutliers || tooManyHolesAndOutliers) {
       ++m_nStoppedBranches;
       return enoughMeasurements ? BranchStopperResult::StopAndKeep
                                 : BranchStopperResult::StopAndDrop;
@@ -263,9 +263,6 @@ TrackFindingAlgorithm::TrackFindingAlgorithm(Config config,
   if (m_cfg.inputMeasurements.empty()) {
     throw std::invalid_argument("Missing measurements input collection");
   }
-  if (m_cfg.inputSourceLinks.empty()) {
-    throw std::invalid_argument("Missing source links input collection");
-  }
   if (m_cfg.inputInitialTrackParameters.empty()) {
     throw std::invalid_argument(
         "Missing initial track parameters input collection");
@@ -294,7 +291,6 @@ TrackFindingAlgorithm::TrackFindingAlgorithm(Config config,
   }
 
   m_inputMeasurements.initialize(m_cfg.inputMeasurements);
-  m_inputSourceLinks.initialize(m_cfg.inputSourceLinks);
   m_inputInitialTrackParameters.initialize(m_cfg.inputInitialTrackParameters);
   m_inputSeeds.maybeInitialize(m_cfg.inputSeeds);
   m_outputTracks.initialize(m_cfg.outputTracks);
@@ -303,7 +299,6 @@ TrackFindingAlgorithm::TrackFindingAlgorithm(Config config,
 ProcessCode TrackFindingAlgorithm::execute(const AlgorithmContext& ctx) const {
   // Read input data
   const auto& measurements = m_inputMeasurements(ctx);
-  const auto& sourceLinks = m_inputSourceLinks(ctx);
   const auto& initialParameters = m_inputInitialTrackParameters(ctx);
   const SimSeedContainer* seeds = nullptr;
 
@@ -340,7 +335,7 @@ ProcessCode TrackFindingAlgorithm::execute(const AlgorithmContext& ctx) const {
   extensions.branchStopper.connect<&BranchStopper::operator()>(&branchStopper);
 
   IndexSourceLinkAccessor slAccessor;
-  slAccessor.container = &sourceLinks;
+  slAccessor.container = &measurements.orderedIndices();
   Acts::SourceLinkAccessorDelegate<IndexSourceLinkAccessor::Iterator>
       slAccessorDelegate;
   slAccessorDelegate.connect<&IndexSourceLinkAccessor::range>(&slAccessor);
@@ -350,11 +345,15 @@ ProcessCode TrackFindingAlgorithm::execute(const AlgorithmContext& ctx) const {
   firstPropOptions.maxSteps = m_cfg.maxSteps;
   firstPropOptions.direction = m_cfg.reverseSearch ? Acts::Direction::Backward
                                                    : Acts::Direction::Forward;
+  firstPropOptions.constrainToVolumeIds = m_cfg.constrainToVolumeIds;
+  firstPropOptions.endOfWorldVolumeIds = m_cfg.endOfWorldVolumeIds;
 
   Acts::PropagatorPlainOptions secondPropOptions(ctx.geoContext,
                                                  ctx.magFieldContext);
   secondPropOptions.maxSteps = m_cfg.maxSteps;
   secondPropOptions.direction = firstPropOptions.direction.invert();
+  secondPropOptions.constrainToVolumeIds = m_cfg.constrainToVolumeIds;
+  secondPropOptions.endOfWorldVolumeIds = m_cfg.endOfWorldVolumeIds;
 
   // Set the CombinatorialKalmanFilter options
   TrackFinderOptions firstOptions(ctx.geoContext, ctx.magFieldContext,
@@ -366,11 +365,11 @@ ProcessCode TrackFindingAlgorithm::execute(const AlgorithmContext& ctx) const {
                                    ctx.calibContext, slAccessorDelegate,
                                    extensions, secondPropOptions);
   secondOptions.targetSurface = m_cfg.reverseSearch ? nullptr : pSurface.get();
+  secondOptions.skipPrePropagationUpdate = true;
 
   using Extrapolator = Acts::Propagator<Acts::SympyStepper, Acts::Navigator>;
-  using ExtrapolatorOptions =
-      Extrapolator::template Options<Acts::ActionList<Acts::MaterialInteractor>,
-                                     Acts::AbortList<Acts::EndOfWorldReached>>;
+  using ExtrapolatorOptions = Extrapolator::template Options<
+      Acts::ActorList<Acts::MaterialInteractor, Acts::EndOfWorldReached>>;
 
   Extrapolator extrapolator(
       Acts::SympyStepper(m_cfg.magneticField),
@@ -379,6 +378,8 @@ ProcessCode TrackFindingAlgorithm::execute(const AlgorithmContext& ctx) const {
       logger().cloneWithSuffix("Propagator"));
 
   ExtrapolatorOptions extrapolationOptions(ctx.geoContext, ctx.magFieldContext);
+  extrapolationOptions.constrainToVolumeIds = m_cfg.constrainToVolumeIds;
+  extrapolationOptions.endOfWorldVolumeIds = m_cfg.endOfWorldVolumeIds;
 
   // Perform the track finding for all initial parameters
   ACTS_DEBUG("Invoke track finding with " << initialParameters.size()
@@ -395,8 +396,8 @@ ProcessCode TrackFindingAlgorithm::execute(const AlgorithmContext& ctx) const {
   TrackContainer tracksTemp(trackContainerTemp, trackStateContainerTemp);
 
   // Note that not all backends support PODs as column types
-  tracks.addColumn<BranchStopper::BrachState>("MyBranchState");
-  tracksTemp.addColumn<BranchStopper::BrachState>("MyBranchState");
+  tracks.addColumn<BranchStopper::BranchState>("MyBranchState");
+  tracksTemp.addColumn<BranchStopper::BranchState>("MyBranchState");
 
   tracks.addColumn<unsigned int>("trackGroup");
   tracksTemp.addColumn<unsigned int>("trackGroup");
@@ -418,6 +419,12 @@ ProcessCode TrackFindingAlgorithm::execute(const AlgorithmContext& ctx) const {
       }
     });
 
+    // trim the track if requested
+    if (m_cfg.trimTracks) {
+      Acts::trimTrack(track, true, true, true);
+    }
+    Acts::calculateTrackQuantities(track);
+
     if (m_trackSelector.has_value() && !m_trackSelector->isValidTrack(track)) {
       return;
     }
@@ -465,8 +472,9 @@ ProcessCode TrackFindingAlgorithm::execute(const AlgorithmContext& ctx) const {
     const Acts::BoundTrackParameters& firstInitialParameters =
         initialParameters.at(iSeed);
 
-    auto firstResult =
-        (*m_cfg.findTracks)(firstInitialParameters, firstOptions, tracksTemp);
+    auto firstRootBranch = tracksTemp.makeTrack();
+    auto firstResult = (*m_cfg.findTracks)(firstInitialParameters, firstOptions,
+                                           tracksTemp, firstRootBranch);
     nSeed++;
 
     if (!firstResult.ok()) {
@@ -504,7 +512,7 @@ ProcessCode TrackFindingAlgorithm::execute(const AlgorithmContext& ctx) const {
 
       if (m_cfg.twoWay) {
         std::optional<Acts::VectorMultiTrajectory::TrackStateProxy>
-            firstMeasurement;
+            firstMeasurementOpt;
         for (auto trackState : trackCandidate.trackStatesReversed()) {
           bool isMeasurement = trackState.typeFlags().test(
               Acts::TrackStateFlag::MeasurementFlag);
@@ -514,36 +522,40 @@ ProcessCode TrackFindingAlgorithm::execute(const AlgorithmContext& ctx) const {
           // decrease resolution because only the smoothing corrected the very
           // first prediction as filtering is not possible.
           if (isMeasurement && !isOutlier) {
-            firstMeasurement = trackState;
+            firstMeasurementOpt = trackState;
           }
         }
 
-        if (firstMeasurement.has_value()) {
+        if (firstMeasurementOpt.has_value()) {
+          auto& firstMeasurement = firstMeasurementOpt.value();
+
           Acts::BoundTrackParameters secondInitialParameters =
-              trackCandidate.createParametersFromState(*firstMeasurement);
+              trackCandidate.createParametersFromState(firstMeasurement);
+
+          if (!secondInitialParameters.referenceSurface().insideBounds(
+                  secondInitialParameters.localPosition())) {
+            m_nSkippedSecondPass++;
+            ACTS_DEBUG(
+                "Smoothing of first pass fit produced out-of-bounds parameters "
+                "relative to the surface. Skipping second pass.");
+            continue;
+          }
 
-          auto secondResult = (*m_cfg.findTracks)(secondInitialParameters,
-                                                  secondOptions, tracksTemp);
+          auto secondRootBranch = tracksTemp.makeTrack();
+          secondRootBranch.copyFrom(trackCandidate, false);
+          auto secondResult =
+              (*m_cfg.findTracks)(secondInitialParameters, secondOptions,
+                                  tracksTemp, secondRootBranch);
 
           if (!secondResult.ok()) {
             ACTS_WARNING("Second track finding failed for seed "
                          << iSeed << " with error" << secondResult.error());
           } else {
-            auto firstState =
-                *std::next(trackCandidate.trackStatesReversed().begin(),
-                           trackCandidate.nTrackStates() - 1);
-            assert(firstState.previous() == Acts::kTrackIndexInvalid);
+            // store the original previous state to restore it later
+            auto originalFirstMeasurementPrevious = firstMeasurement.previous();
 
             auto& secondTracksForSeed = secondResult.value();
             for (auto& secondTrack : secondTracksForSeed) {
-              if (!secondTrack.hasReferenceSurface()) {
-                ACTS_WARNING("Second track has no reference surface.");
-                continue;
-              }
-              if (secondTrack.nMeasurements() <= 1) {
-                continue;
-              }
-
               // TODO a copy of the track should not be necessary but is the
               //      safest way with the current EDM
               // TODO a lightweight copy without copying all the track state
@@ -556,21 +568,22 @@ ProcessCode TrackFindingAlgorithm::execute(const AlgorithmContext& ctx) const {
               // processed
               secondTrackCopy.reverseTrackStates(true);
 
-              firstState.previous() =
-                  (*std::next(secondTrackCopy.trackStatesReversed().begin()))
-                      .index();
+              firstMeasurement.previous() =
+                  secondTrackCopy.outermostTrackState().index();
+
+              trackCandidate.copyFrom(secondTrackCopy, false);
 
               // finalize the track candidate
 
+              bool doExtrapolate = true;
+
               if (!m_cfg.reverseSearch) {
                 // these parameters are already extrapolated by the CKF and have
                 // the optimal resolution. note that we did not smooth all the
                 // states.
 
-                trackCandidate.parameters() = secondTrackCopy.parameters();
-                trackCandidate.covariance() = secondTrackCopy.covariance();
-                trackCandidate.setReferenceSurface(
-                    secondTrackCopy.referenceSurface().getSharedPtr());
+                // only extrapolate if we did not do it already
+                doExtrapolate = !trackCandidate.hasReferenceSurface();
               } else {
                 // smooth the full track and extrapolate to the reference
 
@@ -586,7 +599,9 @@ ProcessCode TrackFindingAlgorithm::execute(const AlgorithmContext& ctx) const {
                 }
 
                 trackCandidate.reverseTrackStates(true);
+              }
 
+              if (doExtrapolate) {
                 auto secondExtrapolationResult =
                     Acts::extrapolateTrackToReferenceSurface(
                         trackCandidate, *pSurface, extrapolator,
@@ -602,23 +617,22 @@ ProcessCode TrackFindingAlgorithm::execute(const AlgorithmContext& ctx) const {
                 }
               }
 
-              Acts::calculateTrackQuantities(trackCandidate);
-
               addTrack(trackCandidate);
 
               ++nSecond;
             }
 
-            // restore `trackCandidate` to its original state in case we need it
-            // again
-            firstState.previous() = Acts::kTrackIndexInvalid;
-            Acts::calculateTrackQuantities(trackCandidate);
+            // restore the original previous state
+            firstMeasurement.previous() = originalFirstMeasurementPrevious;
           }
         }
       }
 
       // if no second track was found, we will use only the first track
       if (nSecond == 0) {
+        // restore the track to the original state
+        trackCandidate.copyFrom(firstTrack, false);
+
         auto firstExtrapolationResult =
             Acts::extrapolateTrackToReferenceSurface(
                 trackCandidate, *pSurface, extrapolator, extrapolationOptions,
@@ -639,7 +653,7 @@ ProcessCode TrackFindingAlgorithm::execute(const AlgorithmContext& ctx) const {
 
   // Compute shared hits from all the reconstructed tracks
   if (m_cfg.computeSharedHits) {
-    computeSharedHits(sourceLinks, tracks);
+    computeSharedHits(tracks, measurements);
   }
 
   ACTS_DEBUG("Finalized track finding with " << tracks.size()
@@ -676,6 +690,7 @@ ProcessCode TrackFindingAlgorithm::finalize() {
   ACTS_INFO("- found tracks: " << m_nFoundTracks);
   ACTS_INFO("- selected tracks: " << m_nSelectedTracks);
   ACTS_INFO("- stopped branches: " << m_nStoppedBranches);
+  ACTS_INFO("- skipped second pass: " << m_nSkippedSecondPass);
 
   auto memoryStatistics =
       m_memoryStatistics.combine([](const auto& a, const auto& b) {
@@ -689,4 +704,54 @@ ProcessCode TrackFindingAlgorithm::finalize() {
   return ProcessCode::SUCCESS;
 }
 
+// TODO this is somewhat duplicated in AmbiguityResolutionAlgorithm.cpp
+// TODO we should make a common implementation in the core at some point
+void TrackFindingAlgorithm::computeSharedHits(
+    TrackContainer& tracks, const MeasurementContainer& measurements) const {
+  // Compute shared hits from all the reconstructed tracks
+  // Compute nSharedhits and Update ckf results
+  // hit index -> list of multi traj indexes [traj, meas]
+
+  std::vector<std::size_t> firstTrackOnTheHit(
+      measurements.size(), std::numeric_limits<std::size_t>::max());
+  std::vector<std::size_t> firstStateOnTheHit(
+      measurements.size(), std::numeric_limits<std::size_t>::max());
+
+  for (auto track : tracks) {
+    for (auto state : track.trackStatesReversed()) {
+      if (!state.typeFlags().test(Acts::TrackStateFlag::MeasurementFlag)) {
+        continue;
+      }
+
+      std::size_t hitIndex = state.getUncalibratedSourceLink()
+                                 .template get<IndexSourceLink>()
+                                 .index();
+
+      // Check if hit not already used
+      if (firstTrackOnTheHit.at(hitIndex) ==
+          std::numeric_limits<std::size_t>::max()) {
+        firstTrackOnTheHit.at(hitIndex) = track.index();
+        firstStateOnTheHit.at(hitIndex) = state.index();
+        continue;
+      }
+
+      // if already used, control if first track state has been marked
+      // as shared
+      int indexFirstTrack = firstTrackOnTheHit.at(hitIndex);
+      int indexFirstState = firstStateOnTheHit.at(hitIndex);
+
+      auto firstState = tracks.getTrack(indexFirstTrack)
+                            .container()
+                            .trackStateContainer()
+                            .getTrackState(indexFirstState);
+      if (!firstState.typeFlags().test(Acts::TrackStateFlag::SharedHitFlag)) {
+        firstState.typeFlags().set(Acts::TrackStateFlag::SharedHitFlag);
+      }
+
+      // Decorate this track state
+      state.typeFlags().set(Acts::TrackStateFlag::SharedHitFlag);
+    }
+  }
+}
+
 }  // namespace ActsExamples
diff --git a/Examples/Algorithms/TrackFinding/src/TrackFindingAlgorithmFunction.cpp b/Examples/Algorithms/TrackFinding/src/TrackFindingAlgorithmFunction.cpp
index 71298d98767..e9f6ae315f3 100644
--- a/Examples/Algorithms/TrackFinding/src/TrackFindingAlgorithmFunction.cpp
+++ b/Examples/Algorithms/TrackFinding/src/TrackFindingAlgorithmFunction.cpp
@@ -1,31 +1,22 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2021-2024 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
-#include "Acts/Definitions/Direction.hpp"
-#include "Acts/EventData/MultiTrajectory.hpp"
 #include "Acts/EventData/TrackContainer.hpp"
-#include "Acts/EventData/TrackStatePropMask.hpp"
-#include "Acts/EventData/VectorMultiTrajectory.hpp"
-#include "Acts/EventData/VectorTrackContainer.hpp"
 #include "Acts/Propagator/Navigator.hpp"
 #include "Acts/Propagator/Propagator.hpp"
 #include "Acts/Propagator/SympyStepper.hpp"
 #include "Acts/TrackFinding/CombinatorialKalmanFilter.hpp"
-#include "Acts/TrackFitting/GainMatrixSmoother.hpp"
 #include "Acts/Utilities/Logger.hpp"
 #include "ActsExamples/EventData/Track.hpp"
 #include "ActsExamples/TrackFinding/TrackFindingAlgorithm.hpp"
 
-#include <algorithm>
-#include <map>
 #include <memory>
 #include <utility>
-#include <vector>
 
 namespace Acts {
 class MagneticFieldProvider;
@@ -44,14 +35,16 @@ struct TrackFinderFunctionImpl
     : public ActsExamples::TrackFindingAlgorithm::TrackFinderFunction {
   CKF trackFinder;
 
-  TrackFinderFunctionImpl(CKF&& f) : trackFinder(std::move(f)) {}
+  explicit TrackFinderFunctionImpl(CKF&& f) : trackFinder(std::move(f)) {}
 
   ActsExamples::TrackFindingAlgorithm::TrackFinderResult operator()(
       const ActsExamples::TrackParameters& initialParameters,
       const ActsExamples::TrackFindingAlgorithm::TrackFinderOptions& options,
-      ActsExamples::TrackContainer& tracks) const override {
-    return trackFinder.findTracks(initialParameters, options, tracks);
-  };
+      ActsExamples::TrackContainer& tracks,
+      ActsExamples::TrackProxy rootBranch) const override {
+    return trackFinder.findTracks(initialParameters, options, tracks,
+                                  rootBranch);
+  }
 };
 
 }  // namespace
diff --git a/Examples/Algorithms/TrackFinding/src/TrackParamsEstimationAlgorithm.cpp b/Examples/Algorithms/TrackFinding/src/TrackParamsEstimationAlgorithm.cpp
index 4b8344b2ad7..c8a30c7147d 100644
--- a/Examples/Algorithms/TrackFinding/src/TrackParamsEstimationAlgorithm.cpp
+++ b/Examples/Algorithms/TrackFinding/src/TrackParamsEstimationAlgorithm.cpp
@@ -1,22 +1,19 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2021-2024 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include "ActsExamples/TrackFinding/TrackParamsEstimationAlgorithm.hpp"
 
 #include "Acts/Definitions/Algebra.hpp"
 #include "Acts/Definitions/TrackParametrization.hpp"
-#include "Acts/EventData/ParticleHypothesis.hpp"
-#include "Acts/EventData/SourceLink.hpp"
+#include "Acts/EventData/Seed.hpp"
 #include "Acts/Geometry/GeometryIdentifier.hpp"
 #include "Acts/Geometry/TrackingGeometry.hpp"
-#include "Acts/MagneticField/MagneticFieldProvider.hpp"
 #include "Acts/Seeding/EstimateTrackParamsFromSeed.hpp"
-#include "Acts/Seeding/Seed.hpp"
 #include "Acts/Surfaces/Surface.hpp"
 #include "Acts/Utilities/Result.hpp"
 #include "ActsExamples/EventData/IndexSourceLink.hpp"
@@ -35,53 +32,9 @@
 
 namespace ActsExamples {
 
-namespace {
-
-Acts::BoundSquareMatrix makeInitialCovariance(
-    const TrackParamsEstimationAlgorithm::Config& config,
-    const Acts::BoundVector& params, const SimSpacePoint& sp) {
-  Acts::BoundSquareMatrix result = Acts::BoundSquareMatrix::Zero();
-
-  for (std::size_t i = Acts::eBoundLoc0; i < Acts::eBoundSize; ++i) {
-    double sigma = config.initialSigmas[i];
-    double variance = sigma * sigma;
-
-    if (i == Acts::eBoundQOverP) {
-      // note that we rely on the fact that sigma theta is already computed
-      double varianceTheta = result(Acts::eBoundTheta, Acts::eBoundTheta);
-
-      // transverse momentum contribution
-      variance +=
-          std::pow(config.initialSigmaPtRel * params[Acts::eBoundQOverP], 2);
-
-      // theta contribution
-      variance +=
-          varianceTheta * std::pow(params[Acts::eBoundQOverP] *
-                                       std::tan(params[Acts::eBoundTheta]),
-                                   2);
-    }
-
-    // Inflate the time uncertainty if no time measurement is available
-    if (i == Acts::eBoundTime && !sp.t().has_value()) {
-      variance *= config.noTimeVarInflation;
-    }
-
-    // Inflate the initial covariance
-    variance *= config.initialVarInflation[i];
-
-    result(i, i) = variance;
-  }
-
-  return result;
-}
-
-}  // namespace
-
-ActsExamples::TrackParamsEstimationAlgorithm::TrackParamsEstimationAlgorithm(
-    ActsExamples::TrackParamsEstimationAlgorithm::Config cfg,
-    Acts::Logging::Level lvl)
-    : ActsExamples::IAlgorithm("TrackParamsEstimationAlgorithm", lvl),
-      m_cfg(std::move(cfg)) {
+TrackParamsEstimationAlgorithm::TrackParamsEstimationAlgorithm(
+    TrackParamsEstimationAlgorithm::Config cfg, Acts::Logging::Level lvl)
+    : IAlgorithm("TrackParamsEstimationAlgorithm", lvl), m_cfg(std::move(cfg)) {
   if (m_cfg.inputSeeds.empty()) {
     throw std::invalid_argument("Missing seeds input collection");
   }
@@ -103,8 +56,8 @@ ActsExamples::TrackParamsEstimationAlgorithm::TrackParamsEstimationAlgorithm(
   m_outputTracks.maybeInitialize(m_cfg.outputProtoTracks);
 }
 
-ActsExamples::ProcessCode ActsExamples::TrackParamsEstimationAlgorithm::execute(
-    const ActsExamples::AlgorithmContext& ctx) const {
+ProcessCode TrackParamsEstimationAlgorithm::execute(
+    const AlgorithmContext& ctx) const {
   auto const& seeds = m_inputSeeds(ctx);
   ACTS_VERBOSE("Read " << seeds.size() << " seeds");
 
@@ -136,7 +89,7 @@ ActsExamples::ProcessCode ActsExamples::TrackParamsEstimationAlgorithm::execute(
   for (std::size_t iseed = 0; iseed < seeds.size(); ++iseed) {
     const auto& seed = seeds[iseed];
     // Get the bottom space point and its reference surface
-    const auto bottomSP = seed.sp().front();
+    const auto& bottomSP = seed.sp().front();
     if (bottomSP->sourceLinks().empty()) {
       ACTS_WARNING("Missing source link in the space point");
       continue;
@@ -171,8 +124,15 @@ ActsExamples::ProcessCode ActsExamples::TrackParamsEstimationAlgorithm::execute(
 
     const auto& params = optParams.value();
 
-    Acts::BoundSquareMatrix cov =
-        makeInitialCovariance(m_cfg, params, *bottomSP);
+    Acts::EstimateTrackParamCovarianceConfig config{
+        .initialSigmas =
+            Eigen::Map<const Acts::BoundVector>{m_cfg.initialSigmas.data()},
+        .initialSigmaPtRel = m_cfg.initialSigmaPtRel,
+        .initialVarInflation = Eigen::Map<const Acts::BoundVector>{
+            m_cfg.initialVarInflation.data()}};
+
+    Acts::BoundSquareMatrix cov = Acts::estimateTrackParamCovariance(
+        config, params, bottomSP->t().has_value());
 
     trackParameters.emplace_back(surface->getSharedPtr(), params, cov,
                                  m_cfg.particleHypothesis);
@@ -197,4 +157,5 @@ ActsExamples::ProcessCode ActsExamples::TrackParamsEstimationAlgorithm::execute(
 
   return ProcessCode::SUCCESS;
 }
+
 }  // namespace ActsExamples
diff --git a/Examples/Algorithms/TrackFindingExaTrkX/include/ActsExamples/TrackFindingExaTrkX/PrototracksToParameters.hpp b/Examples/Algorithms/TrackFindingExaTrkX/include/ActsExamples/TrackFindingExaTrkX/PrototracksToParameters.hpp
index f3084eb9691..3f237ac1487 100644
--- a/Examples/Algorithms/TrackFindingExaTrkX/include/ActsExamples/TrackFindingExaTrkX/PrototracksToParameters.hpp
+++ b/Examples/Algorithms/TrackFindingExaTrkX/include/ActsExamples/TrackFindingExaTrkX/PrototracksToParameters.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2023 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
diff --git a/Examples/Algorithms/TrackFindingExaTrkX/include/ActsExamples/TrackFindingExaTrkX/TrackFindingAlgorithmExaTrkX.hpp b/Examples/Algorithms/TrackFindingExaTrkX/include/ActsExamples/TrackFindingExaTrkX/TrackFindingAlgorithmExaTrkX.hpp
index 18f51b5e99c..f85a000aac7 100644
--- a/Examples/Algorithms/TrackFindingExaTrkX/include/ActsExamples/TrackFindingExaTrkX/TrackFindingAlgorithmExaTrkX.hpp
+++ b/Examples/Algorithms/TrackFindingExaTrkX/include/ActsExamples/TrackFindingExaTrkX/TrackFindingAlgorithmExaTrkX.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2022 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
diff --git a/Examples/Algorithms/TrackFindingExaTrkX/include/ActsExamples/TrackFindingExaTrkX/TrackFindingFromPrototrackAlgorithm.hpp b/Examples/Algorithms/TrackFindingExaTrkX/include/ActsExamples/TrackFindingExaTrkX/TrackFindingFromPrototrackAlgorithm.hpp
index f3271821219..abfc29b462c 100644
--- a/Examples/Algorithms/TrackFindingExaTrkX/include/ActsExamples/TrackFindingExaTrkX/TrackFindingFromPrototrackAlgorithm.hpp
+++ b/Examples/Algorithms/TrackFindingExaTrkX/include/ActsExamples/TrackFindingExaTrkX/TrackFindingFromPrototrackAlgorithm.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2023 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
@@ -16,7 +16,6 @@
 #include "Acts/TrackFitting/GainMatrixSmoother.hpp"
 #include "Acts/TrackFitting/GainMatrixUpdater.hpp"
 #include "Acts/Utilities/Zip.hpp"
-#include "ActsExamples/EventData/IndexSourceLink.hpp"
 #include "ActsExamples/EventData/Measurement.hpp"
 #include "ActsExamples/EventData/ProtoTrack.hpp"
 #include "ActsExamples/EventData/Trajectories.hpp"
@@ -44,9 +43,6 @@ class TrackFindingFromPrototrackAlgorithm final : public IAlgorithm {
     /// Input measurements
     std::string inputMeasurements;
 
-    /// Input source links
-    std::string inputSourceLinks;
-
     /// Input track parameters
     std::string inputInitialTrackParameters;
 
@@ -98,8 +94,6 @@ class TrackFindingFromPrototrackAlgorithm final : public IAlgorithm {
                                                          "InputProtoTracks"};
   ReadDataHandle<MeasurementContainer> m_inputMeasurements{this,
                                                            "InputMeasurements"};
-  ReadDataHandle<IndexSourceLinkContainer> m_inputSourceLinks{
-      this, "InputSourceLinks"};
   ReadDataHandle<TrackParametersContainer> m_inputInitialTrackParameters{
       this, "InputInitialTrackParameters"};
 
diff --git a/Examples/Algorithms/TrackFindingExaTrkX/include/ActsExamples/TrackFindingExaTrkX/TruthGraphBuilder.hpp b/Examples/Algorithms/TrackFindingExaTrkX/include/ActsExamples/TrackFindingExaTrkX/TruthGraphBuilder.hpp
index 97c41acc2bb..9217199d0c3 100644
--- a/Examples/Algorithms/TrackFindingExaTrkX/include/ActsExamples/TrackFindingExaTrkX/TruthGraphBuilder.hpp
+++ b/Examples/Algorithms/TrackFindingExaTrkX/include/ActsExamples/TrackFindingExaTrkX/TruthGraphBuilder.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2022 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
diff --git a/Examples/Algorithms/TrackFindingExaTrkX/src/PrototracksToParameters.cpp b/Examples/Algorithms/TrackFindingExaTrkX/src/PrototracksToParameters.cpp
index 83714f83f46..c8d34f71bd2 100644
--- a/Examples/Algorithms/TrackFindingExaTrkX/src/PrototracksToParameters.cpp
+++ b/Examples/Algorithms/TrackFindingExaTrkX/src/PrototracksToParameters.cpp
@@ -1,16 +1,15 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2024 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include "ActsExamples/TrackFindingExaTrkX/PrototracksToParameters.hpp"
 
 #include "Acts/Seeding/BinnedGroup.hpp"
 #include "Acts/Seeding/EstimateTrackParamsFromSeed.hpp"
-#include "Acts/Seeding/InternalSpacePoint.hpp"
 #include "Acts/Seeding/SeedFilter.hpp"
 #include "Acts/Seeding/SeedFinder.hpp"
 #include "Acts/Seeding/SeedFinderConfig.hpp"
@@ -22,6 +21,7 @@
 #include "ActsExamples/Utilities/EventDataTransforms.hpp"
 
 #include <algorithm>
+#include <tuple>
 
 using namespace ActsExamples;
 using namespace Acts::UnitLiterals;
@@ -96,11 +96,8 @@ ProcessCode PrototracksToParameters::execute(
     // layer-volume spacepoints has 3 or more hits. However, if this is the
     // case, we want to keep the whole prototrack. Therefore, we operate on a
     // tmpTrack.
-    std::sort(track.begin(), track.end(), [&](auto a, auto b) {
-      if (indexToGeoId[a].volume() != indexToGeoId[b].volume()) {
-        return indexToGeoId[a].volume() < indexToGeoId[b].volume();
-      }
-      return indexToGeoId[a].layer() < indexToGeoId[b].layer();
+    std::ranges::sort(track, {}, [&](const auto &t) {
+      return std::make_tuple(indexToGeoId[t].volume(), indexToGeoId[t].layer());
     });
 
     tmpTrack.clear();
@@ -134,8 +131,7 @@ ProcessCode PrototracksToParameters::execute(
       continue;
     }
 
-    std::sort(tmpSps.begin(), tmpSps.end(),
-              [](const auto &a, const auto &b) { return a->r() < b->r(); });
+    std::ranges::sort(tmpSps, {}, [](const auto &t) { return t->r(); });
 
     // Simply use r = m*z + t and solve for r=0 to find z vertex position...
     // Probably not the textbook way to do
@@ -145,10 +141,10 @@ ProcessCode PrototracksToParameters::execute(
     const auto z_vertex = -t / m;
     const auto s = tmpSps.size();
 
-    SimSeed seed =
-        m_cfg.buildTightSeeds
-            ? SimSeed(*tmpSps[0], *tmpSps[1], *tmpSps[2], z_vertex)
-            : SimSeed(*tmpSps[0], *tmpSps[s / 2], *tmpSps[s - 1], z_vertex);
+    SimSeed seed = m_cfg.buildTightSeeds
+                       ? SimSeed(*tmpSps[0], *tmpSps[1], *tmpSps[2])
+                       : SimSeed(*tmpSps[0], *tmpSps[s / 2], *tmpSps[s - 1]);
+    seed.setVertexZ(z_vertex);
 
     // Compute parameters
     const auto &bottomSP = seed.sp().front();
diff --git a/Examples/Algorithms/TrackFindingExaTrkX/src/TrackFindingAlgorithmExaTrkX.cpp b/Examples/Algorithms/TrackFindingExaTrkX/src/TrackFindingAlgorithmExaTrkX.cpp
index 6bd254a0120..df4b8998540 100644
--- a/Examples/Algorithms/TrackFindingExaTrkX/src/TrackFindingAlgorithmExaTrkX.cpp
+++ b/Examples/Algorithms/TrackFindingExaTrkX/src/TrackFindingAlgorithmExaTrkX.cpp
@@ -1,16 +1,17 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2022 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include "ActsExamples/TrackFindingExaTrkX/TrackFindingAlgorithmExaTrkX.hpp"
 
 #include "Acts/Definitions/Units.hpp"
 #include "Acts/Plugins/ExaTrkX/TorchGraphStoreHook.hpp"
 #include "Acts/Plugins/ExaTrkX/TorchTruthGraphMetricsHook.hpp"
+#include "Acts/Utilities/Helpers.hpp"
 #include "Acts/Utilities/Zip.hpp"
 #include "ActsExamples/EventData/Index.hpp"
 #include "ActsExamples/EventData/IndexSourceLink.hpp"
@@ -18,6 +19,7 @@
 #include "ActsExamples/EventData/SimSpacePoint.hpp"
 #include "ActsExamples/Framework/WhiteBoard.hpp"
 
+#include <algorithm>
 #include <numeric>
 
 using namespace ActsExamples;
@@ -38,14 +40,6 @@ struct LoopHook : public Acts::ExaTrkXHook {
   }
 };
 
-// TODO do we have these function in the repo somewhere?
-float theta(float r, float z) {
-  return std::atan2(r, z);
-}
-float eta(float r, float z) {
-  return -std::log(std::tan(0.5 * theta(r, z)));
-}
-
 }  // namespace
 
 ActsExamples::TrackFindingAlgorithmExaTrkX::TrackFindingAlgorithmExaTrkX(
@@ -96,11 +90,9 @@ ActsExamples::TrackFindingAlgorithmExaTrkX::TrackFindingAlgorithmExaTrkX(
       NodeFeature::eClusterX, NodeFeature::eClusterY,  NodeFeature::eCellCount,
       NodeFeature::eCellSum,  NodeFeature::eCluster1R, NodeFeature::eCluster2R};
 
-  auto wantClFeatures = std::any_of(
-      m_cfg.nodeFeatures.begin(), m_cfg.nodeFeatures.end(), [&](const auto& f) {
-        return std::find(clFeatures.begin(), clFeatures.end(), f) !=
-               clFeatures.end();
-      });
+  auto wantClFeatures = std::ranges::any_of(
+      m_cfg.nodeFeatures,
+      [&](const auto& f) { return Acts::rangeContainsValue(clFeatures, f); });
 
   if (wantClFeatures && !m_inputClusters.isInitialized()) {
     throw std::invalid_argument("Cluster features requested, but not provided");
@@ -187,7 +179,7 @@ ActsExamples::ProcessCode ActsExamples::TrackFindingAlgorithmExaTrkX::execute(
         break; case NF::eZ:           f[ift] = sp.z();
         break; case NF::eX:           f[ift] = sp.x();
         break; case NF::eY:           f[ift] = sp.y();
-        break; case NF::eEta:         f[ift] = eta(std::hypot(sp.x(), sp.y()), sp.z());
+        break; case NF::eEta:         f[ift] = Acts::VectorHelpers::eta(Acts::Vector3{sp.x(), sp.y(), sp.z()});
         break; case NF::eClusterX:    f[ift] = cl1->sizeLoc0;
         break; case NF::eClusterY:    f[ift] = cl1->sizeLoc1;
         break; case NF::eCellSum:     f[ift] = cl1->sumActivations();
@@ -198,8 +190,8 @@ ActsExamples::ProcessCode ActsExamples::TrackFindingAlgorithmExaTrkX::execute(
         break; case NF::eCluster2Phi: f[ift] = std::atan2(cl2->globalPosition[Acts::ePos1], cl2->globalPosition[Acts::ePos0]);
         break; case NF::eCluster1Z:   f[ift] = cl1->globalPosition[Acts::ePos2];
         break; case NF::eCluster2Z:   f[ift] = cl2->globalPosition[Acts::ePos2];
-        break; case NF::eCluster1Eta: f[ift] = eta(std::hypot(cl1->globalPosition[Acts::ePos0], cl1->globalPosition[Acts::ePos1]), cl1->globalPosition[Acts::ePos2]);
-        break; case NF::eCluster2Eta: f[ift] = eta(std::hypot(cl2->globalPosition[Acts::ePos0], cl2->globalPosition[Acts::ePos1]), cl2->globalPosition[Acts::ePos2]);
+        break; case NF::eCluster1Eta: f[ift] = Acts::VectorHelpers::eta(Acts::Vector3{cl1->globalPosition[Acts::ePos0], cl1->globalPosition[Acts::ePos1], cl1->globalPosition[Acts::ePos2]});
+        break; case NF::eCluster2Eta: f[ift] = Acts::VectorHelpers::eta(Acts::Vector3{cl2->globalPosition[Acts::ePos0], cl2->globalPosition[Acts::ePos1], cl2->globalPosition[Acts::ePos2]});
       }
       // clang-format on
 
diff --git a/Examples/Algorithms/TrackFindingExaTrkX/src/TrackFindingFromPrototrackAlgorithm.cpp b/Examples/Algorithms/TrackFindingExaTrkX/src/TrackFindingFromPrototrackAlgorithm.cpp
index 69d281110cf..bf28b1743ba 100644
--- a/Examples/Algorithms/TrackFindingExaTrkX/src/TrackFindingFromPrototrackAlgorithm.cpp
+++ b/Examples/Algorithms/TrackFindingExaTrkX/src/TrackFindingFromPrototrackAlgorithm.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2023 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include "ActsExamples/TrackFindingExaTrkX/TrackFindingFromPrototrackAlgorithm.hpp"
 
@@ -48,6 +48,7 @@ struct ProtoTrackSourceLinkAccessor
     return {Iterator{begin}, Iterator{end}};
   }
 };
+
 }  // namespace
 
 namespace ActsExamples {
@@ -58,14 +59,12 @@ TrackFindingFromPrototrackAlgorithm::TrackFindingFromPrototrackAlgorithm(
   m_inputInitialTrackParameters.initialize(m_cfg.inputInitialTrackParameters);
   m_inputMeasurements.initialize(m_cfg.inputMeasurements);
   m_inputProtoTracks.initialize(m_cfg.inputProtoTracks);
-  m_inputSourceLinks.initialize(m_cfg.inputSourceLinks);
   m_outputTracks.initialize(m_cfg.outputTracks);
 }
 
 ActsExamples::ProcessCode TrackFindingFromPrototrackAlgorithm::execute(
     const ActsExamples::AlgorithmContext& ctx) const {
   const auto& measurements = m_inputMeasurements(ctx);
-  const auto& sourceLinks = m_inputSourceLinks(ctx);
   const auto& protoTracks = m_inputProtoTracks(ctx);
   const auto& initialParameters = m_inputInitialTrackParameters(ctx);
 
@@ -98,7 +97,7 @@ ActsExamples::ProcessCode TrackFindingFromPrototrackAlgorithm::execute(
   // The source link accessor
   ProtoTrackSourceLinkAccessor sourceLinkAccessor;
   sourceLinkAccessor.loggerPtr = logger().clone("SourceLinkAccessor");
-  sourceLinkAccessor.container = &sourceLinks;
+  sourceLinkAccessor.container = &measurements.orderedIndices();
 
   Acts::SourceLinkAccessorDelegate<IndexSourceLinkAccessor::Iterator>
       slAccessorDelegate;
@@ -133,7 +132,8 @@ ActsExamples::ProcessCode TrackFindingFromPrototrackAlgorithm::execute(
 
     // Fill the source links via their indices from the container
     for (const auto hitIndex : protoTracks.at(i)) {
-      if (auto it = sourceLinks.nth(hitIndex); it != sourceLinks.end()) {
+      if (auto it = measurements.orderedIndices().nth(hitIndex);
+          it != measurements.orderedIndices().end()) {
         sourceLinkAccessor.protoTrackSourceLinks.insert(*it);
       } else {
         ACTS_FATAL("Proto track " << i << " contains invalid hit index"
@@ -142,7 +142,9 @@ ActsExamples::ProcessCode TrackFindingFromPrototrackAlgorithm::execute(
       }
     }
 
-    auto result = (*m_cfg.findTracks)(initialParameters.at(i), options, tracks);
+    auto rootBranch = tracks.makeTrack();
+    auto result = (*m_cfg.findTracks)(initialParameters.at(i), options, tracks,
+                                      rootBranch);
     nSeed++;
 
     if (!result.ok()) {
@@ -175,7 +177,7 @@ ActsExamples::ProcessCode TrackFindingFromPrototrackAlgorithm::execute(
   // once this is done.
   // Compute shared hits from all the reconstructed tracks if
   // (m_cfg.computeSharedHits) {
-  //   computeSharedHits(sourceLinks, tracks);
+  //   computeSharedHits(measurements, tracks);
   // }
 
   ACTS_INFO("Event " << ctx.eventNumber << ": " << nFailed << " / " << nSeed
diff --git a/Examples/Algorithms/TrackFindingExaTrkX/src/TruthGraphBuilder.cpp b/Examples/Algorithms/TrackFindingExaTrkX/src/TruthGraphBuilder.cpp
index 4d8df390e50..2247c6126f4 100644
--- a/Examples/Algorithms/TrackFindingExaTrkX/src/TruthGraphBuilder.cpp
+++ b/Examples/Algorithms/TrackFindingExaTrkX/src/TruthGraphBuilder.cpp
@@ -1,14 +1,16 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2022 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include <Acts/Definitions/Units.hpp>
 #include <ActsExamples/TrackFindingExaTrkX/TruthGraphBuilder.hpp>
 
+#include <algorithm>
+
 using namespace Acts::UnitLiterals;
 
 namespace ActsExamples {
@@ -82,9 +84,8 @@ std::vector<std::int64_t> TruthGraphBuilder::buildFromMeasurements(
     };
 
     // Sort by radius (this breaks down if the particle has to low momentum)
-    std::sort(track.begin(), track.end(), [&](const auto& a, const auto& b) {
-      return radiusForOrdering(a) < radiusForOrdering(b);
-    });
+    std::ranges::sort(track, {},
+                      [&](const auto& t) { return radiusForOrdering(t); });
 
     if (m_cfg.uniqueModules) {
       auto newEnd = std::unique(
@@ -148,9 +149,7 @@ std::vector<std::int64_t> TruthGraphBuilder::buildFromSimhits(
 
   for (auto& [pid, track] : tracks) {
     // Sort by hit index, so the edges are connected correctly
-    std::sort(track.begin(), track.end(), [](const auto& a, const auto& b) {
-      return a.hitIndex < b.hitIndex;
-    });
+    std::ranges::sort(track, {}, [](const auto& t) { return t.hitIndex; });
 
     auto found = particles.find(pid);
     if (found == particles.end()) {
diff --git a/Examples/Algorithms/TrackFindingML/include/ActsExamples/TrackFindingML/AmbiguityDBScanClustering.hpp b/Examples/Algorithms/TrackFindingML/include/ActsExamples/TrackFindingML/AmbiguityDBScanClustering.hpp
index 16a5801f971..45fe4cb5480 100644
--- a/Examples/Algorithms/TrackFindingML/include/ActsExamples/TrackFindingML/AmbiguityDBScanClustering.hpp
+++ b/Examples/Algorithms/TrackFindingML/include/ActsExamples/TrackFindingML/AmbiguityDBScanClustering.hpp
@@ -1,14 +1,15 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2023-2024 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
 #include "Acts/EventData/TrackContainer.hpp"
+#include "Acts/EventData/TrackContainerFrontendConcept.hpp"
 #include "Acts/TrackFinding/detail/AmbiguityTrackClustering.hpp"
 #include "Acts/Utilities/DBScan.hpp"
 
@@ -25,13 +26,11 @@ namespace Acts {
 /// @param epsilon Maximum distance between 2 tracks to be clustered
 /// @param minPoints Minimum number of tracks to create a cluster
 /// @return an unordered map representing the clusters, the keys the ID of the primary track of each cluster and the store a vector of track IDs.
-template <typename track_container_t, typename traj_t,
-          template <typename> class holder_t>
+template <TrackContainerFrontend track_container_t>
 std::unordered_map<std::size_t, std::vector<std::size_t>> dbscanTrackClustering(
     std::multimap<int, std::pair<std::size_t, std::vector<std::size_t>>>&
         trackMap,
-    const Acts::TrackContainer<track_container_t, traj_t, holder_t>& tracks,
-    float epsilon = 0.07, int minPoints = 2) {
+    const track_container_t& tracks, float epsilon = 0.07, int minPoints = 2) {
   // Unordered map associating a vector with all the track ID of a cluster to
   // the ID of the first track of the cluster
   std::unordered_map<std::size_t, std::vector<std::size_t>> cluster;
diff --git a/Examples/Algorithms/TrackFindingML/include/ActsExamples/TrackFindingML/AmbiguityResolutionML.hpp b/Examples/Algorithms/TrackFindingML/include/ActsExamples/TrackFindingML/AmbiguityResolutionML.hpp
index aafc5c403fc..ea967a23c22 100644
--- a/Examples/Algorithms/TrackFindingML/include/ActsExamples/TrackFindingML/AmbiguityResolutionML.hpp
+++ b/Examples/Algorithms/TrackFindingML/include/ActsExamples/TrackFindingML/AmbiguityResolutionML.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2023 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
diff --git a/Examples/Algorithms/TrackFindingML/include/ActsExamples/TrackFindingML/AmbiguityResolutionMLAlgorithm.hpp b/Examples/Algorithms/TrackFindingML/include/ActsExamples/TrackFindingML/AmbiguityResolutionMLAlgorithm.hpp
index eaf36aff0ce..2e5d22ac01d 100644
--- a/Examples/Algorithms/TrackFindingML/include/ActsExamples/TrackFindingML/AmbiguityResolutionMLAlgorithm.hpp
+++ b/Examples/Algorithms/TrackFindingML/include/ActsExamples/TrackFindingML/AmbiguityResolutionMLAlgorithm.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2023 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
diff --git a/Examples/Algorithms/TrackFindingML/include/ActsExamples/TrackFindingML/AmbiguityResolutionMLDBScanAlgorithm.hpp b/Examples/Algorithms/TrackFindingML/include/ActsExamples/TrackFindingML/AmbiguityResolutionMLDBScanAlgorithm.hpp
index 23c444c2273..6ad387ffdc4 100644
--- a/Examples/Algorithms/TrackFindingML/include/ActsExamples/TrackFindingML/AmbiguityResolutionMLDBScanAlgorithm.hpp
+++ b/Examples/Algorithms/TrackFindingML/include/ActsExamples/TrackFindingML/AmbiguityResolutionMLDBScanAlgorithm.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2023 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
diff --git a/Examples/Algorithms/TrackFindingML/include/ActsExamples/TrackFindingML/SeedFilterDBScanClustering.hpp b/Examples/Algorithms/TrackFindingML/include/ActsExamples/TrackFindingML/SeedFilterDBScanClustering.hpp
index ab6d0aa0438..36674d64800 100644
--- a/Examples/Algorithms/TrackFindingML/include/ActsExamples/TrackFindingML/SeedFilterDBScanClustering.hpp
+++ b/Examples/Algorithms/TrackFindingML/include/ActsExamples/TrackFindingML/SeedFilterDBScanClustering.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2023-2024 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
diff --git a/Examples/Algorithms/TrackFindingML/include/ActsExamples/TrackFindingML/SeedFilterMLAlgorithm.hpp b/Examples/Algorithms/TrackFindingML/include/ActsExamples/TrackFindingML/SeedFilterMLAlgorithm.hpp
index 122feb693c7..6472a6e8d2b 100644
--- a/Examples/Algorithms/TrackFindingML/include/ActsExamples/TrackFindingML/SeedFilterMLAlgorithm.hpp
+++ b/Examples/Algorithms/TrackFindingML/include/ActsExamples/TrackFindingML/SeedFilterMLAlgorithm.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2023 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
diff --git a/Examples/Algorithms/TrackFindingML/src/AmbiguityResolutionML.cpp b/Examples/Algorithms/TrackFindingML/src/AmbiguityResolutionML.cpp
index 6b2d7a52b3d..f3282a15d94 100644
--- a/Examples/Algorithms/TrackFindingML/src/AmbiguityResolutionML.cpp
+++ b/Examples/Algorithms/TrackFindingML/src/AmbiguityResolutionML.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2023 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include "ActsExamples/TrackFindingML/AmbiguityResolutionML.hpp"
 
diff --git a/Examples/Algorithms/TrackFindingML/src/AmbiguityResolutionMLAlgorithm.cpp b/Examples/Algorithms/TrackFindingML/src/AmbiguityResolutionMLAlgorithm.cpp
index 0bdbe661c14..ba2e9abeb98 100644
--- a/Examples/Algorithms/TrackFindingML/src/AmbiguityResolutionMLAlgorithm.cpp
+++ b/Examples/Algorithms/TrackFindingML/src/AmbiguityResolutionMLAlgorithm.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2023 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include "ActsExamples/TrackFindingML/AmbiguityResolutionMLAlgorithm.hpp"
 
diff --git a/Examples/Algorithms/TrackFindingML/src/AmbiguityResolutionMLDBScanAlgorithm.cpp b/Examples/Algorithms/TrackFindingML/src/AmbiguityResolutionMLDBScanAlgorithm.cpp
index cf552639486..6f0c7529208 100644
--- a/Examples/Algorithms/TrackFindingML/src/AmbiguityResolutionMLDBScanAlgorithm.cpp
+++ b/Examples/Algorithms/TrackFindingML/src/AmbiguityResolutionMLDBScanAlgorithm.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2023 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include "ActsExamples/TrackFindingML/AmbiguityResolutionMLDBScanAlgorithm.hpp"
 
diff --git a/Examples/Algorithms/TrackFindingML/src/SeedFilterMLAlgorithm.cpp b/Examples/Algorithms/TrackFindingML/src/SeedFilterMLAlgorithm.cpp
index fa784a258db..f17fc666ec0 100644
--- a/Examples/Algorithms/TrackFindingML/src/SeedFilterMLAlgorithm.cpp
+++ b/Examples/Algorithms/TrackFindingML/src/SeedFilterMLAlgorithm.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2023 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include "ActsExamples/TrackFindingML/SeedFilterMLAlgorithm.hpp"
 
diff --git a/Examples/Algorithms/TrackFitting/include/ActsExamples/TrackFitting/RefittingAlgorithm.hpp b/Examples/Algorithms/TrackFitting/include/ActsExamples/TrackFitting/RefittingAlgorithm.hpp
index 99f01daae5d..19e08f7572f 100644
--- a/Examples/Algorithms/TrackFitting/include/ActsExamples/TrackFitting/RefittingAlgorithm.hpp
+++ b/Examples/Algorithms/TrackFitting/include/ActsExamples/TrackFitting/RefittingAlgorithm.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2019-2021 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
diff --git a/Examples/Algorithms/TrackFitting/include/ActsExamples/TrackFitting/RefittingCalibrator.hpp b/Examples/Algorithms/TrackFitting/include/ActsExamples/TrackFitting/RefittingCalibrator.hpp
index d9a0c80d553..31c196554fe 100644
--- a/Examples/Algorithms/TrackFitting/include/ActsExamples/TrackFitting/RefittingCalibrator.hpp
+++ b/Examples/Algorithms/TrackFitting/include/ActsExamples/TrackFitting/RefittingCalibrator.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2023 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
diff --git a/Examples/Algorithms/TrackFitting/include/ActsExamples/TrackFitting/SurfaceSortingAlgorithm.hpp b/Examples/Algorithms/TrackFitting/include/ActsExamples/TrackFitting/SurfaceSortingAlgorithm.hpp
index ac9a70f0656..02f85bff2e1 100644
--- a/Examples/Algorithms/TrackFitting/include/ActsExamples/TrackFitting/SurfaceSortingAlgorithm.hpp
+++ b/Examples/Algorithms/TrackFitting/include/ActsExamples/TrackFitting/SurfaceSortingAlgorithm.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2019-2020 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
diff --git a/Examples/Algorithms/TrackFitting/include/ActsExamples/TrackFitting/TrackFitterFunction.hpp b/Examples/Algorithms/TrackFitting/include/ActsExamples/TrackFitting/TrackFitterFunction.hpp
index 8e00a47b4a7..a58d0a90afb 100644
--- a/Examples/Algorithms/TrackFitting/include/ActsExamples/TrackFitting/TrackFitterFunction.hpp
+++ b/Examples/Algorithms/TrackFitting/include/ActsExamples/TrackFitting/TrackFitterFunction.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2019-2021 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
diff --git a/Examples/Algorithms/TrackFitting/include/ActsExamples/TrackFitting/TrackFittingAlgorithm.hpp b/Examples/Algorithms/TrackFitting/include/ActsExamples/TrackFitting/TrackFittingAlgorithm.hpp
index 4da6e5577e5..934203aeeaa 100644
--- a/Examples/Algorithms/TrackFitting/include/ActsExamples/TrackFitting/TrackFittingAlgorithm.hpp
+++ b/Examples/Algorithms/TrackFitting/include/ActsExamples/TrackFitting/TrackFittingAlgorithm.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2019-2021 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
@@ -36,8 +36,6 @@ class TrackFittingAlgorithm final : public IAlgorithm {
   struct Config {
     /// Input measurements collection.
     std::string inputMeasurements;
-    /// Input source links collection.
-    std::string inputSourceLinks;
     /// Input proto tracks collection, i.e. groups of hit indices.
     std::string inputProtoTracks;
     /// Input initial track parameter estimates for for each proto track.
@@ -74,8 +72,6 @@ class TrackFittingAlgorithm final : public IAlgorithm {
 
   ReadDataHandle<MeasurementContainer> m_inputMeasurements{this,
                                                            "InputMeasurements"};
-  ReadDataHandle<IndexSourceLinkContainer> m_inputSourceLinks{
-      this, "InputSourceLinks"};
   ReadDataHandle<ProtoTrackContainer> m_inputProtoTracks{this,
                                                          "InputProtoTracks"};
   ReadDataHandle<TrackParametersContainer> m_inputInitialTrackParameters{
diff --git a/Examples/Algorithms/TrackFitting/src/GlobalChiSquareFitterFunction.cpp b/Examples/Algorithms/TrackFitting/src/GlobalChiSquareFitterFunction.cpp
index 4078e3977a5..4f6f6a97d92 100644
--- a/Examples/Algorithms/TrackFitting/src/GlobalChiSquareFitterFunction.cpp
+++ b/Examples/Algorithms/TrackFitting/src/GlobalChiSquareFitterFunction.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2023 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 // TODO We still use some Kalman Fitter functionalities. Check for replacement
 
diff --git a/Examples/Algorithms/TrackFitting/src/GsfFitterFunction.cpp b/Examples/Algorithms/TrackFitting/src/GsfFitterFunction.cpp
index ca0af32d204..7e893fff468 100644
--- a/Examples/Algorithms/TrackFitting/src/GsfFitterFunction.cpp
+++ b/Examples/Algorithms/TrackFitting/src/GsfFitterFunction.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2022 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include "Acts/Definitions/Common.hpp"
 #include "Acts/Definitions/Direction.hpp"
@@ -57,7 +57,9 @@ using namespace ActsExamples;
 
 namespace {
 
-using MultiStepper = Acts::MultiEigenStepperLoop<>;
+using MultiStepper =
+    Acts::MultiEigenStepperLoop<Acts::EigenStepperDefaultExtension,
+                                Acts::MaxWeightReducerLoop>;
 using Propagator = Acts::Propagator<MultiStepper, Acts::Navigator>;
 using DirectPropagator = Acts::Propagator<MultiStepper, Acts::DirectNavigator>;
 
diff --git a/Examples/Algorithms/TrackFitting/src/KalmanFitterFunction.cpp b/Examples/Algorithms/TrackFitting/src/KalmanFitterFunction.cpp
index c96abb3ab9a..6f835c5c967 100644
--- a/Examples/Algorithms/TrackFitting/src/KalmanFitterFunction.cpp
+++ b/Examples/Algorithms/TrackFitting/src/KalmanFitterFunction.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2019-2021 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include "Acts/Definitions/Direction.hpp"
 #include "Acts/Definitions/TrackParametrization.hpp"
@@ -62,7 +62,7 @@ struct SimpleReverseFilteringLogic {
 
   bool doBackwardFiltering(
       Acts::VectorMultiTrajectory::ConstTrackStateProxy trackState) const {
-    auto momentum = fabs(1 / trackState.filtered()[Acts::eBoundQOverP]);
+    auto momentum = std::abs(1 / trackState.filtered()[Acts::eBoundQOverP]);
     return (momentum <= momentumThreshold);
   }
 };
diff --git a/Examples/Algorithms/TrackFitting/src/RefittingAlgorithm.cpp b/Examples/Algorithms/TrackFitting/src/RefittingAlgorithm.cpp
index f3d0df6d1ad..03aa74fa58f 100644
--- a/Examples/Algorithms/TrackFitting/src/RefittingAlgorithm.cpp
+++ b/Examples/Algorithms/TrackFitting/src/RefittingAlgorithm.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2023 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include "ActsExamples/TrackFitting/RefittingAlgorithm.hpp"
 
@@ -24,6 +24,7 @@
 #include "ActsExamples/TrackFitting/RefittingCalibrator.hpp"
 #include "ActsExamples/TrackFitting/TrackFitterFunction.hpp"
 
+#include <algorithm>
 #include <functional>
 #include <optional>
 #include <ostream>
@@ -96,13 +97,13 @@ ActsExamples::ProcessCode ActsExamples::RefittingAlgorithm::execute(
       trackSourceLinks.push_back(Acts::SourceLink{sl});
     }
 
-    std::reverse(surfSequence.begin(), surfSequence.end());
-
     if (surfSequence.empty()) {
       ACTS_WARNING("Empty track " << itrack << " found.");
       continue;
     }
 
+    std::ranges::reverse(surfSequence);
+
     ACTS_VERBOSE("Initial parameters: "
                  << initialParams.fourPosition(ctx.geoContext).transpose()
                  << " -> " << initialParams.direction().transpose());
diff --git a/Examples/Algorithms/TrackFitting/src/RefittingCalibrator.cpp b/Examples/Algorithms/TrackFitting/src/RefittingCalibrator.cpp
index f63a94df499..b54efd0dcb4 100644
--- a/Examples/Algorithms/TrackFitting/src/RefittingCalibrator.cpp
+++ b/Examples/Algorithms/TrackFitting/src/RefittingCalibrator.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2023 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include "ActsExamples/TrackFitting/RefittingCalibrator.hpp"
 
@@ -21,7 +21,7 @@ void RefittingCalibrator::calibrate(const Acts::GeometryContext& /*gctx*/,
                                     Proxy trackState) const {
   const auto sl = sourceLink.get<RefittingSourceLink>();
 
-  // Reset the original uncalibrated sourcelink on this track state
+  // Reset the original uncalibrated source link on this track state
   trackState.setUncalibratedSourceLink(sl.state.getUncalibratedSourceLink());
 
   // Here we construct a measurement by extracting the information available
@@ -37,7 +37,7 @@ void RefittingCalibrator::calibrate(const Acts::GeometryContext& /*gctx*/,
         sl.state.template calibratedCovariance<Size>();
   });
 
-  trackState.setProjectorBitset(sl.state.projectorBitset());
+  trackState.setBoundSubspaceIndices(sl.state.boundSubspaceIndices());
 }
 
 }  // namespace ActsExamples
diff --git a/Examples/Algorithms/TrackFitting/src/SurfaceSortingAlgorithm.cpp b/Examples/Algorithms/TrackFitting/src/SurfaceSortingAlgorithm.cpp
index 8eb05bd5d03..040634efbe9 100644
--- a/Examples/Algorithms/TrackFitting/src/SurfaceSortingAlgorithm.cpp
+++ b/Examples/Algorithms/TrackFitting/src/SurfaceSortingAlgorithm.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2020 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include "ActsExamples/TrackFitting/SurfaceSortingAlgorithm.hpp"
 
diff --git a/Examples/Algorithms/TrackFitting/src/TrackFittingAlgorithm.cpp b/Examples/Algorithms/TrackFitting/src/TrackFittingAlgorithm.cpp
index 2a593669a81..50360e3d3b4 100644
--- a/Examples/Algorithms/TrackFitting/src/TrackFittingAlgorithm.cpp
+++ b/Examples/Algorithms/TrackFitting/src/TrackFittingAlgorithm.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2019-2020 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include "ActsExamples/TrackFitting/TrackFittingAlgorithm.hpp"
 
@@ -18,6 +18,8 @@
 #include "Acts/Surfaces/PerigeeSurface.hpp"
 #include "Acts/Surfaces/Surface.hpp"
 #include "Acts/Utilities/Result.hpp"
+#include "ActsExamples/EventData/IndexSourceLink.hpp"
+#include "ActsExamples/EventData/Measurement.hpp"
 #include "ActsExamples/EventData/MeasurementCalibration.hpp"
 #include "ActsExamples/EventData/ProtoTrack.hpp"
 #include "ActsExamples/Framework/AlgorithmContext.hpp"
@@ -38,9 +40,6 @@ ActsExamples::TrackFittingAlgorithm::TrackFittingAlgorithm(
   if (m_cfg.inputMeasurements.empty()) {
     throw std::invalid_argument("Missing input measurement collection");
   }
-  if (m_cfg.inputSourceLinks.empty()) {
-    throw std::invalid_argument("Missing input source links collection");
-  }
   if (m_cfg.inputProtoTracks.empty()) {
     throw std::invalid_argument("Missing input proto tracks collection");
   }
@@ -59,7 +58,6 @@ ActsExamples::TrackFittingAlgorithm::TrackFittingAlgorithm(
   }
 
   m_inputMeasurements.initialize(m_cfg.inputMeasurements);
-  m_inputSourceLinks.initialize(m_cfg.inputSourceLinks);
   m_inputProtoTracks.initialize(m_cfg.inputProtoTracks);
   m_inputInitialTrackParameters.initialize(m_cfg.inputInitialTrackParameters);
   m_inputClusters.maybeInitialize(m_cfg.inputClusters);
@@ -70,7 +68,6 @@ ActsExamples::ProcessCode ActsExamples::TrackFittingAlgorithm::execute(
     const ActsExamples::AlgorithmContext& ctx) const {
   // Read input data
   const auto& measurements = m_inputMeasurements(ctx);
-  const auto& sourceLinks = m_inputSourceLinks(ctx);
   const auto& protoTracks = m_inputProtoTracks(ctx);
   const auto& initialParameters = m_inputInitialTrackParameters(ctx);
 
@@ -130,15 +127,11 @@ ActsExamples::ProcessCode ActsExamples::TrackFittingAlgorithm::execute(
     trackSourceLinks.reserve(protoTrack.size());
 
     // Fill the source links via their indices from the container
-    for (auto hitIndex : protoTrack) {
-      if (auto it = sourceLinks.nth(hitIndex); it != sourceLinks.end()) {
-        const IndexSourceLink& sourceLink = *it;
-        trackSourceLinks.push_back(Acts::SourceLink{sourceLink});
-      } else {
-        ACTS_FATAL("Proto track " << itrack << " contains invalid hit index"
-                                  << hitIndex);
-        return ProcessCode::ABORT;
-      }
+    for (auto measIndex : protoTrack) {
+      ConstVariableBoundMeasurementProxy measurement =
+          measurements.getMeasurement(measIndex);
+      IndexSourceLink sourceLink(measurement.geometryId(), measIndex);
+      trackSourceLinks.push_back(Acts::SourceLink(sourceLink));
     }
 
     ACTS_DEBUG("Invoke direct fitter for track " << itrack);
diff --git a/Examples/Algorithms/TruthTracking/ActsExamples/TruthTracking/ParticleSelector.cpp b/Examples/Algorithms/TruthTracking/ActsExamples/TruthTracking/ParticleSelector.cpp
index 9987e7106b2..738399a1e42 100644
--- a/Examples/Algorithms/TruthTracking/ActsExamples/TruthTracking/ParticleSelector.cpp
+++ b/Examples/Algorithms/TruthTracking/ActsExamples/TruthTracking/ParticleSelector.cpp
@@ -1,20 +1,17 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2019-2020 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include "ActsExamples/TruthTracking/ParticleSelector.hpp"
 
 #include "Acts/Definitions/Common.hpp"
 #include "Acts/Utilities/VectorHelpers.hpp"
-#include "ActsExamples/EventData/GeometryContainers.hpp"
-#include "ActsExamples/EventData/IndexSourceLink.hpp"
 #include "ActsExamples/EventData/SimParticle.hpp"
 #include "ActsExamples/Framework/AlgorithmContext.hpp"
-#include "ActsFatras/EventData/Particle.hpp"
 
 #include <ostream>
 #include <stdexcept>
@@ -52,29 +49,12 @@ ActsExamples::ParticleSelector::ParticleSelector(const Config& config,
   ACTS_DEBUG("remove charged particles " << m_cfg.removeCharged);
   ACTS_DEBUG("remove neutral particles " << m_cfg.removeNeutral);
   ACTS_DEBUG("remove secondary particles " << m_cfg.removeSecondaries);
-
-  // We only initialize this if we actually select on this
-  if (m_cfg.measurementsMin > 0 ||
-      m_cfg.measurementsMax < std::numeric_limits<std::size_t>::max()) {
-    m_inputMap.initialize(m_cfg.inputMeasurementParticlesMap);
-    ACTS_DEBUG("selection particle number of measurements ["
-               << m_cfg.measurementsMin << "," << m_cfg.measurementsMax << ")");
-  }
 }
 
 ActsExamples::ProcessCode ActsExamples::ParticleSelector::execute(
     const AlgorithmContext& ctx) const {
-  using ParticlesMeasurmentMap =
-      boost::container::flat_multimap<ActsFatras::Barcode, Index>;
-
   // prepare input/ output types
-  const auto& inputParticles = m_inputParticles(ctx);
-
-  // Make global particles measurement map if necessary
-  std::optional<ParticlesMeasurmentMap> particlesMeasMap;
-  if (m_inputMap.isInitialized()) {
-    particlesMeasMap = invertIndexMultimap(m_inputMap(ctx));
-  }
+  const SimParticleContainer& inputParticles = m_inputParticles(ctx);
 
   std::size_t nInvalidCharge = 0;
   std::size_t nInvalidMeasurementCount = 0;
@@ -84,7 +64,7 @@ ActsExamples::ProcessCode ActsExamples::ParticleSelector::execute(
     return (min <= x) && (x < max);
   };
 
-  auto isValidParticle = [&](const ActsFatras::Particle& p) {
+  auto isValidParticle = [&](const SimParticle& p) {
     const auto eta = Acts::VectorHelpers::eta(p.direction());
     const auto phi = Acts::VectorHelpers::phi(p.direction());
     const auto rho = Acts::VectorHelpers::perp(p.position());
@@ -96,18 +76,8 @@ ActsExamples::ProcessCode ActsExamples::ParticleSelector::execute(
 
     nInvalidCharge += static_cast<std::size_t>(!validCharge);
 
-    // default valid measurement count to true and only change if we have loaded
-    // the measurement particles map
-    bool validMeasurementCount = true;
-    if (particlesMeasMap) {
-      auto [b, e] = particlesMeasMap->equal_range(p.particleId());
-      validMeasurementCount =
-          within(static_cast<std::size_t>(std::distance(b, e)),
-                 m_cfg.measurementsMin, m_cfg.measurementsMax);
-
-      ACTS_VERBOSE("Found " << std::distance(b, e) << " measurements for "
-                            << p.particleId());
-    }
+    bool validMeasurementCount =
+        within(p.numberOfHits(), m_cfg.measurementsMin, m_cfg.measurementsMax);
 
     nInvalidMeasurementCount +=
         static_cast<std::size_t>(!validMeasurementCount);
@@ -138,10 +108,11 @@ ActsExamples::ProcessCode ActsExamples::ParticleSelector::execute(
 
   // copy selected particles
   for (const auto& inputParticle : inputParticles) {
-    if (isValidParticle(inputParticle)) {
-      // the input parameters should already be
-      outputParticles.insert(outputParticles.end(), inputParticle);
+    if (!isValidParticle(inputParticle)) {
+      continue;
     }
+
+    outputParticles.insert(outputParticles.end(), inputParticle);
   }
   outputParticles.shrink_to_fit();
 
@@ -153,5 +124,6 @@ ActsExamples::ProcessCode ActsExamples::ParticleSelector::execute(
              << nInvalidMeasurementCount);
 
   m_outputParticles(ctx, std::move(outputParticles));
+
   return ProcessCode::SUCCESS;
 }
diff --git a/Examples/Algorithms/TruthTracking/ActsExamples/TruthTracking/ParticleSelector.hpp b/Examples/Algorithms/TruthTracking/ActsExamples/TruthTracking/ParticleSelector.hpp
index 8a1bd27ec97..78326844f19 100644
--- a/Examples/Algorithms/TruthTracking/ActsExamples/TruthTracking/ParticleSelector.hpp
+++ b/Examples/Algorithms/TruthTracking/ActsExamples/TruthTracking/ParticleSelector.hpp
@@ -1,17 +1,14 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2019-2020 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
-#include "Acts/Geometry/GeometryIdentifier.hpp"
 #include "Acts/Utilities/Logger.hpp"
-#include "ActsExamples/EventData/Index.hpp"
-#include "ActsExamples/EventData/Measurement.hpp"
 #include "ActsExamples/EventData/SimParticle.hpp"
 #include "ActsExamples/Framework/DataHandle.hpp"
 #include "ActsExamples/Framework/IAlgorithm.hpp"
@@ -29,10 +26,9 @@ class ParticleSelector final : public IAlgorithm {
   struct Config {
     /// The input particles collection.
     std::string inputParticles;
-    /// Input measurement particles map (Optional)
-    std::string inputMeasurementParticlesMap;
     /// The output particles collection.
     std::string outputParticles;
+
     // Minimum/maximum distance from the origin in the transverse plane.
     double rhoMin = 0;
     double rhoMax = std::numeric_limits<double>::infinity();
@@ -79,8 +75,6 @@ class ParticleSelector final : public IAlgorithm {
   Config m_cfg;
 
   ReadDataHandle<SimParticleContainer> m_inputParticles{this, "InputParticles"};
-  ReadDataHandle<IndexMultimap<ActsFatras::Barcode>> m_inputMap{
-      this, "InputMeasurementParticlesMap"};
 
   WriteDataHandle<SimParticleContainer> m_outputParticles{this,
                                                           "OutputParticles"};
diff --git a/Examples/Algorithms/TruthTracking/ActsExamples/TruthTracking/ParticleSmearing.cpp b/Examples/Algorithms/TruthTracking/ActsExamples/TruthTracking/ParticleSmearing.cpp
index 5cacd1bd6be..cfc62ab9da9 100644
--- a/Examples/Algorithms/TruthTracking/ActsExamples/TruthTracking/ParticleSmearing.cpp
+++ b/Examples/Algorithms/TruthTracking/ActsExamples/TruthTracking/ParticleSmearing.cpp
@@ -1,16 +1,17 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2019-2024 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include "ActsExamples/TruthTracking/ParticleSmearing.hpp"
 
 #include "Acts/Definitions/Algebra.hpp"
 #include "Acts/Definitions/TrackParametrization.hpp"
 #include "Acts/EventData/ParticleHypothesis.hpp"
+#include "Acts/Seeding/EstimateTrackParamsFromSeed.hpp"
 #include "Acts/Surfaces/PerigeeSurface.hpp"
 #include "Acts/Surfaces/Surface.hpp"
 #include "Acts/Utilities/Helpers.hpp"
@@ -128,31 +129,16 @@ ActsExamples::ProcessCode ActsExamples::ParticleSmearing::execute(
       Acts::BoundSquareMatrix cov = Acts::BoundSquareMatrix::Zero();
       if (m_cfg.initialSigmas) {
         // use the initial sigmas if set
-        for (std::size_t i = Acts::eBoundLoc0; i < Acts::eBoundSize; ++i) {
-          double sigma = (*m_cfg.initialSigmas)[i];
-          double variance = sigma * sigma;
-
-          if (i == Acts::eBoundQOverP) {
-            // note that we rely on the fact that sigma theta is already
-            // computed
-            double varianceTheta = cov(Acts::eBoundTheta, Acts::eBoundTheta);
 
-            // transverse momentum contribution
-            variance += std::pow(
-                m_cfg.initialSigmaPtRel * params[Acts::eBoundQOverP], 2);
+        Acts::EstimateTrackParamCovarianceConfig config{
+            .initialSigmas =
+                Eigen::Map<const Acts::BoundVector>{
+                    m_cfg.initialSigmas->data()},
+            .initialSigmaPtRel = m_cfg.initialSigmaPtRel,
+            .initialVarInflation = Eigen::Map<const Acts::BoundVector>{
+                m_cfg.initialVarInflation.data()}};
 
-            // theta contribution
-            variance += varianceTheta *
-                        std::pow(params[Acts::eBoundQOverP] *
-                                     std::tan(params[Acts::eBoundTheta]),
-                                 2);
-          }
-
-          // Inflate the initial covariance
-          variance *= m_cfg.initialVarInflation[i];
-
-          cov(i, i) = variance;
-        }
+        cov = Acts::estimateTrackParamCovariance(config, params, false);
       } else {
         // otherwise use the smearing sigmas
 
diff --git a/Examples/Algorithms/TruthTracking/ActsExamples/TruthTracking/ParticleSmearing.hpp b/Examples/Algorithms/TruthTracking/ActsExamples/TruthTracking/ParticleSmearing.hpp
index 68ebad5b14d..3b60f12b099 100644
--- a/Examples/Algorithms/TruthTracking/ActsExamples/TruthTracking/ParticleSmearing.hpp
+++ b/Examples/Algorithms/TruthTracking/ActsExamples/TruthTracking/ParticleSmearing.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2019-2024 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
diff --git a/Examples/Algorithms/TruthTracking/ActsExamples/TruthTracking/TrackModifier.cpp b/Examples/Algorithms/TruthTracking/ActsExamples/TruthTracking/TrackModifier.cpp
index a0c31c299cb..1f6b3af571e 100644
--- a/Examples/Algorithms/TruthTracking/ActsExamples/TruthTracking/TrackModifier.cpp
+++ b/Examples/Algorithms/TruthTracking/ActsExamples/TruthTracking/TrackModifier.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2022 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include "ActsExamples/TruthTracking/TrackModifier.hpp"
 
diff --git a/Examples/Algorithms/TruthTracking/ActsExamples/TruthTracking/TrackModifier.hpp b/Examples/Algorithms/TruthTracking/ActsExamples/TruthTracking/TrackModifier.hpp
index 3321b566663..caf77d4ad24 100644
--- a/Examples/Algorithms/TruthTracking/ActsExamples/TruthTracking/TrackModifier.hpp
+++ b/Examples/Algorithms/TruthTracking/ActsExamples/TruthTracking/TrackModifier.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2022 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
diff --git a/Examples/Algorithms/TruthTracking/ActsExamples/TruthTracking/TrackParameterSelector.cpp b/Examples/Algorithms/TruthTracking/ActsExamples/TruthTracking/TrackParameterSelector.cpp
index 27712b00fcf..18b9cf9090c 100644
--- a/Examples/Algorithms/TruthTracking/ActsExamples/TruthTracking/TrackParameterSelector.cpp
+++ b/Examples/Algorithms/TruthTracking/ActsExamples/TruthTracking/TrackParameterSelector.cpp
@@ -1,14 +1,15 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2023 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include "ActsExamples/TruthTracking/TrackParameterSelector.hpp"
 
 #include "Acts/Definitions/TrackParametrization.hpp"
+#include "Acts/Utilities/AngleHelpers.hpp"
 #include "ActsExamples/EventData/Track.hpp"
 #include "ActsExamples/Framework/AlgorithmContext.hpp"
 
@@ -41,7 +42,7 @@ ActsExamples::ProcessCode ActsExamples::TrackParameterSelector::execute(
   };
   auto isValidTrack = [&](const auto& trk) {
     const auto theta = trk.template get<Acts::eBoundTheta>();
-    const auto eta = -std::log(std::tan(theta / 2));
+    const auto eta = Acts::AngleHelpers::etaFromTheta(theta);
     // define charge selection
     return within(trk.transverseMomentum(), m_cfg.ptMin, m_cfg.ptMax) &&
            within(std::abs(eta), m_cfg.absEtaMin, m_cfg.absEtaMax) &&
diff --git a/Examples/Algorithms/TruthTracking/ActsExamples/TruthTracking/TrackParameterSelector.hpp b/Examples/Algorithms/TruthTracking/ActsExamples/TruthTracking/TrackParameterSelector.hpp
index e5ce89fd7d4..a22b62319b7 100644
--- a/Examples/Algorithms/TruthTracking/ActsExamples/TruthTracking/TrackParameterSelector.hpp
+++ b/Examples/Algorithms/TruthTracking/ActsExamples/TruthTracking/TrackParameterSelector.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2023 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
diff --git a/Examples/Algorithms/TruthTracking/ActsExamples/TruthTracking/TrackTruthMatcher.cpp b/Examples/Algorithms/TruthTracking/ActsExamples/TruthTracking/TrackTruthMatcher.cpp
index 46ff000f591..1b77a74008a 100644
--- a/Examples/Algorithms/TruthTracking/ActsExamples/TruthTracking/TrackTruthMatcher.cpp
+++ b/Examples/Algorithms/TruthTracking/ActsExamples/TruthTracking/TrackTruthMatcher.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2024 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include "ActsExamples/TruthTracking/TrackTruthMatcher.hpp"
 
@@ -84,7 +84,7 @@ ActsExamples::ProcessCode TrackTruthMatcher::execute(
         particleHitCounts.front().particleId;
     std::size_t nMajorityHits = particleHitCounts.front().hitCount;
 
-    if (particles.find(majorityParticleId) == particles.end()) {
+    if (!particles.contains(majorityParticleId)) {
       ACTS_DEBUG(
           "The majority particle is not in the input particle collection, "
           "majorityParticleId = "
diff --git a/Examples/Algorithms/TruthTracking/ActsExamples/TruthTracking/TrackTruthMatcher.hpp b/Examples/Algorithms/TruthTracking/ActsExamples/TruthTracking/TrackTruthMatcher.hpp
index ffb0a545540..5f8d89a98b0 100644
--- a/Examples/Algorithms/TruthTracking/ActsExamples/TruthTracking/TrackTruthMatcher.hpp
+++ b/Examples/Algorithms/TruthTracking/ActsExamples/TruthTracking/TrackTruthMatcher.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2024 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
diff --git a/Examples/Algorithms/TruthTracking/ActsExamples/TruthTracking/TruthSeedSelector.cpp b/Examples/Algorithms/TruthTracking/ActsExamples/TruthTracking/TruthSeedSelector.cpp
deleted file mode 100644
index b97483cac62..00000000000
--- a/Examples/Algorithms/TruthTracking/ActsExamples/TruthTracking/TruthSeedSelector.cpp
+++ /dev/null
@@ -1,89 +0,0 @@
-// This file is part of the Acts project.
-//
-// Copyright (C) 2019 CERN for the benefit of the Acts project
-//
-// This Source Code Form is subject to the terms of the Mozilla Public
-// License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-#include "ActsExamples/TruthTracking/TruthSeedSelector.hpp"
-
-#include "Acts/Utilities/MultiIndex.hpp"
-#include "Acts/Utilities/VectorHelpers.hpp"
-#include "ActsExamples/EventData/Index.hpp"
-#include "ActsExamples/EventData/SimParticle.hpp"
-#include "ActsExamples/Utilities/Range.hpp"
-#include "ActsFatras/EventData/Barcode.hpp"
-#include "ActsFatras/EventData/Particle.hpp"
-
-#include <functional>
-#include <stdexcept>
-#include <utility>
-
-namespace ActsExamples {
-struct AlgorithmContext;
-}  // namespace ActsExamples
-
-using namespace ActsExamples;
-
-TruthSeedSelector::TruthSeedSelector(const Config& config,
-                                     Acts::Logging::Level level)
-    : IAlgorithm("TruthSeedSelector", level), m_cfg(config) {
-  if (m_cfg.inputParticles.empty()) {
-    throw std::invalid_argument("Missing input truth particles collection");
-  }
-  if (m_cfg.inputMeasurementParticlesMap.empty()) {
-    throw std::invalid_argument("Missing input hit-particles map collection");
-  }
-  if (m_cfg.outputParticles.empty()) {
-    throw std::invalid_argument("Missing output truth particles collection");
-  }
-
-  m_inputParticles.initialize(m_cfg.inputParticles);
-  m_inputMeasurementParticlesMap.initialize(m_cfg.inputMeasurementParticlesMap);
-  m_outputParticles.initialize(m_cfg.outputParticles);
-}
-
-ProcessCode TruthSeedSelector::execute(const AlgorithmContext& ctx) const {
-  // prepare input collections
-  const auto& inputParticles = m_inputParticles(ctx);
-  const auto& hitParticlesMap = m_inputMeasurementParticlesMap(ctx);
-  // compute particle_id -> {hit_id...} map from the
-  // hit_id -> {particle_id...} map on the fly.
-  const auto& particleHitsMap = invertIndexMultimap(hitParticlesMap);
-
-  // prepare output collection
-  SimParticleContainer selectedParticles;
-  selectedParticles.reserve(inputParticles.size());
-
-  auto within = [](double x, double min, double max) {
-    return (min <= x) && (x < max);
-  };
-  auto isValidparticle = [&](const auto& p) {
-    const auto eta = Acts::VectorHelpers::eta(p.direction());
-    const auto phi = Acts::VectorHelpers::phi(p.direction());
-    const auto rho = Acts::VectorHelpers::perp(p.position());
-    // find the corresponding hits for this particle
-    const auto& hits = makeRange(particleHitsMap.equal_range(p.particleId()));
-    // number of recorded hits
-    std::size_t nHits = hits.size();
-    return within(rho, 0., m_cfg.rhoMax) &&
-           within(p.position().z(), m_cfg.zMin, m_cfg.zMax) &&
-           within(std::abs(eta), m_cfg.absEtaMin, m_cfg.absEtaMax) &&
-           within(eta, m_cfg.etaMin, m_cfg.etaMax) &&
-           within(phi, m_cfg.phiMin, m_cfg.phiMax) &&
-           within(p.transverseMomentum(), m_cfg.ptMin, m_cfg.ptMax) &&
-           within(nHits, m_cfg.nHitsMin, m_cfg.nHitsMax) &&
-           (m_cfg.keepNeutral || (p.charge() != 0));
-  };
-
-  // create prototracks for all input particles
-  for (const auto& particle : inputParticles) {
-    if (isValidparticle(particle)) {
-      selectedParticles.insert(particle);
-    }
-  }
-
-  m_outputParticles(ctx, std::move(selectedParticles));
-  return ProcessCode::SUCCESS;
-}
diff --git a/Examples/Algorithms/TruthTracking/ActsExamples/TruthTracking/TruthSeedSelector.hpp b/Examples/Algorithms/TruthTracking/ActsExamples/TruthTracking/TruthSeedSelector.hpp
deleted file mode 100644
index ccdcf515019..00000000000
--- a/Examples/Algorithms/TruthTracking/ActsExamples/TruthTracking/TruthSeedSelector.hpp
+++ /dev/null
@@ -1,92 +0,0 @@
-// This file is part of the Acts project.
-//
-// Copyright (C) 2020 CERN for the benefit of the Acts project
-//
-// This Source Code Form is subject to the terms of the Mozilla Public
-// License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-#pragma once
-
-#include "Acts/Utilities/Logger.hpp"
-#include "ActsExamples/EventData/SimHit.hpp"
-#include "ActsExamples/EventData/SimParticle.hpp"
-#include "ActsExamples/Framework/DataHandle.hpp"
-#include "ActsExamples/Framework/IAlgorithm.hpp"
-#include "ActsExamples/Framework/ProcessCode.hpp"
-
-#include <cstddef>
-#include <limits>
-#include <string>
-
-namespace ActsFatras {
-class Barcode;
-}  // namespace ActsFatras
-
-namespace ActsExamples {
-struct AlgorithmContext;
-
-/// Select truth particles to be used as 'seeds' of reconstruction algorithms,
-/// e.g. track fitting and track finding.
-///
-/// This pre-selection could help guarantee quality of the 'seeds', i.e. to
-/// avoid empty proto track (no recorded hits for the particle). In addition, it
-/// could help save unnecessary reconstruction time. For instance, when
-/// investigating performance of CombinatorialKalmanFilter (CKF), we might be
-/// interested in its performance for only truth particles with pT and number of
-/// recorded hits (on sensitive detectors) safistying provided criteria (input
-/// measurements of CKF are still recorded hits from all possible particles).
-/// Then we could use particles only satisfying provided criteria as the 'seeds'
-/// of CKF instead of handling all the truth particles.
-//
-class TruthSeedSelector final : public IAlgorithm {
- public:
-  struct Config {
-    /// The input truth particles that should be used to create proto tracks.
-    std::string inputParticles;
-    /// The input hit-particles map collection.
-    std::string inputMeasurementParticlesMap;
-    /// The output proto tracks collection.
-    std::string outputParticles;
-    /// Maximum distance from the origin in the transverse plane
-    double rhoMin = 0.;
-    double rhoMax = std::numeric_limits<double>::max();
-    /// Minimum/Maximum absolute distance from the origin along z
-    double zMin = std::numeric_limits<double>::lowest();
-    double zMax = std::numeric_limits<double>::max();
-    // Truth particle kinematic cuts
-    double phiMin = std::numeric_limits<double>::lowest();
-    double phiMax = std::numeric_limits<double>::max();
-    double etaMin = std::numeric_limits<double>::lowest();
-    double etaMax = std::numeric_limits<double>::max();
-    double absEtaMin = std::numeric_limits<double>::lowest();
-    double absEtaMax = std::numeric_limits<double>::max();
-    double ptMin = 0.0;
-    double ptMax = std::numeric_limits<double>::max();
-    /// Keep neutral particles
-    bool keepNeutral = false;
-    /// Requirement on number of recorded hits
-    //@TODO: implement detector-specific requirements
-    std::size_t nHitsMin = 0;
-    std::size_t nHitsMax = std::numeric_limits<std::size_t>::max();
-  };
-
-  TruthSeedSelector(const Config& config, Acts::Logging::Level level);
-
-  ProcessCode execute(const AlgorithmContext& ctx) const final;
-
-  /// Get readonly access to the config parameters
-  const Config& config() const { return m_cfg; }
-
- private:
-  Config m_cfg;
-
-  ReadDataHandle<SimParticleContainer> m_inputParticles{this, "InputParticles"};
-  ReadDataHandle<HitParticlesMap> m_inputMeasurementParticlesMap{
-      this, "InputMeasurementParticlesMap"};
-
-  WriteDataHandle<SimParticleContainer> m_outputParticles{this,
-                                                          "OutputParticles"};
-};
-
-}  // namespace ActsExamples
diff --git a/Examples/Algorithms/TruthTracking/ActsExamples/TruthTracking/TruthSeedingAlgorithm.cpp b/Examples/Algorithms/TruthTracking/ActsExamples/TruthTracking/TruthSeedingAlgorithm.cpp
index 99e6c3ccb8e..b1e19293a6e 100644
--- a/Examples/Algorithms/TruthTracking/ActsExamples/TruthTracking/TruthSeedingAlgorithm.cpp
+++ b/Examples/Algorithms/TruthTracking/ActsExamples/TruthTracking/TruthSeedingAlgorithm.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2021 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include "ActsExamples/TruthTracking/TruthSeedingAlgorithm.hpp"
 
@@ -151,11 +151,9 @@ ActsExamples::ProcessCode ActsExamples::TruthSeedingAlgorithm::execute(
       continue;
     }
     // Sort the space points
-    std::sort(spacePointsOnTrack.begin(), spacePointsOnTrack.end(),
-              [](const SimSpacePoint* lhs, const SimSpacePoint* rhs) {
-                return std::hypot(lhs->r(), lhs->z()) <
-                       std::hypot(rhs->r(), rhs->z());
-              });
+    std::ranges::sort(spacePointsOnTrack, {}, [](const SimSpacePoint* s) {
+      return std::hypot(s->r(), s->z());
+    });
 
     // Loop over the found space points to find the seed with maximum deltaR
     // between the bottom and top space point
@@ -183,14 +181,14 @@ ActsExamples::ProcessCode ActsExamples::TruthSeedingAlgorithm::execute(
     }
 
     if (seedFound) {
-      SimSeed seed{
-          *spacePointsOnTrack[bestSPIndices[0]],
-          *spacePointsOnTrack[bestSPIndices[1]],
-          *spacePointsOnTrack[bestSPIndices[2]],
-          static_cast<float>(spacePointsOnTrack[bestSPIndices[1]]->z())};
+      SimSeed seed{*spacePointsOnTrack[bestSPIndices[0]],
+                   *spacePointsOnTrack[bestSPIndices[1]],
+                   *spacePointsOnTrack[bestSPIndices[2]]};
+      seed.setVertexZ(
+          static_cast<float>(spacePointsOnTrack[bestSPIndices[1]]->z()));
 
       seededParticles.insert(particle);
-      seeds.emplace_back(std::move(seed));
+      seeds.emplace_back(seed);
       tracks.emplace_back(std::move(track));
     }
   }
diff --git a/Examples/Algorithms/TruthTracking/ActsExamples/TruthTracking/TruthSeedingAlgorithm.hpp b/Examples/Algorithms/TruthTracking/ActsExamples/TruthTracking/TruthSeedingAlgorithm.hpp
index 9f7cca8ac68..a6cb0416160 100644
--- a/Examples/Algorithms/TruthTracking/ActsExamples/TruthTracking/TruthSeedingAlgorithm.hpp
+++ b/Examples/Algorithms/TruthTracking/ActsExamples/TruthTracking/TruthSeedingAlgorithm.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2021 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
diff --git a/Examples/Algorithms/TruthTracking/ActsExamples/TruthTracking/TruthTrackFinder.cpp b/Examples/Algorithms/TruthTracking/ActsExamples/TruthTracking/TruthTrackFinder.cpp
index f738ba4c49f..54953ce7c2b 100644
--- a/Examples/Algorithms/TruthTracking/ActsExamples/TruthTracking/TruthTrackFinder.cpp
+++ b/Examples/Algorithms/TruthTracking/ActsExamples/TruthTracking/TruthTrackFinder.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2019 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include "ActsExamples/TruthTracking/TruthTrackFinder.hpp"
 
diff --git a/Examples/Algorithms/TruthTracking/ActsExamples/TruthTracking/TruthTrackFinder.hpp b/Examples/Algorithms/TruthTracking/ActsExamples/TruthTracking/TruthTrackFinder.hpp
index 119f176ad41..8f7affb79c3 100644
--- a/Examples/Algorithms/TruthTracking/ActsExamples/TruthTracking/TruthTrackFinder.hpp
+++ b/Examples/Algorithms/TruthTracking/ActsExamples/TruthTracking/TruthTrackFinder.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2019 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
diff --git a/Examples/Algorithms/TruthTracking/ActsExamples/TruthTracking/TruthVertexFinder.cpp b/Examples/Algorithms/TruthTracking/ActsExamples/TruthTracking/TruthVertexFinder.cpp
index 9c73b49f267..43742d01855 100644
--- a/Examples/Algorithms/TruthTracking/ActsExamples/TruthTracking/TruthVertexFinder.cpp
+++ b/Examples/Algorithms/TruthTracking/ActsExamples/TruthTracking/TruthVertexFinder.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2020 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include "ActsExamples/TruthTracking/TruthVertexFinder.hpp"
 
@@ -104,7 +104,7 @@ ProcessCode TruthVertexFinder::execute(const AlgorithmContext& ctx) const {
           particleHitCounts.front().particleId;
       std::size_t nMajorityHits = particleHitCounts.front().hitCount;
 
-      if (particles.find(majorityParticleId) == particles.end()) {
+      if (!particles.contains(majorityParticleId)) {
         ACTS_DEBUG(
             "The majority particle is not in the input particle collection, "
             "majorityParticleId = "
diff --git a/Examples/Algorithms/TruthTracking/ActsExamples/TruthTracking/TruthVertexFinder.hpp b/Examples/Algorithms/TruthTracking/ActsExamples/TruthTracking/TruthVertexFinder.hpp
index da699caca71..2ea7d401866 100644
--- a/Examples/Algorithms/TruthTracking/ActsExamples/TruthTracking/TruthVertexFinder.hpp
+++ b/Examples/Algorithms/TruthTracking/ActsExamples/TruthTracking/TruthVertexFinder.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2020 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
diff --git a/Examples/Algorithms/TruthTracking/CMakeLists.txt b/Examples/Algorithms/TruthTracking/CMakeLists.txt
index 7c1eff1ed51..4594cdb7480 100644
--- a/Examples/Algorithms/TruthTracking/CMakeLists.txt
+++ b/Examples/Algorithms/TruthTracking/CMakeLists.txt
@@ -6,7 +6,6 @@ add_library(
     ActsExamples/TruthTracking/TrackParameterSelector.cpp
     ActsExamples/TruthTracking/TrackModifier.cpp
     ActsExamples/TruthTracking/TrackTruthMatcher.cpp
-    ActsExamples/TruthTracking/TruthSeedSelector.cpp
     ActsExamples/TruthTracking/TruthTrackFinder.cpp
     ActsExamples/TruthTracking/TruthVertexFinder.cpp
     ActsExamples/TruthTracking/TruthSeedingAlgorithm.cpp
diff --git a/Examples/Algorithms/Utilities/include/ActsExamples/Utilities/HitSelector.hpp b/Examples/Algorithms/Utilities/include/ActsExamples/Utilities/HitSelector.hpp
index ee356445670..bb1f7ba24e8 100644
--- a/Examples/Algorithms/Utilities/include/ActsExamples/Utilities/HitSelector.hpp
+++ b/Examples/Algorithms/Utilities/include/ActsExamples/Utilities/HitSelector.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2019-2023 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
diff --git a/Examples/Algorithms/Utilities/include/ActsExamples/Utilities/MeasurementMapSelector.hpp b/Examples/Algorithms/Utilities/include/ActsExamples/Utilities/MeasurementMapSelector.hpp
index b9042452399..ef495b3a9a9 100644
--- a/Examples/Algorithms/Utilities/include/ActsExamples/Utilities/MeasurementMapSelector.hpp
+++ b/Examples/Algorithms/Utilities/include/ActsExamples/Utilities/MeasurementMapSelector.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2022 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
@@ -17,6 +17,7 @@
 #include "ActsFatras/EventData/Barcode.hpp"
 
 #include <string>
+#include <utility>
 #include <vector>
 
 namespace ActsExamples {
@@ -30,12 +31,12 @@ class MeasurementMapSelector final : public IAlgorithm {
 
  public:
   struct Config {
+    /// Input measurements
+    std::string inputMeasurements;
+
     /// Input spacepoints collection.
     std::string inputMeasurementParticleMap;
 
-    /// Input source links
-    std::string inputSourceLinks;
-
     /// Output protoTracks collection.
     std::string outputMeasurementParticleMap;
 
@@ -48,27 +49,26 @@ class MeasurementMapSelector final : public IAlgorithm {
   /// @param cfg is the config struct to configure the algorithm
   /// @param level is the logging level
   MeasurementMapSelector(Config cfg, Acts::Logging::Level lvl)
-      : IAlgorithm("MeasurementMapSelector", lvl), m_cfg(cfg) {
-    m_inputSourceLinks.initialize(m_cfg.inputSourceLinks);
+      : IAlgorithm("MeasurementMapSelector", lvl), m_cfg(std::move(cfg)) {
+    m_inputMeasurements.initialize(m_cfg.inputMeasurements);
     m_inputMap.initialize(m_cfg.inputMeasurementParticleMap);
     m_outputMap.initialize(m_cfg.outputMeasurementParticleMap);
   }
 
-  virtual ~MeasurementMapSelector() = default;
-
   /// Filter the measurements
   ///
   /// @param ctx is the algorithm context that holds event-wise information
   /// @return a process code to steer the algorithm flow
   ActsExamples::ProcessCode execute(
       const ActsExamples::AlgorithmContext& ctx) const final {
-    const auto& inputSourceLinks = m_inputSourceLinks(ctx);
+    const auto& inputMeasurements = m_inputMeasurements(ctx);
     const auto& inputMap = m_inputMap(ctx);
 
     Map outputMap;
 
     for (const auto geoId : m_cfg.geometrySelection) {
-      auto range = selectLowestNonZeroGeometryObject(inputSourceLinks, geoId);
+      auto range = selectLowestNonZeroGeometryObject(
+          inputMeasurements.orderedIndices(), geoId);
       for (const auto& sl : range) {
         const auto [begin, end] = inputMap.equal_range(sl.index());
         outputMap.insert(begin, end);
@@ -86,8 +86,8 @@ class MeasurementMapSelector final : public IAlgorithm {
   // configuration
   Config m_cfg;
 
-  ReadDataHandle<IndexSourceLinkContainer> m_inputSourceLinks{
-      this, "InputSourceLinks"};
+  ReadDataHandle<MeasurementContainer> m_inputMeasurements{this,
+                                                           "InputMeasurements"};
   ReadDataHandle<Map> m_inputMap{this, "InputMeasurementParticleMap"};
   WriteDataHandle<Map> m_outputMap{this, "OutputMeasurementParticleMap"};
 };
diff --git a/Examples/Algorithms/Utilities/include/ActsExamples/Utilities/ProtoTracksToTracks.hpp b/Examples/Algorithms/Utilities/include/ActsExamples/Utilities/ProtoTracksToTracks.hpp
index c2bdcacccc3..f6b83dcd2f9 100644
--- a/Examples/Algorithms/Utilities/include/ActsExamples/Utilities/ProtoTracksToTracks.hpp
+++ b/Examples/Algorithms/Utilities/include/ActsExamples/Utilities/ProtoTracksToTracks.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2023 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
diff --git a/Examples/Algorithms/Utilities/include/ActsExamples/Utilities/PrototracksToSeeds.hpp b/Examples/Algorithms/Utilities/include/ActsExamples/Utilities/PrototracksToSeeds.hpp
index 1668a861ab6..d1944ae0f12 100644
--- a/Examples/Algorithms/Utilities/include/ActsExamples/Utilities/PrototracksToSeeds.hpp
+++ b/Examples/Algorithms/Utilities/include/ActsExamples/Utilities/PrototracksToSeeds.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2023 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
diff --git a/Examples/Algorithms/Utilities/include/ActsExamples/Utilities/SeedsToPrototracks.hpp b/Examples/Algorithms/Utilities/include/ActsExamples/Utilities/SeedsToPrototracks.hpp
index a7192361b53..36b03d42194 100644
--- a/Examples/Algorithms/Utilities/include/ActsExamples/Utilities/SeedsToPrototracks.hpp
+++ b/Examples/Algorithms/Utilities/include/ActsExamples/Utilities/SeedsToPrototracks.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2022 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
diff --git a/Examples/Algorithms/Utilities/include/ActsExamples/Utilities/TrackSelectorAlgorithm.hpp b/Examples/Algorithms/Utilities/include/ActsExamples/Utilities/TrackSelectorAlgorithm.hpp
index 3dbb4bbbadd..a3761fcd010 100644
--- a/Examples/Algorithms/Utilities/include/ActsExamples/Utilities/TrackSelectorAlgorithm.hpp
+++ b/Examples/Algorithms/Utilities/include/ActsExamples/Utilities/TrackSelectorAlgorithm.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2019-2023 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
diff --git a/Examples/Algorithms/Utilities/include/ActsExamples/Utilities/TracksToParameters.hpp b/Examples/Algorithms/Utilities/include/ActsExamples/Utilities/TracksToParameters.hpp
index 03c9da77084..b498da3fb4a 100644
--- a/Examples/Algorithms/Utilities/include/ActsExamples/Utilities/TracksToParameters.hpp
+++ b/Examples/Algorithms/Utilities/include/ActsExamples/Utilities/TracksToParameters.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2023 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
diff --git a/Examples/Algorithms/Utilities/include/ActsExamples/Utilities/TracksToTrajectories.hpp b/Examples/Algorithms/Utilities/include/ActsExamples/Utilities/TracksToTrajectories.hpp
index 3bb6c840e5b..761e3d76239 100644
--- a/Examples/Algorithms/Utilities/include/ActsExamples/Utilities/TracksToTrajectories.hpp
+++ b/Examples/Algorithms/Utilities/include/ActsExamples/Utilities/TracksToTrajectories.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2023 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
diff --git a/Examples/Algorithms/Utilities/include/ActsExamples/Utilities/TrajectoriesToPrototracks.hpp b/Examples/Algorithms/Utilities/include/ActsExamples/Utilities/TrajectoriesToPrototracks.hpp
index 1d2f0c74c17..5056d83f802 100644
--- a/Examples/Algorithms/Utilities/include/ActsExamples/Utilities/TrajectoriesToPrototracks.hpp
+++ b/Examples/Algorithms/Utilities/include/ActsExamples/Utilities/TrajectoriesToPrototracks.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2022 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
diff --git a/Examples/Algorithms/Utilities/src/HitSelector.cpp b/Examples/Algorithms/Utilities/src/HitSelector.cpp
index 1da7e059483..c9a33b5f65a 100644
--- a/Examples/Algorithms/Utilities/src/HitSelector.cpp
+++ b/Examples/Algorithms/Utilities/src/HitSelector.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2019-2023 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include "ActsExamples/Utilities/HitSelector.hpp"
 
diff --git a/Examples/Algorithms/Utilities/src/PrototracksToSeeds.cpp b/Examples/Algorithms/Utilities/src/PrototracksToSeeds.cpp
index 73d94825b07..6274e2cbb1e 100644
--- a/Examples/Algorithms/Utilities/src/PrototracksToSeeds.cpp
+++ b/Examples/Algorithms/Utilities/src/PrototracksToSeeds.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2023 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include "ActsExamples/Utilities/PrototracksToSeeds.hpp"
 
diff --git a/Examples/Algorithms/Utilities/src/PrototracksToTracks.cpp b/Examples/Algorithms/Utilities/src/PrototracksToTracks.cpp
index 9506bc9b1e8..12a2b70e6cf 100644
--- a/Examples/Algorithms/Utilities/src/PrototracksToTracks.cpp
+++ b/Examples/Algorithms/Utilities/src/PrototracksToTracks.cpp
@@ -1,13 +1,14 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2023 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include "ActsExamples/Utilities/ProtoTracksToTracks.hpp"
 
+#include "Acts/EventData/SourceLink.hpp"
 #include "Acts/Surfaces/PerigeeSurface.hpp"
 #include "ActsExamples/EventData/IndexSourceLink.hpp"
 #include "ActsExamples/EventData/ProtoTrack.hpp"
@@ -27,16 +28,12 @@ PrototracksToTracks::PrototracksToTracks(Config cfg, Acts::Logging::Level lvl)
 }
 
 ProcessCode PrototracksToTracks::execute(const AlgorithmContext& ctx) const {
+  const auto& measurements = m_inputMeasurements(ctx);
+
   auto trackContainer = std::make_shared<Acts::VectorTrackContainer>();
   auto mtj = std::make_shared<Acts::VectorMultiTrajectory>();
   TrackContainer tracks(trackContainer, mtj);
 
-  boost::container::flat_map<Index, Acts::SourceLink> slMap;
-  for (const auto& m : m_inputMeasurements(ctx)) {
-    const auto idx = m.sourceLink().template get<IndexSourceLink>().index();
-    slMap.insert(std::pair<Index, Acts::SourceLink>{idx, m.sourceLink()});
-  }
-
   const auto& prototracks = m_inputProtoTracks(ctx);
   ACTS_DEBUG("Received " << prototracks.size() << " prototracks");
 
@@ -54,12 +51,15 @@ ProcessCode PrototracksToTracks::execute(const AlgorithmContext& ctx) const {
     maxSize = std::max(maxSize, protoTrack.size());
 
     auto track = tracks.makeTrack();
-    for (auto idx : protoTrack) {
+    for (auto measIndex : protoTrack) {
+      ConstVariableBoundMeasurementProxy measurement =
+          measurements.getMeasurement(measIndex);
+      IndexSourceLink sourceLink(measurement.geometryId(), measIndex);
+
       auto trackStateProxy =
           track.appendTrackState(Acts::TrackStatePropMask::None);
       trackStateProxy.typeFlags().set(Acts::TrackStateFlag::MeasurementFlag);
-      trackStateProxy.setUncalibratedSourceLink(
-          Acts::SourceLink{slMap.at(idx)});
+      trackStateProxy.setUncalibratedSourceLink(Acts::SourceLink(sourceLink));
     }
 
     track.nMeasurements() = static_cast<std::uint32_t>(protoTrack.size());
diff --git a/Examples/Algorithms/Utilities/src/SeedsToPrototracks.cpp b/Examples/Algorithms/Utilities/src/SeedsToPrototracks.cpp
index 0761bf6fe7f..e423154805d 100644
--- a/Examples/Algorithms/Utilities/src/SeedsToPrototracks.cpp
+++ b/Examples/Algorithms/Utilities/src/SeedsToPrototracks.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2022 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include "ActsExamples/Utilities/SeedsToPrototracks.hpp"
 
diff --git a/Examples/Algorithms/Utilities/src/TrackSelectorAlgorithm.cpp b/Examples/Algorithms/Utilities/src/TrackSelectorAlgorithm.cpp
index 8db10634a24..25bee1c19fb 100644
--- a/Examples/Algorithms/Utilities/src/TrackSelectorAlgorithm.cpp
+++ b/Examples/Algorithms/Utilities/src/TrackSelectorAlgorithm.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2019-2023 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include "ActsExamples/Utilities/TrackSelectorAlgorithm.hpp"
 
diff --git a/Examples/Algorithms/Utilities/src/TracksToParameters.cpp b/Examples/Algorithms/Utilities/src/TracksToParameters.cpp
index e8111fa9593..75bdd747f58 100644
--- a/Examples/Algorithms/Utilities/src/TracksToParameters.cpp
+++ b/Examples/Algorithms/Utilities/src/TracksToParameters.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2023 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include "ActsExamples/Utilities/TracksToParameters.hpp"
 
diff --git a/Examples/Algorithms/Utilities/src/TracksToTrajectories.cpp b/Examples/Algorithms/Utilities/src/TracksToTrajectories.cpp
index 99835202091..3cdd1cd3628 100644
--- a/Examples/Algorithms/Utilities/src/TracksToTrajectories.cpp
+++ b/Examples/Algorithms/Utilities/src/TracksToTrajectories.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2023 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include "ActsExamples/Utilities/TracksToTrajectories.hpp"
 
diff --git a/Examples/Algorithms/Utilities/src/TrajectoriesToPrototracks.cpp b/Examples/Algorithms/Utilities/src/TrajectoriesToPrototracks.cpp
index 94d6ff51daf..c92d985d492 100644
--- a/Examples/Algorithms/Utilities/src/TrajectoriesToPrototracks.cpp
+++ b/Examples/Algorithms/Utilities/src/TrajectoriesToPrototracks.cpp
@@ -1,14 +1,15 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2022 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include "ActsExamples/Utilities/TrajectoriesToPrototracks.hpp"
 
 #include "Acts/EventData/MultiTrajectory.hpp"
+#include "ActsExamples/EventData/IndexSourceLink.hpp"
 #include "ActsExamples/EventData/ProtoTrack.hpp"
 #include "ActsExamples/EventData/Trajectories.hpp"
 
@@ -16,7 +17,6 @@
 #include <vector>
 
 namespace ActsExamples {
-class IndexSourceLink;
 struct AlgorithmContext;
 
 TrajectoriesToPrototracks::TrajectoriesToPrototracks(Config cfg,
@@ -41,9 +41,9 @@ ProcessCode TrajectoriesToPrototracks::execute(
           return true;
         }
 
-        auto source_link =
+        const auto sourceLink =
             state.getUncalibratedSourceLink().template get<IndexSourceLink>();
-        track.push_back(source_link.index());
+        track.push_back(sourceLink.index());
 
         return true;
       });
diff --git a/Examples/Algorithms/Vertexing/include/ActsExamples/Vertexing/AdaptiveMultiVertexFinderAlgorithm.hpp b/Examples/Algorithms/Vertexing/include/ActsExamples/Vertexing/AdaptiveMultiVertexFinderAlgorithm.hpp
index 519c9e3e911..25047f125cb 100644
--- a/Examples/Algorithms/Vertexing/include/ActsExamples/Vertexing/AdaptiveMultiVertexFinderAlgorithm.hpp
+++ b/Examples/Algorithms/Vertexing/include/ActsExamples/Vertexing/AdaptiveMultiVertexFinderAlgorithm.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2020-2024 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
diff --git a/Examples/Algorithms/Vertexing/include/ActsExamples/Vertexing/IterativeVertexFinderAlgorithm.hpp b/Examples/Algorithms/Vertexing/include/ActsExamples/Vertexing/IterativeVertexFinderAlgorithm.hpp
index 85410f8ebb3..9a27b527d7b 100644
--- a/Examples/Algorithms/Vertexing/include/ActsExamples/Vertexing/IterativeVertexFinderAlgorithm.hpp
+++ b/Examples/Algorithms/Vertexing/include/ActsExamples/Vertexing/IterativeVertexFinderAlgorithm.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2016-2024 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
diff --git a/Examples/Algorithms/Vertexing/include/ActsExamples/Vertexing/SingleSeedVertexFinderAlgorithm.hpp b/Examples/Algorithms/Vertexing/include/ActsExamples/Vertexing/SingleSeedVertexFinderAlgorithm.hpp
index e5e828dd88d..e11eac25c86 100644
--- a/Examples/Algorithms/Vertexing/include/ActsExamples/Vertexing/SingleSeedVertexFinderAlgorithm.hpp
+++ b/Examples/Algorithms/Vertexing/include/ActsExamples/Vertexing/SingleSeedVertexFinderAlgorithm.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2023 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
diff --git a/Examples/Algorithms/Vertexing/include/ActsExamples/Vertexing/VertexFitterAlgorithm.hpp b/Examples/Algorithms/Vertexing/include/ActsExamples/Vertexing/VertexFitterAlgorithm.hpp
index 4050e542155..12478535b7d 100644
--- a/Examples/Algorithms/Vertexing/include/ActsExamples/Vertexing/VertexFitterAlgorithm.hpp
+++ b/Examples/Algorithms/Vertexing/include/ActsExamples/Vertexing/VertexFitterAlgorithm.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2016-2019 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
diff --git a/Examples/Algorithms/Vertexing/src/AdaptiveMultiVertexFinderAlgorithm.cpp b/Examples/Algorithms/Vertexing/src/AdaptiveMultiVertexFinderAlgorithm.cpp
index 0844ed89f1d..5330e55c76c 100644
--- a/Examples/Algorithms/Vertexing/src/AdaptiveMultiVertexFinderAlgorithm.cpp
+++ b/Examples/Algorithms/Vertexing/src/AdaptiveMultiVertexFinderAlgorithm.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2020-2024 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include "ActsExamples/Vertexing/AdaptiveMultiVertexFinderAlgorithm.hpp"
 
@@ -31,6 +31,7 @@
 #include "ActsExamples/Framework/ProcessCode.hpp"
 #include "ActsExamples/TruthTracking/TruthVertexFinder.hpp"
 
+#include <algorithm>
 #include <memory>
 #include <optional>
 #include <ostream>
@@ -248,7 +249,8 @@ ProcessCode AdaptiveMultiVertexFinderAlgorithm::execute(
       // Count the number of particles associated with each vertex
       std::size_t particleCount = 0;
       for (const auto& particle : truthParticles) {
-        if (particle.particleId().vertexId() == truthVertex.vertexId()) {
+        if (static_cast<SimVertexBarcode>(particle.particleId().vertexId()) ==
+            truthVertex.vertexId()) {
           ++particleCount;
         }
       }
@@ -256,12 +258,10 @@ ProcessCode AdaptiveMultiVertexFinderAlgorithm::execute(
     }
 
     // sort by number of particles
-    std::sort(vertexSeederState.truthVertices.begin(),
-              vertexSeederState.truthVertices.end(),
-              [&vertexParticleCount](const auto& lhs, const auto& rhs) {
-                return vertexParticleCount[lhs.vertexId()] >
-                       vertexParticleCount[rhs.vertexId()];
-              });
+    std::ranges::sort(vertexSeederState.truthVertices, {},
+                      [&vertexParticleCount](const auto& v) {
+                        return vertexParticleCount[v.vertexId()];
+                      });
 
     ACTS_INFO("Got " << truthVertices.size() << " truth vertices and selected "
                      << vertexSeederState.truthVertices.size() << " in event");
diff --git a/Examples/Algorithms/Vertexing/src/IterativeVertexFinderAlgorithm.cpp b/Examples/Algorithms/Vertexing/src/IterativeVertexFinderAlgorithm.cpp
index 7ffa7abdd5f..03d6c4f6ff7 100644
--- a/Examples/Algorithms/Vertexing/src/IterativeVertexFinderAlgorithm.cpp
+++ b/Examples/Algorithms/Vertexing/src/IterativeVertexFinderAlgorithm.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2019-2024 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include "ActsExamples/Vertexing/IterativeVertexFinderAlgorithm.hpp"
 
diff --git a/Examples/Algorithms/Vertexing/src/SingleSeedVertexFinderAlgorithm.cpp b/Examples/Algorithms/Vertexing/src/SingleSeedVertexFinderAlgorithm.cpp
index 12350448cfd..aa571726f5e 100644
--- a/Examples/Algorithms/Vertexing/src/SingleSeedVertexFinderAlgorithm.cpp
+++ b/Examples/Algorithms/Vertexing/src/SingleSeedVertexFinderAlgorithm.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2023 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include "ActsExamples/Vertexing/SingleSeedVertexFinderAlgorithm.hpp"
 
diff --git a/Examples/Algorithms/Vertexing/src/TruthVertexSeeder.cpp b/Examples/Algorithms/Vertexing/src/TruthVertexSeeder.cpp
index 89a3ba90d91..24d54308ac5 100644
--- a/Examples/Algorithms/Vertexing/src/TruthVertexSeeder.cpp
+++ b/Examples/Algorithms/Vertexing/src/TruthVertexSeeder.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2024 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include "TruthVertexSeeder.hpp"
 
diff --git a/Examples/Algorithms/Vertexing/src/TruthVertexSeeder.hpp b/Examples/Algorithms/Vertexing/src/TruthVertexSeeder.hpp
index 27a27425c4b..d7b4c85eaf3 100644
--- a/Examples/Algorithms/Vertexing/src/TruthVertexSeeder.hpp
+++ b/Examples/Algorithms/Vertexing/src/TruthVertexSeeder.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2024 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
diff --git a/Examples/Algorithms/Vertexing/src/VertexFitterAlgorithm.cpp b/Examples/Algorithms/Vertexing/src/VertexFitterAlgorithm.cpp
index 22b14b62a07..373787361d1 100644
--- a/Examples/Algorithms/Vertexing/src/VertexFitterAlgorithm.cpp
+++ b/Examples/Algorithms/Vertexing/src/VertexFitterAlgorithm.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2019-2020 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include "ActsExamples/Vertexing/VertexFitterAlgorithm.hpp"
 
diff --git a/Examples/Algorithms/Vertexing/src/VertexingHelpers.hpp b/Examples/Algorithms/Vertexing/src/VertexingHelpers.hpp
index 6c0a7e12815..3222578a3da 100644
--- a/Examples/Algorithms/Vertexing/src/VertexingHelpers.hpp
+++ b/Examples/Algorithms/Vertexing/src/VertexingHelpers.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2020 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
@@ -15,6 +15,7 @@
 #include "ActsExamples/Framework/AlgorithmContext.hpp"
 #include "ActsExamples/Framework/DataHandle.hpp"
 
+#include <algorithm>
 #include <memory>
 #include <vector>
 
@@ -55,8 +56,7 @@ inline ProtoVertexContainer makeProtoVertices(
     protoVertex.reserve(vertex.tracks().size());
 
     for (const auto& track : vertex.tracks()) {
-      auto it = std::find(inputTracks.begin(), inputTracks.end(),
-                          track.originalParams);
+      auto it = std::ranges::find(inputTracks, track.originalParams);
       if (it != inputTracks.end()) {
         protoVertex.push_back(std::distance(inputTracks.begin(), it));
       } else {
diff --git a/Examples/Detectors/CMakeLists.txt b/Examples/Detectors/CMakeLists.txt
index a04112d572c..7e7aed5daed 100644
--- a/Examples/Detectors/CMakeLists.txt
+++ b/Examples/Detectors/CMakeLists.txt
@@ -4,5 +4,6 @@ add_subdirectory(GenericDetector)
 add_subdirectory_if(Geant4Detector ACTS_BUILD_EXAMPLES_GEANT4)
 add_subdirectory(MagneticField)
 add_subdirectory(TGeoDetector)
+add_subdirectory(ITkModuleSplitting)
 add_subdirectory(TelescopeDetector)
 add_subdirectory_if(MuonSpectrometerMockupDetector ACTS_BUILD_EXAMPLES_GEANT4)
diff --git a/Examples/Detectors/ContextualDetector/include/ActsExamples/ContextualDetector/AlignedDetector.hpp b/Examples/Detectors/ContextualDetector/include/ActsExamples/ContextualDetector/AlignedDetector.hpp
index 82e4e0f7806..66a0f3b6b42 100644
--- a/Examples/Detectors/ContextualDetector/include/ActsExamples/ContextualDetector/AlignedDetector.hpp
+++ b/Examples/Detectors/ContextualDetector/include/ActsExamples/ContextualDetector/AlignedDetector.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2019 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
diff --git a/Examples/Detectors/ContextualDetector/include/ActsExamples/ContextualDetector/AlignmentDecorator.hpp b/Examples/Detectors/ContextualDetector/include/ActsExamples/ContextualDetector/AlignmentDecorator.hpp
index 379ff8d6868..1edf7e03d06 100644
--- a/Examples/Detectors/ContextualDetector/include/ActsExamples/ContextualDetector/AlignmentDecorator.hpp
+++ b/Examples/Detectors/ContextualDetector/include/ActsExamples/ContextualDetector/AlignmentDecorator.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2019 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
diff --git a/Examples/Detectors/ContextualDetector/include/ActsExamples/ContextualDetector/ExternalAlignmentDecorator.hpp b/Examples/Detectors/ContextualDetector/include/ActsExamples/ContextualDetector/ExternalAlignmentDecorator.hpp
index 0130e4a45b6..de3f58b7e0a 100644
--- a/Examples/Detectors/ContextualDetector/include/ActsExamples/ContextualDetector/ExternalAlignmentDecorator.hpp
+++ b/Examples/Detectors/ContextualDetector/include/ActsExamples/ContextualDetector/ExternalAlignmentDecorator.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2019 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
diff --git a/Examples/Detectors/ContextualDetector/include/ActsExamples/ContextualDetector/ExternallyAlignedDetectorElement.hpp b/Examples/Detectors/ContextualDetector/include/ActsExamples/ContextualDetector/ExternallyAlignedDetectorElement.hpp
index 7a4310fede1..7456b9bb61e 100644
--- a/Examples/Detectors/ContextualDetector/include/ActsExamples/ContextualDetector/ExternallyAlignedDetectorElement.hpp
+++ b/Examples/Detectors/ContextualDetector/include/ActsExamples/ContextualDetector/ExternallyAlignedDetectorElement.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2019 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
diff --git a/Examples/Detectors/ContextualDetector/include/ActsExamples/ContextualDetector/InternalAlignmentDecorator.hpp b/Examples/Detectors/ContextualDetector/include/ActsExamples/ContextualDetector/InternalAlignmentDecorator.hpp
index 49084d443ff..e9af06d7755 100644
--- a/Examples/Detectors/ContextualDetector/include/ActsExamples/ContextualDetector/InternalAlignmentDecorator.hpp
+++ b/Examples/Detectors/ContextualDetector/include/ActsExamples/ContextualDetector/InternalAlignmentDecorator.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2019 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
diff --git a/Examples/Detectors/ContextualDetector/include/ActsExamples/ContextualDetector/InternallyAlignedDetectorElement.hpp b/Examples/Detectors/ContextualDetector/include/ActsExamples/ContextualDetector/InternallyAlignedDetectorElement.hpp
index 183bff9fbed..aaa1c8d9b98 100644
--- a/Examples/Detectors/ContextualDetector/include/ActsExamples/ContextualDetector/InternallyAlignedDetectorElement.hpp
+++ b/Examples/Detectors/ContextualDetector/include/ActsExamples/ContextualDetector/InternallyAlignedDetectorElement.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2019 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
diff --git a/Examples/Detectors/ContextualDetector/src/AlignedDetector.cpp b/Examples/Detectors/ContextualDetector/src/AlignedDetector.cpp
index e6459c2dbf4..044cc943a81 100644
--- a/Examples/Detectors/ContextualDetector/src/AlignedDetector.cpp
+++ b/Examples/Detectors/ContextualDetector/src/AlignedDetector.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2019 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include "ActsExamples/ContextualDetector/AlignedDetector.hpp"
 
diff --git a/Examples/Detectors/ContextualDetector/src/ExternalAlignmentDecorator.cpp b/Examples/Detectors/ContextualDetector/src/ExternalAlignmentDecorator.cpp
index 065ef4c6e2f..bca56249419 100644
--- a/Examples/Detectors/ContextualDetector/src/ExternalAlignmentDecorator.cpp
+++ b/Examples/Detectors/ContextualDetector/src/ExternalAlignmentDecorator.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2019 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include "ActsExamples/ContextualDetector/ExternalAlignmentDecorator.hpp"
 
diff --git a/Examples/Detectors/ContextualDetector/src/InternalAlignmentDecorator.cpp b/Examples/Detectors/ContextualDetector/src/InternalAlignmentDecorator.cpp
index 1cfaa44de8d..0ce8dd80f1c 100644
--- a/Examples/Detectors/ContextualDetector/src/InternalAlignmentDecorator.cpp
+++ b/Examples/Detectors/ContextualDetector/src/InternalAlignmentDecorator.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2019 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include "ActsExamples/ContextualDetector/InternalAlignmentDecorator.hpp"
 
diff --git a/Examples/Detectors/DD4hepDetector/include/ActsExamples/DD4hepDetector/DD4hepDetector.hpp b/Examples/Detectors/DD4hepDetector/include/ActsExamples/DD4hepDetector/DD4hepDetector.hpp
index 899df36fad9..015b511825f 100644
--- a/Examples/Detectors/DD4hepDetector/include/ActsExamples/DD4hepDetector/DD4hepDetector.hpp
+++ b/Examples/Detectors/DD4hepDetector/include/ActsExamples/DD4hepDetector/DD4hepDetector.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2018-2024 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
@@ -52,7 +52,8 @@ struct DD4hepDetector {
   DD4hepDetector() = default;
   /// @brief Constructor from geometry service
   /// @param _geometryService the geometry service
-  DD4hepDetector(std::shared_ptr<DD4hepGeometryService> _geometryService);
+  explicit DD4hepDetector(
+      std::shared_ptr<DD4hepGeometryService> _geometryService);
   /// @brief  Default destructor
   ~DD4hepDetector() = default;
 
diff --git a/Examples/Detectors/DD4hepDetector/include/ActsExamples/DD4hepDetector/DD4hepGeometryService.hpp b/Examples/Detectors/DD4hepDetector/include/ActsExamples/DD4hepDetector/DD4hepGeometryService.hpp
index cfef3becff0..edbb720825c 100644
--- a/Examples/Detectors/DD4hepDetector/include/ActsExamples/DD4hepDetector/DD4hepGeometryService.hpp
+++ b/Examples/Detectors/DD4hepDetector/include/ActsExamples/DD4hepDetector/DD4hepGeometryService.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2017-2024 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
@@ -52,7 +52,7 @@ class DD4hepGeometryService {
     /// Log level for the geometry service.
     Acts::Logging::Level logLevel = Acts::Logging::Level::INFO;
     /// Log level for DD4hep itself
-    Acts::Logging::Level dd4hepLogLevel = Acts::Logging::Level::INFO;
+    Acts::Logging::Level dd4hepLogLevel = Acts::Logging::Level::WARNING;
     /// XML-file with the detector description
     std::vector<std::string> xmlFileNames;
     /// The name of the service
@@ -87,7 +87,7 @@ class DD4hepGeometryService {
         std::make_shared<const Acts::GeometryIdentifierHook>();
   };
 
-  DD4hepGeometryService(const Config& cfg);
+  explicit DD4hepGeometryService(const Config& cfg);
   DD4hepGeometryService(const DD4hepGeometryService&) = delete;
   DD4hepGeometryService(DD4hepGeometryService&&) = delete;
   ~DD4hepGeometryService();
diff --git a/Examples/Detectors/DD4hepDetector/src/DD4hepDetector.cpp b/Examples/Detectors/DD4hepDetector/src/DD4hepDetector.cpp
index e3b607d5fc5..a6494ce0860 100644
--- a/Examples/Detectors/DD4hepDetector/src/DD4hepDetector.cpp
+++ b/Examples/Detectors/DD4hepDetector/src/DD4hepDetector.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2019-2024 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include "ActsExamples/DD4hepDetector/DD4hepDetector.hpp"
 
diff --git a/Examples/Detectors/DD4hepDetector/src/DD4hepGeometryService.cpp b/Examples/Detectors/DD4hepDetector/src/DD4hepGeometryService.cpp
index 780fbca385a..2912e39b757 100644
--- a/Examples/Detectors/DD4hepDetector/src/DD4hepGeometryService.cpp
+++ b/Examples/Detectors/DD4hepDetector/src/DD4hepGeometryService.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2017-2024 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include "ActsExamples/DD4hepDetector/DD4hepGeometryService.hpp"
 
@@ -15,7 +15,6 @@
 #include <algorithm>
 #include <memory>
 #include <stdexcept>
-#include <utility>
 
 #include <DD4hep/Detector.h>
 #include <DD4hep/Handle.h>
diff --git a/Examples/Detectors/Geant4Detector/include/ActsExamples/Geant4Detector/Geant4Detector.hpp b/Examples/Detectors/Geant4Detector/include/ActsExamples/Geant4Detector/Geant4Detector.hpp
index 1899a1e035a..5a948c3f3b5 100644
--- a/Examples/Detectors/Geant4Detector/include/ActsExamples/Geant4Detector/Geant4Detector.hpp
+++ b/Examples/Detectors/Geant4Detector/include/ActsExamples/Geant4Detector/Geant4Detector.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2022-2023 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
diff --git a/Examples/Detectors/Geant4Detector/src/Geant4Detector.cpp b/Examples/Detectors/Geant4Detector/src/Geant4Detector.cpp
index 828304e342c..e3b52f36cd3 100644
--- a/Examples/Detectors/Geant4Detector/src/Geant4Detector.cpp
+++ b/Examples/Detectors/Geant4Detector/src/Geant4Detector.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2022-2023 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include "ActsExamples/Geant4Detector/Geant4Detector.hpp"
 
diff --git a/Examples/Detectors/GenericDetector/include/ActsExamples/GenericDetector/BuildGenericDetector.hpp b/Examples/Detectors/GenericDetector/include/ActsExamples/GenericDetector/BuildGenericDetector.hpp
index 9d42ad9441c..c5968ef4ca3 100644
--- a/Examples/Detectors/GenericDetector/include/ActsExamples/GenericDetector/BuildGenericDetector.hpp
+++ b/Examples/Detectors/GenericDetector/include/ActsExamples/GenericDetector/BuildGenericDetector.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2016-2018 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
diff --git a/Examples/Detectors/GenericDetector/include/ActsExamples/GenericDetector/GenericDetector.hpp b/Examples/Detectors/GenericDetector/include/ActsExamples/GenericDetector/GenericDetector.hpp
index 0279b91efef..c487f43d3a6 100644
--- a/Examples/Detectors/GenericDetector/include/ActsExamples/GenericDetector/GenericDetector.hpp
+++ b/Examples/Detectors/GenericDetector/include/ActsExamples/GenericDetector/GenericDetector.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2019 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
diff --git a/Examples/Detectors/GenericDetector/include/ActsExamples/GenericDetector/GenericDetectorElement.hpp b/Examples/Detectors/GenericDetector/include/ActsExamples/GenericDetector/GenericDetectorElement.hpp
index c9d335a6ab8..97d2f7fad3e 100644
--- a/Examples/Detectors/GenericDetector/include/ActsExamples/GenericDetector/GenericDetectorElement.hpp
+++ b/Examples/Detectors/GenericDetector/include/ActsExamples/GenericDetector/GenericDetectorElement.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2016-2018 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
diff --git a/Examples/Detectors/GenericDetector/include/ActsExamples/GenericDetector/LayerBuilderT.hpp b/Examples/Detectors/GenericDetector/include/ActsExamples/GenericDetector/LayerBuilderT.hpp
index c317a9437e7..642b4a63ffc 100644
--- a/Examples/Detectors/GenericDetector/include/ActsExamples/GenericDetector/LayerBuilderT.hpp
+++ b/Examples/Detectors/GenericDetector/include/ActsExamples/GenericDetector/LayerBuilderT.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2016-2018 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
diff --git a/Examples/Detectors/GenericDetector/include/ActsExamples/GenericDetector/ProtoLayerCreatorT.hpp b/Examples/Detectors/GenericDetector/include/ActsExamples/GenericDetector/ProtoLayerCreatorT.hpp
index 8eef808dbb9..fc4fa4c1459 100644
--- a/Examples/Detectors/GenericDetector/include/ActsExamples/GenericDetector/ProtoLayerCreatorT.hpp
+++ b/Examples/Detectors/GenericDetector/include/ActsExamples/GenericDetector/ProtoLayerCreatorT.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2016-2018 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
diff --git a/Examples/Detectors/GenericDetector/src/BuildGenericDetector.cpp b/Examples/Detectors/GenericDetector/src/BuildGenericDetector.cpp
index cd232545eab..5f396bbe4e8 100644
--- a/Examples/Detectors/GenericDetector/src/BuildGenericDetector.cpp
+++ b/Examples/Detectors/GenericDetector/src/BuildGenericDetector.cpp
@@ -1,14 +1,15 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2016-2018 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include "ActsExamples/GenericDetector/BuildGenericDetector.hpp"
 
 #include <cmath>
+#include <numbers>
 
 namespace ActsExamples::Generic {
 
@@ -22,8 +23,8 @@ std::vector<Acts::Vector3> modulePositionsCylinder(
   std::vector<Acts::Vector3> mPositions;
   mPositions.reserve(nPhiBins * nZbins);
   // prep work
-  double phiStep = 2 * M_PI / nPhiBins;
-  double minPhi = -M_PI + 0.5 * phiStep;
+  double phiStep = 2 * std::numbers::pi / nPhiBins;
+  double minPhi = -std::numbers::pi + 0.5 * phiStep;
   double zStart = -0.5 * (nZbins - 1) * (2 * moduleHalfLength - lOverlap);
   double zStep = 2 * std::abs(zStart) / (nZbins - 1);
   // loop over the bins
@@ -102,8 +103,8 @@ std::vector<Acts::Vector3> modulePositionsRing(double z, double radius,
   std::vector<Acts::Vector3> rPositions;
   rPositions.reserve(nPhiBins);
   // prep work
-  double phiStep = 2 * M_PI / nPhiBins;
-  double minPhi = -M_PI + 0.5 * phiStep;
+  double phiStep = 2 * std::numbers::pi / nPhiBins;
+  double minPhi = -std::numbers::pi + 0.5 * phiStep;
   // phi loop
   for (std::size_t iphi = 0; iphi < static_cast<std::size_t>(nPhiBins);
        ++iphi) {
diff --git a/Examples/Detectors/GenericDetector/src/GenericDetector.cpp b/Examples/Detectors/GenericDetector/src/GenericDetector.cpp
index 044f2e209fa..6a152128edc 100644
--- a/Examples/Detectors/GenericDetector/src/GenericDetector.cpp
+++ b/Examples/Detectors/GenericDetector/src/GenericDetector.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2019 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include "ActsExamples/GenericDetector/GenericDetector.hpp"
 
diff --git a/Examples/Detectors/GenericDetector/src/GenericDetectorElement.cpp b/Examples/Detectors/GenericDetector/src/GenericDetectorElement.cpp
index 2d855856334..def22d443d3 100644
--- a/Examples/Detectors/GenericDetector/src/GenericDetectorElement.cpp
+++ b/Examples/Detectors/GenericDetector/src/GenericDetectorElement.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2016-2018 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include "ActsExamples/GenericDetector/GenericDetectorElement.hpp"
 
diff --git a/Examples/Detectors/ITkModuleSplitting/CMakeLists.txt b/Examples/Detectors/ITkModuleSplitting/CMakeLists.txt
new file mode 100644
index 00000000000..affd7146336
--- /dev/null
+++ b/Examples/Detectors/ITkModuleSplitting/CMakeLists.txt
@@ -0,0 +1,7 @@
+add_library(ActsExamplesITkModuleSplitting INTERFACE)
+target_include_directories(
+    ActsExamplesITkModuleSplitting
+    INTERFACE $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
+)
+
+install(DIRECTORY include/ActsExamples DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
diff --git a/Examples/Detectors/ITkModuleSplitting/include/ActsExamples/ITkModuleSplitting/ITkModuleSplitting.hpp b/Examples/Detectors/ITkModuleSplitting/include/ActsExamples/ITkModuleSplitting/ITkModuleSplitting.hpp
new file mode 100644
index 00000000000..591671bffb7
--- /dev/null
+++ b/Examples/Detectors/ITkModuleSplitting/include/ActsExamples/ITkModuleSplitting/ITkModuleSplitting.hpp
@@ -0,0 +1,147 @@
+// This file is part of the ACTS project.
+//
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
+//
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
+
+// This file is part of the Acts project.
+//
+// Copyright (C) 2024 CERN for the benefit of the Acts project
+//
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this
+// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+#pragma once
+
+#include "Acts/Definitions/Algebra.hpp"
+#include "Acts/Surfaces/AnnulusBounds.hpp"
+#include "Acts/Surfaces/RectangleBounds.hpp"
+#include "Acts/Surfaces/Surface.hpp"
+#include "Acts/Surfaces/SurfaceBounds.hpp"
+
+#include <algorithm>
+#include <array>
+#include <cstddef>
+#include <sstream>
+
+namespace ActsExamples::ITk {
+
+template <typename detector_element_t, typename element_factory_t>
+inline std::vector<std::shared_ptr<const detector_element_t>> splitBarrelModule(
+    const Acts::GeometryContext& gctx,
+    const std::shared_ptr<const detector_element_t>& detElement,
+    unsigned int nSegments, const element_factory_t& factory,
+    const std::string& name,
+    const Acts::Logger& logger = Acts::getDummyLogger()) {
+  // Retrieve the surface
+  const Acts::Surface& surface = detElement->surface();
+  const Acts::SurfaceBounds& bounds = surface.bounds();
+  if (bounds.type() != Acts::SurfaceBounds::eRectangle || nSegments <= 1u) {
+    ACTS_WARNING("Invalid splitting config for barrel node: "
+                 << name << "! Node will not be slpit.");
+    return {detElement};
+  }
+
+  // Output container for the submodules
+  std::vector<std::shared_ptr<const detector_element_t>> detElements = {};
+  detElements.reserve(nSegments);
+
+  // Get the geometric information
+  const Acts::Transform3& transform = surface.transform(gctx);
+  // Determine the new bounds
+  const std::vector<double> boundsValues = bounds.values();
+
+  double lengthX = (boundsValues[Acts::RectangleBounds::eMaxX] -
+                    boundsValues[Acts::RectangleBounds::eMinX]) /
+                   nSegments;
+  double lengthY = boundsValues[Acts::RectangleBounds::eMaxY] -
+                   boundsValues[Acts::RectangleBounds::eMinY];
+  auto rectBounds =
+      std::make_shared<Acts::RectangleBounds>(0.5 * lengthX, 0.5 * lengthY);
+  // Translation for every subelement
+  auto localTranslation = Acts::Vector2(-0.5 * lengthX * (nSegments - 1), 0.);
+  const auto step = Acts::Vector2(lengthX, 0.);
+  ACTS_DEBUG("Rectangle bounds for new node (half length): " +
+             std::to_string(rectBounds->halfLengthX()) + ", " +
+             std::to_string(rectBounds->halfLengthY()));
+
+  for (std::size_t i = 0; i < nSegments; i++) {
+    Acts::Vector3 globalTranslation =
+        surface.localToGlobal(gctx, localTranslation, {}) -
+        transform.translation();
+    auto elemTransform =
+        Acts::Transform3(transform).pretranslate(globalTranslation);
+    detElements.emplace_back(factory(elemTransform, rectBounds));
+
+    localTranslation += step;
+  }
+  return detElements;
+}
+
+template <typename detector_element_t, typename element_factory_t>
+inline std::vector<std::shared_ptr<detector_element_t>> splitDiscModule(
+    const Acts::GeometryContext& gctx,
+    const std::shared_ptr<detector_element_t>& detElement,
+    const std::vector<std::pair<double, double>>& splitRanges,
+    const element_factory_t& factory, const std::string& name,
+    const Acts::Logger& logger = Acts::getDummyLogger()) {
+  // Retrieve the surface
+  const Acts::Surface& surface = detElement->surface();
+  const Acts::SurfaceBounds& bounds = surface.bounds();
+
+  // Check annulus bounds origin
+  auto printOrigin = [&](const Acts::Surface& sf) {
+    Acts::Vector3 discOrigin =
+        sf.localToGlobal(gctx, Acts::Vector2(0., 0.), Acts::Vector3::Zero());
+    std::string out =
+        "Disc surface origin at: " + std::to_string(discOrigin[0]) + ", " +
+        std::to_string(discOrigin[1]) + ", " + std::to_string(discOrigin[2]);
+    return out;
+  };
+  ACTS_DEBUG(printOrigin(surface));
+
+  if (bounds.type() != Acts::SurfaceBounds::eAnnulus || splitRanges.empty()) {
+    ACTS_WARNING("Invalid splitting config for disk node: "
+                 << name << "! Node will not be slpit.");
+    return {detElement};
+  }
+
+  auto nSegments = splitRanges.size();
+
+  // Output container for the submodules
+  std::vector<std::shared_ptr<const detector_element_t>> detElements = {};
+  detElements.reserve(nSegments);
+
+  // Get the geometric information
+  const Acts::Transform3& transform = surface.transform(gctx);
+  const std::vector<double> boundsValues = bounds.values();
+  std::array<double, Acts::AnnulusBounds::eSize> values{};
+
+  std::copy_n(boundsValues.begin(), Acts::AnnulusBounds::eSize, values.begin());
+
+  for (std::size_t i = 0; i < nSegments; i++) {
+    if (boundsValues[Acts::AnnulusBounds::eMinR] > splitRanges[i].first ||
+        boundsValues[Acts::AnnulusBounds::eMaxR] < splitRanges[i].second) {
+      ACTS_WARNING(
+          "Radius pattern not within the original bounds, node will not be "
+          "split!");
+      return {detElement};
+    }
+
+    values[Acts::AnnulusBounds::eMinR] = splitRanges[i].first;
+    values[Acts::AnnulusBounds::eMaxR] = splitRanges[i].second;
+    auto annulusBounds = std::make_shared<Acts::AnnulusBounds>(values);
+    ACTS_DEBUG(
+        "New r bounds for node: " + std::to_string(annulusBounds->rMin()) +
+        ", " + std::to_string(annulusBounds->rMax()));
+
+    auto element = factory(transform, annulusBounds);
+    detElements.push_back(std::move(element));
+  }
+  return detElements;
+}
+
+}  // namespace ActsExamples::ITk
diff --git a/Examples/Detectors/MagneticField/include/ActsExamples/MagneticField/FieldMapRootIo.hpp b/Examples/Detectors/MagneticField/include/ActsExamples/MagneticField/FieldMapRootIo.hpp
index 46a565660fc..b5a523c2c0e 100644
--- a/Examples/Detectors/MagneticField/include/ActsExamples/MagneticField/FieldMapRootIo.hpp
+++ b/Examples/Detectors/MagneticField/include/ActsExamples/MagneticField/FieldMapRootIo.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2017-2021 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
diff --git a/Examples/Detectors/MagneticField/include/ActsExamples/MagneticField/FieldMapTextIo.hpp b/Examples/Detectors/MagneticField/include/ActsExamples/MagneticField/FieldMapTextIo.hpp
index eb7149d9e34..ed191226705 100644
--- a/Examples/Detectors/MagneticField/include/ActsExamples/MagneticField/FieldMapTextIo.hpp
+++ b/Examples/Detectors/MagneticField/include/ActsExamples/MagneticField/FieldMapTextIo.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2017-2020 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
diff --git a/Examples/Detectors/MagneticField/include/ActsExamples/MagneticField/MagneticField.hpp b/Examples/Detectors/MagneticField/include/ActsExamples/MagneticField/MagneticField.hpp
index 33206c937a3..e694f0fdd35 100644
--- a/Examples/Detectors/MagneticField/include/ActsExamples/MagneticField/MagneticField.hpp
+++ b/Examples/Detectors/MagneticField/include/ActsExamples/MagneticField/MagneticField.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2017-2020 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
diff --git a/Examples/Detectors/MagneticField/include/ActsExamples/MagneticField/ScalableBField.hpp b/Examples/Detectors/MagneticField/include/ActsExamples/MagneticField/ScalableBField.hpp
index 0cc5d9600f6..5def5740fa4 100644
--- a/Examples/Detectors/MagneticField/include/ActsExamples/MagneticField/ScalableBField.hpp
+++ b/Examples/Detectors/MagneticField/include/ActsExamples/MagneticField/ScalableBField.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2016-2020 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
@@ -26,7 +26,7 @@ class ScalableBField final : public Acts::MagneticFieldProvider {
     Acts::ActsScalar scalor = 1.;
 
     /// @brief constructor with context
-    Cache(const Acts::MagneticFieldContext& mctx) {
+    explicit Cache(const Acts::MagneticFieldContext& mctx) {
       scalor = mctx.get<const ScalableBFieldContext>().scalor;
     }
   };
diff --git a/Examples/Detectors/MagneticField/include/ActsExamples/MagneticField/ScalableBFieldService.hpp b/Examples/Detectors/MagneticField/include/ActsExamples/MagneticField/ScalableBFieldService.hpp
index e9ee99741cc..a228eccfe55 100644
--- a/Examples/Detectors/MagneticField/include/ActsExamples/MagneticField/ScalableBFieldService.hpp
+++ b/Examples/Detectors/MagneticField/include/ActsExamples/MagneticField/ScalableBFieldService.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2019-2020 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
diff --git a/Examples/Detectors/MagneticField/src/FieldMapRootIo.cpp b/Examples/Detectors/MagneticField/src/FieldMapRootIo.cpp
index c7663ad937a..bcc93238364 100644
--- a/Examples/Detectors/MagneticField/src/FieldMapRootIo.cpp
+++ b/Examples/Detectors/MagneticField/src/FieldMapRootIo.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2017-2021 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include "ActsExamples/MagneticField/FieldMapRootIo.hpp"
 
diff --git a/Examples/Detectors/MagneticField/src/FieldMapTextIo.cpp b/Examples/Detectors/MagneticField/src/FieldMapTextIo.cpp
index a04738df738..d298ec046b2 100644
--- a/Examples/Detectors/MagneticField/src/FieldMapTextIo.cpp
+++ b/Examples/Detectors/MagneticField/src/FieldMapTextIo.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2017-2020 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include "ActsExamples/MagneticField/FieldMapTextIo.hpp"
 
diff --git a/Examples/Detectors/MagneticField/src/ScalableBFieldService.cpp b/Examples/Detectors/MagneticField/src/ScalableBFieldService.cpp
index ab22b8fed54..0d1cb1bfa6a 100644
--- a/Examples/Detectors/MagneticField/src/ScalableBFieldService.cpp
+++ b/Examples/Detectors/MagneticField/src/ScalableBFieldService.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2019-2020 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include "ActsExamples/MagneticField/ScalableBFieldService.hpp"
 
diff --git a/Examples/Detectors/MuonSpectrometerMockupDetector/include/ActsExamples/MuonSpectrometerMockupDetector/MockupSectorBuilder.hpp b/Examples/Detectors/MuonSpectrometerMockupDetector/include/ActsExamples/MuonSpectrometerMockupDetector/MockupSectorBuilder.hpp
index 8e0b37179f2..5b349bec9af 100644
--- a/Examples/Detectors/MuonSpectrometerMockupDetector/include/ActsExamples/MuonSpectrometerMockupDetector/MockupSectorBuilder.hpp
+++ b/Examples/Detectors/MuonSpectrometerMockupDetector/include/ActsExamples/MuonSpectrometerMockupDetector/MockupSectorBuilder.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2022-2023 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
@@ -55,7 +55,7 @@ class MockupSectorBuilder {
 
   /// Constructor
   ///@param config The configuration struct
-  MockupSectorBuilder(const Config& config);
+  explicit MockupSectorBuilder(const Config& config);
 
   /// Destructor
   ~MockupSectorBuilder() = default;
diff --git a/Examples/Detectors/MuonSpectrometerMockupDetector/src/MockupSectorBuilder.cpp b/Examples/Detectors/MuonSpectrometerMockupDetector/src/MockupSectorBuilder.cpp
index b9b6e3ec3b1..f6431c5ddbe 100644
--- a/Examples/Detectors/MuonSpectrometerMockupDetector/src/MockupSectorBuilder.cpp
+++ b/Examples/Detectors/MuonSpectrometerMockupDetector/src/MockupSectorBuilder.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2022-2023 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include "ActsExamples/MuonSpectrometerMockupDetector/MockupSectorBuilder.hpp"
 
@@ -37,6 +37,7 @@
 #include <cmath>
 #include <cstddef>
 #include <limits>
+#include <numbers>
 #include <stdexcept>
 #include <string>
 #include <tuple>
@@ -167,10 +168,8 @@ ActsExamples::MockupSectorBuilder::buildSector(
 
   // sort the detector volumes by their radial distance (from
   // innermost---->outermost)
-  std::sort(detVolumes.begin(), detVolumes.end(),
-            [](const auto& detVol1, const auto& detVol2) {
-              return detVol1->center().y() < detVol2->center().y();
-            });
+  std::ranges::sort(detVolumes, {},
+                    [](const auto& detVol) { return detVol->center().y(); });
 
   auto xA = detVolumes.back()->center().x() +
             detVolumes.back()->volumeBounds().values()[0];
@@ -190,9 +189,10 @@ ActsExamples::MockupSectorBuilder::buildSector(
   // calculate the phi angles of the vectors
   auto phiA = Acts::VectorHelpers::phi(pointA);
   auto phiB = Acts::VectorHelpers::phi(pointB);
-  auto sectorAngle = M_PI;
+  Acts::ActsScalar sectorAngle = std::numbers::pi_v<Acts::ActsScalar>;
 
-  auto halfPhi = M_PI / mCfg.NumberOfSectors;
+  Acts::ActsScalar halfPhi =
+      std::numbers::pi_v<Acts::ActsScalar> / mCfg.NumberOfSectors;
 
   if (mCfg.NumberOfSectors == 1) {
     halfPhi = (phiB - phiA) / 2;
@@ -225,7 +225,7 @@ ActsExamples::MockupSectorBuilder::buildSector(
   const Acts::Vector3 pos = {0., 0., 0.};
 
   // the transform of the cylinder volume
-  Acts::AngleAxis3 rotZ(M_PI / 2, Acts::Vector3(0., 0., 1));
+  Acts::AngleAxis3 rotZ(std::numbers::pi / 2., Acts::Vector3(0., 0., 1));
   auto transform = Acts::Transform3(Acts::Translation3(pos));
   transform *= rotZ;
 
diff --git a/Examples/Detectors/TGeoDetector/CMakeLists.txt b/Examples/Detectors/TGeoDetector/CMakeLists.txt
index 04d065adaa5..3df36c62f15 100644
--- a/Examples/Detectors/TGeoDetector/CMakeLists.txt
+++ b/Examples/Detectors/TGeoDetector/CMakeLists.txt
@@ -17,6 +17,7 @@ target_link_libraries(
         ActsPluginJson
         ActsExamplesFramework
         ActsExamplesDetectorGeneric
+        ActsExamplesITkModuleSplitting
 )
 
 install(
diff --git a/Examples/Detectors/TGeoDetector/include/ActsExamples/TGeoDetector/JsonTGeoDetectorConfig.hpp b/Examples/Detectors/TGeoDetector/include/ActsExamples/TGeoDetector/JsonTGeoDetectorConfig.hpp
index 634127fc9b3..eb038572fcf 100644
--- a/Examples/Detectors/TGeoDetector/include/ActsExamples/TGeoDetector/JsonTGeoDetectorConfig.hpp
+++ b/Examples/Detectors/TGeoDetector/include/ActsExamples/TGeoDetector/JsonTGeoDetectorConfig.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2018-2020 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
diff --git a/Examples/Detectors/TGeoDetector/include/ActsExamples/TGeoDetector/TGeoDetector.hpp b/Examples/Detectors/TGeoDetector/include/ActsExamples/TGeoDetector/TGeoDetector.hpp
index cb0b8d90f7a..0fae0df1c5a 100644
--- a/Examples/Detectors/TGeoDetector/include/ActsExamples/TGeoDetector/TGeoDetector.hpp
+++ b/Examples/Detectors/TGeoDetector/include/ActsExamples/TGeoDetector/TGeoDetector.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2018 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
@@ -75,7 +75,7 @@ struct TGeoDetector {
     struct LayerTriplet {
       LayerTriplet() = default;
 
-      LayerTriplet(T value)
+      explicit LayerTriplet(T value)
           : negative{value}, central{value}, positive{value} {}
 
       LayerTriplet(T _negative, T _central, T _positive)
diff --git a/Examples/Detectors/TGeoDetector/include/ActsExamples/TGeoDetector/TGeoITkModuleSplitter.hpp b/Examples/Detectors/TGeoDetector/include/ActsExamples/TGeoDetector/TGeoITkModuleSplitter.hpp
index a08dbebd661..ab928752f49 100644
--- a/Examples/Detectors/TGeoDetector/include/ActsExamples/TGeoDetector/TGeoITkModuleSplitter.hpp
+++ b/Examples/Detectors/TGeoDetector/include/ActsExamples/TGeoDetector/TGeoITkModuleSplitter.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2021 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
diff --git a/Examples/Detectors/TGeoDetector/src/TGeoDetector.cpp b/Examples/Detectors/TGeoDetector/src/TGeoDetector.cpp
index 77edfa78e1a..aeed881eb1e 100644
--- a/Examples/Detectors/TGeoDetector/src/TGeoDetector.cpp
+++ b/Examples/Detectors/TGeoDetector/src/TGeoDetector.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2019 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include "ActsExamples/TGeoDetector/TGeoDetector.hpp"
 
diff --git a/Examples/Detectors/TGeoDetector/src/TGeoITkModuleSplitter.cpp b/Examples/Detectors/TGeoDetector/src/TGeoITkModuleSplitter.cpp
index df88593ff7a..42bbbd9c882 100644
--- a/Examples/Detectors/TGeoDetector/src/TGeoITkModuleSplitter.cpp
+++ b/Examples/Detectors/TGeoDetector/src/TGeoITkModuleSplitter.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2016-2020 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include "ActsExamples/TGeoDetector/TGeoITkModuleSplitter.hpp"
 
@@ -14,6 +14,7 @@
 #include "Acts/Surfaces/RectangleBounds.hpp"
 #include "Acts/Surfaces/Surface.hpp"
 #include "Acts/Surfaces/SurfaceBounds.hpp"
+#include "ActsExamples/ITkModuleSplitting/ITkModuleSplitting.hpp"
 
 #include <algorithm>
 #include <array>
@@ -33,11 +34,9 @@ void ActsExamples::TGeoITkModuleSplitter::initSplitCategories() {
        m_cfg.splitPatterns) {
     // mark pattern for disc or barrel module splits:
     bool is_disk = false;
-    if (m_cfg.discMap.find(pattern_split_category.second) !=
-        m_cfg.discMap.end()) {
+    if (m_cfg.discMap.contains(pattern_split_category.second)) {
       is_disk = true;
-    } else if (m_cfg.barrelMap.find(pattern_split_category.second) ==
-               m_cfg.barrelMap.end()) {
+    } else if (!m_cfg.barrelMap.contains(pattern_split_category.second)) {
       ACTS_ERROR(
           pattern_split_category.second +
           " is neither a category name for barrel or disk module splits.");
@@ -88,55 +87,16 @@ ActsExamples::TGeoITkModuleSplitter::splitBarrelModule(
     const Acts::GeometryContext& gctx,
     const std::shared_ptr<const Acts::TGeoDetectorElement>& detElement,
     unsigned int nSegments) const {
-  // Retrieve the surface
-  auto identifier = detElement->identifier();
-  const Acts::Surface& surface = detElement->surface();
-  const Acts::SurfaceBounds& bounds = surface.bounds();
-  if (bounds.type() != Acts::SurfaceBounds::eRectangle || nSegments <= 1u) {
-    ACTS_WARNING("Invalid splitting config for barrel node: " +
-                 std::string(detElement->tgeoNode().GetName()) +
-                 "! Node will not be slpit.");
-    return {detElement};
-  }
-
-  // Output container for the submodules
-  std::vector<std::shared_ptr<const Acts::TGeoDetectorElement>> detElements =
-      {};
-  detElements.reserve(nSegments);
-
-  // Get the geometric information
-  double thickness = detElement->thickness();
-  const Acts::Transform3& transform = surface.transform(gctx);
-  // Determine the new bounds
-  const std::vector<double> boundsValues = bounds.values();
-  double lengthX = (boundsValues[Acts::RectangleBounds::eMaxX] -
-                    boundsValues[Acts::RectangleBounds::eMinX]) /
-                   nSegments;
-  double lengthY = boundsValues[Acts::RectangleBounds::eMaxY] -
-                   boundsValues[Acts::RectangleBounds::eMinY];
-  auto rectBounds =
-      std::make_shared<Acts::RectangleBounds>(0.5 * lengthX, 0.5 * lengthY);
-  // Translation for every subelement
-  auto localTranslation = Acts::Vector2(-0.5 * lengthX * (nSegments - 1), 0.);
-  const auto step = Acts::Vector2(lengthX, 0.);
-  ACTS_DEBUG("Rectangle bounds for new node (half length): " +
-             std::to_string(rectBounds->halfLengthX()) + ", " +
-             std::to_string(rectBounds->halfLengthY()));
+  auto name = detElement->tgeoNode().GetName();
 
-  for (std::size_t i = 0; i < nSegments; i++) {
-    Acts::Vector3 globalTranslation =
-        surface.localToGlobal(gctx, localTranslation, {}) -
-        transform.translation();
-    auto elemTransform =
-        Acts::Transform3(transform).pretranslate(globalTranslation);
-    auto element = std::make_shared<const Acts::TGeoDetectorElement>(
-        identifier, detElement->tgeoNode(), elemTransform, rectBounds,
-        thickness);
-    detElements.push_back(std::move(element));
+  auto factory = [&](const auto& trafo, const auto& bounds) {
+    return std::make_shared<const Acts::TGeoDetectorElement>(
+        detElement->identifier(), detElement->tgeoNode(), trafo, bounds,
+        detElement->thickness());
+  };
 
-    localTranslation += step;
-  }
-  return detElements;
+  return ITk::splitBarrelModule(gctx, detElement, nSegments, factory, name,
+                                logger());
 }
 
 /// If applicable, returns a split detector element
@@ -146,55 +106,14 @@ ActsExamples::TGeoITkModuleSplitter::splitDiscModule(
     const std::shared_ptr<const Acts::TGeoDetectorElement>& detElement,
     const std::vector<ActsExamples::TGeoITkModuleSplitter::SplitRange>&
         splitRanges) const {
-  // Retrieve the surface
-  auto identifier = detElement->identifier();
-  const Acts::Surface& surface = detElement->surface();
-  const Acts::SurfaceBounds& bounds = surface.bounds();
+  auto name = detElement->tgeoNode().GetName();
 
-  // Check annulus bounds origin
-  auto printOrigin = [&](const Acts::Surface& sf) {
-    Acts::Vector3 discOrigin =
-        sf.localToGlobal(gctx, Acts::Vector2(0., 0.), Acts::Vector3::Zero());
-    std::string out =
-        "Disc surface origin at: " + std::to_string(discOrigin[0]) + ", " +
-        std::to_string(discOrigin[1]) + ", " + std::to_string(discOrigin[2]);
-    return out;
+  auto factory = [&](const auto& trafo, const auto& bounds) {
+    return std::make_shared<const Acts::TGeoDetectorElement>(
+        detElement->identifier(), detElement->tgeoNode(), trafo, bounds,
+        detElement->thickness());
   };
-  ACTS_DEBUG(printOrigin(surface));
-
-  if (bounds.type() != Acts::SurfaceBounds::eAnnulus || splitRanges.empty()) {
-    ACTS_WARNING("Invalid splitting config for disk node: " +
-                 std::string(detElement->tgeoNode().GetName()) +
-                 "! Node will not be slpit.");
-    return {detElement};
-  }
-
-  auto nSegments = splitRanges.size();
-
-  // Output container for the submodules
-  std::vector<std::shared_ptr<const Acts::TGeoDetectorElement>> detElements =
-      {};
-  detElements.reserve(nSegments);
 
-  // Get the geometric information
-  double thickness = detElement->thickness();
-  const Acts::Transform3& transform = surface.transform(gctx);
-  const std::vector<double> boundsValues = bounds.values();
-  std::array<double, Acts::AnnulusBounds::eSize> values{};
-  std::copy_n(boundsValues.begin(), Acts::AnnulusBounds::eSize, values.begin());
-
-  for (std::size_t i = 0; i < nSegments; i++) {
-    values[Acts::AnnulusBounds::eMinR] = splitRanges[i].first;
-    values[Acts::AnnulusBounds::eMaxR] = splitRanges[i].second;
-    auto annulusBounds = std::make_shared<Acts::AnnulusBounds>(values);
-    ACTS_DEBUG(
-        "New r bounds for node: " + std::to_string(annulusBounds->rMin()) +
-        ", " + std::to_string(annulusBounds->rMax()));
-
-    auto element = std::make_shared<const Acts::TGeoDetectorElement>(
-        identifier, detElement->tgeoNode(), transform, annulusBounds,
-        thickness);
-    detElements.push_back(std::move(element));
-  }
-  return detElements;
+  return ITk::splitDiscModule(gctx, detElement, splitRanges, factory, name,
+                              logger());
 }
diff --git a/Examples/Detectors/TelescopeDetector/include/ActsExamples/TelescopeDetector/BuildTelescopeDetector.hpp b/Examples/Detectors/TelescopeDetector/include/ActsExamples/TelescopeDetector/BuildTelescopeDetector.hpp
index 34656cc0a32..9e3b5977a6a 100644
--- a/Examples/Detectors/TelescopeDetector/include/ActsExamples/TelescopeDetector/BuildTelescopeDetector.hpp
+++ b/Examples/Detectors/TelescopeDetector/include/ActsExamples/TelescopeDetector/BuildTelescopeDetector.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2020-2021 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
diff --git a/Examples/Detectors/TelescopeDetector/include/ActsExamples/TelescopeDetector/TelescopeDetector.hpp b/Examples/Detectors/TelescopeDetector/include/ActsExamples/TelescopeDetector/TelescopeDetector.hpp
index 19bb2b700d1..31095f42636 100644
--- a/Examples/Detectors/TelescopeDetector/include/ActsExamples/TelescopeDetector/TelescopeDetector.hpp
+++ b/Examples/Detectors/TelescopeDetector/include/ActsExamples/TelescopeDetector/TelescopeDetector.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2020 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
diff --git a/Examples/Detectors/TelescopeDetector/include/ActsExamples/TelescopeDetector/TelescopeDetectorElement.hpp b/Examples/Detectors/TelescopeDetector/include/ActsExamples/TelescopeDetector/TelescopeDetectorElement.hpp
index e56bbf98465..5a5d276cf9e 100644
--- a/Examples/Detectors/TelescopeDetector/include/ActsExamples/TelescopeDetector/TelescopeDetectorElement.hpp
+++ b/Examples/Detectors/TelescopeDetector/include/ActsExamples/TelescopeDetector/TelescopeDetectorElement.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2020-2021 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
diff --git a/Examples/Detectors/TelescopeDetector/src/BuildTelescopeDetector.cpp b/Examples/Detectors/TelescopeDetector/src/BuildTelescopeDetector.cpp
index 35136911325..7e01a9499bd 100644
--- a/Examples/Detectors/TelescopeDetector/src/BuildTelescopeDetector.cpp
+++ b/Examples/Detectors/TelescopeDetector/src/BuildTelescopeDetector.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2020-2021 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include "ActsExamples/TelescopeDetector/BuildTelescopeDetector.hpp"
 
diff --git a/Examples/Detectors/TelescopeDetector/src/TelescopeDetector.cpp b/Examples/Detectors/TelescopeDetector/src/TelescopeDetector.cpp
index 0d5c35800d5..7a5e262067a 100644
--- a/Examples/Detectors/TelescopeDetector/src/TelescopeDetector.cpp
+++ b/Examples/Detectors/TelescopeDetector/src/TelescopeDetector.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2020-2021 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include "ActsExamples/TelescopeDetector/TelescopeDetector.hpp"
 
@@ -46,7 +46,7 @@ auto ActsExamples::Telescope::TelescopeDetector::finalize(
   // Sort the provided distances
   std::vector<double> positions = cfg.positions;
   std::vector<double> stereos = cfg.stereos;
-  std::sort(positions.begin(), positions.end());
+  std::ranges::sort(positions);
 
   /// Return the telescope detector
   TrackingGeometryPtr gGeometry = ActsExamples::Telescope::buildDetector(
diff --git a/Examples/Detectors/TelescopeDetector/src/TelescopeDetectorElement.cpp b/Examples/Detectors/TelescopeDetector/src/TelescopeDetectorElement.cpp
index dfea5b43886..22421064ef1 100644
--- a/Examples/Detectors/TelescopeDetector/src/TelescopeDetectorElement.cpp
+++ b/Examples/Detectors/TelescopeDetector/src/TelescopeDetectorElement.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2020-2021 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include "ActsExamples/TelescopeDetector/TelescopeDetectorElement.hpp"
 
diff --git a/Examples/Framework/CMakeLists.txt b/Examples/Framework/CMakeLists.txt
index bfe33f2e8e6..032627e0b89 100644
--- a/Examples/Framework/CMakeLists.txt
+++ b/Examples/Framework/CMakeLists.txt
@@ -5,13 +5,16 @@ set(ActsExamplesFramework_SOURCES)
 add_library(
     ActsExamplesFramework
     SHARED
+    src/EventData/Measurement.cpp
     src/EventData/MeasurementCalibration.cpp
     src/EventData/ScalingCalibrator.cpp
+    src/EventData/SimParticle.cpp
     src/Framework/IAlgorithm.cpp
     src/Framework/SequenceElement.cpp
     src/Framework/WhiteBoard.cpp
     src/Framework/RandomNumbers.cpp
     src/Framework/Sequencer.cpp
+    src/Framework/DataHandle.cpp
     src/Utilities/EventDataTransforms.cpp
     src/Utilities/Paths.cpp
     src/Utilities/Options.cpp
@@ -44,30 +47,15 @@ target_compile_definitions(
     PRIVATE BOOST_FILESYSTEM_NO_DEPRECATED
 )
 
-if(ACTS_USE_EXAMPLES_TBB)
-    # newer DD4hep version require TBB and search internally for TBB in
-    # config-only mode. to avoid mismatches we explicitly search using
-    # config-only mode first to be sure that we find the same version.
-    find_package(TBB ${_acts_tbb_version} CONFIG)
-    if(NOT TBB_FOUND)
-        # no version check possible when using the find module
-        find_package(TBB ${_acts_tbb_version} MODULE)
-    endif()
-else()
-    set(TBB_FOUND FALSE)
-endif()
-if(TBB_FOUND)
-    target_link_libraries(ActsExamplesFramework PUBLIC TBB::tbb)
-else()
-    message(
-        STATUS
-        "disable TBB for Examples/Framework - only single-threaded running will be supported"
-    )
-    target_compile_definitions(
-        ActsExamplesFramework
-        PUBLIC -DACTS_EXAMPLES_NO_TBB
-    )
+# newer DD4hep version require TBB and search internally for TBB in
+# config-only mode. to avoid mismatches we explicitly search using
+# config-only mode first to be sure that we find the same version.
+find_package(TBB ${_acts_tbb_version} CONFIG)
+if(NOT TBB_FOUND)
+    # no version check possible when using the find module
+    find_package(TBB ${_acts_tbb_version} MODULE REQUIRED)
 endif()
+target_link_libraries(ActsExamplesFramework PUBLIC TBB::tbb)
 
 install(
     TARGETS ActsExamplesFramework
diff --git a/Examples/Framework/ML/include/ActsExamples/EventData/NeuralCalibrator.hpp b/Examples/Framework/ML/include/ActsExamples/EventData/NeuralCalibrator.hpp
index 8b2aee291b0..9fa7f45e8a1 100644
--- a/Examples/Framework/ML/include/ActsExamples/EventData/NeuralCalibrator.hpp
+++ b/Examples/Framework/ML/include/ActsExamples/EventData/NeuralCalibrator.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2023 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
diff --git a/Examples/Framework/ML/src/NeuralCalibrator.cpp b/Examples/Framework/ML/src/NeuralCalibrator.cpp
index 6dcbe1cc7cf..67c6e76db57 100644
--- a/Examples/Framework/ML/src/NeuralCalibrator.cpp
+++ b/Examples/Framework/ML/src/NeuralCalibrator.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2023 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include "ActsExamples/EventData/NeuralCalibrator.hpp"
 
@@ -12,7 +12,9 @@
 #include "Acts/EventData/MeasurementHelpers.hpp"
 #include "Acts/EventData/SourceLink.hpp"
 #include "Acts/Utilities/CalibrationContext.hpp"
+#include "Acts/Utilities/Helpers.hpp"
 #include "Acts/Utilities/UnitVectors.hpp"
+#include "ActsExamples/EventData/IndexSourceLink.hpp"
 #include "ActsExamples/EventData/Measurement.hpp"
 
 #include <TFile.h>
@@ -84,8 +86,7 @@ void ActsExamples::NeuralCalibrator::calibrate(
   assert((idxSourceLink.index() < measurements.size()) and
          "Source link index is outside the container bounds");
 
-  if (std::find(m_volumeIds.begin(), m_volumeIds.end(),
-                idxSourceLink.geometryId().volume()) == m_volumeIds.end()) {
+  if (!rangeContainsValue(m_volumeIds, idxSourceLink.geometryId())) {
     m_fallback.calibrate(measurements, clusters, gctx, cctx, sourceLink,
                          trackState);
     return;
@@ -106,21 +107,21 @@ void ActsExamples::NeuralCalibrator::calibrate(
   const Acts::Surface& referenceSurface = trackState.referenceSurface();
   auto trackParameters = trackState.parameters();
 
-  const auto& measurement = measurements[idxSourceLink.index()];
+  const ConstVariableBoundMeasurementProxy measurement =
+      measurements.getMeasurement(idxSourceLink.index());
 
   assert(measurement.contains(Acts::eBoundLoc0) &&
          "Measurement does not contain the required bound loc0");
   assert(measurement.contains(Acts::eBoundLoc1) &&
          "Measurement does not contain the required bound loc1");
 
-  auto boundLoc0 = measurement.subspace().indexOf(Acts::eBoundLoc0);
-  auto boundLoc1 = measurement.subspace().indexOf(Acts::eBoundLoc1);
+  auto boundLoc0 = measurement.indexOf(Acts::eBoundLoc0);
+  auto boundLoc1 = measurement.indexOf(Acts::eBoundLoc1);
 
-  Acts::Vector2 localPosition{measurement.effectiveParameters()[boundLoc0],
-                              measurement.effectiveParameters()[boundLoc1]};
-  Acts::Vector2 localCovariance{
-      measurement.effectiveCovariance()(boundLoc0, boundLoc0),
-      measurement.effectiveCovariance()(boundLoc1, boundLoc1)};
+  Acts::Vector2 localPosition{measurement.parameters()[boundLoc0],
+                              measurement.parameters()[boundLoc1]};
+  Acts::Vector2 localCovariance{measurement.covariance()(boundLoc0, boundLoc0),
+                                measurement.covariance()(boundLoc1, boundLoc1)};
 
   Acts::Vector3 dir = Acts::makeDirectionFromPhiTheta(
       trackParameters[Acts::eBoundPhi], trackParameters[Acts::eBoundTheta]);
@@ -172,21 +173,25 @@ void ActsExamples::NeuralCalibrator::calibrate(
   std::size_t iLoc0 = m_nComponents + iMax * 2;
   std::size_t iVar0 = 3 * m_nComponents + iMax * 2;
 
-  Measurement measurementCopy = measurement;
-  measurementCopy.effectiveParameters()[boundLoc0] = output[iLoc0];
-  measurementCopy.effectiveParameters()[boundLoc1] = output[iLoc0 + 1];
-  measurementCopy.effectiveCovariance()(boundLoc0, boundLoc0) = output[iVar0];
-  measurementCopy.effectiveCovariance()(boundLoc1, boundLoc1) =
-      output[iVar0 + 1];
-
   Acts::visit_measurement(measurement.size(), [&](auto N) -> void {
     constexpr std::size_t kMeasurementSize = decltype(N)::value;
+    const ConstFixedBoundMeasurementProxy<kMeasurementSize> fixedMeasurement =
+        static_cast<ConstFixedBoundMeasurementProxy<kMeasurementSize>>(
+            measurement);
+
+    Acts::ActsVector<kMeasurementSize> calibratedParameters =
+        fixedMeasurement.parameters();
+    Acts::ActsSquareMatrix<kMeasurementSize> calibratedCovariance =
+        fixedMeasurement.covariance();
+
+    calibratedParameters[boundLoc0] = output[iLoc0];
+    calibratedParameters[boundLoc1] = output[iLoc0 + 1];
+    calibratedCovariance(boundLoc0, boundLoc0) = output[iVar0];
+    calibratedCovariance(boundLoc1, boundLoc1) = output[iVar0 + 1];
 
     trackState.allocateCalibrated(kMeasurementSize);
-    trackState.calibrated<kMeasurementSize>() =
-        measurementCopy.parameters<kMeasurementSize>();
-    trackState.calibratedCovariance<kMeasurementSize>() =
-        measurementCopy.covariance<kMeasurementSize>();
-    trackState.setProjector(measurementCopy.subspace().fullProjector<double>());
+    trackState.calibrated<kMeasurementSize>() = calibratedParameters;
+    trackState.calibratedCovariance<kMeasurementSize>() = calibratedCovariance;
+    trackState.setSubspaceIndices(fixedMeasurement.subspaceIndices());
   });
 }
diff --git a/Examples/Framework/include/ActsExamples/EventData/AverageSimHits.hpp b/Examples/Framework/include/ActsExamples/EventData/AverageSimHits.hpp
index a88ca90aea9..31756f4620a 100644
--- a/Examples/Framework/include/ActsExamples/EventData/AverageSimHits.hpp
+++ b/Examples/Framework/include/ActsExamples/EventData/AverageSimHits.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2020 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
diff --git a/Examples/Framework/include/ActsExamples/EventData/Cluster.hpp b/Examples/Framework/include/ActsExamples/EventData/Cluster.hpp
index f69e74da587..3eb850b1214 100644
--- a/Examples/Framework/include/ActsExamples/EventData/Cluster.hpp
+++ b/Examples/Framework/include/ActsExamples/EventData/Cluster.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2021 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
@@ -25,6 +25,14 @@ struct Cluster {
 
   // TODO make this be provided by Fatras?
   Acts::Vector3 globalPosition = Acts::Vector3::Zero();
+  Acts::Vector3 localDirection = Acts::Vector3::Zero();
+  Acts::Vector3 lengthDirection = Acts::Vector3::Zero();
+  float localEta = 0.f;
+  float localPhi = 0.f;
+  float globalEta = 0.f;
+  float globalPhi = 0.f;
+  float etaAngle = 0.f;
+  float phiAngle = 0.f;
 
   double sumActivations() const {
     return std::accumulate(
diff --git a/Examples/Framework/include/ActsExamples/EventData/DriftCircle.hpp b/Examples/Framework/include/ActsExamples/EventData/DriftCircle.hpp
index 38ba7513f9f..88cad84fffe 100644
--- a/Examples/Framework/include/ActsExamples/EventData/DriftCircle.hpp
+++ b/Examples/Framework/include/ActsExamples/EventData/DriftCircle.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2023 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
diff --git a/Examples/Framework/include/ActsExamples/EventData/ExtractedSimulationProcess.hpp b/Examples/Framework/include/ActsExamples/EventData/ExtractedSimulationProcess.hpp
index 2005df06a94..1d323089f0c 100644
--- a/Examples/Framework/include/ActsExamples/EventData/ExtractedSimulationProcess.hpp
+++ b/Examples/Framework/include/ActsExamples/EventData/ExtractedSimulationProcess.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2020-2021 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
diff --git a/Examples/Framework/include/ActsExamples/EventData/GeometryContainers.hpp b/Examples/Framework/include/ActsExamples/EventData/GeometryContainers.hpp
index e3007901bfc..0724ed8c4ae 100644
--- a/Examples/Framework/include/ActsExamples/EventData/GeometryContainers.hpp
+++ b/Examples/Framework/include/ActsExamples/EventData/GeometryContainers.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2017-2020 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
@@ -20,6 +20,7 @@
 #include <iostream>
 #include <utility>
 
+#include <boost/bimap.hpp>
 #include <boost/container/flat_map.hpp>
 #include <boost/container/flat_set.hpp>
 
@@ -229,4 +230,9 @@ struct GeometryIdMultisetAccessor {
   const Container* container = nullptr;
 };
 
+/// A map that allows mapping back and forth between ACTS and Athena Geometry
+/// Ids
+using GeometryIdMapActsAthena =
+    boost::bimap<std::uint64_t, Acts::GeometryIdentifier>;
+
 }  // namespace ActsExamples
diff --git a/Examples/Framework/include/ActsExamples/EventData/Graph.hpp b/Examples/Framework/include/ActsExamples/EventData/Graph.hpp
index 5014f6548c4..a7a1e504c85 100644
--- a/Examples/Framework/include/ActsExamples/EventData/Graph.hpp
+++ b/Examples/Framework/include/ActsExamples/EventData/Graph.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2024 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
diff --git a/Examples/Framework/include/ActsExamples/EventData/Index.hpp b/Examples/Framework/include/ActsExamples/EventData/Index.hpp
index 74e7153b78f..46e431ea76a 100644
--- a/Examples/Framework/include/ActsExamples/EventData/Index.hpp
+++ b/Examples/Framework/include/ActsExamples/EventData/Index.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2019-2020 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
@@ -55,7 +55,7 @@ inline boost::container::flat_multimap<value_t, Index> invertIndexMultimap(
     inverse.insert(i);
   }
 #else
-  std::sort(unordered.begin(), unordered.end());
+  std::ranges::sort(unordered);
   inverse.insert(boost::container::ordered_range_t{}, unordered.begin(),
                  unordered.end());
 #endif
diff --git a/Examples/Framework/include/ActsExamples/EventData/IndexSourceLink.hpp b/Examples/Framework/include/ActsExamples/EventData/IndexSourceLink.hpp
index aaaac49d78a..ea60a030b96 100644
--- a/Examples/Framework/include/ActsExamples/EventData/IndexSourceLink.hpp
+++ b/Examples/Framework/include/ActsExamples/EventData/IndexSourceLink.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2020 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
@@ -60,10 +60,6 @@ class IndexSourceLink final {
     return (lhs.geometryId() == rhs.geometryId()) &&
            (lhs.m_index == rhs.m_index);
   }
-  friend bool operator!=(const IndexSourceLink& lhs,
-                         const IndexSourceLink& rhs) {
-    return !(lhs == rhs);
-  }
 };
 
 struct IndexSourceLinkSurfaceAccessor {
@@ -88,11 +84,6 @@ struct IndexSourceLinkSurfaceAccessor {
 
 }  // namespace Experimental
 
-/// Container of index source links.
-///
-/// Since the source links provide a `.geometryId()` accessor, they can be
-/// stored in an ordered geometry container.
-using IndexSourceLinkContainer = GeometryIdMultiset<IndexSourceLink>;
 /// Accessor for the above source link container
 ///
 /// It wraps up a few lookup methods to be used in the Combinatorial Kalman
@@ -109,4 +100,5 @@ struct IndexSourceLinkAccessor : GeometryIdMultisetAccessor<IndexSourceLink> {
     return {Iterator{begin}, Iterator{end}};
   }
 };
+
 }  // namespace ActsExamples
diff --git a/Examples/Framework/include/ActsExamples/EventData/Measurement.hpp b/Examples/Framework/include/ActsExamples/EventData/Measurement.hpp
index ec423531cfa..ab232628341 100644
--- a/Examples/Framework/include/ActsExamples/EventData/Measurement.hpp
+++ b/Examples/Framework/include/ActsExamples/EventData/Measurement.hpp
@@ -1,234 +1,521 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2020-2024 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
+#include "Acts/Definitions/Algebra.hpp"
 #include "Acts/Definitions/TrackParametrization.hpp"
 #include "Acts/EventData/MeasurementHelpers.hpp"
-#include "Acts/EventData/SourceLink.hpp"
-#include "Acts/EventData/detail/CalculateResiduals.hpp"
+#include "Acts/EventData/SubspaceHelpers.hpp"
+#include "Acts/EventData/Types.hpp"
 #include "Acts/EventData/detail/ParameterTraits.hpp"
 #include "Acts/EventData/detail/PrintParameters.hpp"
-#include "Acts/Utilities/detail/Subspace.hpp"
+#include "Acts/Geometry/GeometryIdentifier.hpp"
+#include "Acts/Utilities/Iterator.hpp"
+#include "ActsExamples/EventData/GeometryContainers.hpp"
+#include "ActsExamples/EventData/IndexSourceLink.hpp"
+#include "ActsExamples/EventData/MeasurementConcept.hpp"
 
 #include <array>
+#include <compare>
+#include <concepts>
 #include <cstddef>
 #include <iosfwd>
+#include <iterator>
+#include <type_traits>
 #include <variant>
 #include <vector>
 
+#include <boost/container/static_vector.hpp>
+
 namespace ActsExamples {
 
-/// A measurement of a variable-size subspace of the full parameters.
-///
-/// @tparam indices_t Parameter index type, determines the full parameter space
+template <typename Derived, std::size_t FullSize, bool ReadOnly>
+class MeasurementProxyBase;
+template <std::size_t FullSize, std::size_t Size, bool ReadOnly>
+class FixedMeasurementProxy;
+template <std::size_t FullSize, bool ReadOnly>
+class VariableMeasurementProxy;
+
+template <std::size_t Size>
+using FixedBoundMeasurementProxy =
+    FixedMeasurementProxy<Acts::eBoundSize, Size, false>;
+template <std::size_t Size>
+using ConstFixedBoundMeasurementProxy =
+    FixedMeasurementProxy<Acts::eBoundSize, Size, true>;
+using VariableBoundMeasurementProxy =
+    VariableMeasurementProxy<Acts::eBoundSize, false>;
+using ConstVariableBoundMeasurementProxy =
+    VariableMeasurementProxy<Acts::eBoundSize, true>;
+
+/// @brief A container to store and access measurements
 ///
-/// The measurement intentionally does not store a pointer/reference to the
-/// reference object in the geometry hierarchy, i.e. the surface or volume. The
-/// reference object can already be identified via the geometry identifier
-/// provided by the source link. Since a measurement **must** be anchored within
-/// the geometry hierarchy, all measurement surfaces and volumes **must**
-/// provide valid geometry identifiers. In all use-cases, e.g. Kalman filtering,
-/// a pointer/reference to the reference object is available before the
-/// measurement is accessed; e.g. the propagator provides the surface pointer
-/// during navigation, which is then used to lookup possible measurements.
+/// This container stores measurements of different sizes and provides
+/// access to them through fixed-size and variable-size proxies.
 ///
-/// The pointed-to geometry object would differ depending on the parameter type.
-/// This means either, that there needs to be an additional variable type or
-/// that a pointer to a base object is stored (requiring a `dynamic_cast` later
-/// on). Both variants add additional complications. Since the geometry object
-/// is not required anyway (as discussed above), not storing it removes all
-/// these complications altogether.
-template <typename indices_t>
-class VariableSizeMeasurement {
-  static constexpr std::size_t kFullSize =
-      Acts::detail::kParametersSize<indices_t>;
-
-  using Subspace = Acts::detail::VariableSizeSubspace<kFullSize>;
+/// The measurements are stored densely in a flat buffer and the proxies
+/// provide access to the individual measurements.
+class MeasurementContainer {
+ public:
+  using size_type = std::size_t;
+  using Index = size_type;
+  template <std::size_t Size>
+  using FixedProxy = FixedMeasurementProxy<Acts::eBoundSize, Size, false>;
+  template <std::size_t Size>
+  using ConstFixedProxy = FixedMeasurementProxy<Acts::eBoundSize, Size, true>;
+  using VariableProxy = VariableMeasurementProxy<Acts::eBoundSize, false>;
+  using ConstVariableProxy = VariableMeasurementProxy<Acts::eBoundSize, true>;
+  using OrderedIndices = GeometryIdMultiset<IndexSourceLink>;
+
+  MeasurementContainer();
+
+  /// @brief Get the number of measurements
+  /// @return The number of measurements
+  std::size_t size() const;
+
+  /// @brief Reserve space for a number of measurements
+  /// @param size The number of measurements to reserve space for
+  void reserve(std::size_t size);
+
+  /// @brief Add a measurement of a given size
+  /// @param size The size of the measurement
+  /// @param geometryId The geometry identifier of the measurement surface
+  /// @return The index of the added measurement
+  Index addMeasurement(std::uint8_t size, Acts::GeometryIdentifier geometryId);
+
+  /// @brief Get a variable-size measurement proxy
+  /// @param index The index of the measurement
+  /// @return The variable-size measurement proxy
+  VariableProxy at(Index index);
+  /// @brief Get a const variable-size measurement proxy
+  /// @param index The index of the measurement
+  /// @return The const variable-size measurement proxy
+  ConstVariableProxy at(Index index) const;
+
+  /// @brief Get a variable-size measurement proxy
+  /// @param index The index of the measurement
+  /// @return The variable-size measurement proxy
+  VariableProxy getMeasurement(Index index);
+  /// @brief Get a const variable-size measurement proxy
+  /// @param index The index of the measurement
+  /// @return The const variable-size measurement proxy
+  ConstVariableProxy getMeasurement(Index index) const;
+
+  /// @brief Get a fixed-size measurement proxy
+  /// @tparam Size The size of the measurement
+  /// @param index The index of the measurement
+  /// @return The fixed-size measurement proxy
+  template <std::size_t Size>
+  FixedProxy<Size> getMeasurement(Index index) {
+    return FixedProxy<Size>{*this, index};
+  }
+  /// @brief Get a const fixed-size measurement proxy
+  /// @tparam Size The size of the measurement
+  /// @param index The index of the measurement
+  /// @return The const fixed-size measurement proxy
+  template <std::size_t Size>
+  ConstFixedProxy<Size> getMeasurement(Index index) const {
+    return ConstFixedProxy<Size>{*this, index};
+  }
+
+  /// @brief Make a measurement of a given size
+  /// @param size The size of the measurement
+  /// @param geometryId The geometry identifier of the measurement surface
+  /// @return The variable-size measurement proxy
+  VariableProxy makeMeasurement(std::uint8_t size,
+                                Acts::GeometryIdentifier geometryId);
+  /// @brief Make a fixed-size measurement
+  /// @tparam Size The size of the measurement
+  /// @param geometryId The geometry identifier of the measurement surface
+  /// @return The fixed-size measurement proxy
+  template <std::size_t Size>
+  FixedProxy<Size> makeMeasurement(Acts::GeometryIdentifier geometryId) {
+    return getMeasurement<Size>(addMeasurement(Size, geometryId));
+  }
+
+  template <typename... Args>
+  VariableProxy emplaceMeasurement(std::uint8_t size,
+                                   Acts::GeometryIdentifier geometryId,
+                                   Args&&... args);
+
+  template <std::size_t Size, typename... Args>
+  FixedProxy<Size> emplaceMeasurement(Acts::GeometryIdentifier geometryId,
+                                      Args&&... args);
+
+  const OrderedIndices& orderedIndices() const;
+
+  using iterator =
+      Acts::ContainerIndexIterator<MeasurementContainer, VariableProxy, false>;
+  using const_iterator =
+      Acts::ContainerIndexIterator<const MeasurementContainer,
+                                   ConstVariableProxy, true>;
+
+  iterator begin();
+  iterator end();
+  const_iterator begin() const;
+  const_iterator end() const;
+  const_iterator cbegin() const;
+  const_iterator cend() const;
 
  public:
-  using Scalar = Acts::ActsScalar;
-
-  /// Vector type containing for measured parameter values.
-  template <std::size_t dim>
-  using ParametersVector = Eigen::Matrix<Scalar, dim, 1>;
-  template <std::size_t dim>
-  using ParametersVectorMap = Eigen::Map<ParametersVector<dim>>;
-  template <std::size_t dim>
-  using ConstParametersVectorMap = Eigen::Map<const ParametersVector<dim>>;
-  using EffectiveParametersVector = Eigen::Matrix<Scalar, Eigen::Dynamic, 1>;
-  using EffectiveParametersVectorMap = Eigen::Map<EffectiveParametersVector>;
-  using ConstEffectiveParametersVectorMap =
-      Eigen::Map<const EffectiveParametersVector>;
-
-  /// Matrix type for the measurement covariance.
-  template <std::size_t dim>
-  using CovarianceMatrix = Eigen::Matrix<Scalar, dim, dim>;
-  template <std::size_t dim>
-  using CovarianceMatrixMap = Eigen::Map<CovarianceMatrix<dim>>;
-  template <std::size_t dim>
-  using ConstCovarianceMatrixMap = Eigen::Map<const CovarianceMatrix<dim>>;
-  using EffectiveCovarianceMatrix =
-      Eigen::Matrix<Scalar, Eigen::Dynamic, Eigen::Dynamic>;
-  using EffectiveCovarianceMatrixMap = Eigen::Map<EffectiveCovarianceMatrix>;
-  using ConstEffectiveCovarianceMatrixMap =
-      Eigen::Map<const EffectiveCovarianceMatrix>;
+  struct MeasurementEntry {
+    std::size_t subspaceIndexOffset{};
+    std::size_t parameterOffset{};
+    std::size_t covarianceOffset{};
+    std::uint8_t size{};
+  };
+
+  std::vector<MeasurementEntry> m_entries;
+
+  std::vector<Acts::GeometryIdentifier> m_geometryIds;
+  std::vector<std::uint8_t> m_subspaceIndices;
+  std::vector<double> m_parameters;
+  std::vector<double> m_covariances;
 
-  using FullParametersVector = Acts::ActsVector<kFullSize>;
-  using FullCovarianceMatrix = Acts::ActsSquareMatrix<kFullSize>;
+  OrderedIndices m_orderedIndices;
+};
+
+/// @brief Base class for measurement proxies
+///
+/// This class provides common functionality for fixed-size and variable-size
+/// measurement proxies.
+///
+/// @tparam Derived The derived measurement proxy class
+/// @tparam FullSize The full size of the measurement
+/// @tparam ReadOnly Whether the proxy is read-only
+template <typename Derived, std::size_t FullSize, bool ReadOnly>
+class MeasurementProxyBase {
+ public:
+  using Index = MeasurementContainer::Index;
+  using SubspaceIndex = std::uint8_t;
+  using Scalar = double;
+
+  using FullVector = Acts::ActsVector<FullSize>;
+  using FullSquareMatrix = Acts::ActsSquareMatrix<FullSize>;
+
+  using Container = std::conditional_t<ReadOnly, const MeasurementContainer,
+                                       MeasurementContainer>;
+
+  MeasurementProxyBase(Container& container_, Index index_)
+      : m_container(&container_), m_index(index_) {}
+  template <typename OtherDerived, bool OtherReadOnly>
+  explicit MeasurementProxyBase(
+      const MeasurementProxyBase<OtherDerived, FullSize, OtherReadOnly>& other)
+    requires(ReadOnly == OtherReadOnly || ReadOnly)
+      : m_container(&other.container()), m_index(other.index()) {}
+
+  /// @brief Get the container of the measurement
+  /// @return The container of the measurement
+  Container& container() const { return *m_container; }
+  /// @brief Get the index of the measurement
+  /// @return The index of the measurement
+  Index index() const { return m_index; }
+
+  /// @brief Get the size of the measurement
+  /// @return The size of the measurement
+  std::size_t size() const { return container().m_entries.at(m_index).size; }
+
+  /// @brief Check if the measurement contains a subspace index
+  /// @param i The subspace index
+  /// @return True if the measurement contains the subspace index
+  template <typename indices_t>
+  bool contains(indices_t i) const {
+    return self().subspaceHelper().contains(i);
+  }
 
-  using ProjectionMatrix = Eigen::Matrix<Scalar, Eigen::Dynamic, kFullSize>;
-  using ExpansionMatrix = Eigen::Matrix<Scalar, kFullSize, Eigen::Dynamic>;
+  /// @brief Get the index of a subspace index in the measurement
+  /// @param i The subspace index
+  /// @return The index of the subspace index in the measurement
+  template <typename indices_t>
+  std::size_t indexOf(indices_t i) const {
+    return self().subspaceHelper().indexOf(i);
+  }
+
+  /// @brief Get the geometry ID of the measurement
+  /// @return The geometry ID
+  Acts::GeometryIdentifier geometryId() const {
+    return container().m_geometryIds.at(m_index);
+  }
+
+  /// @brief Set the subspace indices of the measurement
+  /// @param indices The subspace indices
+  template <typename IndexContainer>
+  void setSubspaceIndices(const IndexContainer& indices)
+    requires(!ReadOnly)
+  {
+    assert(Acts::checkSubspaceIndices(indices, FullSize, size()) &&
+           "Invalid indices");
+    std::transform(indices.begin(), indices.end(),
+                   self().subspaceIndexVector().begin(),
+                   [](auto index) { return static_cast<Index>(index); });
+  }
+
+  /// @brief Get the measurement as a full-size vector
+  /// @return The full-size measurement vector
+  FullVector fullParameters() const {
+    return self().subspaceHelper().expandVector(self().parameters());
+  }
+
+  /// @brief Get the covariance as a full-size square matrix
+  /// @return The full-size covariance matrix
+  FullSquareMatrix fullCovariance() const {
+    return self().subspaceHelper().expandMatrix(self().covariance());
+  }
 
-  /// Construct from source link, subset indices, and measured data.
+  /// @brief Construct the measurement from a subspace vector,
+  /// parameters, and covariance.
   ///
-  /// @tparam parameters_t Input parameters vector type
-  /// @tparam covariance_t Input covariance matrix type
-  /// @param source The link that connects to the underlying detector readout
-  /// @param indices Which parameters are measured
-  /// @param params Measured parameters values
-  /// @param cov Measured parameters covariance
+  template <typename Subspace, typename ParameterDerived,
+            typename CovarianceDerived>
+  void fill(Subspace&& subspace,
+            const Eigen::DenseBase<ParameterDerived>& parameters,
+            const Eigen::DenseBase<CovarianceDerived>& covariance)
+    requires(!ReadOnly)
+  {
+    self().setSubspaceIndices(std::forward<Subspace>(subspace));
+    self().parameters() = parameters;
+    self().covariance() = covariance;
+  }
+
+  /// @brief Construct the measurement from a subspace vector,
+  /// parameters, and covariance.
   ///
-  /// @note The indices must be ordered and must describe/match the content
-  ///   of parameters and covariance.
-  template <std::size_t kSize, typename parameters_t, typename covariance_t>
-  VariableSizeMeasurement(Acts::SourceLink source,
-                          const std::array<indices_t, kSize>& indices,
-                          const Eigen::MatrixBase<parameters_t>& params,
-                          const Eigen::MatrixBase<covariance_t>& cov)
-      : m_source(std::move(source)), m_subspace(indices) {
-    static_assert(kSize == parameters_t::RowsAtCompileTime,
-                  "Parameter size mismatch");
-    static_assert(kSize == covariance_t::RowsAtCompileTime,
-                  "Covariance rows mismatch");
-    static_assert(kSize == covariance_t::ColsAtCompileTime,
-                  "Covariance cols mismatch");
-
-    parameters<kSize>() = params;
-    covariance<kSize>() = cov;
-  }
-  /// A measurement can only be constructed with valid parameters.
-  VariableSizeMeasurement() = delete;
-  VariableSizeMeasurement(const VariableSizeMeasurement&) = default;
-  VariableSizeMeasurement(VariableSizeMeasurement&&) = default;
-  ~VariableSizeMeasurement() = default;
-  VariableSizeMeasurement& operator=(const VariableSizeMeasurement&) = default;
-  VariableSizeMeasurement& operator=(VariableSizeMeasurement&&) = default;
-
-  constexpr std::size_t size() const { return m_subspace.size(); }
-
-  /// Source link that connects to the underlying detector readout.
-  const Acts::SourceLink& sourceLink() const { return m_source; }
-
-  const Subspace& subspace() const { return m_subspace; }
-
-  /// Check if a specific parameter is part of this measurement.
-  bool contains(indices_t i) const { return m_subspace.contains(i); }
-
-  template <std::size_t dim>
-  ConstParametersVectorMap<dim> parameters() const {
-    return ConstParametersVectorMap<dim>{m_params.data()};
-  }
-  template <std::size_t dim>
-  ParametersVectorMap<dim> parameters() {
-    return ParametersVectorMap<dim>{m_params.data()};
-  }
-  ConstEffectiveParametersVectorMap effectiveParameters() const {
-    return ConstEffectiveParametersVectorMap{m_params.data(),
-                                             static_cast<Eigen::Index>(size())};
-  }
-  EffectiveParametersVectorMap effectiveParameters() {
-    return EffectiveParametersVectorMap{m_params.data(),
-                                        static_cast<Eigen::Index>(size())};
-  }
-
-  template <std::size_t dim>
-  ConstCovarianceMatrixMap<dim> covariance() const {
-    return ConstCovarianceMatrixMap<dim>{m_cov.data()};
-  }
-  template <std::size_t dim>
-  CovarianceMatrixMap<dim> covariance() {
-    return CovarianceMatrixMap<dim>{m_cov.data()};
-  }
-  ConstEffectiveCovarianceMatrixMap effectiveCovariance() const {
-    return ConstEffectiveCovarianceMatrixMap{m_cov.data(),
-                                             static_cast<Eigen::Index>(size()),
-                                             static_cast<Eigen::Index>(size())};
-  }
-  EffectiveCovarianceMatrixMap effectiveCovariance() {
-    return EffectiveCovarianceMatrixMap{m_cov.data(),
-                                        static_cast<Eigen::Index>(size()),
-                                        static_cast<Eigen::Index>(size())};
-  }
-
-  FullParametersVector fullParameters() const {
-    FullParametersVector result = FullParametersVector::Zero();
-    for (std::size_t i = 0; i < size(); ++i) {
-      result[m_subspace[i]] = effectiveParameters()[i];
-    }
-    return result;
+  template <MeasurementConcept OtherDerived>
+  void fill(const OtherDerived& other)
+    requires(!ReadOnly)
+  {
+    assert(size() == other.size() && "Size mismatch");
+    fill(other.subspaceIndexVector(), other.parameters(), other.covariance());
   }
 
-  FullCovarianceMatrix fullCovariance() const {
-    FullCovarianceMatrix result = FullCovarianceMatrix::Zero();
-    for (std::size_t i = 0; i < size(); ++i) {
-      for (std::size_t j = 0; j < size(); ++j) {
-        result(m_subspace[i], m_subspace[j]) = effectiveCovariance()(i, j);
-      }
+  /// @brief Copy the data from another measurement
+  /// @tparam OtherDerived The derived measurement proxy class of the other
+  ///         measurement
+  /// @param other The other measurement proxy
+  template <typename OtherDerived>
+  void copyFrom(const OtherDerived& other)
+    requires(!ReadOnly) && requires {
+      { this->fill(other) };
     }
-    return result;
+  {
+    fill(other);
   }
 
- private:
-  Acts::SourceLink m_source;
-  Subspace m_subspace;
-  std::array<Scalar, kFullSize> m_params{};
-  std::array<Scalar, kFullSize * kFullSize> m_cov{};
+ protected:
+  Derived& self() { return static_cast<Derived&>(*this); }
+  const Derived& self() const { return static_cast<const Derived&>(*this); }
+
+  Container* m_container;
+  Index m_index;
 };
 
-/// Construct a variable-size measurement for the given indices.
+/// @brief Fixed-size measurement proxy
 ///
-/// @tparam parameters_t Input parameters vector type
-/// @tparam covariance_t Input covariance matrix type
-/// @tparam indices_t Parameter index type, determines the full parameter space
-/// @tparam tail_indices_t Helper types required to support variadic arguments;
-///   all types must be convertibale to `indices_t`.
-/// @param source The link that connects to the underlying detector readout
-/// @param params Measured parameters values
-/// @param cov Measured parameters covariance
-/// @param index0 Required parameter index, measurement must be at least 1d
-/// @param tailIndices Additional parameter indices for larger measurements
-/// @return Variable-size measurement w/ the correct type and given inputs
+/// This class provides access to a fixed-size measurement in a measurement
+/// container.
 ///
-/// @note The indices must be ordered and must be consistent with the content of
-/// parameters and covariance.
-template <typename parameters_t, typename covariance_t, typename indices_t,
-          typename... tail_indices_t>
-VariableSizeMeasurement<indices_t> makeVariableSizeMeasurement(
-    Acts::SourceLink source, const Eigen::MatrixBase<parameters_t>& params,
-    const Eigen::MatrixBase<covariance_t>& cov, indices_t index0,
-    tail_indices_t... tailIndices) {
-  using IndexContainer = std::array<indices_t, 1u + sizeof...(tail_indices_t)>;
-  return {std::move(source), IndexContainer{index0, tailIndices...}, params,
-          cov};
-}
+/// @tparam FullSize The full size of the measurement
+/// @tparam Size The size of the measurement
+/// @tparam ReadOnly Whether the proxy is read-only
+template <std::size_t FullSize, std::size_t Size, bool ReadOnly>
+class FixedMeasurementProxy
+    : public MeasurementProxyBase<
+          FixedMeasurementProxy<FullSize, Size, ReadOnly>, FullSize, ReadOnly> {
+ public:
+  using Base =
+      MeasurementProxyBase<FixedMeasurementProxy<FullSize, Size, ReadOnly>,
+                           FullSize, ReadOnly>;
+  using Index = typename Base::Index;
+  using SubspaceIndex = typename Base::SubspaceIndex;
+  using Scalar = typename Base::Scalar;
+  using Container = typename Base::Container;
+
+  using SubspaceHelper = Acts::FixedSubspaceHelper<FullSize, Size>;
+
+  using SubspaceVector = Eigen::Matrix<SubspaceIndex, Size, 1>;
+  using SubspaceVectorMap =
+      std::conditional_t<ReadOnly, Eigen::Map<const SubspaceVector>,
+                         Eigen::Map<SubspaceVector>>;
+
+  using ParametersVector = Eigen::Matrix<Scalar, Size, 1>;
+  using ParametersVectorMap =
+      std::conditional_t<ReadOnly, Eigen::Map<const ParametersVector>,
+                         Eigen::Map<ParametersVector>>;
+
+  using CovarianceMatrix = Eigen::Matrix<Scalar, Size, Size>;
+  using CovarianceMatrixMap =
+      std::conditional_t<ReadOnly, Eigen::Map<const CovarianceMatrix>,
+                         Eigen::Map<CovarianceMatrix>>;
+
+  FixedMeasurementProxy(Container& container_, Index index_)
+      : Base(container_, index_) {
+    assert(container().m_entries.at(index()).size == Size && "Size mismatch");
+  }
+  template <typename OtherDerived, bool OtherReadOnly>
+  explicit FixedMeasurementProxy(
+      const MeasurementProxyBase<OtherDerived, FullSize, OtherReadOnly>& other)
+    requires(ReadOnly == OtherReadOnly || ReadOnly)
+      : Base(other) {
+    assert(container().m_entries.at(index()).size == Size && "Size mismatch");
+  }
+
+  using Base::container;
+  using Base::index;
+
+  /// @brief Get the size of the measurement
+  /// @return The size of the measurement
+  static constexpr std::size_t size() { return Size; }
 
-/// Type that can hold all possible bound measurements.
-using BoundVariableMeasurement = VariableSizeMeasurement<Acts::BoundIndices>;
+  /// @brief Get the subspace helper for the measurement
+  /// @return The subspace helper
+  SubspaceHelper subspaceHelper() const {
+    return SubspaceHelper{subspaceIndexVector()};
+  }
+
+  /// @brief Get the subspace indices of the measurement
+  /// @return The subspace indices
+  Acts::SubspaceIndices<Size> subspaceIndices() const {
+    return subspaceHelper().indices();
+  }
+
+  /// @brief Get the subspace index vector of the measurement
+  /// @return The subspace index vector
+  SubspaceVectorMap subspaceIndexVector() const {
+    return SubspaceVectorMap{
+        container().m_subspaceIndices.data() +
+        container().m_entries.at(index()).subspaceIndexOffset};
+  }
+
+  /// @brief Get the parameters of the measurement
+  /// @return The parameters
+  ParametersVectorMap parameters() const {
+    return ParametersVectorMap{
+        container().m_parameters.data() +
+        container().m_entries.at(index()).parameterOffset};
+  }
 
-/// Variable measurement type that can contain all possible combinations.
-using Measurement = BoundVariableMeasurement;
+  /// @brief Get the covariance of the measurement
+  /// @return The covariance
+  CovarianceMatrixMap covariance() const {
+    return CovarianceMatrixMap{
+        container().m_covariances.data() +
+        container().m_entries.at(index()).covarianceOffset};
+  }
+};
 
-/// Container of measurements.
+/// @brief Variable-size measurement proxy
 ///
-/// In contrast to the source links, the measurements themself must not be
-/// orderable. The source links stored in the measurements are treated
-/// as opaque here and no ordering is enforced on the stored measurements.
-using MeasurementContainer = std::vector<Measurement>;
+/// This class provides access to a variable-size measurement in a measurement
+/// container.
+///
+/// @tparam FullSize The full size of the measurement
+/// @tparam ReadOnly Whether the proxy is read-only
+template <std::size_t FullSize, bool ReadOnly>
+class VariableMeasurementProxy
+    : public MeasurementProxyBase<VariableMeasurementProxy<FullSize, ReadOnly>,
+                                  FullSize, ReadOnly> {
+ public:
+  using Base =
+      MeasurementProxyBase<VariableMeasurementProxy<FullSize, ReadOnly>,
+                           FullSize, ReadOnly>;
+  using Index = typename Base::Index;
+  using SubspaceIndex = typename Base::SubspaceIndex;
+  using Scalar = typename Base::Scalar;
+  using Container = typename Base::Container;
+
+  using SubspaceHelper = Acts::VariableSubspaceHelper<FullSize>;
+
+  using SubspaceVector = Eigen::Matrix<SubspaceIndex, Eigen::Dynamic, 1>;
+  using SubspaceVectorMap =
+      std::conditional_t<ReadOnly, Eigen::Map<const SubspaceVector>,
+                         Eigen::Map<SubspaceVector>>;
+
+  using ParametersVector = Eigen::Matrix<Scalar, Eigen::Dynamic, 1>;
+  using ParametersVectorMap =
+      std::conditional_t<ReadOnly, Eigen::Map<const ParametersVector>,
+                         Eigen::Map<ParametersVector>>;
+
+  using CovarianceMatrix =
+      Eigen::Matrix<Scalar, Eigen::Dynamic, Eigen::Dynamic>;
+  using CovarianceMatrixMap =
+      std::conditional_t<ReadOnly, Eigen::Map<const CovarianceMatrix>,
+                         Eigen::Map<CovarianceMatrix>>;
+
+  VariableMeasurementProxy(Container& container_, Index index_)
+      : Base(container_, index_) {}
+  template <typename OtherDerived, bool OtherReadOnly>
+  explicit VariableMeasurementProxy(
+      const MeasurementProxyBase<OtherDerived, FullSize, OtherReadOnly>& other)
+    requires(ReadOnly == OtherReadOnly || ReadOnly)
+      : Base(other) {}
+
+  using Base::container;
+  using Base::index;
+
+  /// @brief Get the subspace helper for the measurement
+  /// @return The subspace helper
+  SubspaceHelper subspaceHelper() const {
+    return SubspaceHelper{subspaceIndexVector()};
+  }
+
+  /// @brief Get the subspace indices of the measurement
+  /// @return The subspace indices
+  SubspaceVectorMap subspaceIndexVector() const {
+    const auto size = static_cast<Eigen::Index>(this->size());
+    return SubspaceVectorMap{
+        container().m_subspaceIndices.data() +
+            container().m_entries.at(index()).subspaceIndexOffset,
+        size};
+  }
+
+  /// @brief Get the parameters of the measurement
+  /// @return The parameters
+  ParametersVectorMap parameters() const {
+    const auto size = static_cast<Eigen::Index>(this->size());
+    return ParametersVectorMap{
+        container().m_parameters.data() +
+            container().m_entries.at(index()).parameterOffset,
+        size};
+  }
+
+  /// @brief Get the covariance of the measurement
+  /// @return The covariance
+  CovarianceMatrixMap covariance() const {
+    const auto size = static_cast<Eigen::Index>(this->size());
+    return CovarianceMatrixMap{
+        container().m_covariances.data() +
+            container().m_entries.at(index()).covarianceOffset,
+        size, size};
+  }
+};
+
+template <typename... Args>
+MeasurementContainer::VariableProxy MeasurementContainer::emplaceMeasurement(
+    std::uint8_t size, Acts::GeometryIdentifier geometryId, Args&&... args) {
+  VariableProxy meas = makeMeasurement(size, geometryId);
+
+  meas.fill(std::forward<Args>(args)...);
+
+  return meas;
+}
+
+template <std::size_t Size, typename... Args>
+MeasurementContainer::FixedProxy<Size> MeasurementContainer::emplaceMeasurement(
+    Acts::GeometryIdentifier geometryId, Args&&... args) {
+  FixedProxy<Size> meas = makeMeasurement<Size>(geometryId);
+
+  meas.fill(std::forward<Args>(args)...);
+
+  return meas;
+}
+
+static_assert(
+    std::random_access_iterator<MeasurementContainer::iterator> &&
+    std::random_access_iterator<MeasurementContainer::const_iterator>);
 
 }  // namespace ActsExamples
diff --git a/Examples/Framework/include/ActsExamples/EventData/MeasurementCalibration.hpp b/Examples/Framework/include/ActsExamples/EventData/MeasurementCalibration.hpp
index 576b09f9ad5..f0b61363fba 100644
--- a/Examples/Framework/include/ActsExamples/EventData/MeasurementCalibration.hpp
+++ b/Examples/Framework/include/ActsExamples/EventData/MeasurementCalibration.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2023 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
@@ -14,7 +14,6 @@
 #include "Acts/Geometry/GeometryContext.hpp"
 #include "Acts/Utilities/CalibrationContext.hpp"
 #include "ActsExamples/EventData/Cluster.hpp"
-#include "ActsExamples/EventData/IndexSourceLink.hpp"
 #include <ActsExamples/EventData/Measurement.hpp>
 
 #include <cassert>
diff --git a/Examples/Framework/include/ActsExamples/EventData/MeasurementConcept.hpp b/Examples/Framework/include/ActsExamples/EventData/MeasurementConcept.hpp
new file mode 100644
index 00000000000..14627a78c53
--- /dev/null
+++ b/Examples/Framework/include/ActsExamples/EventData/MeasurementConcept.hpp
@@ -0,0 +1,26 @@
+// This file is part of the ACTS project.
+//
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
+//
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
+
+#pragma once
+
+#include "Acts/EventData/SourceLink.hpp"
+#include "Acts/Geometry/GeometryIdentifier.hpp"
+
+#include <concepts>
+
+namespace ActsExamples {
+
+template <typename T>
+concept MeasurementConcept = requires(const T& m) {
+  { m.size() } -> std::integral;
+  { m.geometryId() } -> std::same_as<Acts::GeometryIdentifier>;
+  { m.subspaceIndexVector() };
+  { m.parameters() };
+  { m.covariance() };
+};
+}  // namespace ActsExamples
diff --git a/Examples/Framework/include/ActsExamples/EventData/MuonSimHit.hpp b/Examples/Framework/include/ActsExamples/EventData/MuonSimHit.hpp
index 9a3144eeb4e..09bba217b03 100644
--- a/Examples/Framework/include/ActsExamples/EventData/MuonSimHit.hpp
+++ b/Examples/Framework/include/ActsExamples/EventData/MuonSimHit.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2023 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
diff --git a/Examples/Framework/include/ActsExamples/EventData/PropagationSummary.hpp b/Examples/Framework/include/ActsExamples/EventData/PropagationSummary.hpp
index e628d757cf9..aa9a736675f 100644
--- a/Examples/Framework/include/ActsExamples/EventData/PropagationSummary.hpp
+++ b/Examples/Framework/include/ActsExamples/EventData/PropagationSummary.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2024 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
diff --git a/Examples/Framework/include/ActsExamples/EventData/ProtoTrack.hpp b/Examples/Framework/include/ActsExamples/EventData/ProtoTrack.hpp
index fcc8c231c06..e091c5e863b 100644
--- a/Examples/Framework/include/ActsExamples/EventData/ProtoTrack.hpp
+++ b/Examples/Framework/include/ActsExamples/EventData/ProtoTrack.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2019-2020 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
diff --git a/Examples/Framework/include/ActsExamples/EventData/ProtoVertex.hpp b/Examples/Framework/include/ActsExamples/EventData/ProtoVertex.hpp
index e0fb02ecb86..6eb8a0214ea 100644
--- a/Examples/Framework/include/ActsExamples/EventData/ProtoVertex.hpp
+++ b/Examples/Framework/include/ActsExamples/EventData/ProtoVertex.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2020 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
diff --git a/Examples/Framework/include/ActsExamples/EventData/ScalingCalibrator.hpp b/Examples/Framework/include/ActsExamples/EventData/ScalingCalibrator.hpp
index 2ab114d9181..a91b6d840cb 100644
--- a/Examples/Framework/include/ActsExamples/EventData/ScalingCalibrator.hpp
+++ b/Examples/Framework/include/ActsExamples/EventData/ScalingCalibrator.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2023 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
@@ -47,7 +47,7 @@ class ScalingCalibrator : public MeasurementCalibrator {
     }
   };
 
-  ScalingCalibrator(const std::filesystem::path& path);
+  explicit ScalingCalibrator(const std::filesystem::path& path);
 
   void calibrate(
       const MeasurementContainer& measurements,
diff --git a/Examples/Framework/include/ActsExamples/EventData/SimHit.hpp b/Examples/Framework/include/ActsExamples/EventData/SimHit.hpp
index 08a0a956616..be10ce2639c 100644
--- a/Examples/Framework/include/ActsExamples/EventData/SimHit.hpp
+++ b/Examples/Framework/include/ActsExamples/EventData/SimHit.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2017 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
diff --git a/Examples/Framework/include/ActsExamples/EventData/SimParticle.hpp b/Examples/Framework/include/ActsExamples/EventData/SimParticle.hpp
index 2eda0b4edd1..cfcf8a5e25e 100644
--- a/Examples/Framework/include/ActsExamples/EventData/SimParticle.hpp
+++ b/Examples/Framework/include/ActsExamples/EventData/SimParticle.hpp
@@ -1,56 +1,230 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2018 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
 #include "ActsExamples/Utilities/GroupBy.hpp"
 #include "ActsFatras/EventData/Particle.hpp"
+#include "ActsFatras/EventData/ParticleOutcome.hpp"
 
 #include <boost/container/flat_set.hpp>
 
 namespace ActsExamples {
+
+using SimBarcode = ::ActsFatras::Barcode;
+using SimBarcodeContainer = ::boost::container::flat_set<SimBarcode>;
+
+using SimParticleState = ::ActsFatras::Particle;
+
+class SimParticle final {
+ public:
+  using Scalar = Acts::ActsScalar;
+  using Vector3 = Acts::ActsVector<3>;
+  using Vector4 = Acts::ActsVector<4>;
+
+  /// Construct a default particle with invalid identity.
+  SimParticle() = default;
+
+  /// Construct a particle at rest with explicit mass and charge.
+  ///
+  /// @param particleId Particle identifier within an event
+  /// @param pdg PDG id
+  /// @param charge Particle charge in native units
+  /// @param mass Particle mass in native units
+  ///
+  /// @warning It is the users responsibility that charge and mass match
+  ///          the PDG particle number.
+  SimParticle(SimBarcode particleId, Acts::PdgParticle pdg, Scalar charge,
+              Scalar mass)
+      : m_initial(particleId, pdg, charge, mass),
+        m_final(particleId, pdg, charge, mass) {}
+
+  /// Construct a particle at rest from a PDG particle number.
+  ///
+  /// @param particleId Particle identifier within an event
+  /// @param pdg PDG particle number
+  ///
+  /// Charge and mass are retrieved from the particle data table.
+  SimParticle(SimBarcode particleId, Acts::PdgParticle pdg)
+      : m_initial(particleId, pdg), m_final(particleId, pdg) {}
+
+  SimParticle(const SimParticleState& initial, const SimParticleState& final)
+      : m_initial(initial), m_final(final) {
+    if (m_initial.particleId() != m_final.particleId()) {
+      throw std::invalid_argument("Particle id mismatch");
+    }
+  }
+
+  const SimParticleState& initial() const { return m_initial; }
+  const SimParticleState& final() const { return m_final; }
+
+  SimParticleState& initial() { return m_initial; }
+  SimParticleState& final() { return m_final; }
+
+  /// Construct a new particle with a new identifier but same kinematics.
+  ///
+  /// @note This is intentionally not a regular setter. The particle id
+  ///       is used to identify the whole particle. Setting it on an existing
+  ///       particle is usually a mistake.
+  SimParticle withParticleId(SimBarcode particleId) const {
+    return SimParticle(initial().withParticleId(particleId),
+                       final().withParticleId(particleId));
+  }
+
+  /// Set the process type that generated this particle.
+  SimParticle& setProcess(ActsFatras::ProcessType proc) {
+    initial().setProcess(proc);
+    final().setProcess(proc);
+    return *this;
+  }
+  /// Set the pdg.
+  SimParticle& setPdg(Acts::PdgParticle pdg) {
+    initial().setPdg(pdg);
+    final().setPdg(pdg);
+    return *this;
+  }
+  /// Set the charge.
+  SimParticle& setCharge(Scalar charge) {
+    initial().setCharge(charge);
+    final().setCharge(charge);
+    return *this;
+  }
+  /// Set the mass.
+  SimParticle& setMass(Scalar mass) {
+    initial().setMass(mass);
+    final().setMass(mass);
+    return *this;
+  }
+  /// Set the particle ID.
+  SimParticle& setParticleId(SimBarcode barcode) {
+    initial().setParticleId(barcode);
+    final().setParticleId(barcode);
+    return *this;
+  }
+
+  /// Particle identifier within an event.
+  SimBarcode particleId() const { return initial().particleId(); }
+  /// Which type of process generated this particle.
+  ActsFatras::ProcessType process() const { return initial().process(); }
+  /// PDG particle number that identifies the type.
+  Acts::PdgParticle pdg() const { return initial().pdg(); }
+  /// Absolute PDG particle number that identifies the type.
+  Acts::PdgParticle absolutePdg() const { return initial().absolutePdg(); }
+  /// Particle charge.
+  double charge() const { return initial().charge(); }
+  /// Particle absolute charge.
+  double absoluteCharge() const { return initial().absoluteCharge(); }
+  /// Particle mass.
+  double mass() const { return initial().mass(); }
+
+  /// Check if this is a secondary particle.
+  bool isSecondary() const { return initial().isSecondary(); }
+
+  /// Particle hypothesis.
+  Acts::ParticleHypothesis hypothesis() const { return initial().hypothesis(); }
+  /// Particl qOverP.
+  double qOverP() const { return initial().qOverP(); }
+
+  /// Space-time position four-vector.
+  const Acts::Vector4& fourPosition() const { return initial().fourPosition(); }
+  /// Three-position, i.e. spatial coordinates without the time.
+  auto position() const { return initial().position(); }
+  /// Time coordinate.
+  double time() const { return initial().time(); }
+  /// Energy-momentum four-vector.
+  Acts::Vector4 fourMomentum() const { return initial().fourMomentum(); }
+  /// Unit three-direction, i.e. the normalized momentum three-vector.
+  const Acts::Vector3& direction() const { return initial().direction(); }
+  /// Polar angle.
+  double theta() const { return initial().theta(); }
+  /// Azimuthal angle.
+  double phi() const { return initial().phi(); }
+  /// Absolute momentum in the x-y plane.
+  double transverseMomentum() const { return initial().transverseMomentum(); }
+  /// Absolute momentum.
+  double absoluteMomentum() const { return initial().absoluteMomentum(); }
+  /// Absolute momentum.
+  Acts::Vector3 momentum() const { return initial().momentum(); }
+  /// Total energy, i.e. norm of the four-momentum.
+  double energy() const { return initial().energy(); }
+
+  /// Energy loss over the particles lifetime or simulation time.
+  double energyLoss() const { return initial().energy() - final().energy(); }
+
+  /// Accumulated path within material measured in radiation lengths.
+  double pathInX0() const { return final().pathInX0(); }
+  /// Accumulated path within material measured in interaction lengths.
+  double pathInL0() const { return final().pathInL0(); }
+
+  /// Number of hits.
+  std::uint32_t numberOfHits() const { return final().numberOfHits(); }
+
+  /// Particle outcome.
+  ActsFatras::ParticleOutcome outcome() const { return final().outcome(); }
+
+ private:
+  SimParticleState m_initial;
+  SimParticleState m_final;
+};
+
+std::ostream& operator<<(std::ostream& os, const SimParticle& particle);
+
 namespace detail {
 struct CompareParticleId {
   using is_transparent = void;
-  constexpr bool operator()(const ActsFatras::Particle& lhs,
-                            const ActsFatras::Particle& rhs) const {
+  bool operator()(const SimParticleState& lhs,
+                  const SimParticleState& rhs) const {
     return lhs.particleId() < rhs.particleId();
   }
-  constexpr bool operator()(ActsFatras::Barcode lhs,
-                            const ActsFatras::Particle& rhs) const {
+  bool operator()(const SimParticle& lhs, const SimParticle& rhs) const {
+    return lhs.particleId() < rhs.particleId();
+  }
+  bool operator()(SimBarcode lhs, const SimParticleState& rhs) const {
     return lhs < rhs.particleId();
   }
-  constexpr bool operator()(const ActsFatras::Particle& lhs,
-                            ActsFatras::Barcode rhs) const {
+  bool operator()(SimBarcode lhs, const SimParticle& rhs) const {
+    return lhs < rhs.particleId();
+  }
+  bool operator()(const SimParticleState& lhs, SimBarcode rhs) const {
+    return lhs.particleId() < rhs;
+  }
+  bool operator()(const SimParticle& lhs, SimBarcode rhs) const {
     return lhs.particleId() < rhs;
   }
 };
 struct PrimaryVertexIdGetter {
-  constexpr ActsFatras::Barcode operator()(
-      const ActsFatras::Particle& particle) const {
-    return ActsFatras::Barcode(0u).setVertexPrimary(
+  SimBarcode operator()(const SimParticleState& particle) const {
+    return SimBarcode(0u).setVertexPrimary(
+        particle.particleId().vertexPrimary());
+  }
+  SimBarcode operator()(const SimParticle& particle) const {
+    return SimBarcode(0u).setVertexPrimary(
         particle.particleId().vertexPrimary());
   }
 };
 struct SecondaryVertexIdGetter {
-  constexpr ActsFatras::Barcode operator()(
-      const ActsFatras::Particle& particle) const {
-    return ActsFatras::Barcode(0u)
+  SimBarcode operator()(const SimParticleState& particle) const {
+    return SimBarcode(0u)
+        .setVertexPrimary(particle.particleId().vertexPrimary())
+        .setVertexSecondary(particle.particleId().vertexSecondary());
+  }
+  SimBarcode operator()(const SimParticle& particle) const {
+    return SimBarcode(0u)
         .setVertexPrimary(particle.particleId().vertexPrimary())
         .setVertexSecondary(particle.particleId().vertexSecondary());
   }
 };
 }  // namespace detail
 
-using SimBarcode = ::ActsFatras::Barcode;
-using SimParticle = ::ActsFatras::Particle;
+using SimParticleStateContainer =
+    ::boost::container::flat_set<SimParticleState, detail::CompareParticleId>;
+
 /// Store particles ordered by particle identifier.
-using SimBarcodeContainer = ::boost::container::flat_set<SimBarcode>;
 using SimParticleContainer =
     ::boost::container::flat_set<SimParticle, detail::CompareParticleId>;
 
diff --git a/Examples/Framework/include/ActsExamples/EventData/SimSeed.hpp b/Examples/Framework/include/ActsExamples/EventData/SimSeed.hpp
index 35ade9b231c..5c211673f2a 100644
--- a/Examples/Framework/include/ActsExamples/EventData/SimSeed.hpp
+++ b/Examples/Framework/include/ActsExamples/EventData/SimSeed.hpp
@@ -1,17 +1,16 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2021 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
-#include "Acts/Seeding/Seed.hpp"
+#include "Acts/EventData/Seed.hpp"
 #include "ActsExamples/EventData/SimSpacePoint.hpp"
 
-#include <map>
 #include <vector>
 
 namespace ActsExamples {
diff --git a/Examples/Framework/include/ActsExamples/EventData/SimSpacePoint.hpp b/Examples/Framework/include/ActsExamples/EventData/SimSpacePoint.hpp
index 42d75328552..0359913199f 100644
--- a/Examples/Framework/include/ActsExamples/EventData/SimSpacePoint.hpp
+++ b/Examples/Framework/include/ActsExamples/EventData/SimSpacePoint.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2020 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
diff --git a/Examples/Framework/include/ActsExamples/EventData/SimVertex.hpp b/Examples/Framework/include/ActsExamples/EventData/SimVertex.hpp
index 761c19ead93..0bdfbb4925c 100644
--- a/Examples/Framework/include/ActsExamples/EventData/SimVertex.hpp
+++ b/Examples/Framework/include/ActsExamples/EventData/SimVertex.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2018 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
@@ -21,8 +21,9 @@ class SimVertexBarcode {
   using Value = SimBarcode::Value;
 
   constexpr SimVertexBarcode() = default;
-  constexpr SimVertexBarcode(Value encoded) : m_id(SimBarcode(encoded)) {}
-  constexpr SimVertexBarcode(SimBarcode vertexId)
+  explicit constexpr SimVertexBarcode(Value encoded)
+      : m_id(SimBarcode(encoded)) {}
+  explicit constexpr SimVertexBarcode(SimBarcode vertexId)
       : m_id(vertexId.setParticle(0).setSubParticle(0)) {
     if (vertexId != vertexId.vertexId()) {
       throw std::invalid_argument("SimVertexBarcode: invalid vertexId");
@@ -63,19 +64,18 @@ class SimVertexBarcode {
   friend constexpr bool operator<(SimVertexBarcode lhs, SimVertexBarcode rhs) {
     return lhs.m_id < rhs.m_id;
   }
+
   friend constexpr bool operator==(SimVertexBarcode lhs, SimVertexBarcode rhs) {
     return lhs.m_id == rhs.m_id;
   }
-  friend constexpr bool operator!=(SimVertexBarcode lhs, SimVertexBarcode rhs) {
-    return lhs.m_id != rhs.m_id;
-  }
+
   friend inline std::ostream& operator<<(std::ostream& os,
                                          SimVertexBarcode idx) {
     return os << idx.m_id;
   }
 };
 
-/// A simultated vertex e.g. from a physics process.
+/// A simulated vertex e.g. from a physics process.
 struct SimVertex {
   using Scalar = Acts::ActsScalar;
   using Vector4 = Acts::ActsVector<4>;
diff --git a/Examples/Framework/include/ActsExamples/EventData/SpacePointContainer.hpp b/Examples/Framework/include/ActsExamples/EventData/SpacePointContainer.hpp
new file mode 100644
index 00000000000..dbf94345f0a
--- /dev/null
+++ b/Examples/Framework/include/ActsExamples/EventData/SpacePointContainer.hpp
@@ -0,0 +1,124 @@
+// This file is part of the ACTS project.
+//
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
+//
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
+
+#pragma once
+
+#include "Acts/EventData/SpacePointContainer.hpp"
+#include "Acts/Utilities/Holders.hpp"
+#include "ActsExamples/EventData/SimSpacePoint.hpp"
+
+#include <any>
+
+namespace ActsExamples {
+
+template <typename collection_t>
+class SpacePointContainer {
+ public:
+  using CollectionType = collection_t;
+  using ValueType = typename CollectionType::value_type;
+
+  friend Acts::SpacePointContainer<
+      ActsExamples::SpacePointContainer<collection_t>, Acts::detail::RefHolder>;
+
+  // default constructor is of no use. It cannot be used, so why bother?
+  SpacePointContainer() = delete;
+  // we never get the ownership. In both read-only and read-and-write mode
+  // the memory backend is independetly handled. This is only interfacing it to
+  // ACTS
+  SpacePointContainer(CollectionType&& container) = delete;
+  explicit SpacePointContainer(CollectionType& container)
+      : m_storage(container) {}
+  explicit SpacePointContainer(CollectionType* container)
+      : m_storage(container) {}
+
+  // No copy constructor or copy operation allowed
+  SpacePointContainer(const SpacePointContainer<collection_t>&) = delete;
+  SpacePointContainer<collection_t>& operator=(
+      const SpacePointContainer<collection_t>&) = delete;
+
+  // only move operation allowed
+  SpacePointContainer(SpacePointContainer<collection_t>&& other) noexcept
+      : m_storage(std::exchange(other.m_storage.ptr, nullptr)) {}
+  SpacePointContainer<collection_t>& operator=(
+      SpacePointContainer<collection_t>&& other) noexcept {
+    m_storage = std::exchange(other.m_storage.ptr, nullptr);
+    return *this;
+  }
+
+  ~SpacePointContainer() = default;
+
+ private:
+  std::size_t size_impl() const;
+
+  float x_impl(std::size_t idx) const;
+  float y_impl(std::size_t idx) const;
+  float z_impl(std::size_t idx) const;
+  float varianceR_impl(std::size_t idx) const;
+  float varianceZ_impl(std::size_t idx) const;
+
+  const ValueType& get_impl(std::size_t idx) const { return storage()[idx]; }
+
+  std::any component_impl(Acts::HashedString key, std::size_t /*n*/) const {
+    using namespace Acts::HashedStringLiteral;
+    switch (key) {
+      case "TopStripVector"_hash:
+      case "BottomStripVector"_hash:
+      case "StripCenterDistance"_hash:
+      case "TopStripCenterPosition"_hash:
+        return Acts::Vector3(0, 0, 0);
+      default:
+        throw std::runtime_error("no such component " + std::to_string(key));
+    }
+  }
+
+ private:
+  const CollectionType& storage() const;
+
+ private:
+  Acts::detail::RefHolder<CollectionType> m_storage;
+};
+
+template <typename collection_t>
+inline std::size_t SpacePointContainer<collection_t>::size_impl() const {
+  return storage().size();
+}
+
+template <typename collection_t>
+inline float SpacePointContainer<collection_t>::x_impl(std::size_t idx) const {
+  return storage()[idx]->x();
+}
+
+template <typename collection_t>
+inline float SpacePointContainer<collection_t>::y_impl(std::size_t idx) const {
+  return storage()[idx]->y();
+}
+
+template <typename collection_t>
+inline float SpacePointContainer<collection_t>::z_impl(std::size_t idx) const {
+  return storage()[idx]->z();
+}
+
+template <typename collection_t>
+inline float SpacePointContainer<collection_t>::varianceR_impl(
+    std::size_t idx) const {
+  return storage()[idx]->varianceR();
+}
+
+template <typename collection_t>
+inline float SpacePointContainer<collection_t>::varianceZ_impl(
+    std::size_t idx) const {
+  return storage()[idx]->varianceZ();
+}
+
+template <typename collection_t>
+const typename SpacePointContainer<collection_t>::CollectionType&
+SpacePointContainer<collection_t>::storage() const {
+  return *m_storage;
+}
+
+}  // namespace ActsExamples
diff --git a/Examples/Framework/include/ActsExamples/EventData/Track.hpp b/Examples/Framework/include/ActsExamples/EventData/Track.hpp
index f70c6cf66b8..aafb8533e49 100644
--- a/Examples/Framework/include/ActsExamples/EventData/Track.hpp
+++ b/Examples/Framework/include/ActsExamples/EventData/Track.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2019-2020 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
diff --git a/Examples/Framework/include/ActsExamples/EventData/Trajectories.hpp b/Examples/Framework/include/ActsExamples/EventData/Trajectories.hpp
index b77ab9fd060..b3423266eb9 100644
--- a/Examples/Framework/include/ActsExamples/EventData/Trajectories.hpp
+++ b/Examples/Framework/include/ActsExamples/EventData/Trajectories.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2019-2020 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
@@ -79,7 +79,7 @@ struct Trajectories final {
   /// @return Whether having fitted track parameters or not
   bool hasTrackParameters(
       Acts::MultiTrajectoryTraits::IndexType entryIndex) const {
-    return (0 < m_trackParameters.count(entryIndex));
+    return m_trackParameters.contains(entryIndex);
   }
 
   /// Access the fitted track parameters for the given index.
diff --git a/Examples/Framework/include/ActsExamples/EventData/TruthMatching.hpp b/Examples/Framework/include/ActsExamples/EventData/TruthMatching.hpp
index f83e254421f..7b135498d6f 100644
--- a/Examples/Framework/include/ActsExamples/EventData/TruthMatching.hpp
+++ b/Examples/Framework/include/ActsExamples/EventData/TruthMatching.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2024 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
diff --git a/Examples/Framework/include/ActsExamples/EventData/Vertex.hpp b/Examples/Framework/include/ActsExamples/EventData/Vertex.hpp
index f808aa392ad..62e1af074e2 100644
--- a/Examples/Framework/include/ActsExamples/EventData/Vertex.hpp
+++ b/Examples/Framework/include/ActsExamples/EventData/Vertex.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2024 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
diff --git a/Examples/Framework/include/ActsExamples/Framework/AlgorithmContext.hpp b/Examples/Framework/include/ActsExamples/Framework/AlgorithmContext.hpp
index 0cc81dc9409..c70eaea6539 100644
--- a/Examples/Framework/include/ActsExamples/Framework/AlgorithmContext.hpp
+++ b/Examples/Framework/include/ActsExamples/Framework/AlgorithmContext.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2017 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
@@ -13,8 +13,6 @@
 #include <Acts/MagneticField/MagneticFieldContext.hpp>
 #include <Acts/Utilities/CalibrationContext.hpp>
 
-#include <memory>
-
 namespace ActsExamples {
 
 class WhiteBoard;
diff --git a/Examples/Framework/include/ActsExamples/Framework/DataHandle.hpp b/Examples/Framework/include/ActsExamples/Framework/DataHandle.hpp
index 6e8edbf07fc..eebe8cae749 100644
--- a/Examples/Framework/include/ActsExamples/Framework/DataHandle.hpp
+++ b/Examples/Framework/include/ActsExamples/Framework/DataHandle.hpp
@@ -1,18 +1,16 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2023 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
-#include "Acts/Utilities/ThrowAssert.hpp"
 #include "ActsExamples/Framework/SequenceElement.hpp"
 #include "ActsExamples/Framework/WhiteBoard.hpp"
 
-#include <iostream>
 #include <stdexcept>
 #include <typeinfo>
 
@@ -54,14 +52,33 @@ class DataHandleBase {
   std::optional<std::string> m_key{};
 };
 
-template <typename T>
-class ReadDataHandle;
+class WriteDataHandleBase : public DataHandleBase {
+ protected:
+  WriteDataHandleBase(SequenceElement* parent, const std::string& name)
+      : DataHandleBase{parent, name} {}
+
+ public:
+  void initialize(const std::string& key);
+
+  bool isCompatible(const DataHandleBase& other) const final;
+};
+
+class ReadDataHandleBase : public DataHandleBase {
+ protected:
+  ReadDataHandleBase(SequenceElement* parent, const std::string& name)
+      : DataHandleBase{parent, name} {}
+
+ public:
+  void initialize(const std::string& key);
+
+  bool isCompatible(const DataHandleBase& other) const final;
+};
 
 template <typename T>
-class WriteDataHandle final : public DataHandleBase {
+class WriteDataHandle final : public WriteDataHandleBase {
  public:
   WriteDataHandle(SequenceElement* parent, const std::string& name)
-      : DataHandleBase{parent, name} {
+      : WriteDataHandleBase{parent, name} {
     m_parent->registerWriteHandle(*this);
   }
 
@@ -77,37 +94,17 @@ class WriteDataHandle final : public DataHandleBase {
     wb.add(m_key.value(), std::move(value));
   }
 
-  void initialize(const std::string& key) {
-    if (key.empty()) {
-      throw std::invalid_argument{"Write handle '" + fullName() +
-                                  "' cannot receive empty key"};
-    }
-    m_key = key;
-  }
-
-  bool isCompatible(const DataHandleBase& other) const override {
-    return dynamic_cast<const ReadDataHandle<T>*>(&other) != nullptr;
-  }
-
   const std::type_info& typeInfo() const override { return typeid(T); };
 };
 
 template <typename T>
-class ReadDataHandle final : public DataHandleBase {
+class ReadDataHandle final : public ReadDataHandleBase {
  public:
   ReadDataHandle(SequenceElement* parent, const std::string& name)
-      : DataHandleBase{parent, name} {
+      : ReadDataHandleBase{parent, name} {
     m_parent->registerReadHandle(*this);
   }
 
-  void initialize(const std::string& key) {
-    if (key.empty()) {
-      throw std::invalid_argument{"Read handle '" + fullName() +
-                                  "' cannot receive empty key"};
-    }
-    m_key = key;
-  }
-
   const T& operator()(const AlgorithmContext& ctx) const {
     return (*this)(ctx.eventStore);
   }
@@ -120,10 +117,6 @@ class ReadDataHandle final : public DataHandleBase {
     return wb.get<T>(m_key.value());
   }
 
-  bool isCompatible(const DataHandleBase& other) const override {
-    return dynamic_cast<const WriteDataHandle<T>*>(&other) != nullptr;
-  }
-
   const std::type_info& typeInfo() const override { return typeid(T); };
 };
 
diff --git a/Examples/Framework/include/ActsExamples/Framework/IAlgorithm.hpp b/Examples/Framework/include/ActsExamples/Framework/IAlgorithm.hpp
index 29b6d894bae..77fd2b41c98 100644
--- a/Examples/Framework/include/ActsExamples/Framework/IAlgorithm.hpp
+++ b/Examples/Framework/include/ActsExamples/Framework/IAlgorithm.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2017-2023 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
@@ -44,7 +44,7 @@ class IAlgorithm : public SequenceElement {
   /// @param context The algorithm context
   ProcessCode internalExecute(const AlgorithmContext& context) final {
     return execute(context);
-  };
+  }
 
   /// Initialize the algorithm
   ProcessCode initialize() override { return ProcessCode::SUCCESS; }
diff --git a/Examples/Framework/include/ActsExamples/Framework/IContextDecorator.hpp b/Examples/Framework/include/ActsExamples/Framework/IContextDecorator.hpp
index fbbd300a0c1..4c646348d0e 100644
--- a/Examples/Framework/include/ActsExamples/Framework/IContextDecorator.hpp
+++ b/Examples/Framework/include/ActsExamples/Framework/IContextDecorator.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2019 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
diff --git a/Examples/Framework/include/ActsExamples/Framework/IReader.hpp b/Examples/Framework/include/ActsExamples/Framework/IReader.hpp
index 51e056c24e3..fc5987b14b9 100644
--- a/Examples/Framework/include/ActsExamples/Framework/IReader.hpp
+++ b/Examples/Framework/include/ActsExamples/Framework/IReader.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2017-2018 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
diff --git a/Examples/Framework/include/ActsExamples/Framework/IWriter.hpp b/Examples/Framework/include/ActsExamples/Framework/IWriter.hpp
index 49a096da2e1..025730887c8 100644
--- a/Examples/Framework/include/ActsExamples/Framework/IWriter.hpp
+++ b/Examples/Framework/include/ActsExamples/Framework/IWriter.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2017 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
diff --git a/Examples/Framework/include/ActsExamples/Framework/ProcessCode.hpp b/Examples/Framework/include/ActsExamples/Framework/ProcessCode.hpp
index e309735ef84..014076904e8 100644
--- a/Examples/Framework/include/ActsExamples/Framework/ProcessCode.hpp
+++ b/Examples/Framework/include/ActsExamples/Framework/ProcessCode.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2017 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
diff --git a/Examples/Framework/include/ActsExamples/Framework/RandomNumbers.hpp b/Examples/Framework/include/ActsExamples/Framework/RandomNumbers.hpp
index 56bc8e20043..a94bac778f6 100644
--- a/Examples/Framework/include/ActsExamples/Framework/RandomNumbers.hpp
+++ b/Examples/Framework/include/ActsExamples/Framework/RandomNumbers.hpp
@@ -1,23 +1,13 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2017 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-//
-//  RandomNumbers.hpp
-//  ActsExamples
-//
-//  Created by Andreas Salzburger on 17/05/16.
-//
-//
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
-#include "ActsExamples/Framework/AlgorithmContext.hpp"
-
 #include <cstdint>
 #include <random>
 
@@ -27,6 +17,9 @@ struct AlgorithmContext;
 /// The random number generator used in the framework.
 using RandomEngine = std::mt19937;  ///< Mersenne Twister
 
+/// The seed type used in the framework.
+using RandomSeed = std::uint32_t;
+
 /// Provide event and algorithm specific random number generator.s
 ///
 /// This provides local random number generators, allowing for
@@ -41,10 +34,10 @@ using RandomEngine = std::mt19937;  ///< Mersenne Twister
 class RandomNumbers {
  public:
   struct Config {
-    std::uint64_t seed = 1234567890u;  ///< random seed
+    RandomSeed seed = 1234567890u;  ///< random seed
   };
 
-  RandomNumbers(const Config& cfg);
+  explicit RandomNumbers(const Config& cfg);
 
   /// Spawn an algorithm-local random number generator. To avoid inefficiencies
   /// and multiple uses of a given RNG seed, this should only be done once per
@@ -59,7 +52,7 @@ class RandomNumbers {
   ///
   /// This should only be used in special cases e.g. where a custom
   /// random engine is used and `spawnGenerator` can not be used.
-  std::uint64_t generateSeed(const AlgorithmContext& context) const;
+  RandomSeed generateSeed(const AlgorithmContext& context) const;
 
  private:
   Config m_cfg;
diff --git a/Examples/Framework/include/ActsExamples/Framework/SequenceElement.hpp b/Examples/Framework/include/ActsExamples/Framework/SequenceElement.hpp
index 3844cba840c..4db3b8d1af6 100644
--- a/Examples/Framework/include/ActsExamples/Framework/SequenceElement.hpp
+++ b/Examples/Framework/include/ActsExamples/Framework/SequenceElement.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2017 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
diff --git a/Examples/Framework/include/ActsExamples/Framework/Sequencer.hpp b/Examples/Framework/include/ActsExamples/Framework/Sequencer.hpp
index bb332145ae6..a8f2ad27950 100644
--- a/Examples/Framework/include/ActsExamples/Framework/Sequencer.hpp
+++ b/Examples/Framework/include/ActsExamples/Framework/Sequencer.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2017 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
@@ -22,7 +22,6 @@
 #include <optional>
 #include <stdexcept>
 #include <string>
-#include <typeinfo>
 #include <unordered_map>
 #include <utility>
 #include <vector>
@@ -82,9 +81,6 @@ class Sequencer {
     /// Callback that is invoked in the event loop.
     /// @warning This function can be called from multiple threads and should therefore be thread-safe
     IterationCallback iterationCallback = []() {};
-    /// Run data flow consistency checks
-    /// Defaults to false right now until all components are migrated
-    bool runDataFlowChecks = true;
 
     bool trackFpes = true;
     std::vector<FpeMask> fpeMasks{};
@@ -92,7 +88,7 @@ class Sequencer {
     std::size_t fpeStackTraceLength = 8;
   };
 
-  Sequencer(const Config &cfg);
+  explicit Sequencer(const Config &cfg);
 
   /// Add a context decorator to the set of context decorators.
   ///
diff --git a/Examples/Framework/include/ActsExamples/Framework/WhiteBoard.hpp b/Examples/Framework/include/ActsExamples/Framework/WhiteBoard.hpp
index d70d2c00260..777d27fe898 100644
--- a/Examples/Framework/include/ActsExamples/Framework/WhiteBoard.hpp
+++ b/Examples/Framework/include/ActsExamples/Framework/WhiteBoard.hpp
@@ -1,13 +1,14 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2017-2019 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
+#include <Acts/Utilities/Concepts.hpp>
 #include <Acts/Utilities/Logger.hpp>
 
 #include <algorithm>
@@ -71,13 +72,11 @@ class WhiteBoard {
     virtual ~IHolder() = default;
     virtual const std::type_info& type() const = 0;
   };
-  template <typename T,
-            typename =
-                std::enable_if_t<std::is_nothrow_move_constructible<T>::value>>
+  template <Acts::Concepts::nothrow_move_constructible T>
   struct HolderT : public IHolder {
     T value;
 
-    HolderT(T&& v) : value(std::move(v)) {}
+    explicit HolderT(T&& v) : value(std::move(v)) {}
     const std::type_info& type() const override { return typeid(T); }
   };
 
@@ -109,7 +108,7 @@ inline void ActsExamples::WhiteBoard::add(const std::string& name, T&& object) {
   if (name.empty()) {
     throw std::invalid_argument("Object can not have an empty name");
   }
-  if (0 < m_store.count(name)) {
+  if (m_store.contains(name)) {
     throw std::invalid_argument("Object '" + name + "' already exists");
   }
   auto holder = std::make_shared<HolderT<T>>(std::forward<T>(object));
@@ -155,5 +154,6 @@ inline const T& ActsExamples::WhiteBoard::get(const std::string& name) const {
 }
 
 inline bool ActsExamples::WhiteBoard::exists(const std::string& name) const {
-  return m_store.find(name) != m_store.end();
+  // TODO remove this function?
+  return m_store.contains(name);
 }
diff --git a/Examples/Framework/include/ActsExamples/Framework/WriterT.hpp b/Examples/Framework/include/ActsExamples/Framework/WriterT.hpp
index 84b3bcbf571..5f150ca652d 100644
--- a/Examples/Framework/include/ActsExamples/Framework/WriterT.hpp
+++ b/Examples/Framework/include/ActsExamples/Framework/WriterT.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2017 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
diff --git a/Examples/Framework/include/ActsExamples/Utilities/EventDataTransforms.hpp b/Examples/Framework/include/ActsExamples/Utilities/EventDataTransforms.hpp
index dc0a8c4414a..fdbc7991ddc 100644
--- a/Examples/Framework/include/ActsExamples/Utilities/EventDataTransforms.hpp
+++ b/Examples/Framework/include/ActsExamples/Utilities/EventDataTransforms.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2020 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
diff --git a/Examples/Framework/include/ActsExamples/Utilities/GroupBy.hpp b/Examples/Framework/include/ActsExamples/Utilities/GroupBy.hpp
index ecaed376a3e..638c641ff6a 100644
--- a/Examples/Framework/include/ActsExamples/Utilities/GroupBy.hpp
+++ b/Examples/Framework/include/ActsExamples/Utilities/GroupBy.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2020 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
@@ -92,10 +92,6 @@ class GroupBy {
                                      const GroupEndIterator& rhs) {
       return lhs.m_groupBegin == rhs;
     }
-    friend constexpr bool operator!=(const GroupIterator& lhs,
-                                     const GroupEndIterator& rhs) {
-      return !(lhs == rhs);
-    }
   };
 
   /// Construct the group-by proxy for an iterator range.
@@ -119,7 +115,7 @@ class GroupBy {
   /// complexity in the group size. It does not assume any ordering of the
   /// underlying container and is a cache-friendly access pattern.
   constexpr Iterator findEndOfGroup(Iterator start) const {
-    // check for end so we can safely dereference the start iterator.
+    // check for end that we can safely dereference the start iterator.
     if (start == m_end) {
       return start;
     }
diff --git a/Examples/Framework/include/ActsExamples/Utilities/Helpers.hpp b/Examples/Framework/include/ActsExamples/Utilities/Helpers.hpp
index e57c650c365..81315d7d042 100644
--- a/Examples/Framework/include/ActsExamples/Utilities/Helpers.hpp
+++ b/Examples/Framework/include/ActsExamples/Utilities/Helpers.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2019-2023 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
diff --git a/Examples/Framework/include/ActsExamples/Utilities/Options.hpp b/Examples/Framework/include/ActsExamples/Utilities/Options.hpp
index c60c3cc1812..c82934bccf8 100644
--- a/Examples/Framework/include/ActsExamples/Utilities/Options.hpp
+++ b/Examples/Framework/include/ActsExamples/Utilities/Options.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2017-2020 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
diff --git a/Examples/Framework/include/ActsExamples/Utilities/OptionsFwd.hpp b/Examples/Framework/include/ActsExamples/Utilities/OptionsFwd.hpp
index 945400b2922..749dd086bfd 100644
--- a/Examples/Framework/include/ActsExamples/Utilities/OptionsFwd.hpp
+++ b/Examples/Framework/include/ActsExamples/Utilities/OptionsFwd.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2019 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
diff --git a/Examples/Framework/include/ActsExamples/Utilities/Paths.hpp b/Examples/Framework/include/ActsExamples/Utilities/Paths.hpp
index 782ca28a550..a2b6f372b73 100644
--- a/Examples/Framework/include/ActsExamples/Utilities/Paths.hpp
+++ b/Examples/Framework/include/ActsExamples/Utilities/Paths.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2017 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
diff --git a/Examples/Framework/include/ActsExamples/Utilities/Range.hpp b/Examples/Framework/include/ActsExamples/Utilities/Range.hpp
index 2ce5db9684e..5acc97f082b 100644
--- a/Examples/Framework/include/ActsExamples/Utilities/Range.hpp
+++ b/Examples/Framework/include/ActsExamples/Utilities/Range.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2019 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
diff --git a/Examples/Framework/include/ActsExamples/Utilities/tbbWrap.hpp b/Examples/Framework/include/ActsExamples/Utilities/tbbWrap.hpp
index 839545252c7..79969369221 100644
--- a/Examples/Framework/include/ActsExamples/Utilities/tbbWrap.hpp
+++ b/Examples/Framework/include/ActsExamples/Utilities/tbbWrap.hpp
@@ -1,27 +1,18 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2022 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
-// uncomment to remove all use of tbb library.
-// #define ACTS_EXAMPLES_NO_TBB
-
-#ifdef ACTS_EXAMPLES_NO_TBB
-#define ACTS_EXAMPLES_WITH_TBB(a)
-#include <stdexcept>
-#else
-#define ACTS_EXAMPLES_WITH_TBB(a) a
 #include <optional>
 
 #include <tbb/parallel_for.h>
 #include <tbb/queuing_mutex.h>
 #include <tbb/task_arena.h>
-#endif
 
 /// Wrapper for most of the tbb functions that we use in Sequencer.
 ///
@@ -30,34 +21,9 @@
 /// tbb::blocked_range (which doesn't require any thread setup) is still taken
 /// from the tbb library.
 ///
-/// However, if ACTS_EXAMPLES_NO_TBB is defined, then don't use tbb library at
-/// all (requires nthreads=1 or -1). This allows the ACTS Examples to be built
-/// without the tbb library (and reduces the dependency on ROOT).
-/// In this case, we provide our own minimal implementation of
-/// tbb::blocked_range.
-///
 /// Based on an idea from
 ///   https://stackoverflow.com/questions/59736661/how-to-completely-switch-off-threading-in-tbb-code
 
-#ifdef ACTS_EXAMPLES_NO_TBB
-namespace ActsExamples::tbb {
-namespace task_arena {
-constexpr int automatic = -1;
-}  // namespace task_arena
-
-template <typename Value>
-struct blocked_range {
-  blocked_range(Value begin_, Value end_) : my_end(end_), my_begin(begin_) {}
-  Value begin() const { return my_begin; }
-  Value end() const { return my_end; }
-
- private:
-  Value my_end;
-  Value my_begin;
-};
-}  // namespace ActsExamples::tbb
-#endif
-
 namespace ActsExamples::tbbWrap {
 /// enableTBB keeps a record of whether we are multi-threaded (nthreads!=1) or
 /// not. This is set once in task_arena and stored globally.
@@ -67,17 +33,10 @@ namespace ActsExamples::tbbWrap {
 static bool enableTBB(int nthreads = -99) {
   static bool setting = false;
   if (nthreads != -99) {
-#ifdef ACTS_EXAMPLES_NO_TBB
-    if (nthreads > 1) {
-      throw std::runtime_error(
-          "tbb is not available, so can't do multi-threading.");
-    }
-#else
     bool newSetting = (nthreads != 1);
     if (!setting && newSetting) {
       setting = newSetting;
     }
-#endif
   }
   return setting;
 }
@@ -87,28 +46,20 @@ static bool enableTBB(int nthreads = -99) {
 /// That should be fine because the task_arena is initialised before spawning
 /// any threads.
 class task_arena {
-#ifndef ACTS_EXAMPLES_NO_TBB
   std::optional<tbb::task_arena> tbb;
-#endif
 
  public:
-  task_arena(int nthreads = tbb::task_arena::automatic,
-             unsigned ACTS_EXAMPLES_WITH_TBB(res) = 1) {
+  task_arena(int nthreads = tbb::task_arena::automatic, unsigned res = 1) {
     if (enableTBB(nthreads)) {
-#ifndef ACTS_EXAMPLES_NO_TBB
       tbb.emplace(nthreads, res);
-#endif
     }
   }
 
   template <typename F>
   void execute(const F& f) {
-#ifndef ACTS_EXAMPLES_NO_TBB
     if (tbb) {
       tbb->execute(f);
-    } else
-#endif
-    {
+    } else {
       f();
     }
   }
@@ -119,12 +70,9 @@ class parallel_for {
  public:
   template <typename R, typename F>
   parallel_for(const R& r, const F& f) {
-#ifndef ACTS_EXAMPLES_NO_TBB
     if (enableTBB()) {
       tbb::parallel_for(r, f);
-    } else
-#endif
-    {
+    } else {
       for (auto i = r.begin(); i != r.end(); ++i) {  // use default grainsize=1
         f(R(i, i + 1));
       }
@@ -134,39 +82,29 @@ class parallel_for {
 
 /// Small wrapper for tbb::queuing_mutex and tbb::queuing_mutex::scoped_lock.
 class queuing_mutex {
-#ifndef ACTS_EXAMPLES_NO_TBB
   std::optional<tbb::queuing_mutex> tbb;
-#endif
 
  public:
   queuing_mutex() {
-#ifndef ACTS_EXAMPLES_NO_TBB
     if (enableTBB()) {
       tbb.emplace();
     }
-#endif
   }
 
   class scoped_lock {
-#ifndef ACTS_EXAMPLES_NO_TBB
     std::optional<tbb::queuing_mutex::scoped_lock> tbb;
-#endif
 
    public:
     scoped_lock() {
-#ifndef ACTS_EXAMPLES_NO_TBB
       if (enableTBB()) {
         tbb.emplace();
       }
-#endif
     }
 
-    scoped_lock(queuing_mutex& ACTS_EXAMPLES_WITH_TBB(m)) {
-#ifndef ACTS_EXAMPLES_NO_TBB
+    explicit scoped_lock(queuing_mutex& m) {
       if (enableTBB()) {
         tbb.emplace(*m.tbb);
       }
-#endif
     }
   };
 };
diff --git a/Examples/Framework/include/ActsExamples/Validation/DuplicationPlotTool.hpp b/Examples/Framework/include/ActsExamples/Validation/DuplicationPlotTool.hpp
index 4fade111a67..86b96539f3c 100644
--- a/Examples/Framework/include/ActsExamples/Validation/DuplicationPlotTool.hpp
+++ b/Examples/Framework/include/ActsExamples/Validation/DuplicationPlotTool.hpp
@@ -1,17 +1,17 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2019 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
 #include "Acts/EventData/TrackParameters.hpp"
 #include "Acts/Utilities/Logger.hpp"
+#include "ActsExamples/EventData/SimParticle.hpp"
 #include "ActsExamples/Utilities/Helpers.hpp"
-#include "ActsFatras/EventData/Particle.hpp"
 
 #include <cstddef>
 #include <map>
@@ -80,7 +80,7 @@ class DuplicationPlotTool {
   /// @param truthParticle the truth Particle
   /// @param nDuplicatedTracks the number of duplicated tracks
   void fill(DuplicationPlotCache& duplicationPlotCache,
-            const ActsFatras::Particle& truthParticle,
+            const SimParticleState& truthParticle,
             std::size_t nDuplicatedTracks) const;
 
   /// @brief write the duplication plots to file
diff --git a/Examples/Framework/include/ActsExamples/Validation/EffPlotTool.hpp b/Examples/Framework/include/ActsExamples/Validation/EffPlotTool.hpp
index 2399bb16023..d6fcd57bad3 100644
--- a/Examples/Framework/include/ActsExamples/Validation/EffPlotTool.hpp
+++ b/Examples/Framework/include/ActsExamples/Validation/EffPlotTool.hpp
@@ -1,16 +1,16 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2019 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
 #include "Acts/Utilities/Logger.hpp"
+#include "ActsExamples/EventData/SimParticle.hpp"
 #include "ActsExamples/Utilities/Helpers.hpp"
-#include "ActsFatras/EventData/Particle.hpp"
 
 #include <map>
 #include <memory>
@@ -34,6 +34,7 @@ class EffPlotTool {
         {"Eta", PlotHelpers::Binning("#eta", 40, -4, 4)},
         {"Phi", PlotHelpers::Binning("#phi", 100, -3.15, 3.15)},
         {"Pt", PlotHelpers::Binning("pT [GeV/c]", 40, 0, 100)},
+        {"Z0", PlotHelpers::Binning("z_0 [mm]", 50, -200, 200)},
         {"DeltaR", PlotHelpers::Binning("#Delta R", 100, 0, 0.3)}};
   };
 
@@ -42,6 +43,7 @@ class EffPlotTool {
     TEfficiency* trackEff_vs_pT{nullptr};   ///< Tracking efficiency vs pT
     TEfficiency* trackEff_vs_eta{nullptr};  ///< Tracking efficiency vs eta
     TEfficiency* trackEff_vs_phi{nullptr};  ///< Tracking efficiency vs phi
+    TEfficiency* trackEff_vs_z0{nullptr};   ///< Tracking efficiency vs z0
     TEfficiency* trackEff_vs_DeltaR{
         nullptr};  ///< Tracking efficiency vs distance to the closest truth
                    ///< particle
@@ -64,9 +66,8 @@ class EffPlotTool {
   /// @param truthParticle the truth Particle
   /// @param deltaR the distance to the closest truth particle
   /// @param status the reconstruction status
-  void fill(EffPlotCache& effPlotCache,
-            const ActsFatras::Particle& truthParticle, double deltaR,
-            bool status) const;
+  void fill(EffPlotCache& effPlotCache, const SimParticleState& truthParticle,
+            double deltaR, bool status) const;
 
   /// @brief write the efficiency plots to file
   ///
diff --git a/Examples/Framework/include/ActsExamples/Validation/FakeRatePlotTool.hpp b/Examples/Framework/include/ActsExamples/Validation/FakeRatePlotTool.hpp
index c84d7823539..988e9f2ec41 100644
--- a/Examples/Framework/include/ActsExamples/Validation/FakeRatePlotTool.hpp
+++ b/Examples/Framework/include/ActsExamples/Validation/FakeRatePlotTool.hpp
@@ -1,17 +1,17 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2019 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
 #include "Acts/EventData/TrackParameters.hpp"
 #include "Acts/Utilities/Logger.hpp"
+#include "ActsExamples/EventData/SimParticle.hpp"
 #include "ActsExamples/Utilities/Helpers.hpp"
-#include "ActsFatras/EventData/Particle.hpp"
 
 #include <cstddef>
 #include <map>
@@ -86,7 +86,7 @@ class FakeRatePlotTool {
   /// @param nTruthMatchedTracks the number of truth-Matched tracks
   /// @param nFakeTracks the number of fake tracks
   void fill(FakeRatePlotCache& fakeRatePlotCache,
-            const ActsFatras::Particle& truthParticle,
+            const SimParticleState& truthParticle,
             std::size_t nTruthMatchedTracks, std::size_t nFakeTracks) const;
 
   /// @brief write the fake rate plots to file
diff --git a/Examples/Framework/include/ActsExamples/Validation/ResPlotTool.hpp b/Examples/Framework/include/ActsExamples/Validation/ResPlotTool.hpp
index ce0aac548dd..1f1bb6ea85f 100644
--- a/Examples/Framework/include/ActsExamples/Validation/ResPlotTool.hpp
+++ b/Examples/Framework/include/ActsExamples/Validation/ResPlotTool.hpp
@@ -1,18 +1,18 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2019 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
 #include "Acts/EventData/TrackParameters.hpp"
 #include "Acts/Geometry/GeometryContext.hpp"
 #include "Acts/Utilities/Logger.hpp"
+#include "ActsExamples/EventData/SimParticle.hpp"
 #include "ActsExamples/Utilities/Helpers.hpp"
-#include "ActsFatras/EventData/Particle.hpp"
 
 #include <map>
 #include <memory>
@@ -100,7 +100,7 @@ class ResPlotTool {
   /// @param truthParticle the truth particle
   /// @param fittedParamters the fitted parameters at perigee surface
   void fill(ResPlotCache& resPlotCache, const Acts::GeometryContext& gctx,
-            const ActsFatras::Particle& truthParticle,
+            const SimParticleState& truthParticle,
             const Acts::BoundTrackParameters& fittedParamters) const;
 
   /// @brief extract the details of the residual/pull plots and fill details
diff --git a/Examples/Framework/include/ActsExamples/Validation/TrackClassification.hpp b/Examples/Framework/include/ActsExamples/Validation/TrackClassification.hpp
index 47c5bd61d30..aaea6705432 100644
--- a/Examples/Framework/include/ActsExamples/Validation/TrackClassification.hpp
+++ b/Examples/Framework/include/ActsExamples/Validation/TrackClassification.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2019-2020 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
diff --git a/Examples/Framework/include/ActsExamples/Validation/TrackSummaryPlotTool.hpp b/Examples/Framework/include/ActsExamples/Validation/TrackSummaryPlotTool.hpp
index f5b8894085f..d5ca6f26558 100644
--- a/Examples/Framework/include/ActsExamples/Validation/TrackSummaryPlotTool.hpp
+++ b/Examples/Framework/include/ActsExamples/Validation/TrackSummaryPlotTool.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2019 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
diff --git a/Examples/Framework/src/EventData/Measurement.cpp b/Examples/Framework/src/EventData/Measurement.cpp
new file mode 100644
index 00000000000..ab2dad07489
--- /dev/null
+++ b/Examples/Framework/src/EventData/Measurement.cpp
@@ -0,0 +1,99 @@
+// This file is part of the ACTS project.
+//
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
+//
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
+
+#include "ActsExamples/EventData/Measurement.hpp"
+
+#include "Acts/Geometry/GeometryIdentifier.hpp"
+#include "ActsExamples/EventData/IndexSourceLink.hpp"
+
+namespace ActsExamples {
+
+MeasurementContainer::MeasurementContainer() = default;
+
+std::size_t MeasurementContainer::size() const {
+  return m_entries.size();
+}
+
+void MeasurementContainer::reserve(std::size_t size) {
+  m_geometryIds.reserve(size);
+  m_subspaceIndices.reserve(size * 2);
+  m_parameters.reserve(size * 2);
+  m_covariances.reserve(size * 2 * 2);
+}
+
+std::size_t MeasurementContainer::addMeasurement(
+    std::uint8_t size, Acts::GeometryIdentifier geometryId) {
+  m_entries.push_back({m_subspaceIndices.size(), m_parameters.size(),
+                       m_covariances.size(), size});
+  m_geometryIds.emplace_back(geometryId);
+  m_subspaceIndices.resize(m_subspaceIndices.size() + size);
+  m_parameters.resize(m_parameters.size() + size);
+  m_covariances.resize(m_covariances.size() + size * size);
+
+  std::size_t index = m_entries.size() - 1;
+  IndexSourceLink sourceLink(geometryId, index);
+  m_orderedIndices.emplace_hint(m_orderedIndices.end(), sourceLink);
+
+  return index;
+}
+
+MeasurementContainer::VariableProxy MeasurementContainer::at(
+    std::size_t index) {
+  return VariableProxy{*this, index};
+}
+
+MeasurementContainer::ConstVariableProxy MeasurementContainer::at(
+    std::size_t index) const {
+  return ConstVariableProxy{*this, index};
+}
+
+MeasurementContainer::VariableProxy MeasurementContainer::getMeasurement(
+    std::size_t index) {
+  return VariableProxy{*this, index};
+}
+
+MeasurementContainer::ConstVariableProxy MeasurementContainer::getMeasurement(
+    std::size_t index) const {
+  return ConstVariableProxy{*this, index};
+}
+
+MeasurementContainer::VariableProxy MeasurementContainer::makeMeasurement(
+    std::uint8_t size, Acts::GeometryIdentifier geometryId) {
+  return getMeasurement(addMeasurement(size, geometryId));
+}
+
+const MeasurementContainer::OrderedIndices&
+MeasurementContainer::orderedIndices() const {
+  return m_orderedIndices;
+}
+
+MeasurementContainer::iterator MeasurementContainer::begin() {
+  return iterator{*this, 0};
+}
+
+MeasurementContainer::iterator MeasurementContainer::end() {
+  return iterator{*this, m_entries.size()};
+}
+
+MeasurementContainer::const_iterator MeasurementContainer::begin() const {
+  return const_iterator{*this, 0};
+}
+
+MeasurementContainer::const_iterator MeasurementContainer::end() const {
+  return const_iterator{*this, m_entries.size()};
+}
+
+MeasurementContainer::const_iterator MeasurementContainer::cbegin() const {
+  return const_iterator{*this, 0};
+}
+
+MeasurementContainer::const_iterator MeasurementContainer::cend() const {
+  return const_iterator{*this, m_entries.size()};
+}
+
+}  // namespace ActsExamples
diff --git a/Examples/Framework/src/EventData/MeasurementCalibration.cpp b/Examples/Framework/src/EventData/MeasurementCalibration.cpp
index 444021c91ca..b4764844770 100644
--- a/Examples/Framework/src/EventData/MeasurementCalibration.cpp
+++ b/Examples/Framework/src/EventData/MeasurementCalibration.cpp
@@ -1,16 +1,17 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2023 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
+
+#include "ActsExamples/EventData/MeasurementCalibration.hpp"
 
 #include "Acts/Definitions/TrackParametrization.hpp"
 #include "Acts/EventData/SourceLink.hpp"
 #include "ActsExamples/EventData/IndexSourceLink.hpp"
 #include "ActsExamples/EventData/Measurement.hpp"
-#include <ActsExamples/EventData/MeasurementCalibration.hpp>
 
 #include <cassert>
 #include <variant>
@@ -31,17 +32,20 @@ void ActsExamples::PassThroughCalibrator::calibrate(
   assert((idxSourceLink.index() < measurements.size()) &&
          "Source link index is outside the container bounds");
 
-  const auto& measurement = measurements[idxSourceLink.index()];
+  const ConstVariableBoundMeasurementProxy measurement =
+      measurements.getMeasurement(idxSourceLink.index());
 
   Acts::visit_measurement(measurement.size(), [&](auto N) -> void {
     constexpr std::size_t kMeasurementSize = decltype(N)::value;
+    const ConstFixedBoundMeasurementProxy<kMeasurementSize> fixedMeasurement =
+        static_cast<ConstFixedBoundMeasurementProxy<kMeasurementSize>>(
+            measurement);
 
     trackState.allocateCalibrated(kMeasurementSize);
-    trackState.calibrated<kMeasurementSize>() =
-        measurement.parameters<kMeasurementSize>();
+    trackState.calibrated<kMeasurementSize>() = fixedMeasurement.parameters();
     trackState.calibratedCovariance<kMeasurementSize>() =
-        measurement.covariance<kMeasurementSize>();
-    trackState.setProjector(measurement.subspace().fullProjector<double>());
+        fixedMeasurement.covariance();
+    trackState.setSubspaceIndices(fixedMeasurement.subspaceIndices());
   });
 }
 
diff --git a/Examples/Framework/src/EventData/ScalingCalibrator.cpp b/Examples/Framework/src/EventData/ScalingCalibrator.cpp
index fd93c584c51..ae5c1eca4fe 100644
--- a/Examples/Framework/src/EventData/ScalingCalibrator.cpp
+++ b/Examples/Framework/src/EventData/ScalingCalibrator.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2023 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include "ActsExamples/EventData/ScalingCalibrator.hpp"
 
@@ -151,30 +151,36 @@ void ActsExamples::ScalingCalibrator::calibrate(
   const Cluster& cl = clusters->at(idxSourceLink.index());
   ConstantTuple ct = m_calib_maps.at(mgid).at(cl.sizeLoc0, cl.sizeLoc1);
 
-  const auto& measurement = measurements[idxSourceLink.index()];
+  const ConstVariableBoundMeasurementProxy measurement =
+      measurements.getMeasurement(idxSourceLink.index());
 
   assert(measurement.contains(Acts::eBoundLoc0) &&
          "Measurement does not contain the required bound loc0");
   assert(measurement.contains(Acts::eBoundLoc1) &&
          "Measurement does not contain the required bound loc1");
 
-  auto boundLoc0 = measurement.subspace().indexOf(Acts::eBoundLoc0);
-  auto boundLoc1 = measurement.subspace().indexOf(Acts::eBoundLoc1);
-
-  Measurement measurementCopy = measurement;
-  measurementCopy.effectiveParameters()[boundLoc0] += ct.x_offset;
-  measurementCopy.effectiveParameters()[boundLoc1] += ct.y_offset;
-  measurementCopy.effectiveCovariance()(boundLoc0, boundLoc0) *= ct.x_scale;
-  measurementCopy.effectiveCovariance()(boundLoc1, boundLoc1) *= ct.y_scale;
+  auto boundLoc0 = measurement.indexOf(Acts::eBoundLoc0);
+  auto boundLoc1 = measurement.indexOf(Acts::eBoundLoc1);
 
   Acts::visit_measurement(measurement.size(), [&](auto N) -> void {
     constexpr std::size_t kMeasurementSize = decltype(N)::value;
+    const ConstFixedBoundMeasurementProxy<kMeasurementSize> fixedMeasurement =
+        static_cast<ConstFixedBoundMeasurementProxy<kMeasurementSize>>(
+            measurement);
+
+    Acts::ActsVector<kMeasurementSize> calibratedParameters =
+        fixedMeasurement.parameters();
+    Acts::ActsSquareMatrix<kMeasurementSize> calibratedCovariance =
+        fixedMeasurement.covariance();
+
+    calibratedParameters[boundLoc0] += ct.x_offset;
+    calibratedParameters[boundLoc1] += ct.y_offset;
+    calibratedCovariance(boundLoc0, boundLoc0) *= ct.x_scale;
+    calibratedCovariance(boundLoc1, boundLoc1) *= ct.y_scale;
 
     trackState.allocateCalibrated(kMeasurementSize);
-    trackState.calibrated<kMeasurementSize>() =
-        measurement.parameters<kMeasurementSize>();
-    trackState.calibratedCovariance<kMeasurementSize>() =
-        measurementCopy.covariance<kMeasurementSize>();
-    trackState.setProjector(measurement.subspace().fullProjector<double>());
+    trackState.calibrated<kMeasurementSize>() = calibratedParameters;
+    trackState.calibratedCovariance<kMeasurementSize>() = calibratedCovariance;
+    trackState.setSubspaceIndices(fixedMeasurement.subspaceIndices());
   });
 }
diff --git a/Examples/Framework/src/EventData/SimParticle.cpp b/Examples/Framework/src/EventData/SimParticle.cpp
new file mode 100644
index 00000000000..900d55f1018
--- /dev/null
+++ b/Examples/Framework/src/EventData/SimParticle.cpp
@@ -0,0 +1,21 @@
+// This file is part of the ACTS project.
+//
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
+//
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
+
+#include "ActsExamples/EventData/SimParticle.hpp"
+
+std::ostream& ActsExamples::operator<<(std::ostream& os,
+                                       const SimParticle& particle) {
+  // compact format w/ only identity information but no kinematics
+  os << "id=" << particle.particleId().value() << "(" << particle.particleId()
+     << ")";
+  os << "|pdg=" << particle.pdg();
+  os << "|q=" << particle.charge();
+  os << "|m=" << particle.mass();
+  os << "|p=" << particle.absoluteMomentum();
+  return os;
+}
diff --git a/Examples/Framework/src/Framework/DataHandle.cpp b/Examples/Framework/src/Framework/DataHandle.cpp
new file mode 100644
index 00000000000..621b6201d0f
--- /dev/null
+++ b/Examples/Framework/src/Framework/DataHandle.cpp
@@ -0,0 +1,39 @@
+// This file is part of the ACTS project.
+//
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
+//
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
+
+#include "ActsExamples/Framework/DataHandle.hpp"
+
+namespace ActsExamples {
+
+void WriteDataHandleBase::initialize(const std::string& key) {
+  if (key.empty()) {
+    throw std::invalid_argument{"Write handle '" + fullName() +
+                                "' cannot receive empty key"};
+  }
+  m_key = key;
+}
+
+bool WriteDataHandleBase::isCompatible(const DataHandleBase& other) const {
+  return dynamic_cast<const ReadDataHandleBase*>(&other) != nullptr &&
+         typeInfo() == other.typeInfo();
+}
+
+void ReadDataHandleBase::initialize(const std::string& key) {
+  if (key.empty()) {
+    throw std::invalid_argument{"Read handle '" + fullName() +
+                                "' cannot receive empty key"};
+  }
+  m_key = key;
+}
+
+bool ReadDataHandleBase::isCompatible(const DataHandleBase& other) const {
+  return dynamic_cast<const WriteDataHandleBase*>(&other) != nullptr &&
+         typeInfo() == other.typeInfo();
+}
+
+}  // namespace ActsExamples
diff --git a/Examples/Framework/src/Framework/IAlgorithm.cpp b/Examples/Framework/src/Framework/IAlgorithm.cpp
index c97d48db4d1..32ea6445dda 100644
--- a/Examples/Framework/src/Framework/IAlgorithm.cpp
+++ b/Examples/Framework/src/Framework/IAlgorithm.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2017-2023 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include "ActsExamples/Framework/IAlgorithm.hpp"
 
diff --git a/Examples/Framework/src/Framework/RandomNumbers.cpp b/Examples/Framework/src/Framework/RandomNumbers.cpp
index 35dcbce0338..4313a5cce77 100644
--- a/Examples/Framework/src/Framework/RandomNumbers.cpp
+++ b/Examples/Framework/src/Framework/RandomNumbers.cpp
@@ -1,31 +1,26 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2017 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-//
-//  RandomNumbers.cpp
-//  ActsExamples
-//
-//  Created by Andreas Salzburger on 17/05/16.
-//
-//
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include "ActsExamples/Framework/RandomNumbers.hpp"
 
 #include "ActsExamples/Framework/AlgorithmContext.hpp"
 
-ActsExamples::RandomNumbers::RandomNumbers(const Config& cfg) : m_cfg(cfg) {}
+namespace ActsExamples {
+
+RandomNumbers::RandomNumbers(const Config& cfg) : m_cfg(cfg) {}
 
-ActsExamples::RandomEngine ActsExamples::RandomNumbers::spawnGenerator(
+RandomEngine RandomNumbers::spawnGenerator(
     const AlgorithmContext& context) const {
   return RandomEngine(generateSeed(context));
 }
 
-std::uint64_t ActsExamples::RandomNumbers::generateSeed(
-    const AlgorithmContext& context) const {
+RandomSeed RandomNumbers::generateSeed(const AlgorithmContext& context) const {
   return m_cfg.seed + context.eventNumber;
 }
+
+}  // namespace ActsExamples
diff --git a/Examples/Framework/src/Framework/SequenceElement.cpp b/Examples/Framework/src/Framework/SequenceElement.cpp
index cef2bc635e3..4232e7b59fb 100644
--- a/Examples/Framework/src/Framework/SequenceElement.cpp
+++ b/Examples/Framework/src/Framework/SequenceElement.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2017-2023 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include "ActsExamples/Framework/SequenceElement.hpp"
 
diff --git a/Examples/Framework/src/Framework/Sequencer.cpp b/Examples/Framework/src/Framework/Sequencer.cpp
index 520bc86587e..eb9bf8fd1c0 100644
--- a/Examples/Framework/src/Framework/Sequencer.cpp
+++ b/Examples/Framework/src/Framework/Sequencer.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2017-2019 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include "ActsExamples/Framework/Sequencer.hpp"
 
@@ -42,15 +42,11 @@
 #include <string_view>
 #include <typeinfo>
 
-#include <boost/stacktrace/stacktrace.hpp>
-
-#ifndef ACTS_EXAMPLES_NO_TBB
 #include <TROOT.h>
-#endif
-
 #include <boost/algorithm/string.hpp>
 #include <boost/algorithm/string/predicate.hpp>
 #include <boost/core/demangle.hpp>
+#include <boost/stacktrace/stacktrace.hpp>
 
 namespace ActsExamples {
 
@@ -108,16 +104,12 @@ Sequencer::Sequencer(const Sequencer::Config& cfg)
       m_taskArena((m_cfg.numThreads < 0) ? tbb::task_arena::automatic
                                          : m_cfg.numThreads),
       m_logger(Acts::getDefaultLogger("Sequencer", m_cfg.logLevel)) {
-#ifndef ACTS_EXAMPLES_NO_TBB
   if (m_cfg.numThreads == 1) {
-#endif
     ACTS_INFO("Create Sequencer (single-threaded)");
-#ifndef ACTS_EXAMPLES_NO_TBB
   } else {
     ROOT::EnableThreadSafety();
     ACTS_INFO("Create Sequencer with " << m_cfg.numThreads << " threads");
   }
-#endif
 
   const char* envvar = std::getenv("ACTS_SEQUENCER_DISABLE_FPEMON");
   if (envvar != nullptr) {
@@ -126,6 +118,13 @@ Sequencer::Sequencer(const Sequencer::Config& cfg)
         "ACTS_SEQUENCER_DISABLE_FPEMON");
     m_cfg.trackFpes = false;
   }
+
+  if (m_cfg.trackFpes && !m_cfg.fpeMasks.empty() &&
+      !Acts::FpeMonitor::canSymbolize()) {
+    ACTS_ERROR("FPE monitoring is enabled but symbolization is not available");
+    throw std::runtime_error(
+        "FPE monitoring is enabled but symbolization is not available");
+  }
 }
 
 void Sequencer::addContextDecorator(
@@ -172,10 +171,6 @@ void Sequencer::addElement(const std::shared_ptr<SequenceElement>& element) {
   elementTypeCapitalized[0] = std::toupper(elementTypeCapitalized[0]);
   ACTS_INFO("Add " << elementType << " '" << element->name() << "'");
 
-  if (!m_cfg.runDataFlowChecks) {
-    return;
-  }
-
   auto symbol = [&](const char* in) {
     std::string s = demangleAndShorten(in);
     std::size_t pos = 0;
@@ -264,10 +259,13 @@ void Sequencer::addWhiteboardAlias(const std::string& aliasName,
   auto [it, success] =
       m_whiteboardObjectAliases.insert({objectName, aliasName});
   if (!success) {
-    throw std::invalid_argument("Alias to '" + aliasName + "' -> '" +
-                                objectName + "' already set");
+    ACTS_INFO("Key '" << objectName << "' aliased to '" << aliasName
+                      << "' already set");
+    return;
   }
 
+  ACTS_INFO("Key '" << objectName << "' aliased to '" << aliasName << "'");
+
   if (auto oit = m_whiteBoardState.find(objectName);
       oit != m_whiteBoardState.end()) {
     m_whiteBoardState[aliasName] = oit->second;
@@ -364,7 +362,7 @@ struct StopWatch {
   Timepoint start;
   Duration& store;
 
-  StopWatch(Duration& s) : start(Clock::now()), store(s) {}
+  explicit StopWatch(Duration& s) : start(Clock::now()), store(s) {}
   ~StopWatch() { store += Clock::now() - start; }
 };
 
@@ -608,7 +606,7 @@ void Sequencer::fpeReport() const {
     auto merged = std::accumulate(
         fpe.begin(), fpe.end(), Acts::FpeMonitor::Result{},
         [](const auto& lhs, const auto& rhs) { return lhs.merged(rhs); });
-    if (!merged) {
+    if (!merged.hasStackTraces()) {
       // no FPEs to report
       continue;
     }
@@ -622,9 +620,8 @@ void Sequencer::fpeReport() const {
     std::transform(merged.stackTraces().begin(), merged.stackTraces().end(),
                    std::back_inserter(sorted),
                    [](const auto& f) -> const auto& { return f; });
-    std::sort(sorted.begin(), sorted.end(), [](const auto& a, const auto& b) {
-      return a.get().count > b.get().count;
-    });
+    std::ranges::sort(sorted, std::greater{},
+                      [](const auto& s) { return s.get().count; });
 
     std::vector<std::reference_wrapper<const Acts::FpeMonitor::Result::FpeInfo>>
         remaining;
diff --git a/Examples/Framework/src/Framework/WhiteBoard.cpp b/Examples/Framework/src/Framework/WhiteBoard.cpp
index b7e53eaeda5..099eac53efc 100644
--- a/Examples/Framework/src/Framework/WhiteBoard.cpp
+++ b/Examples/Framework/src/Framework/WhiteBoard.cpp
@@ -1,13 +1,14 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2022 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include "ActsExamples/Framework/WhiteBoard.hpp"
 
+#include <algorithm>
 #include <array>
 #include <string_view>
 
@@ -67,8 +68,7 @@ std::vector<std::string_view> ActsExamples::WhiteBoard::similarNames(
     }
   }
 
-  std::sort(names.begin(), names.end(),
-            [&](const auto &a, const auto &b) { return a.first < b.first; });
+  std::ranges::sort(names, {}, [](const auto &n) { return n.first; });
 
   std::vector<std::string_view> selected_names;
   for (std::size_t i = 0; i < std::min(names.size(), maxNumber); ++i) {
diff --git a/Examples/Framework/src/Utilities/EventDataTransforms.cpp b/Examples/Framework/src/Utilities/EventDataTransforms.cpp
index c32c1875d5d..79d3d543a05 100644
--- a/Examples/Framework/src/Utilities/EventDataTransforms.cpp
+++ b/Examples/Framework/src/Utilities/EventDataTransforms.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2022 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include "ActsExamples/Utilities/EventDataTransforms.hpp"
 
@@ -12,14 +12,15 @@
 #include "ActsExamples/EventData/IndexSourceLink.hpp"
 #include "ActsExamples/EventData/SimSpacePoint.hpp"
 
+#include <algorithm>
 #include <vector>
 
 ActsExamples::ProtoTrack ActsExamples::seedToPrototrack(
     const ActsExamples::SimSeed& seed) {
   ProtoTrack track;
   track.reserve(seed.sp().size());
-  for (auto spacePointPtr : seed.sp()) {
-    for (const auto& slink : spacePointPtr->sourceLinks()) {
+  for (const auto& spacePoints : seed.sp()) {
+    for (const auto& slink : spacePoints->sourceLinks()) {
       const auto& islink = slink.get<IndexSourceLink>();
       track.emplace_back(islink.index());
     }
@@ -31,12 +32,12 @@ const ActsExamples::SimSpacePoint* ActsExamples::findSpacePointForIndex(
     ActsExamples::Index index, const SimSpacePointContainer& spacepoints) {
   auto match = [&](const SimSpacePoint& sp) {
     const auto& sls = sp.sourceLinks();
-    return std::any_of(sls.begin(), sls.end(), [&](const auto& sl) {
+    return std::ranges::any_of(sls, [&](const auto& sl) {
       return sl.template get<IndexSourceLink>().index() == index;
     });
   };
 
-  auto found = std::find_if(spacepoints.begin(), spacepoints.end(), match);
+  auto found = std::ranges::find_if(spacepoints, match);
 
   if (found == spacepoints.end()) {
     return nullptr;
@@ -68,8 +69,7 @@ ActsExamples::SimSeed ActsExamples::prototrackToSeed(
 
   std::transform(track.begin(), track.end(), std::back_inserter(ps),
                  findSpacePoint);
-  std::sort(ps.begin(), ps.end(),
-            [](const auto& a, const auto& b) { return a->r() < b->r(); });
+  std::ranges::sort(ps, {}, [](const auto& p) { return p->r(); });
 
   // Simply use r = m*z + t and solve for r=0 to find z vertex position...
   // Probably not the textbook way to do
@@ -78,5 +78,7 @@ ActsExamples::SimSeed ActsExamples::prototrackToSeed(
   const auto t = ps.front()->r() - m * ps.front()->z();
   const auto z_vertex = -t / m;
 
-  return SimSeed(*ps[0], *ps[s / 2], *ps[s - 1], z_vertex);
+  SimSeed seed(*ps[0], *ps[s / 2], *ps[s - 1]);
+  seed.setVertexZ(z_vertex);
+  return seed;
 }
diff --git a/Examples/Framework/src/Utilities/Helpers.cpp b/Examples/Framework/src/Utilities/Helpers.cpp
index 544d58dfd22..2706e09a631 100644
--- a/Examples/Framework/src/Utilities/Helpers.cpp
+++ b/Examples/Framework/src/Utilities/Helpers.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2019-2023 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include "ActsExamples/Utilities/Helpers.hpp"
 
diff --git a/Examples/Framework/src/Utilities/Options.cpp b/Examples/Framework/src/Utilities/Options.cpp
index afafbfaf095..2e4e40536bf 100644
--- a/Examples/Framework/src/Utilities/Options.cpp
+++ b/Examples/Framework/src/Utilities/Options.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2020 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include "ActsExamples/Utilities/Options.hpp"
 
diff --git a/Examples/Framework/src/Utilities/Paths.cpp b/Examples/Framework/src/Utilities/Paths.cpp
index 8cd858a40e4..02bf5889c68 100644
--- a/Examples/Framework/src/Utilities/Paths.cpp
+++ b/Examples/Framework/src/Utilities/Paths.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2017 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include "ActsExamples/Utilities/Paths.hpp"
 
diff --git a/Examples/Framework/src/Validation/DuplicationPlotTool.cpp b/Examples/Framework/src/Validation/DuplicationPlotTool.cpp
index a0af3b4be2e..8b6aaca0925 100644
--- a/Examples/Framework/src/Validation/DuplicationPlotTool.cpp
+++ b/Examples/Framework/src/Validation/DuplicationPlotTool.cpp
@@ -1,16 +1,15 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2019 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include "ActsExamples/Validation/DuplicationPlotTool.hpp"
 
-#include "Acts/Definitions/Algebra.hpp"
 #include "Acts/Utilities/VectorHelpers.hpp"
-#include "ActsFatras/EventData/Particle.hpp"
+#include "ActsExamples/EventData/SimParticle.hpp"
 
 #include <TEfficiency.h>
 #include <TProfile.h>
@@ -98,7 +97,7 @@ void ActsExamples::DuplicationPlotTool::fill(
 
 void ActsExamples::DuplicationPlotTool::fill(
     DuplicationPlotTool::DuplicationPlotCache& duplicationPlotCache,
-    const ActsFatras::Particle& truthParticle,
+    const SimParticleState& truthParticle,
     std::size_t nDuplicatedTracks) const {
   const auto t_phi = phi(truthParticle.direction());
   const auto t_eta = eta(truthParticle.direction());
diff --git a/Examples/Framework/src/Validation/EffPlotTool.cpp b/Examples/Framework/src/Validation/EffPlotTool.cpp
index 23225d8f778..17e3bb7034e 100644
--- a/Examples/Framework/src/Validation/EffPlotTool.cpp
+++ b/Examples/Framework/src/Validation/EffPlotTool.cpp
@@ -1,15 +1,15 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2019 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include "ActsExamples/Validation/EffPlotTool.hpp"
 
 #include "Acts/Utilities/VectorHelpers.hpp"
-#include "ActsFatras/EventData/Particle.hpp"
+#include "ActsExamples/EventData/SimParticle.hpp"
 
 #include <TEfficiency.h>
 
@@ -27,6 +27,7 @@ void ActsExamples::EffPlotTool::book(
   PlotHelpers::Binning bEta = m_cfg.varBinning.at("Eta");
   PlotHelpers::Binning bPt = m_cfg.varBinning.at("Pt");
   PlotHelpers::Binning bDeltaR = m_cfg.varBinning.at("DeltaR");
+  PlotHelpers::Binning bZ0 = m_cfg.varBinning.at("Z0");
   ACTS_DEBUG("Initialize the histograms for efficiency plots");
   // efficiency vs pT
   effPlotCache.trackEff_vs_pT = PlotHelpers::bookEff(
@@ -37,6 +38,9 @@ void ActsExamples::EffPlotTool::book(
   // efficiency vs phi
   effPlotCache.trackEff_vs_phi = PlotHelpers::bookEff(
       "trackeff_vs_phi", "Tracking efficiency;Truth #phi;Efficiency", bPhi);
+  // efficiency vs z0
+  effPlotCache.trackEff_vs_z0 = PlotHelpers::bookEff(
+      "trackeff_vs_z0", "Tracking efficiency;Truth z_0 [mm];Efficiency", bZ0);
   // efficiancy vs distance to the closest truth particle
   effPlotCache.trackEff_vs_DeltaR = PlotHelpers::bookEff(
       "trackeff_vs_DeltaR",
@@ -47,6 +51,7 @@ void ActsExamples::EffPlotTool::clear(EffPlotCache& effPlotCache) const {
   delete effPlotCache.trackEff_vs_pT;
   delete effPlotCache.trackEff_vs_eta;
   delete effPlotCache.trackEff_vs_phi;
+  delete effPlotCache.trackEff_vs_z0;
   delete effPlotCache.trackEff_vs_DeltaR;
 }
 
@@ -56,19 +61,22 @@ void ActsExamples::EffPlotTool::write(
   effPlotCache.trackEff_vs_pT->Write();
   effPlotCache.trackEff_vs_eta->Write();
   effPlotCache.trackEff_vs_phi->Write();
+  effPlotCache.trackEff_vs_z0->Write();
   effPlotCache.trackEff_vs_DeltaR->Write();
 }
 
 void ActsExamples::EffPlotTool::fill(EffPlotTool::EffPlotCache& effPlotCache,
-                                     const ActsFatras::Particle& truthParticle,
+                                     const SimParticleState& truthParticle,
                                      double deltaR, bool status) const {
   const auto t_phi = phi(truthParticle.direction());
   const auto t_eta = eta(truthParticle.direction());
   const auto t_pT = truthParticle.transverseMomentum();
+  const auto t_z0 = truthParticle.position().z();
   const auto t_deltaR = deltaR;
 
   PlotHelpers::fillEff(effPlotCache.trackEff_vs_pT, t_pT, status);
   PlotHelpers::fillEff(effPlotCache.trackEff_vs_eta, t_eta, status);
   PlotHelpers::fillEff(effPlotCache.trackEff_vs_phi, t_phi, status);
+  PlotHelpers::fillEff(effPlotCache.trackEff_vs_z0, t_z0, status);
   PlotHelpers::fillEff(effPlotCache.trackEff_vs_DeltaR, t_deltaR, status);
 }
diff --git a/Examples/Framework/src/Validation/FakeRatePlotTool.cpp b/Examples/Framework/src/Validation/FakeRatePlotTool.cpp
index b62a108a299..af23d225d56 100644
--- a/Examples/Framework/src/Validation/FakeRatePlotTool.cpp
+++ b/Examples/Framework/src/Validation/FakeRatePlotTool.cpp
@@ -1,16 +1,15 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2019 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include "ActsExamples/Validation/FakeRatePlotTool.hpp"
 
-#include "Acts/Definitions/Algebra.hpp"
 #include "Acts/Utilities/VectorHelpers.hpp"
-#include "ActsFatras/EventData/Particle.hpp"
+#include "ActsExamples/EventData/SimParticle.hpp"
 
 #include <TEfficiency.h>
 #include <TH2.h>
@@ -109,7 +108,7 @@ void ActsExamples::FakeRatePlotTool::fill(
 
 void ActsExamples::FakeRatePlotTool::fill(
     FakeRatePlotTool::FakeRatePlotCache& fakeRatePlotCache,
-    const ActsFatras::Particle& truthParticle, std::size_t nTruthMatchedTracks,
+    const SimParticleState& truthParticle, std::size_t nTruthMatchedTracks,
     std::size_t nFakeTracks) const {
   const auto t_eta = eta(truthParticle.direction());
   const auto t_pT = truthParticle.transverseMomentum();
diff --git a/Examples/Framework/src/Validation/ResPlotTool.cpp b/Examples/Framework/src/Validation/ResPlotTool.cpp
index 3a53fd2877a..882e1e41fb7 100644
--- a/Examples/Framework/src/Validation/ResPlotTool.cpp
+++ b/Examples/Framework/src/Validation/ResPlotTool.cpp
@@ -1,20 +1,18 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2019-2023 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include "ActsExamples/Validation/ResPlotTool.hpp"
 
 #include "Acts/Definitions/TrackParametrization.hpp"
 #include "Acts/Surfaces/Surface.hpp"
-#include "Acts/Utilities/Helpers.hpp"
 #include "Acts/Utilities/Result.hpp"
-#include "ActsFatras/EventData/Particle.hpp"
+#include "ActsExamples/EventData/SimParticle.hpp"
 
-#include <algorithm>
 #include <cmath>
 #include <optional>
 #include <ostream>
@@ -146,7 +144,7 @@ void ActsExamples::ResPlotTool::write(
 
 void ActsExamples::ResPlotTool::fill(
     ResPlotTool::ResPlotCache& resPlotCache, const Acts::GeometryContext& gctx,
-    const ActsFatras::Particle& truthParticle,
+    const SimParticleState& truthParticle,
     const Acts::BoundTrackParameters& fittedParamters) const {
   using ParametersVector = Acts::BoundTrackParameters::ParametersVector;
   using Acts::VectorHelpers::eta;
@@ -158,21 +156,27 @@ void ActsExamples::ResPlotTool::fill(
   auto trackParameter = fittedParamters.parameters();
 
   // get the perigee surface
-  auto pSurface = &fittedParamters.referenceSurface();
+  const auto& pSurface = fittedParamters.referenceSurface();
 
   // get the truth position and momentum
   ParametersVector truthParameter = ParametersVector::Zero();
 
   // get the truth perigee parameter
-  auto lpResult = pSurface->globalToLocal(gctx, truthParticle.position(),
-                                          truthParticle.direction());
-  if (lpResult.ok()) {
+  auto intersection =
+      pSurface
+          .intersect(gctx, truthParticle.position(), truthParticle.direction())
+          .closest();
+  if (intersection.isValid()) {
+    auto lpResult = pSurface.globalToLocal(gctx, intersection.position(),
+                                           truthParticle.direction());
+    assert(lpResult.ok());
+
     truthParameter[Acts::BoundIndices::eBoundLoc0] =
         lpResult.value()[Acts::BoundIndices::eBoundLoc0];
     truthParameter[Acts::BoundIndices::eBoundLoc1] =
         lpResult.value()[Acts::BoundIndices::eBoundLoc1];
   } else {
-    ACTS_ERROR("Global to local transformation did not succeed.");
+    ACTS_ERROR("Cannot get the truth perigee parameter");
   }
   truthParameter[Acts::BoundIndices::eBoundPhi] =
       phi(truthParticle.direction());
diff --git a/Examples/Framework/src/Validation/TrackClassification.cpp b/Examples/Framework/src/Validation/TrackClassification.cpp
index e163106b291..d1e79d15835 100644
--- a/Examples/Framework/src/Validation/TrackClassification.cpp
+++ b/Examples/Framework/src/Validation/TrackClassification.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2019-2020 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include "ActsExamples/Validation/TrackClassification.hpp"
 
@@ -25,10 +25,9 @@ inline void increaseHitCount(
     std::vector<ActsExamples::ParticleHitCount>& particleHitCounts,
     ActsFatras::Barcode particleId) {
   // linear search since there is no ordering
-  auto it = std::find_if(particleHitCounts.begin(), particleHitCounts.end(),
-                         [=](const ActsExamples::ParticleHitCount& phc) {
-                           return (phc.particleId == particleId);
-                         });
+  auto it = std::ranges::find_if(particleHitCounts, [=](const auto& phc) {
+    return (phc.particleId == particleId);
+  });
   // either increase count if we saw the particle before or add it
   if (it != particleHitCounts.end()) {
     it->hitCount += 1u;
@@ -40,11 +39,8 @@ inline void increaseHitCount(
 /// Sort hit counts by decreasing values, i.e. majority particle comes first.
 inline void sortHitCount(
     std::vector<ActsExamples::ParticleHitCount>& particleHitCounts) {
-  std::sort(particleHitCounts.begin(), particleHitCounts.end(),
-            [](const ActsExamples::ParticleHitCount& lhs,
-               const ActsExamples::ParticleHitCount& rhs) {
-              return (lhs.hitCount > rhs.hitCount);
-            });
+  std::ranges::sort(particleHitCounts, std::greater{},
+                    [](const auto& p) { return p.hitCount; });
 }
 
 }  // namespace
@@ -57,8 +53,9 @@ void ActsExamples::identifyContributingParticles(
 
   for (auto hitIndex : protoTrack) {
     // register all particles that generated this hit
-    for (auto hitParticle : makeRange(hitParticlesMap.equal_range(hitIndex))) {
-      increaseHitCount(particleHitCounts, hitParticle.second);
+    for (const auto& [_, value] :
+         makeRange(hitParticlesMap.equal_range(hitIndex))) {
+      increaseHitCount(particleHitCounts, value);
     }
   }
   sortHitCount(particleHitCounts);
@@ -83,8 +80,9 @@ void ActsExamples::identifyContributingParticles(
     IndexSourceLink sl =
         state.getUncalibratedSourceLink().template get<IndexSourceLink>();
     auto hitIndex = sl.index();
-    for (auto hitParticle : makeRange(hitParticlesMap.equal_range(hitIndex))) {
-      increaseHitCount(particleHitCounts, hitParticle.second);
+    for (const auto& [_, value] :
+         makeRange(hitParticlesMap.equal_range(hitIndex))) {
+      increaseHitCount(particleHitCounts, value);
     }
     return true;
   });
@@ -106,8 +104,9 @@ void ActsExamples::identifyContributingParticles(
     IndexSourceLink sl =
         state.getUncalibratedSourceLink().template get<IndexSourceLink>();
     auto hitIndex = sl.index();
-    for (auto hitParticle : makeRange(hitParticlesMap.equal_range(hitIndex))) {
-      increaseHitCount(particleHitCounts, hitParticle.second);
+    for (const auto& [_, value] :
+         makeRange(hitParticlesMap.equal_range(hitIndex))) {
+      increaseHitCount(particleHitCounts, value);
     }
   }
   sortHitCount(particleHitCounts);
diff --git a/Examples/Framework/src/Validation/TrackSummaryPlotTool.cpp b/Examples/Framework/src/Validation/TrackSummaryPlotTool.cpp
index 913aadfde5b..1805da6079b 100644
--- a/Examples/Framework/src/Validation/TrackSummaryPlotTool.cpp
+++ b/Examples/Framework/src/Validation/TrackSummaryPlotTool.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2019 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include "ActsExamples/Validation/TrackSummaryPlotTool.hpp"
 
diff --git a/Examples/HelloWorld/HelloData.hpp b/Examples/HelloWorld/HelloData.hpp
index c400e43e3ae..6aed4ac7d09 100644
--- a/Examples/HelloWorld/HelloData.hpp
+++ b/Examples/HelloWorld/HelloData.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2017-2019 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
diff --git a/Examples/HelloWorld/HelloLoggerAlgorithm.cpp b/Examples/HelloWorld/HelloLoggerAlgorithm.cpp
index d84c838c8cc..696bda8ac78 100644
--- a/Examples/HelloWorld/HelloLoggerAlgorithm.cpp
+++ b/Examples/HelloWorld/HelloLoggerAlgorithm.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2017-2019 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include "HelloLoggerAlgorithm.hpp"
 
diff --git a/Examples/HelloWorld/HelloLoggerAlgorithm.hpp b/Examples/HelloWorld/HelloLoggerAlgorithm.hpp
index dcbab97f35c..3cafd2c4f55 100644
--- a/Examples/HelloWorld/HelloLoggerAlgorithm.hpp
+++ b/Examples/HelloWorld/HelloLoggerAlgorithm.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2017-2019 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
@@ -17,7 +17,7 @@ namespace ActsExamples {
 /// A simple algorithm that just prints hello world.
 class HelloLoggerAlgorithm : public ActsExamples::IAlgorithm {
  public:
-  HelloLoggerAlgorithm(Acts::Logging::Level level);
+  explicit HelloLoggerAlgorithm(Acts::Logging::Level level);
 
   // Log a few messages.
   ActsExamples::ProcessCode execute(const AlgorithmContext& ctx) const override;
diff --git a/Examples/HelloWorld/HelloRandomAlgorithm.cpp b/Examples/HelloWorld/HelloRandomAlgorithm.cpp
index 5c279e76c3b..27ed5b7f488 100644
--- a/Examples/HelloWorld/HelloRandomAlgorithm.cpp
+++ b/Examples/HelloWorld/HelloRandomAlgorithm.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2017-2019 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include "HelloRandomAlgorithm.hpp"
 
diff --git a/Examples/HelloWorld/HelloRandomAlgorithm.hpp b/Examples/HelloWorld/HelloRandomAlgorithm.hpp
index 860eeb45dbb..1a4f804e4a2 100644
--- a/Examples/HelloWorld/HelloRandomAlgorithm.hpp
+++ b/Examples/HelloWorld/HelloRandomAlgorithm.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2017-2019 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
diff --git a/Examples/HelloWorld/HelloWhiteBoardAlgorithm.cpp b/Examples/HelloWorld/HelloWhiteBoardAlgorithm.cpp
index 9ca49236a85..55562e8c6e8 100644
--- a/Examples/HelloWorld/HelloWhiteBoardAlgorithm.cpp
+++ b/Examples/HelloWorld/HelloWhiteBoardAlgorithm.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2017-2019 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include "HelloWhiteBoardAlgorithm.hpp"
 
diff --git a/Examples/HelloWorld/HelloWhiteBoardAlgorithm.hpp b/Examples/HelloWorld/HelloWhiteBoardAlgorithm.hpp
index 630a1a2e653..65074585cb1 100644
--- a/Examples/HelloWorld/HelloWhiteBoardAlgorithm.hpp
+++ b/Examples/HelloWorld/HelloWhiteBoardAlgorithm.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2017-2019 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
diff --git a/Examples/HelloWorld/HelloWorld.cpp b/Examples/HelloWorld/HelloWorld.cpp
index 391f5ab274a..51fae31070c 100644
--- a/Examples/HelloWorld/HelloWorld.cpp
+++ b/Examples/HelloWorld/HelloWorld.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2017-2019 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include "ActsExamples/Framework/RandomNumbers.hpp"
 #include "ActsExamples/Framework/Sequencer.hpp"
diff --git a/Examples/Io/CMakeLists.txt b/Examples/Io/CMakeLists.txt
index dcf7c16a0a1..8b7f2861a6e 100644
--- a/Examples/Io/CMakeLists.txt
+++ b/Examples/Io/CMakeLists.txt
@@ -2,8 +2,6 @@ add_subdirectory(Csv)
 add_subdirectory_if(EDM4hep ACTS_BUILD_EXAMPLES_EDM4HEP)
 add_subdirectory_if(HepMC3 ACTS_BUILD_EXAMPLES_HEPMC3)
 add_subdirectory(Json)
-add_subdirectory(NuclearInteractions)
 add_subdirectory(Obj)
-add_subdirectory(Performance)
 add_subdirectory(Root)
 add_subdirectory_if(Svg ACTS_BUILD_PLUGIN_ACTSVG)
diff --git a/Examples/Io/Csv/CMakeLists.txt b/Examples/Io/Csv/CMakeLists.txt
index e252bd95fe7..f57275ee915 100644
--- a/Examples/Io/Csv/CMakeLists.txt
+++ b/Examples/Io/Csv/CMakeLists.txt
@@ -21,6 +21,7 @@ add_library(
     src/CsvSpacePointWriter.cpp
     src/CsvExaTrkXGraphWriter.cpp
     src/CsvExaTrkXGraphReader.cpp
+    src/CsvSpacePointsBucketWriter.cpp
     src/CsvBFieldWriter.cpp
 )
 target_include_directories(
diff --git a/Examples/Io/Csv/include/ActsExamples/Io/Csv/CsvBFieldWriter.hpp b/Examples/Io/Csv/include/ActsExamples/Io/Csv/CsvBFieldWriter.hpp
index 84b5f288ae9..d3bc6b457bb 100644
--- a/Examples/Io/Csv/include/ActsExamples/Io/Csv/CsvBFieldWriter.hpp
+++ b/Examples/Io/Csv/include/ActsExamples/Io/Csv/CsvBFieldWriter.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2022 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
diff --git a/Examples/Io/Csv/include/ActsExamples/Io/Csv/CsvDriftCircleReader.hpp b/Examples/Io/Csv/include/ActsExamples/Io/Csv/CsvDriftCircleReader.hpp
index 147f2fb8c62..af9eeef8b3a 100644
--- a/Examples/Io/Csv/include/ActsExamples/Io/Csv/CsvDriftCircleReader.hpp
+++ b/Examples/Io/Csv/include/ActsExamples/Io/Csv/CsvDriftCircleReader.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2023 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
diff --git a/Examples/Io/Csv/include/ActsExamples/Io/Csv/CsvExaTrkXGraphReader.hpp b/Examples/Io/Csv/include/ActsExamples/Io/Csv/CsvExaTrkXGraphReader.hpp
index 4b41d57a448..bb30bc07fb0 100644
--- a/Examples/Io/Csv/include/ActsExamples/Io/Csv/CsvExaTrkXGraphReader.hpp
+++ b/Examples/Io/Csv/include/ActsExamples/Io/Csv/CsvExaTrkXGraphReader.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2022 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
diff --git a/Examples/Io/Csv/include/ActsExamples/Io/Csv/CsvExaTrkXGraphWriter.hpp b/Examples/Io/Csv/include/ActsExamples/Io/Csv/CsvExaTrkXGraphWriter.hpp
index 15a2f7bb182..5147acc702b 100644
--- a/Examples/Io/Csv/include/ActsExamples/Io/Csv/CsvExaTrkXGraphWriter.hpp
+++ b/Examples/Io/Csv/include/ActsExamples/Io/Csv/CsvExaTrkXGraphWriter.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2020 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
diff --git a/Examples/Io/Csv/include/ActsExamples/Io/Csv/CsvInputOutput.hpp b/Examples/Io/Csv/include/ActsExamples/Io/Csv/CsvInputOutput.hpp
index a8cd535e926..e141f470988 100644
--- a/Examples/Io/Csv/include/ActsExamples/Io/Csv/CsvInputOutput.hpp
+++ b/Examples/Io/Csv/include/ActsExamples/Io/Csv/CsvInputOutput.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2024 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
@@ -35,6 +35,10 @@
 // OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 // SOFTWARE.
 
+#include "Acts/Utilities/Concepts.hpp"
+#include "Acts/Utilities/Helpers.hpp"
+
+#include <algorithm>
 #include <array>
 #include <cassert>
 #include <fstream>
@@ -210,12 +214,10 @@ class DsvWriter {
   std::ofstream m_file;
   std::size_t m_num_columns;
 
-  // enable_if to prevent this overload to be used for std::vector<T> as well
   template <typename T>
-  static std::enable_if_t<std::is_arithmetic<std::decay_t<T>>::value ||
-                              std::is_convertible<T, std::string>::value,
-                          unsigned>
-  write(T&& x, std::ostream& os);
+  unsigned write(T&& x, std::ostream& os)
+    requires(Acts::Concepts::arithmetic<std::decay_t<T>> ||
+             std::convertible_to<T, std::string>);
   template <typename T, typename Allocator>
   static unsigned write(const std::vector<T, Allocator>& xs, std::ostream& os);
 };
@@ -234,7 +236,7 @@ class DsvReader {
   /// Open a file at the given path.
   ///
   /// \param path Path to the input file
-  DsvReader(const std::string& path);
+  explicit DsvReader(const std::string& path);
 
   /// Read the next line from the file.
   ///
@@ -272,9 +274,8 @@ class NamedTupleDsvWriter {
 
   /// Append a record to the file.
   void append(const NamedTuple& record) {
-    append_impl(record,
-                std::make_index_sequence<
-                    std::tuple_size<typename NamedTuple::Tuple>::value>{});
+    append_impl(record, std::make_index_sequence<
+                            std::tuple_size_v<typename NamedTuple::Tuple>>{});
   }
 
  private:
@@ -445,10 +446,10 @@ inline void DsvWriter<Delimiter>::append(Arg0&& arg0, Args&&... args) {
 
 template <char Delimiter>
 template <typename T>
-inline std::enable_if_t<std::is_arithmetic<std::decay_t<T>>::value ||
-                            std::is_convertible<T, std::string>::value,
-                        unsigned>
-DsvWriter<Delimiter>::write(T&& x, std::ostream& os) {
+inline unsigned DsvWriter<Delimiter>::write(T&& x, std::ostream& os)
+  requires(Acts::Concepts::arithmetic<std::decay_t<T>> ||
+           std::convertible_to<T, std::string>)
+{
   os << x;
   return 1u;
 }
@@ -547,8 +548,7 @@ inline bool NamedTupleDsvReader<Delimiter, NamedTuple>::read(
                              std::to_string(m_reader.num_lines()));
   }
   // convert to tuple
-  parse_record(record,
-               std::make_index_sequence<std::tuple_size<Tuple>::value>{});
+  parse_record(record, std::make_index_sequence<std::tuple_size_v<Tuple>>{});
   return true;
 }
 
@@ -571,7 +571,7 @@ inline bool NamedTupleDsvReader<Delimiter, NamedTuple>::read(
 template <char Delimiter, typename NamedTuple>
 inline void NamedTupleDsvReader<Delimiter, NamedTuple>::use_default_columns() {
   // assume row content is identical in content and order to the tuple
-  m_num_columns = std::tuple_size<Tuple>::value;
+  m_num_columns = std::tuple_size_v<Tuple>;
   for (std::size_t i = 0; i < m_tuple_column_map.size(); ++i) {
     m_tuple_column_map[i] = i;
   }
@@ -590,13 +590,11 @@ inline void NamedTupleDsvReader<Delimiter, NamedTuple>::parse_header(
   // check that all non-optional columns are available
   for (const auto& name : names) {
     // no need to for availability if the column is optional
-    auto o = std::find(optional_columns.begin(), optional_columns.end(), name);
-    if (o != optional_columns.end()) {
+    if (Acts::rangeContainsValue(optional_columns, name)) {
       continue;
     }
     // missing, non-optional column mean we can not continue
-    auto c = std::find(m_columns.begin(), m_columns.end(), name);
-    if (c == m_columns.end()) {
+    if (!Acts::rangeContainsValue(m_columns, name)) {
       throw std::runtime_error("Missing header column '" + name + "'");
     }
   }
@@ -608,7 +606,7 @@ inline void NamedTupleDsvReader<Delimiter, NamedTuple>::parse_header(
   m_extra_columns.clear();
   for (std::size_t i = 0; i < m_columns.size(); ++i) {
     // find the position of the column in the tuple.
-    auto it = std::find(names.begin(), names.end(), m_columns[i]);
+    auto it = std::ranges::find(names, m_columns[i]);
     if (it != names.end()) {
       // establish mapping between column and tuple item position
       m_tuple_column_map[std::distance(names.begin(), it)] = i;
diff --git a/Examples/Io/Csv/include/ActsExamples/Io/Csv/CsvMeasurementReader.hpp b/Examples/Io/Csv/include/ActsExamples/Io/Csv/CsvMeasurementReader.hpp
index 1050a7ee4bf..d3c5359d16e 100644
--- a/Examples/Io/Csv/include/ActsExamples/Io/Csv/CsvMeasurementReader.hpp
+++ b/Examples/Io/Csv/include/ActsExamples/Io/Csv/CsvMeasurementReader.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2021 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 #pragma once
 
 #include "Acts/Geometry/GeometryIdentifier.hpp"
@@ -13,7 +13,6 @@
 #include "ActsExamples/EventData/Cluster.hpp"
 #include "ActsExamples/EventData/GeometryContainers.hpp"
 #include "ActsExamples/EventData/Index.hpp"
-#include "ActsExamples/EventData/IndexSourceLink.hpp"
 #include "ActsExamples/EventData/Measurement.hpp"
 #include "ActsExamples/EventData/SimHit.hpp"
 #include "ActsExamples/EventData/SimParticle.hpp"
@@ -32,7 +31,6 @@ class Surface;
 }
 
 namespace ActsExamples {
-class IndexSourceLink;
 struct AlgorithmContext;
 
 /// Read in a measurement cluster collection in comma-separated-value format.
@@ -60,8 +58,6 @@ class CsvMeasurementReader final : public IReader {
     std::string outputMeasurements;
     /// Output measurement to sim hit collection.
     std::string outputMeasurementSimHitsMap;
-    /// Output source links collection.
-    std::string outputSourceLinks;
     /// Output cluster collection (optional).
     std::string outputClusters;
 
@@ -102,9 +98,6 @@ class CsvMeasurementReader final : public IReader {
   WriteDataHandle<IndexMultimap<Index>> m_outputMeasurementSimHitsMap{
       this, "OutputMeasurementSimHitsMap"};
 
-  WriteDataHandle<GeometryIdMultiset<IndexSourceLink>> m_outputSourceLinks{
-      this, "OutputSourceLinks"};
-
   WriteDataHandle<ClusterContainer> m_outputClusters{this, "OutputClusters"};
 
   WriteDataHandle<IndexMultimap<ActsFatras::Barcode>>
diff --git a/Examples/Io/Csv/include/ActsExamples/Io/Csv/CsvMeasurementWriter.hpp b/Examples/Io/Csv/include/ActsExamples/Io/Csv/CsvMeasurementWriter.hpp
index d567d81397b..f166a5ab6b9 100644
--- a/Examples/Io/Csv/include/ActsExamples/Io/Csv/CsvMeasurementWriter.hpp
+++ b/Examples/Io/Csv/include/ActsExamples/Io/Csv/CsvMeasurementWriter.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2021 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
diff --git a/Examples/Io/Csv/include/ActsExamples/Io/Csv/CsvMuonSimHitReader.hpp b/Examples/Io/Csv/include/ActsExamples/Io/Csv/CsvMuonSimHitReader.hpp
index 1b5919aa559..03577d86140 100644
--- a/Examples/Io/Csv/include/ActsExamples/Io/Csv/CsvMuonSimHitReader.hpp
+++ b/Examples/Io/Csv/include/ActsExamples/Io/Csv/CsvMuonSimHitReader.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2023 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
diff --git a/Examples/Io/Csv/include/ActsExamples/Io/Csv/CsvParticleReader.hpp b/Examples/Io/Csv/include/ActsExamples/Io/Csv/CsvParticleReader.hpp
index de1ca9f0a75..9d45af9b241 100644
--- a/Examples/Io/Csv/include/ActsExamples/Io/Csv/CsvParticleReader.hpp
+++ b/Examples/Io/Csv/include/ActsExamples/Io/Csv/CsvParticleReader.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2017-2019 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
diff --git a/Examples/Io/Csv/include/ActsExamples/Io/Csv/CsvParticleWriter.hpp b/Examples/Io/Csv/include/ActsExamples/Io/Csv/CsvParticleWriter.hpp
index 01dc4fdaea7..342ca8f3516 100644
--- a/Examples/Io/Csv/include/ActsExamples/Io/Csv/CsvParticleWriter.hpp
+++ b/Examples/Io/Csv/include/ActsExamples/Io/Csv/CsvParticleWriter.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2017-2018 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
diff --git a/Examples/Io/Csv/include/ActsExamples/Io/Csv/CsvProtoTrackWriter.hpp b/Examples/Io/Csv/include/ActsExamples/Io/Csv/CsvProtoTrackWriter.hpp
index 5d8da5e6dce..eaf166a95da 100644
--- a/Examples/Io/Csv/include/ActsExamples/Io/Csv/CsvProtoTrackWriter.hpp
+++ b/Examples/Io/Csv/include/ActsExamples/Io/Csv/CsvProtoTrackWriter.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2023 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
diff --git a/Examples/Io/Csv/include/ActsExamples/Io/Csv/CsvSeedWriter.hpp b/Examples/Io/Csv/include/ActsExamples/Io/Csv/CsvSeedWriter.hpp
index b3b7c49d001..670183f7c29 100644
--- a/Examples/Io/Csv/include/ActsExamples/Io/Csv/CsvSeedWriter.hpp
+++ b/Examples/Io/Csv/include/ActsExamples/Io/Csv/CsvSeedWriter.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2023 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
diff --git a/Examples/Io/Csv/include/ActsExamples/Io/Csv/CsvSimHitReader.hpp b/Examples/Io/Csv/include/ActsExamples/Io/Csv/CsvSimHitReader.hpp
index 3b249d083b4..1c912dca618 100644
--- a/Examples/Io/Csv/include/ActsExamples/Io/Csv/CsvSimHitReader.hpp
+++ b/Examples/Io/Csv/include/ActsExamples/Io/Csv/CsvSimHitReader.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2020 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
diff --git a/Examples/Io/Csv/include/ActsExamples/Io/Csv/CsvSimHitWriter.hpp b/Examples/Io/Csv/include/ActsExamples/Io/Csv/CsvSimHitWriter.hpp
index f62f12e8347..f2a09bfbd49 100644
--- a/Examples/Io/Csv/include/ActsExamples/Io/Csv/CsvSimHitWriter.hpp
+++ b/Examples/Io/Csv/include/ActsExamples/Io/Csv/CsvSimHitWriter.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2020 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
diff --git a/Examples/Io/Csv/include/ActsExamples/Io/Csv/CsvSpacePointReader.hpp b/Examples/Io/Csv/include/ActsExamples/Io/Csv/CsvSpacePointReader.hpp
index 57ef8055598..46c0780e02d 100644
--- a/Examples/Io/Csv/include/ActsExamples/Io/Csv/CsvSpacePointReader.hpp
+++ b/Examples/Io/Csv/include/ActsExamples/Io/Csv/CsvSpacePointReader.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2020 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
diff --git a/Examples/Io/Csv/include/ActsExamples/Io/Csv/CsvSpacePointsBucketWriter.hpp b/Examples/Io/Csv/include/ActsExamples/Io/Csv/CsvSpacePointsBucketWriter.hpp
new file mode 100644
index 00000000000..713665f0929
--- /dev/null
+++ b/Examples/Io/Csv/include/ActsExamples/Io/Csv/CsvSpacePointsBucketWriter.hpp
@@ -0,0 +1,79 @@
+// This file is part of the ACTS project.
+//
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
+//
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
+
+#pragma once
+
+#include "Acts/Definitions/TrackParametrization.hpp"
+#include "Acts/Geometry/GeometryContext.hpp"
+#include "Acts/Geometry/GeometryHierarchyMap.hpp"
+#include "Acts/Geometry/GeometryIdentifier.hpp"
+#include "Acts/Utilities/Helpers.hpp"
+#include "ActsExamples/Digitization/DigitizationConfig.hpp"
+#include "ActsExamples/EventData/Cluster.hpp"
+#include "ActsExamples/EventData/Index.hpp"
+#include "ActsExamples/EventData/Measurement.hpp"
+#include "ActsExamples/EventData/SimHit.hpp"
+#include "ActsExamples/EventData/SimSeed.hpp"
+#include "ActsExamples/EventData/SimSpacePoint.hpp"
+#include "ActsExamples/Framework/WriterT.hpp"
+
+#include <string>
+
+namespace ActsExamples {
+
+/// @class CsvSpacePointsBucketWriter
+///
+/// This writes one file per event containing information about the
+/// buckets
+///
+///     event000000001-buckets.csv
+///     event000000002-buckets.csv
+///     ...
+///
+/// Intrinsically thread-safe as one file per event.
+class CsvSpacePointsBucketWriter final
+    : public WriterT<std::vector<SimSpacePointContainer>> {
+ public:
+  struct Config {
+    /// Which bucket collection to write.
+    std::string inputBuckets;
+    /// Where to place output files
+    std::string outputDir;
+    /// Number of decimal digits for floating point precision in output.
+    int outputPrecision = std::numeric_limits<float>::max_digits10;
+  };
+
+  /// Constructor with
+  /// @param config configuration struct
+  /// @param level logging level
+  CsvSpacePointsBucketWriter(const Config& config, Acts::Logging::Level level);
+
+  /// Virtual destructor
+  ~CsvSpacePointsBucketWriter() override;
+
+  /// End-of-run hook
+  ProcessCode finalize() override;
+
+  /// Get readonly access to the config parameters
+  const Config& config() const { return m_cfg; }
+
+ protected:
+  /// This implementation holds the actual writing method
+  /// and is called by the WriterT<>::write interface
+  ///
+  /// @param ctx The Algorithm context with per event information
+  /// @param buckets is the data to be written out
+  ProcessCode writeT(
+      const AlgorithmContext& ctx,
+      const std::vector<SimSpacePointContainer>& buckets) override;
+
+ private:
+  Config m_cfg;
+};
+
+}  // namespace ActsExamples
diff --git a/Examples/Io/Csv/include/ActsExamples/Io/Csv/CsvSpacepointWriter.hpp b/Examples/Io/Csv/include/ActsExamples/Io/Csv/CsvSpacepointWriter.hpp
index bf282982e96..1e24eb4bc97 100644
--- a/Examples/Io/Csv/include/ActsExamples/Io/Csv/CsvSpacepointWriter.hpp
+++ b/Examples/Io/Csv/include/ActsExamples/Io/Csv/CsvSpacepointWriter.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2022 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
diff --git a/Examples/Io/Csv/include/ActsExamples/Io/Csv/CsvTrackParameterReader.hpp b/Examples/Io/Csv/include/ActsExamples/Io/Csv/CsvTrackParameterReader.hpp
index 1b4ae98baaf..4fee8ad8aec 100644
--- a/Examples/Io/Csv/include/ActsExamples/Io/Csv/CsvTrackParameterReader.hpp
+++ b/Examples/Io/Csv/include/ActsExamples/Io/Csv/CsvTrackParameterReader.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2022 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
diff --git a/Examples/Io/Csv/include/ActsExamples/Io/Csv/CsvTrackParameterWriter.hpp b/Examples/Io/Csv/include/ActsExamples/Io/Csv/CsvTrackParameterWriter.hpp
index 34525b9c5eb..4b448b7cd2e 100644
--- a/Examples/Io/Csv/include/ActsExamples/Io/Csv/CsvTrackParameterWriter.hpp
+++ b/Examples/Io/Csv/include/ActsExamples/Io/Csv/CsvTrackParameterWriter.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2022 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
diff --git a/Examples/Io/Csv/include/ActsExamples/Io/Csv/CsvTrackWriter.hpp b/Examples/Io/Csv/include/ActsExamples/Io/Csv/CsvTrackWriter.hpp
index d8267d04f5e..06a449e2615 100644
--- a/Examples/Io/Csv/include/ActsExamples/Io/Csv/CsvTrackWriter.hpp
+++ b/Examples/Io/Csv/include/ActsExamples/Io/Csv/CsvTrackWriter.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2021 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
diff --git a/Examples/Io/Csv/include/ActsExamples/Io/Csv/CsvTrackingGeometryWriter.hpp b/Examples/Io/Csv/include/ActsExamples/Io/Csv/CsvTrackingGeometryWriter.hpp
index f407c253a9d..7035e792075 100644
--- a/Examples/Io/Csv/include/ActsExamples/Io/Csv/CsvTrackingGeometryWriter.hpp
+++ b/Examples/Io/Csv/include/ActsExamples/Io/Csv/CsvTrackingGeometryWriter.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2017-2018 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
diff --git a/Examples/Io/Csv/src/CsvBFieldWriter.cpp b/Examples/Io/Csv/src/CsvBFieldWriter.cpp
index 05e2c8ca93f..dc38472c8ef 100644
--- a/Examples/Io/Csv/src/CsvBFieldWriter.cpp
+++ b/Examples/Io/Csv/src/CsvBFieldWriter.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2022 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include "ActsExamples/Io/Csv/CsvBFieldWriter.hpp"
 
diff --git a/Examples/Io/Csv/src/CsvDriftCircleReader.cpp b/Examples/Io/Csv/src/CsvDriftCircleReader.cpp
index 9fdb0d86083..ce179d9d5be 100644
--- a/Examples/Io/Csv/src/CsvDriftCircleReader.cpp
+++ b/Examples/Io/Csv/src/CsvDriftCircleReader.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2023 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include "ActsExamples/Io/Csv/CsvDriftCircleReader.hpp"
 
diff --git a/Examples/Io/Csv/src/CsvExaTrkXGraphReader.cpp b/Examples/Io/Csv/src/CsvExaTrkXGraphReader.cpp
index 9caf1df4142..f6ad7ba850d 100644
--- a/Examples/Io/Csv/src/CsvExaTrkXGraphReader.cpp
+++ b/Examples/Io/Csv/src/CsvExaTrkXGraphReader.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2017 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include "ActsExamples/Io/Csv/CsvExaTrkXGraphReader.hpp"
 
diff --git a/Examples/Io/Csv/src/CsvExaTrkXGraphWriter.cpp b/Examples/Io/Csv/src/CsvExaTrkXGraphWriter.cpp
index 664ed1f5fb5..eb12cdcdf89 100644
--- a/Examples/Io/Csv/src/CsvExaTrkXGraphWriter.cpp
+++ b/Examples/Io/Csv/src/CsvExaTrkXGraphWriter.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2020 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include "ActsExamples/Io/Csv/CsvExaTrkXGraphWriter.hpp"
 
diff --git a/Examples/Io/Csv/src/CsvMeasurementReader.cpp b/Examples/Io/Csv/src/CsvMeasurementReader.cpp
index e1c31d52b63..f426784ea30 100644
--- a/Examples/Io/Csv/src/CsvMeasurementReader.cpp
+++ b/Examples/Io/Csv/src/CsvMeasurementReader.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2021 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include "ActsExamples/Io/Csv/CsvMeasurementReader.hpp"
 
@@ -45,7 +45,6 @@ ActsExamples::CsvMeasurementReader::CsvMeasurementReader(
 
   m_outputMeasurements.initialize(m_cfg.outputMeasurements);
   m_outputMeasurementSimHitsMap.initialize(m_cfg.outputMeasurementSimHitsMap);
-  m_outputSourceLinks.initialize(m_cfg.outputSourceLinks);
   m_outputClusters.maybeInitialize(m_cfg.outputClusters);
   m_outputMeasurementParticlesMap.maybeInitialize(
       m_cfg.outputMeasurementParticlesMap);
@@ -124,7 +123,7 @@ std::vector<ActsExamples::MeasurementData> readMeasurementsByGeometryId(
   auto measurements = readEverything<ActsExamples::MeasurementData>(
       inputDir, "measurements.csv", {"geometry_id", "t"}, event);
   // sort same way they will be sorted in the output container
-  std::sort(measurements.begin(), measurements.end(), CompareGeometryId{});
+  std::ranges::sort(measurements, CompareGeometryId{});
   return measurements;
 }
 
@@ -193,15 +192,14 @@ ActsExamples::ProcessCode ActsExamples::CsvMeasurementReader::read(
       readMeasurementsByGeometryId(m_cfg.inputDir, ctx.eventNumber);
 
   // Prepare containers for the hit data using the framework event data types
-  GeometryIdMultimap<Measurement> orderedMeasurements;
+  MeasurementContainer tmpMeasurements;
+  GeometryIdMultimap<ConstVariableBoundMeasurementProxy> orderedMeasurements;
   IndexMultimap<Index> measurementSimHitsMap;
-  IndexSourceLinkContainer sourceLinks;
-  // need list here for stable addresses
-  std::list<IndexSourceLink> sourceLinkStorage;
+
+  tmpMeasurements.reserve(measurementData.size());
   orderedMeasurements.reserve(measurementData.size());
   // Safe long as we have single particle to sim hit association
   measurementSimHitsMap.reserve(measurementData.size());
-  sourceLinks.reserve(measurementData.size());
 
   auto measurementSimHitLinkData =
       readEverything<ActsExamples::MeasurementSimHitLink>(
@@ -249,27 +247,23 @@ ActsExamples::ProcessCode ActsExamples::CsvMeasurementReader::read(
 
     // The measurement container is unordered and the index under which
     // the measurement will be stored is known before adding it.
-    const Index index = orderedMeasurements.size();
-    IndexSourceLink& sourceLink = sourceLinkStorage.emplace_back(geoId, index);
-    auto measurement = createMeasurement(dParameters, sourceLink);
+    auto measurement = createMeasurement(tmpMeasurements, geoId, dParameters);
 
     // Due to the previous sorting of the raw hit data by geometry id, new
     // measurements should always end up at the end of the container. previous
     // elements were not touched; cluster indices remain stable and can
     // be used to identify the m.
-    auto inserted = orderedMeasurements.emplace_hint(
-        orderedMeasurements.end(), geoId, std::move(measurement));
+    auto inserted = orderedMeasurements.emplace_hint(orderedMeasurements.end(),
+                                                     geoId, measurement);
     if (std::next(inserted) != orderedMeasurements.end()) {
       ACTS_FATAL("Something went horribly wrong with the hit sorting");
       return ProcessCode::ABORT;
     }
-
-    sourceLinks.insert(sourceLinks.end(), std::cref(sourceLink));
   }
 
   MeasurementContainer measurements;
   for (auto& [_, meas] : orderedMeasurements) {
-    measurements.emplace_back(std::move(meas));
+    measurements.emplaceMeasurement(meas.size(), meas.geometryId(), meas);
   }
 
   // Generate measurement-particles-map
@@ -290,7 +284,6 @@ ActsExamples::ProcessCode ActsExamples::CsvMeasurementReader::read(
   // Write the data to the EventStore
   m_outputMeasurements(ctx, std::move(measurements));
   m_outputMeasurementSimHitsMap(ctx, std::move(measurementSimHitsMap));
-  m_outputSourceLinks(ctx, std::move(sourceLinks));
 
   /////////////////////////
   // Cluster information //
diff --git a/Examples/Io/Csv/src/CsvMeasurementWriter.cpp b/Examples/Io/Csv/src/CsvMeasurementWriter.cpp
index 0f65fca0d20..851966e8fba 100644
--- a/Examples/Io/Csv/src/CsvMeasurementWriter.cpp
+++ b/Examples/Io/Csv/src/CsvMeasurementWriter.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2021 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include "ActsExamples/Io/Csv/CsvMeasurementWriter.hpp"
 
@@ -13,7 +13,7 @@
 #include "Acts/Geometry/GeometryIdentifier.hpp"
 #include "ActsExamples/EventData/Cluster.hpp"
 #include "ActsExamples/EventData/Index.hpp"
-#include "ActsExamples/EventData/IndexSourceLink.hpp"
+#include "ActsExamples/EventData/Measurement.hpp"
 #include "ActsExamples/Framework/AlgorithmContext.hpp"
 #include "ActsExamples/Io/Csv/CsvInputOutput.hpp"
 #include "ActsExamples/Utilities/Paths.hpp"
@@ -92,15 +92,15 @@ ActsExamples::ProcessCode ActsExamples::CsvMeasurementWriter::writeT(
                           << " measurements in this event.");
 
   for (Index measIdx = 0u; measIdx < measurements.size(); ++measIdx) {
-    const auto& measurement = measurements[measIdx];
+    const ConstVariableBoundMeasurementProxy measurement =
+        measurements.getMeasurement(measIdx);
 
     auto simHitIndices = makeRange(measurementSimHitsMap.equal_range(measIdx));
     for (auto [_, simHitIdx] : simHitIndices) {
       writerMeasurementSimHitMap.append({measIdx, simHitIdx});
     }
 
-    Acts::GeometryIdentifier geoId =
-        measurement.sourceLink().template get<IndexSourceLink>().geometryId();
+    Acts::GeometryIdentifier geoId = measurement.geometryId();
     // MEASUREMENT information ------------------------------------
 
     // Encoded geometry identifier. same for all hits on the module
diff --git a/Examples/Io/Csv/src/CsvMuonSimHitReader.cpp b/Examples/Io/Csv/src/CsvMuonSimHitReader.cpp
index d6d166eee7d..58240dcecce 100644
--- a/Examples/Io/Csv/src/CsvMuonSimHitReader.cpp
+++ b/Examples/Io/Csv/src/CsvMuonSimHitReader.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2023 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include "ActsExamples/Io/Csv/CsvMuonSimHitReader.hpp"
 
diff --git a/Examples/Io/Csv/src/CsvOutputData.hpp b/Examples/Io/Csv/src/CsvOutputData.hpp
index af977ecbc5f..63fd8a23f0d 100644
--- a/Examples/Io/Csv/src/CsvOutputData.hpp
+++ b/Examples/Io/Csv/src/CsvOutputData.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2019-2022 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
@@ -354,4 +354,30 @@ struct GraphData {
   DFE_NAMEDTUPLE(GraphData, edge0, edge1, weight);
 };
 
+struct SpacePointBucketData {
+  /// @brief Data structure for space point buckets
+  /// @details A bucket is a collection of space points
+  ///        Different buckets can contain the same space point
+  ///        Measurement IDs are used to uniquely identify space points
+
+  /// Bucket index
+  std::uint64_t bucketIdx;
+  /// Bucket size (number of space points)
+  std::uint64_t bucketSize;
+
+  /// Measurement IDs of the space points in the bucket
+  /// To allow for variable size, the bucket data is split into several lines
+  /// A line can contain up to 20 space points (arbitrary number)
+  std::array<std::uint64_t, 20> measurement_id;
+
+  DFE_NAMEDTUPLE(SpacePointBucketData, bucketIdx, bucketSize, measurement_id[0],
+                 measurement_id[1], measurement_id[2], measurement_id[3],
+                 measurement_id[4], measurement_id[5], measurement_id[6],
+                 measurement_id[7], measurement_id[8], measurement_id[9],
+                 measurement_id[10], measurement_id[11], measurement_id[12],
+                 measurement_id[13], measurement_id[14], measurement_id[15],
+                 measurement_id[16], measurement_id[17], measurement_id[18],
+                 measurement_id[19]);
+};
+
 }  // namespace ActsExamples
diff --git a/Examples/Io/Csv/src/CsvParticleReader.cpp b/Examples/Io/Csv/src/CsvParticleReader.cpp
index fa8a17f0f13..de8d70c9014 100644
--- a/Examples/Io/Csv/src/CsvParticleReader.cpp
+++ b/Examples/Io/Csv/src/CsvParticleReader.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2017 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include "ActsExamples/Io/Csv/CsvParticleReader.hpp"
 
@@ -63,10 +63,10 @@ ActsExamples::ProcessCode ActsExamples::CsvParticleReader::read(
   ParticleData data;
 
   while (reader.read(data)) {
-    ActsFatras::Particle particle(ActsFatras::Barcode(data.particle_id),
-                                  Acts::PdgParticle{data.particle_type},
-                                  data.q * Acts::UnitConstants::e,
-                                  data.m * Acts::UnitConstants::GeV);
+    SimParticleState particle(ActsFatras::Barcode(data.particle_id),
+                              Acts::PdgParticle{data.particle_type},
+                              data.q * Acts::UnitConstants::e,
+                              data.m * Acts::UnitConstants::GeV);
     particle.setProcess(static_cast<ActsFatras::ProcessType>(data.process));
     particle.setPosition4(
         data.vx * Acts::UnitConstants::mm, data.vy * Acts::UnitConstants::mm,
@@ -75,7 +75,7 @@ ActsExamples::ProcessCode ActsExamples::CsvParticleReader::read(
     particle.setDirection(data.px, data.py, data.pz);
     particle.setAbsoluteMomentum(std::hypot(data.px, data.py, data.pz) *
                                  Acts::UnitConstants::GeV);
-    unordered.push_back(std::move(particle));
+    unordered.push_back(SimParticle(particle, particle));
   }
 
   // Write ordered particles container to the EventStore
diff --git a/Examples/Io/Csv/src/CsvParticleWriter.cpp b/Examples/Io/Csv/src/CsvParticleWriter.cpp
index db2d38d6af9..787fae5439b 100644
--- a/Examples/Io/Csv/src/CsvParticleWriter.cpp
+++ b/Examples/Io/Csv/src/CsvParticleWriter.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2022 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include "ActsExamples/Io/Csv/CsvParticleWriter.hpp"
 
diff --git a/Examples/Io/Csv/src/CsvProtoTrackWriter.cpp b/Examples/Io/Csv/src/CsvProtoTrackWriter.cpp
index 1b6c3d4ae37..802533f8bbe 100644
--- a/Examples/Io/Csv/src/CsvProtoTrackWriter.cpp
+++ b/Examples/Io/Csv/src/CsvProtoTrackWriter.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2023 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include "ActsExamples/Io/Csv/CsvProtoTrackWriter.hpp"
 
diff --git a/Examples/Io/Csv/src/CsvSeedWriter.cpp b/Examples/Io/Csv/src/CsvSeedWriter.cpp
index 2b3be226c48..29dd72ce8df 100644
--- a/Examples/Io/Csv/src/CsvSeedWriter.cpp
+++ b/Examples/Io/Csv/src/CsvSeedWriter.cpp
@@ -1,15 +1,15 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2023 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include "ActsExamples/Io/Csv/CsvSeedWriter.hpp"
 
+#include "Acts/EventData/Seed.hpp"
 #include "Acts/EventData/TrackParameters.hpp"
-#include "Acts/Seeding/Seed.hpp"
 #include "Acts/Utilities/Helpers.hpp"
 #include "ActsExamples/EventData/AverageSimHits.hpp"
 #include "ActsExamples/EventData/Index.hpp"
@@ -22,8 +22,10 @@
 #include "ActsExamples/Utilities/Range.hpp"
 #include "ActsExamples/Validation/TrackClassification.hpp"
 
+#include <fstream>
 #include <ios>
 #include <iostream>
+#include <numbers>
 #include <stdexcept>
 #include <string>
 #include <unordered_map>
@@ -122,14 +124,15 @@ ActsExamples::ProcessCode ActsExamples::CsvSeedWriter::writeT(
       // Compute the distance between the truth and estimated directions
       float truthPhi = phi(truthUnitDir);
       float truthEta = std::atanh(std::cos(theta(truthUnitDir)));
-      float dEta = fabs(truthEta - seedEta);
-      float dPhi = fabs(truthPhi - seedPhi) < M_PI
-                       ? fabs(truthPhi - seedPhi)
-                       : fabs(truthPhi - seedPhi) - M_PI;
+      float dEta = std::abs(truthEta - seedEta);
+      float dPhi =
+          std::abs(truthPhi - seedPhi) < std::numbers::pi_v<float>
+              ? std::abs(truthPhi - seedPhi)
+              : std::abs(truthPhi - seedPhi) - std::numbers::pi_v<float>;
       truthDistance = sqrt(dPhi * dPhi + dEta * dEta);
       // If the seed is truth matched, check if it is the closest one for the
       // contributing particle
-      if (goodSeed.find(majorityParticleId) != goodSeed.end()) {
+      if (goodSeed.contains(majorityParticleId)) {
         if (goodSeed[majorityParticleId].second > truthDistance) {
           goodSeed[majorityParticleId] = std::make_pair(iparams, truthDistance);
         }
@@ -163,13 +166,8 @@ ActsExamples::ProcessCode ActsExamples::CsvSeedWriter::writeT(
     infoMap[toAdd.seedID] = toAdd;
   }
 
-  mos << "seed_id,particleId,"
-      << "pT,eta,phi,"
-      << "bX,bY,bZ,"
-      << "mX,mY,mZ,"
-      << "tX,tY,tZ,"
-      << "good/duplicate/fake,"
-      << "vertexZ,quality,"
+  mos << "seed_id,particleId," << "pT,eta,phi," << "bX,bY,bZ," << "mX,mY,mZ,"
+      << "tX,tY,tZ," << "good/duplicate/fake," << "vertexZ,quality,"
       << "Hits_ID" << '\n';
 
   for (auto& [id, info] : infoMap) {
diff --git a/Examples/Io/Csv/src/CsvSimHitReader.cpp b/Examples/Io/Csv/src/CsvSimHitReader.cpp
index 5e9d6180389..949b6d4ce5c 100644
--- a/Examples/Io/Csv/src/CsvSimHitReader.cpp
+++ b/Examples/Io/Csv/src/CsvSimHitReader.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2020 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include "ActsExamples/Io/Csv/CsvSimHitReader.hpp"
 
diff --git a/Examples/Io/Csv/src/CsvSimHitWriter.cpp b/Examples/Io/Csv/src/CsvSimHitWriter.cpp
index 96b628afb33..0cd5b46d79f 100644
--- a/Examples/Io/Csv/src/CsvSimHitWriter.cpp
+++ b/Examples/Io/Csv/src/CsvSimHitWriter.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2020 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include "ActsExamples/Io/Csv/CsvSimHitWriter.hpp"
 
diff --git a/Examples/Io/Csv/src/CsvSpacePointReader.cpp b/Examples/Io/Csv/src/CsvSpacePointReader.cpp
index 2db167975f9..58b7ab6ceb5 100644
--- a/Examples/Io/Csv/src/CsvSpacePointReader.cpp
+++ b/Examples/Io/Csv/src/CsvSpacePointReader.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2017 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include "ActsExamples/Io/Csv/CsvSpacePointReader.hpp"
 
diff --git a/Examples/Io/Csv/src/CsvSpacePointWriter.cpp b/Examples/Io/Csv/src/CsvSpacePointWriter.cpp
index 6fecad15461..9eb440f7692 100644
--- a/Examples/Io/Csv/src/CsvSpacePointWriter.cpp
+++ b/Examples/Io/Csv/src/CsvSpacePointWriter.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2021 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include "ActsExamples/Io/Csv/CsvSpacepointWriter.hpp"
 
diff --git a/Examples/Io/Csv/src/CsvSpacePointsBucketWriter.cpp b/Examples/Io/Csv/src/CsvSpacePointsBucketWriter.cpp
new file mode 100755
index 00000000000..73150330f62
--- /dev/null
+++ b/Examples/Io/Csv/src/CsvSpacePointsBucketWriter.cpp
@@ -0,0 +1,76 @@
+// This file is part of the ACTS project.
+//
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
+//
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
+
+#include "ActsExamples/Io/Csv/CsvSpacePointsBucketWriter.hpp"
+
+#include "Acts/Definitions/Units.hpp"
+#include "ActsExamples/EventData/SimSeed.hpp"
+#include "ActsExamples/EventData/SimSpacePoint.hpp"
+#include "ActsExamples/Io/Csv/CsvInputOutput.hpp"
+#include "ActsExamples/Utilities/Paths.hpp"
+
+#include <cstddef>
+#include <ios>
+#include <optional>
+#include <stdexcept>
+
+#include "CsvOutputData.hpp"
+
+ActsExamples::CsvSpacePointsBucketWriter::CsvSpacePointsBucketWriter(
+    const ActsExamples::CsvSpacePointsBucketWriter::Config& config,
+    Acts::Logging::Level level)
+    : WriterT(config.inputBuckets, "CsvSpacePointsBucketWriter", level),
+      m_cfg(config) {}
+
+ActsExamples::CsvSpacePointsBucketWriter::~CsvSpacePointsBucketWriter() =
+    default;
+
+ActsExamples::ProcessCode ActsExamples::CsvSpacePointsBucketWriter::finalize() {
+  // Write the tree
+  return ProcessCode::SUCCESS;
+}
+
+ActsExamples::ProcessCode ActsExamples::CsvSpacePointsBucketWriter::writeT(
+    const AlgorithmContext& ctx,
+    const std::vector<SimSpacePointContainer>& buckets) {
+  // Open per-event file for all components
+  std::string pathBucket =
+      perEventFilepath(m_cfg.outputDir, "buckets.csv", ctx.eventNumber);
+
+  ActsExamples::NamedTupleCsvWriter<SpacePointBucketData> writerBucket(
+      pathBucket, m_cfg.outputPrecision);
+
+  SpacePointBucketData bucketData{};
+
+  int bucketIdx = 0;
+  for (const auto& bucket : buckets) {
+    if (bucket.empty()) {
+      continue;
+    }
+    // Split the bucket into lines of 20 space points to manage variable sizes
+    auto numLines =
+        static_cast<int>((bucket.size() / 20) +
+                         static_cast<std::size_t>(bucket.size() % 20 != 0));
+    for (int nLines = 0; nLines < numLines; nLines++) {
+      bucketData.bucketIdx = bucketIdx;
+      bucketData.bucketSize = bucket.size();
+      int maxSPIdx =
+          std::min(20, static_cast<int>(bucket.size() - nLines * 20));
+      for (int SPIdx = 0; SPIdx < maxSPIdx; SPIdx++) {
+        bucketData.measurement_id[SPIdx] = (bucket[nLines * 20 + SPIdx])
+                                               .sourceLinks()[0]
+                                               .get<IndexSourceLink>()
+                                               .index();
+      }
+      writerBucket.append(bucketData);
+    }
+    bucketIdx++;
+  }
+
+  return ActsExamples::ProcessCode::SUCCESS;
+}
diff --git a/Examples/Io/Csv/src/CsvTrackParameterReader.cpp b/Examples/Io/Csv/src/CsvTrackParameterReader.cpp
index 3e9c4ebb3a6..76db2e2ca05 100644
--- a/Examples/Io/Csv/src/CsvTrackParameterReader.cpp
+++ b/Examples/Io/Csv/src/CsvTrackParameterReader.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2022 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include "ActsExamples/Io/Csv/CsvTrackParameterReader.hpp"
 
diff --git a/Examples/Io/Csv/src/CsvTrackParameterWriter.cpp b/Examples/Io/Csv/src/CsvTrackParameterWriter.cpp
index 6251f983b4b..4370451e606 100644
--- a/Examples/Io/Csv/src/CsvTrackParameterWriter.cpp
+++ b/Examples/Io/Csv/src/CsvTrackParameterWriter.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2022 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include "ActsExamples/Io/Csv/CsvTrackParameterWriter.hpp"
 
diff --git a/Examples/Io/Csv/src/CsvTrackWriter.cpp b/Examples/Io/Csv/src/CsvTrackWriter.cpp
index 5ac430f4b7a..9f6d74ec730 100644
--- a/Examples/Io/Csv/src/CsvTrackWriter.cpp
+++ b/Examples/Io/Csv/src/CsvTrackWriter.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2021 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include "ActsExamples/Io/Csv/CsvTrackWriter.hpp"
 
@@ -28,14 +28,11 @@
 #include <memory>
 #include <stdexcept>
 #include <string>
+#include <tuple>
 #include <unordered_map>
 #include <unordered_set>
 #include <utility>
 
-namespace ActsExamples {
-class IndexSourceLink;
-}  // namespace ActsExamples
-
 using namespace ActsExamples;
 
 CsvTrackWriter::CsvTrackWriter(const CsvTrackWriter::Config& config,
@@ -159,19 +156,13 @@ ProcessCode CsvTrackWriter::writeT(const AlgorithmContext& context,
   // Find duplicates
   std::unordered_set<std::size_t> listGoodTracks;
   for (auto& [particleId, matchedTracks] : matched) {
-    std::sort(matchedTracks.begin(), matchedTracks.end(),
-              [](const RecoTrackInfo& lhs, const RecoTrackInfo& rhs) {
-                // sort by nMajorityHits
-                if (lhs.first.nMajorityHits != rhs.first.nMajorityHits) {
-                  return (lhs.first.nMajorityHits > rhs.first.nMajorityHits);
-                }
-                // sort by nOutliers
-                if (lhs.first.nOutliers != rhs.first.nOutliers) {
-                  return (lhs.first.nOutliers < rhs.first.nOutliers);
-                }
-                // sort by chi2
-                return (lhs.first.chi2Sum < rhs.first.chi2Sum);
-              });
+    std::ranges::sort(matchedTracks, [](const auto& lhs, const auto& rhs) {
+      const auto& t1 = lhs.first;
+      const auto& t2 = rhs.first;
+      // nMajorityHits are sorted descending, others ascending
+      return std::tie(t2.nMajorityHits, t1.nOutliers, t1.chi2Sum) <
+             std::tie(t1.nMajorityHits, t2.nOutliers, t2.chi2Sum);
+    });
 
     listGoodTracks.insert(matchedTracks.front().first.trackId);
   }
@@ -190,7 +181,7 @@ ProcessCode CsvTrackWriter::writeT(const AlgorithmContext& context,
 
   // good/duplicate/fake = 0/1/2
   for (auto& [id, trajState] : infoMap) {
-    if (listGoodTracks.find(id) != listGoodTracks.end()) {
+    if (listGoodTracks.contains(id)) {
       trajState.trackType = "good";
     } else if (trajState.trackType != "fake") {
       trajState.trackType = "duplicate";
diff --git a/Examples/Io/Csv/src/CsvTrackingGeometryWriter.cpp b/Examples/Io/Csv/src/CsvTrackingGeometryWriter.cpp
index 0d98c8d0f54..1257be23ff6 100644
--- a/Examples/Io/Csv/src/CsvTrackingGeometryWriter.cpp
+++ b/Examples/Io/Csv/src/CsvTrackingGeometryWriter.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2017 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include "ActsExamples/Io/Csv/CsvTrackingGeometryWriter.hpp"
 
diff --git a/Examples/Io/EDM4hep/include/ActsExamples/Io/EDM4hep/EDM4hepMeasurementReader.hpp b/Examples/Io/EDM4hep/include/ActsExamples/Io/EDM4hep/EDM4hepMeasurementReader.hpp
index b32259f176b..34a95d3709a 100644
--- a/Examples/Io/EDM4hep/include/ActsExamples/Io/EDM4hep/EDM4hepMeasurementReader.hpp
+++ b/Examples/Io/EDM4hep/include/ActsExamples/Io/EDM4hep/EDM4hepMeasurementReader.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2022 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 #pragma once
 
 #include "Acts/Plugins/Podio/PodioUtil.hpp"
@@ -41,8 +41,6 @@ class EDM4hepMeasurementReader final : public IReader {
     std::string outputMeasurements;
     /// Output measurement to sim hit collection.
     std::string outputMeasurementSimHitsMap;
-    /// Output source links collection.
-    std::string outputSourceLinks;
     /// Output cluster collection (optional).
     std::string outputClusters;
   };
@@ -79,9 +77,6 @@ class EDM4hepMeasurementReader final : public IReader {
   WriteDataHandle<IndexMultimap<Index>> m_outputMeasurementSimHitsMap{
       this, "OutputMeasurementSimHitsMap"};
 
-  WriteDataHandle<GeometryIdMultiset<IndexSourceLink>> m_outputSourceLinks{
-      this, "OutputSourceLinks"};
-
   WriteDataHandle<ClusterContainer> m_outputClusters{this, "OutputClusters"};
 };
 
diff --git a/Examples/Io/EDM4hep/include/ActsExamples/Io/EDM4hep/EDM4hepMeasurementWriter.hpp b/Examples/Io/EDM4hep/include/ActsExamples/Io/EDM4hep/EDM4hepMeasurementWriter.hpp
index 11c52b04de4..d559ee9a5e4 100644
--- a/Examples/Io/EDM4hep/include/ActsExamples/Io/EDM4hep/EDM4hepMeasurementWriter.hpp
+++ b/Examples/Io/EDM4hep/include/ActsExamples/Io/EDM4hep/EDM4hepMeasurementWriter.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2022 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
diff --git a/Examples/Io/EDM4hep/include/ActsExamples/Io/EDM4hep/EDM4hepMultiTrajectoryWriter.hpp b/Examples/Io/EDM4hep/include/ActsExamples/Io/EDM4hep/EDM4hepMultiTrajectoryWriter.hpp
index 5d200d57cf9..8117e4b663d 100644
--- a/Examples/Io/EDM4hep/include/ActsExamples/Io/EDM4hep/EDM4hepMultiTrajectoryWriter.hpp
+++ b/Examples/Io/EDM4hep/include/ActsExamples/Io/EDM4hep/EDM4hepMultiTrajectoryWriter.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2022 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
diff --git a/Examples/Io/EDM4hep/include/ActsExamples/Io/EDM4hep/EDM4hepParticleWriter.hpp b/Examples/Io/EDM4hep/include/ActsExamples/Io/EDM4hep/EDM4hepParticleWriter.hpp
index 7120d634053..55f28c5f011 100644
--- a/Examples/Io/EDM4hep/include/ActsExamples/Io/EDM4hep/EDM4hepParticleWriter.hpp
+++ b/Examples/Io/EDM4hep/include/ActsExamples/Io/EDM4hep/EDM4hepParticleWriter.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2022 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
diff --git a/Examples/Io/EDM4hep/include/ActsExamples/Io/EDM4hep/EDM4hepReader.hpp b/Examples/Io/EDM4hep/include/ActsExamples/Io/EDM4hep/EDM4hepReader.hpp
index 51c716aaa4b..204f88ad83a 100644
--- a/Examples/Io/EDM4hep/include/ActsExamples/Io/EDM4hep/EDM4hepReader.hpp
+++ b/Examples/Io/EDM4hep/include/ActsExamples/Io/EDM4hep/EDM4hepReader.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2024 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
@@ -15,7 +15,6 @@
 #include "ActsExamples/EventData/SimParticle.hpp"
 #include "ActsExamples/Framework/DataHandle.hpp"
 #include "ActsExamples/Framework/IReader.hpp"
-#include "ActsFatras/EventData/Particle.hpp"
 
 #include <memory>
 #include <string>
@@ -44,13 +43,10 @@ class EDM4hepReader final : public IReader {
     std::string inputParticles = "MCParticles";
     /// Names of the sim hit collections
     std::vector<std::string> inputSimHits{};
-    /// Particles at creation
-    std::string outputParticlesInitial;
-    /// Particles at their endpoints
-    std::string outputParticlesFinal;
     /// Particles from the generator
     std::string outputParticlesGenerator;
-
+    /// Particles from the simulation
+    std::string outputParticlesSimulation;
     /// Output simulated (truth) hits collection.
     std::string outputSimHits;
 
@@ -88,15 +84,14 @@ class EDM4hepReader final : public IReader {
   const Config& config() const { return m_cfg; }
 
   void processChildren(const edm4hep::MCParticle& particle, SimBarcode parentId,
-                       SimParticleContainer::sequence_type& particles,
+                       std::vector<SimParticle>& particles,
                        ParentRelationship& parentRelationship,
                        std::unordered_map<int, std::size_t>& particleMap,
                        std::size_t& nSecondaryVertices,
                        std::size_t& maxGen) const;
 
-  static void setSubParticleIds(
-      const SimParticleContainer::sequence_type::iterator& begin,
-      const SimParticleContainer::sequence_type::iterator& end);
+  static void setSubParticleIds(std::vector<SimParticle>::iterator begin,
+                                std::vector<SimParticle>::iterator end);
 
  private:
   const Acts::Logger& logger() const { return *m_logger; }
@@ -111,17 +106,14 @@ class EDM4hepReader final : public IReader {
 
   Acts::PodioUtil::ROOTReader& reader();
 
-  WriteDataHandle<SimParticleContainer> m_outputParticlesInitial{
-      this, "OutputParticlesInitial"};
-  WriteDataHandle<SimParticleContainer> m_outputParticlesFinal{
-      this, "OutputParticlesFinal"};
   WriteDataHandle<SimParticleContainer> m_outputParticlesGenerator{
       this, "OutputParticlesGenerator"};
+  WriteDataHandle<SimParticleContainer> m_outputParticlesSimulation{
+      this, "OutputParticlesSimulation"};
 
   WriteDataHandle<SimHitContainer> m_outputSimHits{this, "OutputSimHits"};
 
-  void graphviz(std::ostream& os,
-                const SimParticleContainer::sequence_type& particles,
+  void graphviz(std::ostream& os, const std::vector<SimParticle>& particles,
                 const ParentRelationship& parents) const;
 };
 
diff --git a/Examples/Io/EDM4hep/include/ActsExamples/Io/EDM4hep/EDM4hepSimHitWriter.hpp b/Examples/Io/EDM4hep/include/ActsExamples/Io/EDM4hep/EDM4hepSimHitWriter.hpp
index 91d55b4394e..bf1f49e7da7 100644
--- a/Examples/Io/EDM4hep/include/ActsExamples/Io/EDM4hep/EDM4hepSimHitWriter.hpp
+++ b/Examples/Io/EDM4hep/include/ActsExamples/Io/EDM4hep/EDM4hepSimHitWriter.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2022 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
diff --git a/Examples/Io/EDM4hep/include/ActsExamples/Io/EDM4hep/EDM4hepTrackReader.hpp b/Examples/Io/EDM4hep/include/ActsExamples/Io/EDM4hep/EDM4hepTrackReader.hpp
index 3bd0dea4554..c795af039fe 100644
--- a/Examples/Io/EDM4hep/include/ActsExamples/Io/EDM4hep/EDM4hepTrackReader.hpp
+++ b/Examples/Io/EDM4hep/include/ActsExamples/Io/EDM4hep/EDM4hepTrackReader.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2023 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
diff --git a/Examples/Io/EDM4hep/include/ActsExamples/Io/EDM4hep/EDM4hepTrackWriter.hpp b/Examples/Io/EDM4hep/include/ActsExamples/Io/EDM4hep/EDM4hepTrackWriter.hpp
index 30d4d5af85e..340301df810 100644
--- a/Examples/Io/EDM4hep/include/ActsExamples/Io/EDM4hep/EDM4hepTrackWriter.hpp
+++ b/Examples/Io/EDM4hep/include/ActsExamples/Io/EDM4hep/EDM4hepTrackWriter.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2023 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
diff --git a/Examples/Io/EDM4hep/include/ActsExamples/Io/EDM4hep/EDM4hepUtil.hpp b/Examples/Io/EDM4hep/include/ActsExamples/Io/EDM4hep/EDM4hepUtil.hpp
index 432f5a28323..bdce08bc876 100644
--- a/Examples/Io/EDM4hep/include/ActsExamples/Io/EDM4hep/EDM4hepUtil.hpp
+++ b/Examples/Io/EDM4hep/include/ActsExamples/Io/EDM4hep/EDM4hepUtil.hpp
@@ -1,18 +1,18 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2022 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 #pragma once
 
 #include "Acts/Geometry/GeometryContext.hpp"
 #include "ActsExamples/EventData/Cluster.hpp"
 #include "ActsExamples/EventData/Measurement.hpp"
+#include "ActsExamples/EventData/SimParticle.hpp"
 #include "ActsExamples/EventData/Trajectories.hpp"
 #include "ActsFatras/EventData/Hit.hpp"
-#include "ActsFatras/EventData/Particle.hpp"
 
 #include <functional>
 
@@ -20,7 +20,6 @@
 #include "edm4hep/MutableMCParticle.h"
 #include "edm4hep/MutableSimTrackerHit.h"
 #include "edm4hep/MutableTrack.h"
-#include "edm4hep/MutableTrackerHit.h"
 #include "edm4hep/MutableTrackerHitPlane.h"
 #include "edm4hep/SimTrackerHit.h"
 #include "edm4hep/TrackerHit.h"
@@ -49,7 +48,7 @@ using MapGeometryIdTo =
 /// Inpersistent information:
 /// - particle ID
 /// - process
-ActsFatras::Particle readParticle(
+SimParticle readParticle(
     const edm4hep::MCParticle& from,
     const MapParticleIdFrom& particleMapper = zeroParticleMapper);
 
@@ -58,8 +57,7 @@ ActsFatras::Particle readParticle(
 /// Inpersistent information:
 /// - particle ID
 /// - process
-void writeParticle(const ActsFatras::Particle& from,
-                   edm4hep::MutableMCParticle to);
+void writeParticle(const SimParticle& from, edm4hep::MutableMCParticle to);
 
 /// Reads a Fatras hit from EDM4hep.
 ///
@@ -91,10 +89,10 @@ void writeSimHit(const ActsFatras::Hit& from, edm4hep::MutableSimTrackerHit to,
 /// Known issues:
 /// - cluster channels are read from inappropriate fields
 /// - local 2D coordinates and time are read from position
-Measurement readMeasurement(const edm4hep::TrackerHitPlane& from,
-                            const edm4hep::TrackerHitCollection* fromClusters,
-                            Cluster* toCluster,
-                            const MapGeometryIdFrom& geometryMapper);
+VariableBoundMeasurementProxy readMeasurement(
+    MeasurementContainer& container, const edm4hep::TrackerHitPlane& from,
+    const edm4hep::TrackerHitCollection* fromClusters, Cluster* toCluster,
+    const MapGeometryIdFrom& geometryMapper);
 
 /// Writes a measurement cluster to EDM4hep.
 ///
@@ -106,7 +104,7 @@ Measurement readMeasurement(const edm4hep::TrackerHitPlane& from,
 /// Known issues:
 /// - cluster channels are written to inappropriate fields
 /// - local 2D coordinates and time are written to position
-void writeMeasurement(const Measurement& from,
+void writeMeasurement(const ConstVariableBoundMeasurementProxy& from,
                       edm4hep::MutableTrackerHitPlane to,
                       const Cluster* fromCluster,
                       edm4hep::TrackerHitCollection& toClusters,
diff --git a/Examples/Io/EDM4hep/src/EDM4hepMeasurementReader.cpp b/Examples/Io/EDM4hep/src/EDM4hepMeasurementReader.cpp
index f24e64ccd8e..237ff19e3b6 100644
--- a/Examples/Io/EDM4hep/src/EDM4hepMeasurementReader.cpp
+++ b/Examples/Io/EDM4hep/src/EDM4hepMeasurementReader.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2022 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include "ActsExamples/Io/EDM4hep/EDM4hepMeasurementReader.hpp"
 
@@ -37,7 +37,6 @@ EDM4hepMeasurementReader::EDM4hepMeasurementReader(
 
   m_outputMeasurements.initialize(m_cfg.outputMeasurements);
   m_outputMeasurementSimHitsMap.initialize(m_cfg.outputMeasurementSimHitsMap);
-  m_outputSourceLinks.initialize(m_cfg.outputSourceLinks);
   m_outputClusters.maybeInitialize(m_cfg.outputClusters);
 }
 
@@ -55,7 +54,6 @@ ProcessCode EDM4hepMeasurementReader::read(const AlgorithmContext& ctx) {
   ClusterContainer clusters;
   // TODO what about those?
   IndexMultimap<Index> measurementSimHitsMap;
-  IndexSourceLinkContainer sourceLinks;
 
   podio::Frame frame = reader().readEntry("events", ctx.eventNumber);
 
@@ -66,18 +64,16 @@ ProcessCode EDM4hepMeasurementReader::read(const AlgorithmContext& ctx) {
 
   for (const auto& trackerHitPlane : trackerHitPlaneCollection) {
     Cluster cluster;
-    auto measurement = EDM4hepUtil::readMeasurement(
-        trackerHitPlane, &trackerHitRawCollection, &cluster,
+    EDM4hepUtil::readMeasurement(
+        measurements, trackerHitPlane, &trackerHitRawCollection, &cluster,
         [](std::uint64_t cellId) { return Acts::GeometryIdentifier(cellId); });
 
-    measurements.push_back(std::move(measurement));
     clusters.push_back(std::move(cluster));
   }
 
   // Write the data to the EventStore
   m_outputMeasurements(ctx, std::move(measurements));
   m_outputMeasurementSimHitsMap(ctx, std::move(measurementSimHitsMap));
-  m_outputSourceLinks(ctx, std::move(sourceLinks));
   if (!m_cfg.outputClusters.empty()) {
     m_outputClusters(ctx, std::move(clusters));
   }
diff --git a/Examples/Io/EDM4hep/src/EDM4hepMeasurementWriter.cpp b/Examples/Io/EDM4hep/src/EDM4hepMeasurementWriter.cpp
index 6b26db80362..0f9e9422d28 100644
--- a/Examples/Io/EDM4hep/src/EDM4hepMeasurementWriter.cpp
+++ b/Examples/Io/EDM4hep/src/EDM4hepMeasurementWriter.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2022 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include "ActsExamples/Io/EDM4hep/EDM4hepMeasurementWriter.hpp"
 
@@ -55,7 +55,8 @@ ActsExamples::ProcessCode EDM4hepMeasurementWriter::writeT(
                           << " measurements in this event.");
 
   for (Index hitIdx = 0u; hitIdx < measurements.size(); ++hitIdx) {
-    const auto& from = measurements[hitIdx];
+    ConstVariableBoundMeasurementProxy from =
+        measurements.getMeasurement(hitIdx);
     const Cluster* fromCluster = clusters.empty() ? nullptr : &clusters[hitIdx];
 
     auto to = hitsPlane.create();
diff --git a/Examples/Io/EDM4hep/src/EDM4hepMultiTrajectoryWriter.cpp b/Examples/Io/EDM4hep/src/EDM4hepMultiTrajectoryWriter.cpp
index bfd48049c8c..106b2777d4f 100644
--- a/Examples/Io/EDM4hep/src/EDM4hepMultiTrajectoryWriter.cpp
+++ b/Examples/Io/EDM4hep/src/EDM4hepMultiTrajectoryWriter.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2021 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include "ActsExamples/Io/EDM4hep/EDM4hepMultiTrajectoryWriter.hpp"
 
diff --git a/Examples/Io/EDM4hep/src/EDM4hepParticleWriter.cpp b/Examples/Io/EDM4hep/src/EDM4hepParticleWriter.cpp
index c4b5533e599..fc0806acb43 100644
--- a/Examples/Io/EDM4hep/src/EDM4hepParticleWriter.cpp
+++ b/Examples/Io/EDM4hep/src/EDM4hepParticleWriter.cpp
@@ -1,17 +1,14 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2022 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include "ActsExamples/Io/EDM4hep/EDM4hepParticleWriter.hpp"
 
-#include "Acts/Definitions/Units.hpp"
-#include "ActsExamples/Framework/WhiteBoard.hpp"
 #include "ActsExamples/Io/EDM4hep/EDM4hepUtil.hpp"
-#include "ActsExamples/Utilities/Paths.hpp"
 
 #include <stdexcept>
 
diff --git a/Examples/Io/EDM4hep/src/EDM4hepReader.cpp b/Examples/Io/EDM4hep/src/EDM4hepReader.cpp
index 7e61ba2a561..3d5008863a3 100644
--- a/Examples/Io/EDM4hep/src/EDM4hepReader.cpp
+++ b/Examples/Io/EDM4hep/src/EDM4hepReader.cpp
@@ -1,15 +1,14 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2024 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include "ActsExamples/Io/EDM4hep/EDM4hepReader.hpp"
 
 #include "Acts/Definitions/Units.hpp"
-#include "Acts/Geometry/GeometryContext.hpp"
 #include "Acts/Geometry/GeometryIdentifier.hpp"
 #include "Acts/Plugins/DD4hep/DD4hepDetectorElement.hpp"
 #include "ActsExamples/DD4hepDetector/DD4hepDetector.hpp"
@@ -36,28 +35,22 @@ namespace ActsExamples {
 EDM4hepReader::EDM4hepReader(const Config& config, Acts::Logging::Level level)
     : m_cfg(config),
       m_logger(Acts::getDefaultLogger("EDM4hepParticleReader", level)) {
-  if (m_cfg.outputParticlesInitial.empty()) {
-    throw std::invalid_argument("Missing output collection initial particles");
-  }
-
-  if (m_cfg.outputParticlesFinal.empty()) {
-    throw std::invalid_argument("Missing output collection final particles");
-  }
-
   if (m_cfg.outputParticlesGenerator.empty()) {
     throw std::invalid_argument(
         "Missing output collection generator particles");
   }
-
+  if (m_cfg.outputParticlesSimulation.empty()) {
+    throw std::invalid_argument(
+        "Missing output collection simulated particles");
+  }
   if (m_cfg.outputSimHits.empty()) {
     throw std::invalid_argument("Missing output collection sim hits");
   }
 
   m_eventsRange = std::make_pair(0, reader().getEntries("events"));
 
-  m_outputParticlesInitial.initialize(m_cfg.outputParticlesInitial);
-  m_outputParticlesFinal.initialize(m_cfg.outputParticlesFinal);
   m_outputParticlesGenerator.initialize(m_cfg.outputParticlesGenerator);
+  m_outputParticlesSimulation.initialize(m_cfg.outputParticlesSimulation);
   m_outputSimHits.initialize(m_cfg.outputSimHits);
 
   m_cfg.trackingGeometry->visitSurfaces([&](const auto* surface) {
@@ -119,9 +112,9 @@ std::string plabel(const SimParticle& particle) {
 
 }  // namespace
 
-void EDM4hepReader::graphviz(
-    std::ostream& os, const SimParticleContainer::sequence_type& particles,
-    const ParentRelationship& parents) const {
+void EDM4hepReader::graphviz(std::ostream& os,
+                             const std::vector<SimParticle>& particles,
+                             const ParentRelationship& parents) const {
   os << "digraph Event {\n";
 
   std::set<unsigned int> primaryVertices;
@@ -164,7 +157,7 @@ ProcessCode EDM4hepReader::read(const AlgorithmContext& ctx) {
 
   ACTS_DEBUG("Reading EDM4hep inputs");
 
-  SimParticleContainer::sequence_type unordered;
+  std::vector<SimParticle> unorderedParticlesInitial;
 
   // Read particles from the input file
   // Find particles without parents and group them by vtx position to find
@@ -181,11 +174,9 @@ ProcessCode EDM4hepReader::read(const AlgorithmContext& ctx) {
     vtxPos /= Acts::UnitConstants::mm;
 
     // linear search for vector
-    auto it = std::find_if(
-        primaryVertices.begin(), primaryVertices.end(),
-        [&vtxPos](
-            const std::pair<Acts::Vector3, std::vector<edm4hep::MCParticle>>&
-                pair) { return pair.first == vtxPos; });
+    auto it = std::ranges::find_if(primaryVertices, [&vtxPos](const auto& v) {
+      return v.first == vtxPos;
+    });
 
     if (it == primaryVertices.end()) {
       ACTS_DEBUG("Found primary vertex at " << vtx.x << ", " << vtx.y << ", "
@@ -214,13 +205,14 @@ ProcessCode EDM4hepReader::read(const AlgorithmContext& ctx) {
     std::size_t nParticles = 0;
     std::size_t nSecondaryVertices = 0;
     std::size_t maxGen = 0;
-    auto startSize = unordered.size();
+    auto startSize = unorderedParticlesInitial.size();
     for (const auto& inParticle : particles) {
       nParticles += 1;
-      SimParticle particle{EDM4hepUtil::readParticle(inParticle)};
-      particle.setParticleId(SimBarcode{}
-                                 .setParticle(nParticles)
-                                 .setVertexPrimary(nPrimaryVertices));
+      SimParticle particle =
+          EDM4hepUtil::readParticle(inParticle)
+              .withParticleId(SimBarcode{}
+                                  .setParticle(nParticles)
+                                  .setVertexPrimary(nPrimaryVertices));
       ACTS_VERBOSE("+ add particle " << particle);
       ACTS_VERBOSE("  - at " << particle.position().transpose());
       ACTS_VERBOSE("  - createdInSim: " << inParticle.isCreatedInSimulation());
@@ -231,24 +223,28 @@ ProcessCode EDM4hepReader::read(const AlgorithmContext& ctx) {
                                     << inParticle.getEndpoint().y << ", "
                                     << inParticle.getEndpoint().z);
       const auto pid = particle.particleId();
-      unordered.push_back(std::move(particle));
-      edm4hepParticleMap[inParticle.getObjectID().index] = unordered.size() - 1;
-      processChildren(inParticle, pid, unordered, parentRelationship,
-                      edm4hepParticleMap, nSecondaryVertices, maxGen);
+      unorderedParticlesInitial.push_back(std::move(particle));
+      edm4hepParticleMap[inParticle.getObjectID().index] =
+          unorderedParticlesInitial.size() - 1;
+      processChildren(inParticle, pid, unorderedParticlesInitial,
+                      parentRelationship, edm4hepParticleMap,
+                      nSecondaryVertices, maxGen);
     }
     ACTS_VERBOSE("Primary vertex complete, produced "
-                 << (unordered.size() - startSize) << " particles and "
-                 << nSecondaryVertices << " secondary vertices in " << maxGen
-                 << " generations");
-    setSubParticleIds(std::next(unordered.begin(), startSize), unordered.end());
+                 << (unorderedParticlesInitial.size() - startSize)
+                 << " particles and " << nSecondaryVertices
+                 << " secondary vertices in " << maxGen << " generations");
+    setSubParticleIds(std::next(unorderedParticlesInitial.begin(), startSize),
+                      unorderedParticlesInitial.end());
   }
 
-  ACTS_DEBUG("Found " << unordered.size() << " particles");
+  ACTS_DEBUG("Found " << unorderedParticlesInitial.size() << " particles");
 
   // @TODO: Order simhits by time
 
-  SimParticleContainer particlesFinal;
   SimParticleContainer particlesGenerator;
+  SimParticleContainer particlesSimulated;
+
   for (const auto& inParticle : mcParticleCollection) {
     auto particleIt = edm4hepParticleMap.find(inParticle.getObjectID().index);
     if (particleIt == edm4hepParticleMap.end()) {
@@ -257,11 +253,11 @@ ProcessCode EDM4hepReader::read(const AlgorithmContext& ctx) {
       continue;
     }
     const std::size_t index = particleIt->second;
-    const auto& particleInitial = unordered.at(index);
+    const auto& particleInitial = unorderedParticlesInitial.at(index);
     if (!inParticle.isCreatedInSimulation()) {
       particlesGenerator.insert(particleInitial);
     }
-    SimParticle particleFinal = particleInitial;
+    SimParticle particleSimulated = particleInitial;
 
     float time = inParticle.getTime() * Acts::UnitConstants::ns;
     for (const auto& daughter : inParticle.getDaughters()) {
@@ -271,7 +267,7 @@ ProcessCode EDM4hepReader::read(const AlgorithmContext& ctx) {
       }
     }
 
-    particleFinal.setPosition4(
+    particleSimulated.final().setPosition4(
         inParticle.getEndpoint()[0] * Acts::UnitConstants::mm,
         inParticle.getEndpoint()[1] * Acts::UnitConstants::mm,
         inParticle.getEndpoint()[2] * Acts::UnitConstants::mm, time);
@@ -279,28 +275,24 @@ ProcessCode EDM4hepReader::read(const AlgorithmContext& ctx) {
     Acts::Vector3 momentumFinal = {inParticle.getMomentumAtEndpoint()[0],
                                    inParticle.getMomentumAtEndpoint()[1],
                                    inParticle.getMomentumAtEndpoint()[2]};
-    particleFinal.setDirection(momentumFinal.normalized());
-    particleFinal.setAbsoluteMomentum(momentumFinal.norm());
+    particleSimulated.final().setDirection(momentumFinal.normalized());
+    particleSimulated.final().setAbsoluteMomentum(momentumFinal.norm());
 
     ACTS_VERBOSE("- Updated particle initial -> final, position: "
                  << particleInitial.fourPosition().transpose() << " -> "
-                 << particleFinal.fourPosition().transpose());
+                 << particleSimulated.final().fourPosition().transpose());
     ACTS_VERBOSE("                                     momentum: "
                  << particleInitial.fourMomentum().transpose() << " -> "
-                 << particleFinal.fourMomentum().transpose());
+                 << particleSimulated.final().fourMomentum().transpose());
 
-    particlesFinal.insert(particleFinal);
+    particlesSimulated.insert(particleSimulated);
   }
 
-  // Write ordered particles container to the EventStore
-  SimParticleContainer particlesInitial;
-  particlesInitial.insert(unordered.begin(), unordered.end());
-
   if (!m_cfg.graphvizOutput.empty()) {
     std::string path = perEventFilepath(m_cfg.graphvizOutput, "particles.dot",
                                         ctx.eventNumber);
     std::ofstream dot(path);
-    graphviz(dot, unordered, parentRelationship);
+    graphviz(dot, unorderedParticlesInitial, parentRelationship);
   }
 
   SimHitContainer simHits;
@@ -322,7 +314,7 @@ ProcessCode EDM4hepReader::read(const AlgorithmContext& ctx) {
                   "SimHit has source particle that we did not see before");
               return SimBarcode{};
             }
-            const auto& particle = unordered.at(it->second);
+            const auto& particle = unorderedParticlesInitial.at(it->second);
             ACTS_VERBOSE("- " << inParticle.getObjectID().index << " -> "
                               << particle.particleId());
             return particle.particleId();
@@ -396,10 +388,9 @@ ProcessCode EDM4hepReader::read(const AlgorithmContext& ctx) {
         }
       }
 
-      std::sort(hitIndices.begin(), hitIndices.end(),
-                [&](std::size_t a, std::size_t b) {
-                  return simHits.nth(a)->time() < simHits.nth(b)->time();
-                });
+      std::ranges::sort(hitIndices, {}, [&simHits](std::size_t h) {
+        return simHits.nth(h)->time();
+      });
 
       for (std::size_t i = 0; i < hitIndices.size(); ++i) {
         auto& hit = *simHits.nth(hitIndices[i]);
@@ -419,9 +410,8 @@ ProcessCode EDM4hepReader::read(const AlgorithmContext& ctx) {
     }
   }
 
-  m_outputParticlesInitial(ctx, std::move(particlesInitial));
-  m_outputParticlesFinal(ctx, std::move(particlesFinal));
   m_outputParticlesGenerator(ctx, std::move(particlesGenerator));
+  m_outputParticlesSimulation(ctx, std::move(particlesSimulated));
 
   m_outputSimHits(ctx, std::move(simHits));
 
@@ -430,8 +420,7 @@ ProcessCode EDM4hepReader::read(const AlgorithmContext& ctx) {
 
 void EDM4hepReader::processChildren(
     const edm4hep::MCParticle& inParticle, SimBarcode parentId,
-    SimParticleContainer::sequence_type& particles,
-    ParentRelationship& parentRelationship,
+    std::vector<SimParticle>& particles, ParentRelationship& parentRelationship,
     std::unordered_map<int, std::size_t>& particleMap,
     std::size_t& nSecondaryVertices, std::size_t& maxGen) const {
   constexpr auto indent = [&](std::size_t n) {
@@ -503,9 +492,8 @@ void EDM4hepReader::processChildren(
   }
 }
 
-void EDM4hepReader::setSubParticleIds(
-    const SimParticleContainer::sequence_type::iterator& begin,
-    const SimParticleContainer::sequence_type::iterator& end) {
+void EDM4hepReader::setSubParticleIds(std::vector<SimParticle>::iterator begin,
+                                      std::vector<SimParticle>::iterator end) {
   std::vector<std::size_t> numByGeneration;
   numByGeneration.reserve(10);
 
diff --git a/Examples/Io/EDM4hep/src/EDM4hepSimHitWriter.cpp b/Examples/Io/EDM4hep/src/EDM4hepSimHitWriter.cpp
index 8df2a02a1eb..7528ba4589f 100644
--- a/Examples/Io/EDM4hep/src/EDM4hepSimHitWriter.cpp
+++ b/Examples/Io/EDM4hep/src/EDM4hepSimHitWriter.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2022 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include "ActsExamples/Io/EDM4hep/EDM4hepSimHitWriter.hpp"
 
diff --git a/Examples/Io/EDM4hep/src/EDM4hepTrackReader.cpp b/Examples/Io/EDM4hep/src/EDM4hepTrackReader.cpp
index 262307efab1..d95dfc79fc4 100644
--- a/Examples/Io/EDM4hep/src/EDM4hepTrackReader.cpp
+++ b/Examples/Io/EDM4hep/src/EDM4hepTrackReader.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2023 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include "ActsExamples/Io/EDM4hep/EDM4hepTrackReader.hpp"
 
diff --git a/Examples/Io/EDM4hep/src/EDM4hepTrackWriter.cpp b/Examples/Io/EDM4hep/src/EDM4hepTrackWriter.cpp
index c9d50032351..c2dd5734ecb 100644
--- a/Examples/Io/EDM4hep/src/EDM4hepTrackWriter.cpp
+++ b/Examples/Io/EDM4hep/src/EDM4hepTrackWriter.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2023 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include "ActsExamples/Io/EDM4hep/EDM4hepTrackWriter.hpp"
 
diff --git a/Examples/Io/EDM4hep/src/EDM4hepUtil.cpp b/Examples/Io/EDM4hep/src/EDM4hepUtil.cpp
index 6a7adfe98c5..38e26038779 100644
--- a/Examples/Io/EDM4hep/src/EDM4hepUtil.cpp
+++ b/Examples/Io/EDM4hep/src/EDM4hepUtil.cpp
@@ -1,24 +1,21 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2022 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include "ActsExamples/Io/EDM4hep/EDM4hepUtil.hpp"
 
 #include "Acts/Definitions/Common.hpp"
 #include "Acts/Definitions/Units.hpp"
-#include "Acts/EventData/Charge.hpp"
-#include "Acts/EventData/MultiTrajectory.hpp"
 #include "Acts/EventData/MultiTrajectoryHelpers.hpp"
 #include "Acts/Geometry/GeometryContext.hpp"
 #include "Acts/Plugins/EDM4hep/EDM4hepUtil.hpp"
 #include "ActsExamples/Digitization/MeasurementCreation.hpp"
 #include "ActsExamples/EventData/Index.hpp"
-#include "ActsExamples/EventData/IndexSourceLink.hpp"
-#include "ActsExamples/EventData/SimHit.hpp"
+#include "ActsExamples/EventData/Measurement.hpp"
 #include "ActsExamples/Validation/TrackClassification.hpp"
 
 #include "edm4hep/TrackState.h"
@@ -27,34 +24,33 @@ using namespace Acts::UnitLiterals;
 
 namespace ActsExamples {
 
-ActsFatras::Particle EDM4hepUtil::readParticle(
-    const edm4hep::MCParticle& from, const MapParticleIdFrom& particleMapper) {
+SimParticle EDM4hepUtil::readParticle(const edm4hep::MCParticle& from,
+                                      const MapParticleIdFrom& particleMapper) {
   ActsFatras::Barcode particleId = particleMapper(from);
 
-  ActsFatras::Particle to(particleId,
-                          static_cast<Acts::PdgParticle>(from.getPDG()),
-                          from.getCharge() * Acts::UnitConstants::e,
-                          from.getMass() * Acts::UnitConstants::GeV);
+  SimParticle to(particleId, static_cast<Acts::PdgParticle>(from.getPDG()),
+                 from.getCharge() * Acts::UnitConstants::e,
+                 from.getMass() * Acts::UnitConstants::GeV);
 
   // TODO do we have that in EDM4hep?
   // particle.setProcess(static_cast<ActsFatras::ProcessType>(data.process));
 
-  to.setPosition4(from.getVertex()[0] * Acts::UnitConstants::mm,
-                  from.getVertex()[1] * Acts::UnitConstants::mm,
-                  from.getVertex()[2] * Acts::UnitConstants::mm,
-                  from.getTime() * Acts::UnitConstants::ns);
+  to.initial().setPosition4(from.getVertex()[0] * Acts::UnitConstants::mm,
+                            from.getVertex()[1] * Acts::UnitConstants::mm,
+                            from.getVertex()[2] * Acts::UnitConstants::mm,
+                            from.getTime() * Acts::UnitConstants::ns);
 
   // Only used for direction; normalization/units do not matter
   Acts::Vector3 momentum = {from.getMomentum()[0], from.getMomentum()[1],
                             from.getMomentum()[2]};
-  to.setDirection(momentum.normalized());
+  to.initial().setDirection(momentum.normalized());
 
-  to.setAbsoluteMomentum(momentum.norm() * 1_GeV);
+  to.initial().setAbsoluteMomentum(momentum.norm() * 1_GeV);
 
   return to;
 }
 
-void EDM4hepUtil::writeParticle(const ActsFatras::Particle& from,
+void EDM4hepUtil::writeParticle(const SimParticle& from,
                                 edm4hep::MutableMCParticle to) {
   // TODO what about particleId?
 
@@ -65,6 +61,10 @@ void EDM4hepUtil::writeParticle(const ActsFatras::Particle& from,
   to.setMomentum({static_cast<float>(from.fourMomentum().x()),
                   static_cast<float>(from.fourMomentum().y()),
                   static_cast<float>(from.fourMomentum().z())});
+  to.setMomentumAtEndpoint(
+      {static_cast<float>(from.final().fourMomentum().x()),
+       static_cast<float>(from.final().fourMomentum().y()),
+       static_cast<float>(from.final().fourMomentum().z())});
 }
 
 ActsFatras::Hit EDM4hepUtil::readSimHit(
@@ -144,16 +144,13 @@ void EDM4hepUtil::writeSimHit(const ActsFatras::Hit& from,
   to.setEDep(-delta4[Acts::eEnergy] / Acts::UnitConstants::GeV);
 }
 
-Measurement EDM4hepUtil::readMeasurement(
-    const edm4hep::TrackerHitPlane& from,
+VariableBoundMeasurementProxy EDM4hepUtil::readMeasurement(
+    MeasurementContainer& container, const edm4hep::TrackerHitPlane& from,
     const edm4hep::TrackerHitCollection* fromClusters, Cluster* toCluster,
     const MapGeometryIdFrom& geometryMapper) {
   // no need for digitization as we only want to identify the sensor
   Acts::GeometryIdentifier geometryId = geometryMapper(from.getCellID());
 
-  IndexSourceLink sourceLink{
-      geometryId, static_cast<Index>(podioObjectIDToInteger(from.id()))};
-
   auto pos = from.getPosition();
   auto cov = from.getCovMatrix();
 
@@ -172,7 +169,7 @@ Measurement EDM4hepUtil::readMeasurement(
   dParameters.values.push_back(pos.z);
   dParameters.variances.push_back(cov[5]);
 
-  auto to = createMeasurement(dParameters, sourceLink);
+  auto to = createMeasurement(container, geometryId, dParameters);
 
   if (fromClusters != nullptr) {
     for (const auto objectId : from.getRawHits()) {
@@ -196,13 +193,12 @@ Measurement EDM4hepUtil::readMeasurement(
   return to;
 }
 
-void EDM4hepUtil::writeMeasurement(const Measurement& from,
-                                   edm4hep::MutableTrackerHitPlane to,
-                                   const Cluster* fromCluster,
-                                   edm4hep::TrackerHitCollection& toClusters,
-                                   const MapGeometryIdTo& geometryMapper) {
-  Acts::GeometryIdentifier geoId =
-      from.sourceLink().template get<IndexSourceLink>().geometryId();
+void EDM4hepUtil::writeMeasurement(
+    const ConstVariableBoundMeasurementProxy& from,
+    edm4hep::MutableTrackerHitPlane to, const Cluster* fromCluster,
+    edm4hep::TrackerHitCollection& toClusters,
+    const MapGeometryIdTo& geometryMapper) {
+  Acts::GeometryIdentifier geoId = from.geometryId();
 
   if (geometryMapper) {
     // no need for digitization as we only want to identify the sensor
diff --git a/Examples/Io/HepMC3/include/ActsExamples/Io/HepMC3/HepMC3Event.hpp b/Examples/Io/HepMC3/include/ActsExamples/Io/HepMC3/HepMC3Event.hpp
index 950ba814f1a..0094dc85e10 100644
--- a/Examples/Io/HepMC3/include/ActsExamples/Io/HepMC3/HepMC3Event.hpp
+++ b/Examples/Io/HepMC3/include/ActsExamples/Io/HepMC3/HepMC3Event.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2018 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
diff --git a/Examples/Io/HepMC3/include/ActsExamples/Io/HepMC3/HepMC3Particle.hpp b/Examples/Io/HepMC3/include/ActsExamples/Io/HepMC3/HepMC3Particle.hpp
index 1585b5f84c5..0da9cced072 100644
--- a/Examples/Io/HepMC3/include/ActsExamples/Io/HepMC3/HepMC3Particle.hpp
+++ b/Examples/Io/HepMC3/include/ActsExamples/Io/HepMC3/HepMC3Particle.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2018 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
diff --git a/Examples/Io/HepMC3/include/ActsExamples/Io/HepMC3/HepMC3Reader.hpp b/Examples/Io/HepMC3/include/ActsExamples/Io/HepMC3/HepMC3Reader.hpp
index d224ff2a7ce..84dbbfd926f 100644
--- a/Examples/Io/HepMC3/include/ActsExamples/Io/HepMC3/HepMC3Reader.hpp
+++ b/Examples/Io/HepMC3/include/ActsExamples/Io/HepMC3/HepMC3Reader.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2018-2020 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
diff --git a/Examples/Io/HepMC3/include/ActsExamples/Io/HepMC3/HepMC3Vertex.hpp b/Examples/Io/HepMC3/include/ActsExamples/Io/HepMC3/HepMC3Vertex.hpp
index 47e190b5769..bba58811ec7 100644
--- a/Examples/Io/HepMC3/include/ActsExamples/Io/HepMC3/HepMC3Vertex.hpp
+++ b/Examples/Io/HepMC3/include/ActsExamples/Io/HepMC3/HepMC3Vertex.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2018 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
diff --git a/Examples/Io/HepMC3/include/ActsExamples/Io/HepMC3/HepMC3Writer.hpp b/Examples/Io/HepMC3/include/ActsExamples/Io/HepMC3/HepMC3Writer.hpp
index 451e838fe20..3b534cd3584 100644
--- a/Examples/Io/HepMC3/include/ActsExamples/Io/HepMC3/HepMC3Writer.hpp
+++ b/Examples/Io/HepMC3/include/ActsExamples/Io/HepMC3/HepMC3Writer.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2018-2020 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
diff --git a/Examples/Io/HepMC3/src/HepMC3Event.cpp b/Examples/Io/HepMC3/src/HepMC3Event.cpp
index 0fc87296a84..ffd62c272f9 100644
--- a/Examples/Io/HepMC3/src/HepMC3Event.cpp
+++ b/Examples/Io/HepMC3/src/HepMC3Event.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2018 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include "ActsExamples/Io/HepMC3/HepMC3Event.hpp"
 
diff --git a/Examples/Io/HepMC3/src/HepMC3Particle.cpp b/Examples/Io/HepMC3/src/HepMC3Particle.cpp
index 99564447a94..315c79dced1 100644
--- a/Examples/Io/HepMC3/src/HepMC3Particle.cpp
+++ b/Examples/Io/HepMC3/src/HepMC3Particle.cpp
@@ -1,14 +1,15 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2018 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include "ActsExamples/Io/HepMC3/HepMC3Particle.hpp"
 
 #include "Acts/Definitions/ParticleData.hpp"
+#include "ActsExamples/EventData/SimParticle.hpp"
 #include "ActsExamples/Io/HepMC3/HepMC3Vertex.hpp"
 
 namespace ActsExamples {
@@ -23,12 +24,12 @@ SimParticle HepMC3Particle::particle(
     const HepMC3::ConstGenParticlePtr& particle) {
   SimBarcode particleId = barcode(particle);
   Acts::PdgParticle pdg = static_cast<Acts::PdgParticle>(particle->pid());
-  SimParticle fw(particleId, pdg, Acts::findCharge(pdg).value_or(0),
-                 particle->generated_mass());
+  SimParticleState fw(particleId, pdg, Acts::findCharge(pdg).value_or(0),
+                      particle->generated_mass());
   fw.setDirection(particle->momentum().x(), particle->momentum().y(),
                   particle->momentum().z());
   fw.setAbsoluteMomentum(particle->momentum().p3mod());
-  return fw;
+  return SimParticle(fw, fw);
 }
 
 int HepMC3Particle::id(const std::shared_ptr<HepMC3::GenParticle>& particle) {
diff --git a/Examples/Io/HepMC3/src/HepMC3Reader.cpp b/Examples/Io/HepMC3/src/HepMC3Reader.cpp
index 8101ebf1e1f..8d9c91c9811 100644
--- a/Examples/Io/HepMC3/src/HepMC3Reader.cpp
+++ b/Examples/Io/HepMC3/src/HepMC3Reader.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2018-2020 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include "ActsExamples/Io/HepMC3/HepMC3Reader.hpp"
 
diff --git a/Examples/Io/HepMC3/src/HepMC3Vertex.cpp b/Examples/Io/HepMC3/src/HepMC3Vertex.cpp
index aa18c760a70..397eba88085 100644
--- a/Examples/Io/HepMC3/src/HepMC3Vertex.cpp
+++ b/Examples/Io/HepMC3/src/HepMC3Vertex.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2018 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include "ActsExamples/Io/HepMC3/HepMC3Vertex.hpp"
 
diff --git a/Examples/Io/HepMC3/src/HepMC3Writer.cpp b/Examples/Io/HepMC3/src/HepMC3Writer.cpp
index fe300f1087f..4adc222c9fe 100644
--- a/Examples/Io/HepMC3/src/HepMC3Writer.cpp
+++ b/Examples/Io/HepMC3/src/HepMC3Writer.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2018-2020 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include "ActsExamples/Io/HepMC3/HepMC3Writer.hpp"
 
diff --git a/Examples/Io/Json/include/ActsExamples/Io/Json/JsonDigitizationConfig.hpp b/Examples/Io/Json/include/ActsExamples/Io/Json/JsonDigitizationConfig.hpp
index 34993814862..11e063acaa8 100644
--- a/Examples/Io/Json/include/ActsExamples/Io/Json/JsonDigitizationConfig.hpp
+++ b/Examples/Io/Json/include/ActsExamples/Io/Json/JsonDigitizationConfig.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2021 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
diff --git a/Examples/Io/Json/include/ActsExamples/Io/Json/JsonGeometryList.hpp b/Examples/Io/Json/include/ActsExamples/Io/Json/JsonGeometryList.hpp
index 278325ac444..8b9887f3503 100644
--- a/Examples/Io/Json/include/ActsExamples/Io/Json/JsonGeometryList.hpp
+++ b/Examples/Io/Json/include/ActsExamples/Io/Json/JsonGeometryList.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2021 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
diff --git a/Examples/Io/Json/include/ActsExamples/Io/Json/JsonMaterialWriter.hpp b/Examples/Io/Json/include/ActsExamples/Io/Json/JsonMaterialWriter.hpp
index 310333f7d27..c59a5a2a909 100644
--- a/Examples/Io/Json/include/ActsExamples/Io/Json/JsonMaterialWriter.hpp
+++ b/Examples/Io/Json/include/ActsExamples/Io/Json/JsonMaterialWriter.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2017-2019 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
diff --git a/Examples/Io/Json/include/ActsExamples/Io/Json/JsonSurfacesReader.hpp b/Examples/Io/Json/include/ActsExamples/Io/Json/JsonSurfacesReader.hpp
index fcd16b97a8e..50bbf15d35f 100644
--- a/Examples/Io/Json/include/ActsExamples/Io/Json/JsonSurfacesReader.hpp
+++ b/Examples/Io/Json/include/ActsExamples/Io/Json/JsonSurfacesReader.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2023 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
@@ -33,7 +33,14 @@ struct Options {
 /// @param options specifies which file and what to read
 ///
 /// @return  a vector of surfaces
-Acts::GeometryHierarchyMap<std::shared_ptr<Acts::Surface>> read(
+Acts::GeometryHierarchyMap<std::shared_ptr<Acts::Surface>> readHierarchyMap(
     const Options& options);
 
+/// @brief Read the flat surfaces from the input file
+///
+/// @param inputFile is the input file to read from
+///
+/// @return  a vector of surfaces
+std::vector<std::shared_ptr<Acts::Surface>> readVector(const Options& options);
+
 }  // namespace ActsExamples::JsonSurfacesReader
diff --git a/Examples/Io/Json/include/ActsExamples/Io/Json/JsonSurfacesWriter.hpp b/Examples/Io/Json/include/ActsExamples/Io/Json/JsonSurfacesWriter.hpp
index 3e202e14502..fd173885151 100644
--- a/Examples/Io/Json/include/ActsExamples/Io/Json/JsonSurfacesWriter.hpp
+++ b/Examples/Io/Json/include/ActsExamples/Io/Json/JsonSurfacesWriter.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2021 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
diff --git a/Examples/Io/Json/src/JsonDigitizationConfig.cpp b/Examples/Io/Json/src/JsonDigitizationConfig.cpp
index 5e1d6b684ff..489c86087bf 100644
--- a/Examples/Io/Json/src/JsonDigitizationConfig.cpp
+++ b/Examples/Io/Json/src/JsonDigitizationConfig.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2021 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include "ActsExamples/Io/Json/JsonDigitizationConfig.hpp"
 
@@ -139,7 +139,9 @@ void ActsExamples::to_json(nlohmann::json& j,
   j["thickness"] = gdc.thickness;
   j["threshold"] = gdc.threshold;
   j["digital"] = gdc.digital;
-  to_json(j["charge-smearing"], gdc.chargeSmearer);
+  if (j.find("charge-smearing") != j.end()) {
+    to_json(j["charge-smearing"], gdc.chargeSmearer);
+  }
 }
 
 void ActsExamples::from_json(const nlohmann::json& j,
@@ -161,7 +163,9 @@ void ActsExamples::from_json(const nlohmann::json& j,
       gdc.varianceMap[idx] = vars;
     }
   }
-  from_json(j["charge-smearing"], gdc.chargeSmearer);
+  if (j.find("charge-smearing") != j.end()) {
+    from_json(j["charge-smearing"], gdc.chargeSmearer);
+  }
 }
 
 void ActsExamples::to_json(nlohmann::json& j,
diff --git a/Examples/Io/Json/src/JsonGeometryList.cpp b/Examples/Io/Json/src/JsonGeometryList.cpp
index 859ee0ed829..4c9554954f8 100644
--- a/Examples/Io/Json/src/JsonGeometryList.cpp
+++ b/Examples/Io/Json/src/JsonGeometryList.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2021 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include "ActsExamples/Io/Json/JsonGeometryList.hpp"
 
diff --git a/Examples/Io/Json/src/JsonMaterialWriter.cpp b/Examples/Io/Json/src/JsonMaterialWriter.cpp
index 4370835355e..55b6b686e98 100644
--- a/Examples/Io/Json/src/JsonMaterialWriter.cpp
+++ b/Examples/Io/Json/src/JsonMaterialWriter.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2017-2019 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include "ActsExamples/Io/Json/JsonMaterialWriter.hpp"
 
diff --git a/Examples/Io/Json/src/JsonSurfacesReader.cpp b/Examples/Io/Json/src/JsonSurfacesReader.cpp
index fdc80f5c144..469c9828d46 100644
--- a/Examples/Io/Json/src/JsonSurfacesReader.cpp
+++ b/Examples/Io/Json/src/JsonSurfacesReader.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2023 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include "ActsExamples/Io/Json/JsonSurfacesReader.hpp"
 
@@ -20,7 +20,8 @@
 namespace ActsExamples {
 
 Acts::GeometryHierarchyMap<std::shared_ptr<Acts::Surface>>
-JsonSurfacesReader::read(const JsonSurfacesReader::Options& options) {
+JsonSurfacesReader::readHierarchyMap(
+    const JsonSurfacesReader::Options& options) {
   // Read the json file into a json object
   nlohmann::json j;
   std::ifstream in(options.inputFile);
@@ -50,4 +51,26 @@ JsonSurfacesReader::read(const JsonSurfacesReader::Options& options) {
   return SurfaceHierachyMap(std::move(surfaceElements));
 }
 
+std::vector<std::shared_ptr<Acts::Surface>> JsonSurfacesReader::readVector(
+    const Options& options) {
+  // Read the json file into a json object
+  nlohmann::json j;
+  std::ifstream in(options.inputFile);
+  in >> j;
+  in.close();
+
+  // Walk down the path to the surface entries
+  nlohmann::json jSurfaces = j;
+  for (const auto& jep : options.jsonEntryPath) {
+    jSurfaces = jSurfaces[jep];
+  }
+
+  std::vector<std::shared_ptr<Acts::Surface>> surfaces;
+  for (const auto& jSurface : jSurfaces) {
+    auto surface = Acts::SurfaceJsonConverter::fromJson(jSurface);
+    surfaces.push_back(surface);
+  }
+  return surfaces;
+}
+
 }  // namespace ActsExamples
diff --git a/Examples/Io/Json/src/JsonSurfacesWriter.cpp b/Examples/Io/Json/src/JsonSurfacesWriter.cpp
index 99176f742b3..9e6a5cc0135 100644
--- a/Examples/Io/Json/src/JsonSurfacesWriter.cpp
+++ b/Examples/Io/Json/src/JsonSurfacesWriter.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2021 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include "ActsExamples/Io/Json/JsonSurfacesWriter.hpp"
 
@@ -26,6 +26,7 @@
 #include "ActsExamples/Utilities/Paths.hpp"
 
 #include <cstddef>
+#include <fstream>
 #include <iomanip>
 #include <sstream>
 #include <stdexcept>
diff --git a/Examples/Io/NuclearInteractions/CMakeLists.txt b/Examples/Io/NuclearInteractions/CMakeLists.txt
deleted file mode 100644
index 3f7ad2b9b9b..00000000000
--- a/Examples/Io/NuclearInteractions/CMakeLists.txt
+++ /dev/null
@@ -1,20 +0,0 @@
-add_library(
-    ActsExamplesIoNuclearInteractions
-    SHARED
-    src/RootNuclearInteractionParametersWriter.cpp
-    src/detail/NuclearInteractionParametrisation.cpp
-)
-target_include_directories(
-    ActsExamplesIoNuclearInteractions
-    PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
-)
-target_link_libraries(
-    ActsExamplesIoNuclearInteractions
-    PUBLIC ActsCore ActsExamplesFramework Threads::Threads
-    PRIVATE ROOT::Core ROOT::Hist ROOT::Tree
-)
-
-install(
-    TARGETS ActsExamplesIoNuclearInteractions
-    LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
-)
diff --git a/Examples/Io/Obj/include/ActsExamples/Plugins/Obj/ObjPropagationStepsWriter.hpp b/Examples/Io/Obj/include/ActsExamples/Plugins/Obj/ObjPropagationStepsWriter.hpp
index 8741c21fe93..1a20c483976 100644
--- a/Examples/Io/Obj/include/ActsExamples/Plugins/Obj/ObjPropagationStepsWriter.hpp
+++ b/Examples/Io/Obj/include/ActsExamples/Plugins/Obj/ObjPropagationStepsWriter.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2017-2024 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
diff --git a/Examples/Io/Obj/include/ActsExamples/Plugins/Obj/ObjTrackingGeometryWriter.hpp b/Examples/Io/Obj/include/ActsExamples/Plugins/Obj/ObjTrackingGeometryWriter.hpp
index 086d973a282..2eae269c6a4 100644
--- a/Examples/Io/Obj/include/ActsExamples/Plugins/Obj/ObjTrackingGeometryWriter.hpp
+++ b/Examples/Io/Obj/include/ActsExamples/Plugins/Obj/ObjTrackingGeometryWriter.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2017-2018 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
@@ -43,11 +43,11 @@ class ObjTrackingGeometryWriter {
     std::size_t outputPrecision = 6;  ///< floating point precision
     std::string outputDir = ".";
 
-    Acts::ViewConfig containerView = Acts::ViewConfig({220, 220, 220});
-    Acts::ViewConfig volumeView = Acts::ViewConfig({220, 220, 0});
-    Acts::ViewConfig sensitiveView = Acts::ViewConfig({0, 180, 240});
-    Acts::ViewConfig passiveView = Acts::ViewConfig({240, 280, 0});
-    Acts::ViewConfig gridView = Acts::ViewConfig({220, 0, 0});
+    Acts::ViewConfig containerView = {.color = {220, 220, 220}};
+    Acts::ViewConfig volumeView = {.color = {220, 220, 0}};
+    Acts::ViewConfig sensitiveView = {.color = {0, 180, 240}};
+    Acts::ViewConfig passiveView = {.color = {240, 280, 0}};
+    Acts::ViewConfig gridView = {.color = {220, 0, 0}};
   };
 
   /// Constructor
diff --git a/Examples/Io/Obj/include/ActsExamples/Plugins/Obj/ObjWriterOptions.hpp b/Examples/Io/Obj/include/ActsExamples/Plugins/Obj/ObjWriterOptions.hpp
index 2590e6b7799..f62a8b6a557 100644
--- a/Examples/Io/Obj/include/ActsExamples/Plugins/Obj/ObjWriterOptions.hpp
+++ b/Examples/Io/Obj/include/ActsExamples/Plugins/Obj/ObjWriterOptions.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2017-2018 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
diff --git a/Examples/Io/Obj/src/ObjPropagationStepsWriter.cpp b/Examples/Io/Obj/src/ObjPropagationStepsWriter.cpp
index 50007b1070b..6d0388984cc 100644
--- a/Examples/Io/Obj/src/ObjPropagationStepsWriter.cpp
+++ b/Examples/Io/Obj/src/ObjPropagationStepsWriter.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2024 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include "ActsExamples/Plugins/Obj/ObjPropagationStepsWriter.hpp"
 
diff --git a/Examples/Io/Obj/src/ObjTrackingGeometryWriter.cpp b/Examples/Io/Obj/src/ObjTrackingGeometryWriter.cpp
index 707add19bfd..4937757c85f 100644
--- a/Examples/Io/Obj/src/ObjTrackingGeometryWriter.cpp
+++ b/Examples/Io/Obj/src/ObjTrackingGeometryWriter.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2017 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include "ActsExamples/Plugins/Obj/ObjTrackingGeometryWriter.hpp"
 
@@ -14,6 +14,8 @@
 #include <Acts/Visualization/GeometryView3D.hpp>
 #include <Acts/Visualization/ObjVisualization3D.hpp>
 
+#include <filesystem>
+
 ActsExamples::ObjTrackingGeometryWriter::ObjTrackingGeometryWriter(
     const ActsExamples::ObjTrackingGeometryWriter::Config& config,
     Acts::Logging::Level level)
@@ -43,5 +45,5 @@ void ActsExamples::ObjTrackingGeometryWriter::write(
   Acts::GeometryView3D::drawTrackingVolume(
       objVis, tVolume, context.geoContext, m_cfg.containerView,
       m_cfg.volumeView, m_cfg.passiveView, m_cfg.sensitiveView, m_cfg.gridView,
-      true, "", m_cfg.outputDir);
+      true, "", std::filesystem::path(m_cfg.outputDir));
 }
diff --git a/Examples/Io/Performance/CMakeLists.txt b/Examples/Io/Performance/CMakeLists.txt
deleted file mode 100644
index b41bf76ea07..00000000000
--- a/Examples/Io/Performance/CMakeLists.txt
+++ /dev/null
@@ -1,23 +0,0 @@
-add_library(
-    ActsExamplesIoPerformance
-    SHARED
-    ActsExamples/Io/Performance/CKFPerformanceWriter.cpp
-    ActsExamples/Io/Performance/SeedingPerformanceWriter.cpp
-    ActsExamples/Io/Performance/TrackFinderPerformanceWriter.cpp
-    ActsExamples/Io/Performance/TrackFitterPerformanceWriter.cpp
-    ActsExamples/Io/Performance/VertexPerformanceWriter.cpp
-)
-target_include_directories(
-    ActsExamplesIoPerformance
-    PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
-)
-target_link_libraries(
-    ActsExamplesIoPerformance
-    PUBLIC ActsExamplesFramework
-    PRIVATE ActsCore ROOT::Core ROOT::Tree
-)
-
-install(
-    TARGETS ActsExamplesIoPerformance
-    LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
-)
diff --git a/Examples/Io/Root/CMakeLists.txt b/Examples/Io/Root/CMakeLists.txt
index 3ac12286395..353d68debab 100644
--- a/Examples/Io/Root/CMakeLists.txt
+++ b/Examples/Io/Root/CMakeLists.txt
@@ -23,6 +23,13 @@ add_library(
     src/RootVertexReader.cpp
     src/RootVertexWriter.cpp
     src/RootAthenaDumpReader.cpp
+    src/RootNuclearInteractionParametersWriter.cpp
+    src/detail/NuclearInteractionParametrisation.cpp
+    src/TrackFinderPerformanceWriter.cpp
+    src/SeedingPerformanceWriter.cpp
+    src/TrackFinderNTupleWriter.cpp
+    src/TrackFitterPerformanceWriter.cpp
+    src/VertexNTupleWriter.cpp
 )
 target_include_directories(
     ActsExamplesIoRoot
diff --git a/Examples/Io/Root/LinkDef.hpp b/Examples/Io/Root/LinkDef.hpp
index aef74c9d816..0f2b7b5a315 100644
--- a/Examples/Io/Root/LinkDef.hpp
+++ b/Examples/Io/Root/LinkDef.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2024 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
diff --git a/Examples/Io/Root/include/ActsExamples/Io/Root/RootAthenaDumpReader.hpp b/Examples/Io/Root/include/ActsExamples/Io/Root/RootAthenaDumpReader.hpp
index 3083197f63d..2a09d8492b2 100644
--- a/Examples/Io/Root/include/ActsExamples/Io/Root/RootAthenaDumpReader.hpp
+++ b/Examples/Io/Root/include/ActsExamples/Io/Root/RootAthenaDumpReader.hpp
@@ -1,14 +1,15 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2024 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
 #include "Acts/Utilities/Logger.hpp"
+#include "ActsExamples/EventData/GeometryContainers.hpp"
 #include "ActsExamples/EventData/Measurement.hpp"
 #include "ActsExamples/EventData/SimSpacePoint.hpp"
 #include "ActsExamples/Framework/DataHandle.hpp"
@@ -62,13 +63,33 @@ class RootAthenaDumpReader : public IReader {
     // name of the track parameters (fitted by athena?)
     std::string outputTrackParameters = "athena_track_parameters";
 
+    /// Only extract spacepoints
+    bool onlySpacepoints = false;
+
     /// Only extract particles that passed the tracking requirements, for
     /// details see:
     /// https://gitlab.cern.ch/atlas/athena/-/blob/main/InnerDetector/InDetGNNTracking/src/DumpObjects.cxx?ref_type=heads#L1363
     bool onlyPassedParticles = false;
 
+    /// Skip spacepoints with phi overlap
     bool skipOverlapSPsPhi = false;
+
+    /// Skip spacepoints with eta overlap
     bool skipOverlapSPsEta = false;
+
+    /// A map that provides a mapping between ACTS and Athena surface
+    /// identifiers
+    std::shared_ptr<ActsExamples::GeometryIdMapActsAthena> geometryIdMap =
+        nullptr;
+
+    /// Tracking Geometry that contains the surfaces where we project
+    /// the measurements on
+    std::shared_ptr<Acts::TrackingGeometry> trackingGeometry = nullptr;
+
+    /// When projecting measurements on ACTS surfaces, which euclidean boundary
+    /// tolerance should be allowed. If a value above zero is needed, this
+    /// indicates that the ACTS surfaces do not 100% include the athena surfaces
+    double absBoundaryTolerance = 0.0;
   };
 
   RootAthenaDumpReader(const RootAthenaDumpReader &) = delete;
@@ -94,12 +115,42 @@ class RootAthenaDumpReader : public IReader {
   const Config &config() const { return m_cfg; }
 
  private:
+  /// Particles with barcodes larger then this value are considered to be
+  /// secondary particles
+  /// https://gitlab.cern.ch/atlas/athena/-/blob/main/InnerDetector/InDetGNNTracking/src/DumpObjects.h?ref_type=heads#L101
+  constexpr static int s_maxBarcodeForPrimary = 200000;
+
   /// Private access to the logging instance
   const Acts::Logger &logger() const { return *m_logger; }
 
   /// The config class
   Config m_cfg;
 
+  /// Helper method to read particles
+  SimParticleContainer readParticles() const;
+
+  /// Helper method to read measurements
+  std::tuple<ClusterContainer, MeasurementContainer,
+             IndexMultimap<ActsFatras::Barcode>,
+             std::unordered_map<int, std::size_t>>
+  readMeasurements(SimParticleContainer &particles,
+                   const Acts::GeometryContext &gctx) const;
+
+  /// Helper method to read spacepoints
+  /// @param imIdxMap optional remapping of indices. Since the measurement
+  /// index must be continuous, we need to remap the measurements indices
+  /// if we skip measurements in the first place
+  std::tuple<SimSpacePointContainer, SimSpacePointContainer,
+             SimSpacePointContainer>
+  readSpacepoints(const std::optional<std::unordered_map<int, std::size_t>>
+                      &imIdxMap) const;
+
+  /// Helper method to reprocess particle ids
+  std::pair<SimParticleContainer, IndexMultimap<ActsFatras::Barcode>>
+  reprocessParticles(
+      const SimParticleContainer &particles,
+      const IndexMultimap<ActsFatras::Barcode> &measPartMap) const;
+
   /// Write handlers
   WriteDataHandle<SimSpacePointContainer> m_outputPixelSpacePoints{
       this, "outputPixelSpacepoints"};
@@ -122,6 +173,7 @@ class RootAthenaDumpReader : public IReader {
   std::vector<std::tuple<std::uint32_t, std::size_t, std::size_t>> m_eventMap;
   std::shared_ptr<TChain> m_inputchain;
   long unsigned int m_events;
+  bool m_haveStripFeatures = true;
 
   static constexpr unsigned int maxCL = 1500000;
   static constexpr unsigned int maxSP = 1500000;
@@ -138,7 +190,7 @@ class RootAthenaDumpReader : public IReader {
   int CLindex[maxCL] = {};  //[nCL]
 
   // Clusters
-  std::vector<std::string> *CLhardware;
+  std::vector<std::string> *CLhardware{};
   Double_t CLx[maxCL] = {};           //[nCL]
   Double_t CLy[maxCL] = {};           //[nCL]
   Double_t CLz[maxCL] = {};           //[nCL]
@@ -148,13 +200,13 @@ class RootAthenaDumpReader : public IReader {
   Int_t CLphi_module[maxCL] = {};     //[nCL]
   Int_t CLside[maxCL] = {};           //[nCL]
   ULong64_t CLmoduleID[maxCL] = {};   //[nCL]
-  std::vector<std::vector<int>> *CLparticleLink_eventIndex;
-  std::vector<std::vector<int>> *CLparticleLink_barcode;
-  std::vector<std::vector<bool>> *CLbarcodesLinked;
-  std::vector<std::vector<float>> *CLparticle_charge;
-  std::vector<std::vector<int>> *CLphis;
-  std::vector<std::vector<int>> *CLetas;
-  std::vector<std::vector<int>> *CLtots;
+  std::vector<std::vector<int>> *CLparticleLink_eventIndex{};
+  std::vector<std::vector<int>> *CLparticleLink_barcode{};
+  std::vector<std::vector<bool>> *CLbarcodesLinked{};
+  std::vector<std::vector<float>> *CLparticle_charge{};
+  std::vector<std::vector<int>> *CLphis{};
+  std::vector<std::vector<int>> *CLetas{};
+  std::vector<std::vector<int>> *CLtots{};
   Double_t CLloc_direction1[maxCL] = {};      //[nCL]
   Double_t CLloc_direction2[maxCL] = {};      //[nCL]
   Double_t CLloc_direction3[maxCL] = {};      //[nCL]
@@ -172,7 +224,7 @@ class RootAthenaDumpReader : public IReader {
   Float_t CLnorm_x[maxCL] = {};               //[nCL]
   Float_t CLnorm_y[maxCL] = {};               //[nCL]
   Float_t CLnorm_z[maxCL] = {};               //[nCL]
-  std::vector<std::vector<double>> *CLlocal_cov;
+  std::vector<std::vector<double>> *CLlocal_cov{};
 
   // Particles
   Int_t nPartEVT = 0;
@@ -195,8 +247,8 @@ class RootAthenaDumpReader : public IReader {
   Int_t Part_vProdNout[maxPart] = {};     //[nPartEVT]
   Int_t Part_vProdStatus[maxPart] = {};   //[nPartEVT]
   Int_t Part_vProdBarcode[maxPart] = {};  //[nPartEVT]
-  std::vector<std::vector<int>> *Part_vParentID;
-  std::vector<std::vector<int>> *Part_vParentBarcode;
+  std::vector<std::vector<int>> *Part_vParentID{};
+  std::vector<std::vector<int>> *Part_vParentBarcode{};
 
   // Spacepoints
   Int_t nSP = 0;
@@ -212,27 +264,27 @@ class RootAthenaDumpReader : public IReader {
   double SPcovz[maxSP] = {};        //[nSP]
   float SPhl_topstrip[maxSP] = {};  //[nSP]
   float SPhl_botstrip[maxSP] = {};  //[nSP]
-  std::vector<std::vector<float>> *SPtopStripDirection;
-  std::vector<std::vector<float>> *SPbottomStripDirection;
-  std::vector<std::vector<float>> *SPstripCenterDistance;
-  std::vector<std::vector<float>> *SPtopStripCenterPosition;
+  std::vector<std::vector<float>> *SPtopStripDirection{};
+  std::vector<std::vector<float>> *SPbottomStripDirection{};
+  std::vector<std::vector<float>> *SPstripCenterDistance{};
+  std::vector<std::vector<float>> *SPtopStripCenterPosition{};
 
   // Tracks
   Int_t nTRK = 0;
   Int_t TRKindex[maxTRK] = {};                //[nTRK]
   Int_t TRKtrack_fitter[maxTRK] = {};         //[nTRK]
   Int_t TRKparticle_hypothesis[maxTRK] = {};  //[nTRK]
-  std::vector<std::vector<int>> *TRKproperties;
-  std::vector<std::vector<int>> *TRKpattern;
+  std::vector<std::vector<int>> *TRKproperties{};
+  std::vector<std::vector<int>> *TRKpattern{};
   Int_t TRKndof[maxTRK] = {};     //[nTRK]
   Int_t TRKmot[maxTRK] = {};      //[nTRK]
   Int_t TRKoot[maxTRK] = {};      //[nTRK]
   Float_t TRKchiSq[maxTRK] = {};  //[nTRK]
-  std::vector<std::vector<int>> *TRKmeasurementsOnTrack_pixcl_sctcl_index;
-  std::vector<std::vector<int>> *TRKoutliersOnTrack_pixcl_sctcl_index;
+  std::vector<std::vector<int>> *TRKmeasurementsOnTrack_pixcl_sctcl_index{};
+  std::vector<std::vector<int>> *TRKoutliersOnTrack_pixcl_sctcl_index{};
   Int_t TRKcharge[maxTRK] = {};  //[nTRK]
-  std::vector<std::vector<double>> *TRKperigee_position;
-  std::vector<std::vector<double>> *TRKperigee_momentum;
+  std::vector<std::vector<double>> *TRKperigee_position{};
+  std::vector<std::vector<double>> *TRKperigee_momentum{};
   Int_t TTCindex[maxTRK] = {};          //[nTRK]
   Int_t TTCevent_index[maxTRK] = {};    //[nTRK]
   Int_t TTCparticle_link[maxTRK] = {};  //[nTRK]
@@ -242,10 +294,10 @@ class RootAthenaDumpReader : public IReader {
   Int_t nDTT = 0;
   Int_t DTTindex[maxDTT] = {};  //[nDTT]
   Int_t DTTsize[maxDTT] = {};   //[nDTT]
-  std::vector<std::vector<int>> *DTTtrajectory_eventindex;
-  std::vector<std::vector<int>> *DTTtrajectory_barcode;
-  std::vector<std::vector<int>> *DTTstTruth_subDetType;
-  std::vector<std::vector<int>> *DTTstTrack_subDetType;
-  std::vector<std::vector<int>> *DTTstCommon_subDetType;
+  std::vector<std::vector<int>> *DTTtrajectory_eventindex{};
+  std::vector<std::vector<int>> *DTTtrajectory_barcode{};
+  std::vector<std::vector<int>> *DTTstTruth_subDetType{};
+  std::vector<std::vector<int>> *DTTstTrack_subDetType{};
+  std::vector<std::vector<int>> *DTTstCommon_subDetType{};
 };
 }  // namespace ActsExamples
diff --git a/Examples/Io/Root/include/ActsExamples/Io/Root/RootAthenaNTupleReader.hpp b/Examples/Io/Root/include/ActsExamples/Io/Root/RootAthenaNTupleReader.hpp
index d9e437e0e18..7f4d6f7bc73 100644
--- a/Examples/Io/Root/include/ActsExamples/Io/Root/RootAthenaNTupleReader.hpp
+++ b/Examples/Io/Root/include/ActsExamples/Io/Root/RootAthenaNTupleReader.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2022-2024 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
diff --git a/Examples/Io/Root/include/ActsExamples/Io/Root/RootBFieldWriter.hpp b/Examples/Io/Root/include/ActsExamples/Io/Root/RootBFieldWriter.hpp
index eb987147aaf..a8685f809c9 100644
--- a/Examples/Io/Root/include/ActsExamples/Io/Root/RootBFieldWriter.hpp
+++ b/Examples/Io/Root/include/ActsExamples/Io/Root/RootBFieldWriter.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2017-2021 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
diff --git a/Examples/Io/Root/include/ActsExamples/Io/Root/RootMaterialDecorator.hpp b/Examples/Io/Root/include/ActsExamples/Io/Root/RootMaterialDecorator.hpp
index c6dc213626c..f5bab09fb70 100644
--- a/Examples/Io/Root/include/ActsExamples/Io/Root/RootMaterialDecorator.hpp
+++ b/Examples/Io/Root/include/ActsExamples/Io/Root/RootMaterialDecorator.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2017-2019 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
diff --git a/Examples/Io/Root/include/ActsExamples/Io/Root/RootMaterialTrackReader.hpp b/Examples/Io/Root/include/ActsExamples/Io/Root/RootMaterialTrackReader.hpp
index bdcb3e0aab7..3c3bf2aece3 100644
--- a/Examples/Io/Root/include/ActsExamples/Io/Root/RootMaterialTrackReader.hpp
+++ b/Examples/Io/Root/include/ActsExamples/Io/Root/RootMaterialTrackReader.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2017-2019 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
diff --git a/Examples/Io/Root/include/ActsExamples/Io/Root/RootMaterialTrackWriter.hpp b/Examples/Io/Root/include/ActsExamples/Io/Root/RootMaterialTrackWriter.hpp
index ccb427cce77..3bd337a7fe8 100644
--- a/Examples/Io/Root/include/ActsExamples/Io/Root/RootMaterialTrackWriter.hpp
+++ b/Examples/Io/Root/include/ActsExamples/Io/Root/RootMaterialTrackWriter.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2017-2019 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
diff --git a/Examples/Io/Root/include/ActsExamples/Io/Root/RootMaterialWriter.hpp b/Examples/Io/Root/include/ActsExamples/Io/Root/RootMaterialWriter.hpp
index 6975cd79165..ec6142e65f9 100644
--- a/Examples/Io/Root/include/ActsExamples/Io/Root/RootMaterialWriter.hpp
+++ b/Examples/Io/Root/include/ActsExamples/Io/Root/RootMaterialWriter.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2017-2019 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
diff --git a/Examples/Io/Root/include/ActsExamples/Io/Root/RootMeasurementWriter.hpp b/Examples/Io/Root/include/ActsExamples/Io/Root/RootMeasurementWriter.hpp
index ccf1be2a901..3958e845fb2 100644
--- a/Examples/Io/Root/include/ActsExamples/Io/Root/RootMeasurementWriter.hpp
+++ b/Examples/Io/Root/include/ActsExamples/Io/Root/RootMeasurementWriter.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2020-2024 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
diff --git a/Examples/Io/NuclearInteractions/include/ActsExamples/Io/NuclearInteractions/RootNuclearInteractionParametersWriter.hpp b/Examples/Io/Root/include/ActsExamples/Io/Root/RootNuclearInteractionParametersWriter.hpp
similarity index 92%
rename from Examples/Io/NuclearInteractions/include/ActsExamples/Io/NuclearInteractions/RootNuclearInteractionParametersWriter.hpp
rename to Examples/Io/Root/include/ActsExamples/Io/Root/RootNuclearInteractionParametersWriter.hpp
index 325605d9f2d..d688920fc76 100644
--- a/Examples/Io/NuclearInteractions/include/ActsExamples/Io/NuclearInteractions/RootNuclearInteractionParametersWriter.hpp
+++ b/Examples/Io/Root/include/ActsExamples/Io/Root/RootNuclearInteractionParametersWriter.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2020-2021 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
@@ -12,7 +12,7 @@
 #include "ActsExamples/EventData/ExtractedSimulationProcess.hpp"
 #include "ActsExamples/Framework/ProcessCode.hpp"
 #include "ActsExamples/Framework/WriterT.hpp"
-#include "ActsExamples/Io/NuclearInteractions/detail/NuclearInteractionParametrisation.hpp"
+#include "ActsExamples/Io/Root/detail/NuclearInteractionParametrisation.hpp"
 
 #include <mutex>
 #include <string>
diff --git a/Examples/Io/Root/include/ActsExamples/Io/Root/RootParticleReader.hpp b/Examples/Io/Root/include/ActsExamples/Io/Root/RootParticleReader.hpp
index cc151c58f34..0bcd108570c 100644
--- a/Examples/Io/Root/include/ActsExamples/Io/Root/RootParticleReader.hpp
+++ b/Examples/Io/Root/include/ActsExamples/Io/Root/RootParticleReader.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2017-2024 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
@@ -114,6 +114,12 @@ class RootParticleReader : public IReader {
   std::vector<std::uint32_t>* m_particle = new std::vector<std::uint32_t>;
   std::vector<std::uint32_t>* m_generation = new std::vector<std::uint32_t>;
   std::vector<std::uint32_t>* m_subParticle = new std::vector<std::uint32_t>;
+
+  std::vector<float>* m_eLoss = new std::vector<float>;
+  std::vector<float>* m_pathInX0 = new std::vector<float>;
+  std::vector<float>* m_pathInL0 = new std::vector<float>;
+  std::vector<std::int32_t>* m_numberOfHits = new std::vector<std::int32_t>;
+  std::vector<std::uint32_t>* m_outcome = new std::vector<std::uint32_t>;
 };
 
 }  // namespace ActsExamples
diff --git a/Examples/Io/Root/include/ActsExamples/Io/Root/RootParticleWriter.hpp b/Examples/Io/Root/include/ActsExamples/Io/Root/RootParticleWriter.hpp
index d5917ddeb54..670008c6631 100644
--- a/Examples/Io/Root/include/ActsExamples/Io/Root/RootParticleWriter.hpp
+++ b/Examples/Io/Root/include/ActsExamples/Io/Root/RootParticleWriter.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2017-2024 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
@@ -37,9 +37,6 @@ class RootParticleWriter final : public WriterT<SimParticleContainer> {
   struct Config {
     /// Input particle collection to write.
     std::string inputParticles;
-    /// Optional. If given, the the energy loss and traversed material is
-    /// computed and written.
-    std::string inputFinalParticles;
     /// Path to the output file.
     std::string filePath;
     /// Output file access mode.
@@ -74,9 +71,6 @@ class RootParticleWriter final : public WriterT<SimParticleContainer> {
  private:
   Config m_cfg;
 
-  ReadDataHandle<SimParticleContainer> m_inputFinalParticles{
-      this, "InputFinalParticles"};
-
   std::mutex m_writeMutex;
 
   TFile* m_outputFile = nullptr;
@@ -119,7 +113,6 @@ class RootParticleWriter final : public WriterT<SimParticleContainer> {
   std::vector<std::uint32_t> m_generation;
   std::vector<std::uint32_t> m_subParticle;
 
-  // Optional information depending on input collections.
   /// Total energy loss in GeV.
   std::vector<float> m_eLoss;
   /// Accumulated material
diff --git a/Examples/Io/Root/include/ActsExamples/Io/Root/RootPropagationStepsWriter.hpp b/Examples/Io/Root/include/ActsExamples/Io/Root/RootPropagationStepsWriter.hpp
index 6f1026806ab..330fe1e9151 100644
--- a/Examples/Io/Root/include/ActsExamples/Io/Root/RootPropagationStepsWriter.hpp
+++ b/Examples/Io/Root/include/ActsExamples/Io/Root/RootPropagationStepsWriter.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2018-2024 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
diff --git a/Examples/Io/Root/include/ActsExamples/Io/Root/RootPropagationSummaryWriter.hpp b/Examples/Io/Root/include/ActsExamples/Io/Root/RootPropagationSummaryWriter.hpp
index b55db747128..c1f6afe9059 100644
--- a/Examples/Io/Root/include/ActsExamples/Io/Root/RootPropagationSummaryWriter.hpp
+++ b/Examples/Io/Root/include/ActsExamples/Io/Root/RootPropagationSummaryWriter.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2024 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
@@ -92,7 +92,7 @@ class RootPropagationSummaryWriter : public WriterT<PropagationSummaries> {
   /// track number
   int m_trackNr = 0;
 
-  // initial trajectory parameters
+  /// initial trajectory parameters
   float m_d0 = 0;
   float m_z0 = 0;
   float m_phi = 0;
@@ -100,11 +100,16 @@ class RootPropagationSummaryWriter : public WriterT<PropagationSummaries> {
   float m_qOverP = 0;
   float m_t = 0;
 
-  // derived initial trajectory parameters
+  /// derived initial trajectory parameters
   float m_eta = 0;
   float m_pt = 0;
   float m_p = 0;
 
+  /// Propagation summary statstics
+  int m_nSensitives = 0;
+  int m_nMaterials = 0;
+  int m_nPortals = 0;
+
   // steper statistics
   int m_nSteps = 0;
   int m_nStepTrials = 0;
diff --git a/Examples/Io/Root/include/ActsExamples/Io/Root/RootSeedWriter.hpp b/Examples/Io/Root/include/ActsExamples/Io/Root/RootSeedWriter.hpp
index 92117222063..5165ff38fe8 100644
--- a/Examples/Io/Root/include/ActsExamples/Io/Root/RootSeedWriter.hpp
+++ b/Examples/Io/Root/include/ActsExamples/Io/Root/RootSeedWriter.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2022 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
diff --git a/Examples/Io/Root/include/ActsExamples/Io/Root/RootSimHitReader.hpp b/Examples/Io/Root/include/ActsExamples/Io/Root/RootSimHitReader.hpp
index dbbf0394e8c..bf05678cd8f 100644
--- a/Examples/Io/Root/include/ActsExamples/Io/Root/RootSimHitReader.hpp
+++ b/Examples/Io/Root/include/ActsExamples/Io/Root/RootSimHitReader.hpp
@@ -1,15 +1,13 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2023 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
-#include "Acts/Definitions/Algebra.hpp"
-#include "Acts/Propagator/MaterialInteractor.hpp"
 #include "Acts/Utilities/Logger.hpp"
 #include "ActsExamples/EventData/SimHit.hpp"
 #include "ActsExamples/Framework/DataHandle.hpp"
@@ -18,7 +16,6 @@
 
 #include <cstddef>
 #include <cstdint>
-#include <map>
 #include <memory>
 #include <mutex>
 #include <string>
diff --git a/Examples/Io/Root/include/ActsExamples/Io/Root/RootSimHitWriter.hpp b/Examples/Io/Root/include/ActsExamples/Io/Root/RootSimHitWriter.hpp
index 005e7401447..45a117a5f39 100644
--- a/Examples/Io/Root/include/ActsExamples/Io/Root/RootSimHitWriter.hpp
+++ b/Examples/Io/Root/include/ActsExamples/Io/Root/RootSimHitWriter.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2018 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
diff --git a/Examples/Io/Root/include/ActsExamples/Io/Root/RootSpacepointWriter.hpp b/Examples/Io/Root/include/ActsExamples/Io/Root/RootSpacepointWriter.hpp
index 8e4d4767ff4..626f05b6399 100644
--- a/Examples/Io/Root/include/ActsExamples/Io/Root/RootSpacepointWriter.hpp
+++ b/Examples/Io/Root/include/ActsExamples/Io/Root/RootSpacepointWriter.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2022 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
diff --git a/Examples/Io/Root/include/ActsExamples/Io/Root/RootTrackParameterWriter.hpp b/Examples/Io/Root/include/ActsExamples/Io/Root/RootTrackParameterWriter.hpp
index a54828983ad..9f5b2fa2c42 100644
--- a/Examples/Io/Root/include/ActsExamples/Io/Root/RootTrackParameterWriter.hpp
+++ b/Examples/Io/Root/include/ActsExamples/Io/Root/RootTrackParameterWriter.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2017-2018 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
@@ -23,9 +23,6 @@
 
 class TFile;
 class TTree;
-namespace ActsFatras {
-class Barcode;
-}  // namespace ActsFatras
 
 namespace ActsExamples {
 struct AlgorithmContext;
@@ -95,29 +92,68 @@ class RootTrackParameterWriter final : public TrackParameterWriter {
   ReadDataHandle<HitSimHitsMap> m_inputMeasurementSimHitsMap{
       this, "InputMeasurementSimHitsMap"};
 
-  std::mutex m_writeMutex;  ///< Mutex used to protect multi-threaded writes
-  TFile* m_outputFile{nullptr};  ///< The output file
-  TTree* m_outputTree{nullptr};  ///< The output tree
-  int m_eventNr{0};              ///< the event number of
-
-  float m_loc0{NaNfloat};   ///< loc0
-  float m_loc1{NaNfloat};   ///< loc1
-  float m_phi{NaNfloat};    ///< phi
-  float m_theta{NaNfloat};  ///< theta
-  float m_qop{NaNfloat};    ///< q/p
-  float m_time{NaNfloat};   ///< time
-  float m_p{NaNfloat};      ///< p
-  float m_pt{NaNfloat};     ///< pt
-  float m_eta{NaNfloat};    ///< eta
-
-  int m_t_charge{0};            ///< Truth particle charge
-  float m_t_loc0{NaNfloat};     ///< Truth parameter loc0
-  float m_t_loc1{NaNfloat};     ///< Truth parameter loc1
-  float m_t_phi{NaNfloat};      ///< Truth parameter phi
-  float m_t_theta{NaNfloat};    ///< Truth parameter theta
-  float m_t_qop{NaNfloat};      ///< Truth parameter qop
-  float m_t_time{NaNfloat};     ///< Truth parameter time
-  bool m_truthMatched = false;  ///< Whether the seed is matched with truth
+  /// Mutex used to protect multi-threaded writes
+  std::mutex m_writeMutex;
+  TFile* m_outputFile{nullptr};
+  TTree* m_outputTree{nullptr};
+
+  int m_eventNr{0};
+
+  int m_volumeId{0};
+  int m_layerId{0};
+  int m_surfaceId{0};
+
+  // Track parameters
+  float m_loc0{NaNfloat};
+  float m_loc1{NaNfloat};
+  float m_phi{NaNfloat};
+  float m_theta{NaNfloat};
+  float m_qop{NaNfloat};
+  float m_time{NaNfloat};
+
+  float m_err_loc0{NaNfloat};
+  float m_err_loc1{NaNfloat};
+  float m_err_phi{NaNfloat};
+  float m_err_theta{NaNfloat};
+  float m_err_qop{NaNfloat};
+  float m_err_time{NaNfloat};
+
+  int m_charge{0};
+  float m_p{NaNfloat};
+  float m_pt{NaNfloat};
+  float m_eta{NaNfloat};
+
+  // Truth parameters
+  /// Whether the seed is matched with truth
+  bool m_t_matched{false};
+  std::uint64_t m_t_particleId{0};
+  unsigned int m_nMajorityHits{0};
+
+  float m_t_loc0{NaNfloat};
+  float m_t_loc1{NaNfloat};
+  float m_t_phi{NaNfloat};
+  float m_t_theta{NaNfloat};
+  float m_t_qop{NaNfloat};
+  float m_t_time{NaNfloat};
+
+  int m_t_charge{0};
+  float m_t_p{NaNfloat};
+  float m_t_pt{NaNfloat};
+  float m_t_eta{NaNfloat};
+
+  float m_res_loc0{NaNfloat};
+  float m_res_loc1{NaNfloat};
+  float m_res_phi{NaNfloat};
+  float m_res_theta{NaNfloat};
+  float m_res_qop{NaNfloat};
+  float m_res_time{NaNfloat};
+
+  float m_pull_loc0{NaNfloat};
+  float m_pull_loc1{NaNfloat};
+  float m_pull_phi{NaNfloat};
+  float m_pull_theta{NaNfloat};
+  float m_pull_qop{NaNfloat};
+  float m_pull_time{NaNfloat};
 };
 
 }  // namespace ActsExamples
diff --git a/Examples/Io/Root/include/ActsExamples/Io/Root/RootTrackStatesWriter.hpp b/Examples/Io/Root/include/ActsExamples/Io/Root/RootTrackStatesWriter.hpp
index 84ff593161f..bacb794113e 100644
--- a/Examples/Io/Root/include/ActsExamples/Io/Root/RootTrackStatesWriter.hpp
+++ b/Examples/Io/Root/include/ActsExamples/Io/Root/RootTrackStatesWriter.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2019-2024 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
diff --git a/Examples/Io/Root/include/ActsExamples/Io/Root/RootTrackSummaryReader.hpp b/Examples/Io/Root/include/ActsExamples/Io/Root/RootTrackSummaryReader.hpp
index 3da4590c439..71ff807fb32 100644
--- a/Examples/Io/Root/include/ActsExamples/Io/Root/RootTrackSummaryReader.hpp
+++ b/Examples/Io/Root/include/ActsExamples/Io/Root/RootTrackSummaryReader.hpp
@@ -1,14 +1,13 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2017-2021 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
-#include "Acts/EventData/TrackParameters.hpp"
 #include "ActsExamples/EventData/SimParticle.hpp"
 #include "ActsExamples/EventData/Track.hpp"
 #include "ActsExamples/Framework/DataHandle.hpp"
diff --git a/Examples/Io/Root/include/ActsExamples/Io/Root/RootTrackSummaryWriter.hpp b/Examples/Io/Root/include/ActsExamples/Io/Root/RootTrackSummaryWriter.hpp
index 8ff1a5bce78..5c9a71d6c94 100644
--- a/Examples/Io/Root/include/ActsExamples/Io/Root/RootTrackSummaryWriter.hpp
+++ b/Examples/Io/Root/include/ActsExamples/Io/Root/RootTrackSummaryWriter.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2019-2024 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
diff --git a/Examples/Io/Root/include/ActsExamples/Io/Root/RootUtility.hpp b/Examples/Io/Root/include/ActsExamples/Io/Root/RootUtility.hpp
index addbcc7a583..fedc931e1e0 100644
--- a/Examples/Io/Root/include/ActsExamples/Io/Root/RootUtility.hpp
+++ b/Examples/Io/Root/include/ActsExamples/Io/Root/RootUtility.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2024 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
diff --git a/Examples/Io/Root/include/ActsExamples/Io/Root/RootVertexReader.hpp b/Examples/Io/Root/include/ActsExamples/Io/Root/RootVertexReader.hpp
index 7523f91e436..46afe962bdb 100644
--- a/Examples/Io/Root/include/ActsExamples/Io/Root/RootVertexReader.hpp
+++ b/Examples/Io/Root/include/ActsExamples/Io/Root/RootVertexReader.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2024 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
diff --git a/Examples/Io/Root/include/ActsExamples/Io/Root/RootVertexWriter.hpp b/Examples/Io/Root/include/ActsExamples/Io/Root/RootVertexWriter.hpp
index fbd66c29b5d..50666ad93d2 100644
--- a/Examples/Io/Root/include/ActsExamples/Io/Root/RootVertexWriter.hpp
+++ b/Examples/Io/Root/include/ActsExamples/Io/Root/RootVertexWriter.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2024 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
diff --git a/Examples/Io/Performance/ActsExamples/Io/Performance/SeedingPerformanceWriter.hpp b/Examples/Io/Root/include/ActsExamples/Io/Root/SeedingPerformanceWriter.hpp
similarity index 94%
rename from Examples/Io/Performance/ActsExamples/Io/Performance/SeedingPerformanceWriter.hpp
rename to Examples/Io/Root/include/ActsExamples/Io/Root/SeedingPerformanceWriter.hpp
index 02ae07a28cd..49006631b92 100644
--- a/Examples/Io/Performance/ActsExamples/Io/Performance/SeedingPerformanceWriter.hpp
+++ b/Examples/Io/Root/include/ActsExamples/Io/Root/SeedingPerformanceWriter.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2020-2021 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
diff --git a/Examples/Io/Performance/ActsExamples/Io/Performance/TrackFinderPerformanceWriter.hpp b/Examples/Io/Root/include/ActsExamples/Io/Root/TrackFinderNTupleWriter.hpp
similarity index 80%
rename from Examples/Io/Performance/ActsExamples/Io/Performance/TrackFinderPerformanceWriter.hpp
rename to Examples/Io/Root/include/ActsExamples/Io/Root/TrackFinderNTupleWriter.hpp
index 481eca1db3f..799471be784 100644
--- a/Examples/Io/Performance/ActsExamples/Io/Performance/TrackFinderPerformanceWriter.hpp
+++ b/Examples/Io/Root/include/ActsExamples/Io/Root/TrackFinderNTupleWriter.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2019-2024 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
@@ -24,7 +24,7 @@ struct AlgorithmContext;
 ///
 /// Only considers the track finding itself, i.e. grouping of hits into tracks,
 /// and computes relevant per-track and per-particles statistics.
-class TrackFinderPerformanceWriter final : public WriterT<TrackContainer> {
+class TrackFinderNTupleWriter final : public WriterT<ConstTrackContainer> {
  public:
   struct Config {
     /// Input reconstructed track collection.
@@ -48,9 +48,9 @@ class TrackFinderPerformanceWriter final : public WriterT<TrackContainer> {
   /// Constructor
   /// @param config the configuration
   /// @param level The log level
-  TrackFinderPerformanceWriter(Config config, Acts::Logging::Level level);
+  TrackFinderNTupleWriter(Config config, Acts::Logging::Level level);
 
-  ~TrackFinderPerformanceWriter() override;
+  ~TrackFinderNTupleWriter() override;
 
   ProcessCode finalize() override;
 
@@ -59,7 +59,7 @@ class TrackFinderPerformanceWriter final : public WriterT<TrackContainer> {
 
  private:
   ProcessCode writeT(const AlgorithmContext& ctx,
-                     const TrackContainer& tracks) override;
+                     const ConstTrackContainer& tracks) override;
 
   struct Impl;
 
diff --git a/Examples/Io/Performance/ActsExamples/Io/Performance/CKFPerformanceWriter.hpp b/Examples/Io/Root/include/ActsExamples/Io/Root/TrackFinderPerformanceWriter.hpp
similarity index 91%
rename from Examples/Io/Performance/ActsExamples/Io/Performance/CKFPerformanceWriter.hpp
rename to Examples/Io/Root/include/ActsExamples/Io/Root/TrackFinderPerformanceWriter.hpp
index a7342cbac1a..b3b6c36436c 100644
--- a/Examples/Io/Performance/ActsExamples/Io/Performance/CKFPerformanceWriter.hpp
+++ b/Examples/Io/Root/include/ActsExamples/Io/Root/TrackFinderPerformanceWriter.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2020 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
@@ -41,7 +41,7 @@ struct AlgorithmContext;
 /// done by setting the Config::rootFile pointer to an existing file.
 ///
 /// Safe to use from multiple writer threads - uses a std::mutex lock.
-class CKFPerformanceWriter final : public WriterT<ConstTrackContainer> {
+class TrackFinderPerformanceWriter final : public WriterT<ConstTrackContainer> {
  public:
   struct Config {
     /// Input (found) tracks collection.
@@ -68,8 +68,8 @@ class CKFPerformanceWriter final : public WriterT<ConstTrackContainer> {
   };
 
   /// Construct from configuration and log level.
-  CKFPerformanceWriter(Config cfg, Acts::Logging::Level lvl);
-  ~CKFPerformanceWriter() override;
+  TrackFinderPerformanceWriter(Config cfg, Acts::Logging::Level lvl);
+  ~TrackFinderPerformanceWriter() override;
 
   /// Finalize plots.
   ProcessCode finalize() override;
diff --git a/Examples/Io/Performance/ActsExamples/Io/Performance/TrackFitterPerformanceWriter.hpp b/Examples/Io/Root/include/ActsExamples/Io/Root/TrackFitterPerformanceWriter.hpp
similarity index 94%
rename from Examples/Io/Performance/ActsExamples/Io/Performance/TrackFitterPerformanceWriter.hpp
rename to Examples/Io/Root/include/ActsExamples/Io/Root/TrackFitterPerformanceWriter.hpp
index 56f0cb41130..c0bbbf36e7e 100644
--- a/Examples/Io/Performance/ActsExamples/Io/Performance/TrackFitterPerformanceWriter.hpp
+++ b/Examples/Io/Root/include/ActsExamples/Io/Root/TrackFitterPerformanceWriter.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2019-2020 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
diff --git a/Examples/Io/Performance/ActsExamples/Io/Performance/VertexPerformanceWriter.hpp b/Examples/Io/Root/include/ActsExamples/Io/Root/VertexNTupleWriter.hpp
similarity index 95%
rename from Examples/Io/Performance/ActsExamples/Io/Performance/VertexPerformanceWriter.hpp
rename to Examples/Io/Root/include/ActsExamples/Io/Root/VertexNTupleWriter.hpp
index 3b44a53ab79..514dbfc8850 100644
--- a/Examples/Io/Performance/ActsExamples/Io/Performance/VertexPerformanceWriter.hpp
+++ b/Examples/Io/Root/include/ActsExamples/Io/Root/VertexNTupleWriter.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2019-2024 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
@@ -38,15 +38,14 @@ enum class RecoVertexClassification {
   Split,
 };
 
-/// @class VertexPerformanceWriter
+/// @class VertexNTupleWriter
 ///
 /// Writes out the number of reconstructed primary vertices along with
 /// the number of primary vertices in detector acceptance as well as
 /// reconstructable primary vertices after track fitting.
 /// Additionally it matches the reco vertices to their truth vertices
 /// and write out the difference in x,y and z position.
-class VertexPerformanceWriter final
-    : public WriterT<std::vector<Acts::Vertex>> {
+class VertexNTupleWriter final : public WriterT<std::vector<Acts::Vertex>> {
  public:
   struct Config {
     /// Input vertex collection.
@@ -90,9 +89,9 @@ class VertexPerformanceWriter final
   ///
   /// @param config Configuration struct
   /// @param level Message level declaration
-  VertexPerformanceWriter(const Config& config, Acts::Logging::Level level);
+  VertexNTupleWriter(const Config& config, Acts::Logging::Level level);
 
-  ~VertexPerformanceWriter() override;
+  ~VertexNTupleWriter() override;
 
   /// End-of-run hook
   ProcessCode finalize() override;
diff --git a/Examples/Io/NuclearInteractions/include/ActsExamples/Io/NuclearInteractions/detail/NuclearInteractionParametrisation.hpp b/Examples/Io/Root/include/ActsExamples/Io/Root/detail/NuclearInteractionParametrisation.hpp
similarity index 96%
rename from Examples/Io/NuclearInteractions/include/ActsExamples/Io/NuclearInteractions/detail/NuclearInteractionParametrisation.hpp
rename to Examples/Io/Root/include/ActsExamples/Io/Root/detail/NuclearInteractionParametrisation.hpp
index 97ab2338d96..e00fb79c63a 100644
--- a/Examples/Io/NuclearInteractions/include/ActsExamples/Io/NuclearInteractions/detail/NuclearInteractionParametrisation.hpp
+++ b/Examples/Io/Root/include/ActsExamples/Io/Root/detail/NuclearInteractionParametrisation.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2020-2021 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
@@ -34,7 +34,7 @@ struct EventFraction {
   ///
   /// @param [in] event Tuple containing the initial particle, the particle
   /// before the interaction and all final state particles after the interaction
-  EventFraction(const ActsExamples::ExtractedSimulationProcess& event)
+  explicit EventFraction(const ActsExamples::ExtractedSimulationProcess& event)
       : initialParticle(event.initial),
         interactingParticle(event.before),
         finalParticles(event.after) {}
diff --git a/Examples/Io/Root/src/RootAthenaDumpReader.cpp b/Examples/Io/Root/src/RootAthenaDumpReader.cpp
index 8300237ef9e..47e5150501a 100644
--- a/Examples/Io/Root/src/RootAthenaDumpReader.cpp
+++ b/Examples/Io/Root/src/RootAthenaDumpReader.cpp
@@ -1,80 +1,67 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2022-2024 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include "ActsExamples/Io/Root/RootAthenaDumpReader.hpp"
 
+#include "Acts/Definitions/Units.hpp"
 #include "Acts/EventData/SourceLink.hpp"
 #include "Acts/Geometry/GeometryIdentifier.hpp"
 #include "Acts/Utilities/Zip.hpp"
 #include "ActsExamples/EventData/Cluster.hpp"
-#include "ActsExamples/EventData/GeometryContainers.hpp"
 #include "ActsExamples/EventData/IndexSourceLink.hpp"
+#include "ActsExamples/EventData/SimParticle.hpp"
 #include <ActsExamples/Digitization/MeasurementCreation.hpp>
 
-#include <cmath>
-
 #include <TChain.h>
 #include <boost/container/static_vector.hpp>
 
-class BarcodeConstructor {
-  /// Particles with barcodes larger then this value are considered to be
-  /// secondary particles
-  /// https://gitlab.cern.ch/atlas/athena/-/blob/main/InnerDetector/InDetGNNTracking/src/DumpObjects.h?ref_type=heads#L101
-  constexpr static int s_maxBarcodeForPrimary = 200000;
-
-  std::uint16_t m_primaryCount = 0;
-  std::uint16_t m_secondaryCount = 0;
-  std::unordered_map<std::uint64_t, ActsFatras::Barcode> m_barcodeMap;
-
-  static std::uint64_t concatInts(int a, int b) {
-    auto va = static_cast<std::uint32_t>(a);
-    auto vb = static_cast<std::uint32_t>(b);
-    std::uint64_t value = (static_cast<std::uint64_t>(va) << 32) | vb;
-    return value;
-  }
-
- public:
-  ActsFatras::Barcode getBarcode(int barcode, int evtnumber) {
-    auto v = concatInts(barcode, evtnumber);
-    auto found = m_barcodeMap.find(v);
-    if (found != m_barcodeMap.end()) {
-      return found->second;
-    }
+using namespace Acts::UnitLiterals;
 
-    auto primary = (barcode < s_maxBarcodeForPrimary);
+namespace {
+std::uint64_t concatInts(int a, int b) {
+  auto va = static_cast<std::uint32_t>(a);
+  auto vb = static_cast<std::uint32_t>(b);
+  std::uint64_t value = (static_cast<std::uint64_t>(va) << 32) | vb;
+  return value;
+}
 
-    ActsFatras::Barcode fBarcode;
+std::pair<std::uint32_t, std::uint32_t> splitInt(std::uint64_t v) {
+  return {static_cast<std::uint32_t>((v & 0xFFFFFFFF00000000LL) >> 32),
+          static_cast<std::uint32_t>(v & 0xFFFFFFFFLL)};
+}
 
-    // vertex primary shouldn't be zero for a valid particle
-    fBarcode.setVertexPrimary(1);
-    if (primary) {
-      fBarcode.setVertexSecondary(0);
-      fBarcode.setParticle(m_primaryCount);
-      assert(m_primaryCount < std::numeric_limits<std::uint16_t>::max());
-      m_primaryCount++;
-    } else {
-      fBarcode.setVertexSecondary(1);
-      fBarcode.setParticle(m_secondaryCount);
-      assert(m_primaryCount < std::numeric_limits<std::uint16_t>::max());
-      m_secondaryCount++;
-    }
+/// In cases when there is built up a particle collection in an iterative way it
+/// can be way faster to build up a vector and afterwards use a special
+/// constructor to speed up the set creation.
+inline auto particleVectorToSet(
+    std::vector<ActsExamples::SimParticle>& particles) {
+  using namespace ActsExamples;
+  auto cmp = [](const auto& a, const auto& b) {
+    return a.particleId().value() == b.particleId().value();
+  };
+
+  std::sort(particles.begin(), particles.end(), detail::CompareParticleId{});
+  particles.erase(std::unique(particles.begin(), particles.end(), cmp),
+                  particles.end());
+
+  return SimParticleContainer(boost::container::ordered_unique_range_t{},
+                              particles.begin(), particles.end());
+}
 
-    m_barcodeMap[v] = fBarcode;
-    return fBarcode;
-  }
-};
+}  // namespace
 
 enum SpacePointType { ePixel = 1, eStrip = 2 };
 
-ActsExamples::RootAthenaDumpReader::RootAthenaDumpReader(
-    const ActsExamples::RootAthenaDumpReader::Config& config,
-    Acts::Logging::Level level)
-    : ActsExamples::IReader(),
+namespace ActsExamples {
+
+RootAthenaDumpReader::RootAthenaDumpReader(
+    const RootAthenaDumpReader::Config& config, Acts::Logging::Level level)
+    : IReader(),
       m_cfg(config),
       m_logger(Acts::getDefaultLogger(name(), level)) {
   if (m_cfg.inputfile.empty()) {
@@ -89,10 +76,17 @@ ActsExamples::RootAthenaDumpReader::RootAthenaDumpReader(
   m_outputPixelSpacePoints.initialize(m_cfg.outputPixelSpacePoints);
   m_outputStripSpacePoints.initialize(m_cfg.outputStripSpacePoints);
   m_outputSpacePoints.initialize(m_cfg.outputSpacePoints);
-  m_outputClusters.initialize(m_cfg.outputClusters);
-  m_outputParticles.initialize(m_cfg.outputParticles);
-  m_outputMeasParticleMap.initialize(m_cfg.outputMeasurementParticlesMap);
-  m_outputMeasurements.initialize(m_cfg.outputMeasurements);
+  if (!m_cfg.onlySpacepoints) {
+    m_outputClusters.initialize(m_cfg.outputClusters);
+    m_outputParticles.initialize(m_cfg.outputParticles);
+    m_outputMeasParticleMap.initialize(m_cfg.outputMeasurementParticlesMap);
+    m_outputMeasurements.initialize(m_cfg.outputMeasurements);
+  }
+
+  if (m_inputchain->GetBranch("SPtopStripDirection") == nullptr) {
+    ACTS_WARNING("Additional SP strip features not available");
+    m_haveStripFeatures = false;
+  }
 
   // Set the branches
 
@@ -202,13 +196,13 @@ ActsExamples::RootAthenaDumpReader::RootAthenaDumpReader(
   m_inputchain->SetBranchAddress("SPcovz", SPcovz);
   m_inputchain->SetBranchAddress("SPhl_topstrip", SPhl_topstrip);
   m_inputchain->SetBranchAddress("SPhl_botstrip", SPhl_botstrip);
-  m_inputchain->SetBranchAddress("SPtopStripDirection", SPtopStripDirection);
+  m_inputchain->SetBranchAddress("SPtopStripDirection", &SPtopStripDirection);
   m_inputchain->SetBranchAddress("SPbottomStripDirection",
-                                 SPbottomStripDirection);
+                                 &SPbottomStripDirection);
   m_inputchain->SetBranchAddress("SPstripCenterDistance",
-                                 SPstripCenterDistance);
+                                 &SPstripCenterDistance);
   m_inputchain->SetBranchAddress("SPtopStripCenterPosition",
-                                 SPtopStripCenterPosition);
+                                 &SPtopStripCenterPosition);
 
   m_inputchain->SetBranchAddress("nTRK", &nTRK);
   m_inputchain->SetBranchAddress("TRKindex", TRKindex);
@@ -252,36 +246,20 @@ ActsExamples::RootAthenaDumpReader::RootAthenaDumpReader(
   m_events = m_inputchain->GetEntries();
 
   ACTS_DEBUG("End of constructor. In total available events=" << m_events);
-
 }  // constructor
 
-ActsExamples::ProcessCode ActsExamples::RootAthenaDumpReader::read(
-    const ActsExamples::AlgorithmContext& ctx) {
-  ACTS_DEBUG("Reading event " << ctx.eventNumber);
-  auto entry = ctx.eventNumber;
-  if (entry >= m_events) {
-    ACTS_ERROR("event out of bounds");
-    return ProcessCode::ABORT;
-  }
-
-  std::lock_guard<std::mutex> lock(m_read_mutex);
-
-  m_inputchain->GetEntry(entry);
-
-  // Concat the two 32bit integers from athena to a Fatras barcode
-
-  SimParticleContainer particles;
-  BarcodeConstructor barcodeConstructor;
+SimParticleContainer RootAthenaDumpReader::readParticles() const {
+  std::vector<SimParticle> particles;
+  particles.reserve(nPartEVT);
 
   for (auto ip = 0; ip < nPartEVT; ++ip) {
     if (m_cfg.onlyPassedParticles && !static_cast<bool>(Part_passed[ip])) {
       continue;
     }
 
-    auto barcode =
-        barcodeConstructor.getBarcode(Part_barcode[ip], Part_event_number[ip]);
-    SimParticle particle(barcode,
-                         static_cast<Acts::PdgParticle>(Part_pdg_id[ip]));
+    auto dummyBarcode = concatInts(Part_barcode[ip], Part_event_number[ip]);
+    SimParticleState particle(dummyBarcode,
+                              static_cast<Acts::PdgParticle>(Part_pdg_id[ip]));
 
     Acts::Vector3 p = Acts::Vector3{Part_px[ip], Part_py[ip], Part_pz[ip]} *
                       Acts::UnitConstants::MeV;
@@ -292,26 +270,52 @@ ActsExamples::ProcessCode ActsExamples::RootAthenaDumpReader::read(
     auto x = Acts::Vector4{Part_vx[ip], Part_vy[ip], Part_vz[ip], 0.0};
     particle.setPosition4(x);
 
-    particles.insert(particle);
+    particles.push_back(SimParticle(particle, particle));
   }
 
+  ACTS_DEBUG("Created " << particles.size() << " particles");
+  auto before = particles.size();
+
+  auto particlesSet = particleVectorToSet(particles);
+
+  if (particlesSet.size() < before) {
+    ACTS_WARNING("Particle IDs not unique for " << before - particles.size()
+                                                << " particles!");
+  }
+
+  return particlesSet;
+}
+
+std::tuple<ClusterContainer, MeasurementContainer,
+           IndexMultimap<ActsFatras::Barcode>,
+           std::unordered_map<int, std::size_t>>
+RootAthenaDumpReader::readMeasurements(
+    SimParticleContainer& particles, const Acts::GeometryContext& gctx) const {
   ClusterContainer clusters(nCL);
+  clusters.reserve(nCL);
+
   MeasurementContainer measurements;
   measurements.reserve(nCL);
 
+  std::size_t nTotalTotZero = 0;
+
+  const auto prevParticlesSize = particles.size();
   IndexMultimap<ActsFatras::Barcode> measPartMap;
 
+  // We cannot use im for the index since we might skip measurements
+  std::unordered_map<int, std::size_t> imIdxMap;
+
   for (int im = 0; im < nCL; im++) {
     if (!(CLhardware->at(im) == "PIXEL" || CLhardware->at(im) == "STRIP")) {
-      ACTS_ERROR("hardware is neither 'PIXEL' or 'STRIP'");
-      return ActsExamples::ProcessCode::ABORT;
+      ACTS_ERROR("hardware is neither 'PIXEL' or 'STRIP', skip particle");
+      continue;
     }
     ACTS_VERBOSE("Cluster " << im << ": " << CLhardware->at(im));
 
     auto type = (CLhardware->at(im) == "PIXEL") ? ePixel : eStrip;
 
     // Make cluster
-    // TODO refactor ActsExamples::Cluster class so it is not so tedious
+    // TODO refactor Cluster class so it is not so tedious
     Cluster cluster;
 
     const auto& etas = CLetas->at(im);
@@ -326,12 +330,18 @@ ActsExamples::ProcessCode ActsExamples::RootAthenaDumpReader::read(
     cluster.sizeLoc0 = *maxEta - *minEta;
     cluster.sizeLoc1 = *maxPhi - *minPhi;
 
+    if (totalTot == 0.0) {
+      ACTS_VERBOSE("total time over threshold is 0, set all activations to 0");
+      nTotalTotZero++;
+    }
+
     for (const auto& [eta, phi, tot] : Acts::zip(etas, phis, tots)) {
       // Make best out of what we have:
       // Weight the overall collected charge corresponding to the
       // time-over-threshold of each cell Use this as activation (does this make
       // sense?)
-      auto activation = CLcharge_count[im] * tot / totalTot;
+      auto activation =
+          (totalTot != 0.0) ? CLcharge_count[im] * tot / totalTot : 0.0;
 
       // This bases every cluster at zero, but shouldn't matter right now
       ActsFatras::Segmentizer::Bin2D bin;
@@ -344,6 +354,17 @@ ActsExamples::ProcessCode ActsExamples::RootAthenaDumpReader::read(
     }
 
     cluster.globalPosition = {CLx[im], CLy[im], CLz[im]};
+    cluster.localDirection = {CLloc_direction1[im], CLloc_direction2[im],
+                              CLloc_direction3[im]};
+    cluster.lengthDirection = {CLJan_loc_direction1[im],
+                               CLJan_loc_direction2[im],
+                               CLJan_loc_direction3[im]};
+    cluster.localEta = CLloc_eta[im];
+    cluster.localPhi = CLloc_phi[im];
+    cluster.globalEta = CLglob_eta[im];
+    cluster.globalPhi = CLglob_phi[im];
+    cluster.etaAngle = CLeta_angle[im];
+    cluster.phiAngle = CLphi_angle[im];
 
     ACTS_VERBOSE("CL shape: " << cluster.channels.size()
                               << "cells, dimensions: " << cluster.sizeLoc0
@@ -357,37 +378,126 @@ ActsExamples::ProcessCode ActsExamples::RootAthenaDumpReader::read(
                                 << CLloc_direction3[im]);
     const auto& locCov = CLlocal_cov->at(im);
 
+    Acts::GeometryIdentifier geoId;
+    std::vector<double> localParams;
+    if (m_cfg.geometryIdMap && m_cfg.trackingGeometry) {
+      const auto& geoIdMap = m_cfg.geometryIdMap->left;
+      if (geoIdMap.find(CLmoduleID[im]) == geoIdMap.end()) {
+        ACTS_WARNING("Missing geo id for " << CLmoduleID[im] << ", skip hit");
+        continue;
+      }
+
+      geoId = m_cfg.geometryIdMap->left.at(CLmoduleID[im]);
+
+      auto surface = m_cfg.trackingGeometry->findSurface(geoId);
+      if (surface == nullptr) {
+        ACTS_WARNING("Did not find " << geoId
+                                     << " in tracking geometry, skip hit");
+        continue;
+      }
+
+      bool inside =
+          surface->isOnSurface(gctx, cluster.globalPosition, {},
+                               Acts::BoundaryTolerance::AbsoluteEuclidean{
+                                   m_cfg.absBoundaryTolerance},
+                               std::numeric_limits<double>::max());
+
+      if (!inside) {
+        const Acts::Vector3 v =
+            surface->transform(gctx).inverse() * cluster.globalPosition;
+        ACTS_WARNING("Projected position is not in surface bounds for "
+                     << surface->geometryId() << ", skip hit");
+        ACTS_WARNING("Position in local coordinates: " << v.transpose());
+        ACTS_WARNING("Surface details:\n" << surface->toStream(gctx));
+        continue;
+      }
+
+      const double tol = (type == ePixel) ? Acts::s_onSurfaceTolerance : 1.3_mm;
+      auto loc = surface->globalToLocal(gctx, cluster.globalPosition, {}, tol);
+
+      if (!loc.ok()) {
+        const Acts::Vector3 v =
+            surface->transform(gctx).inverse() * cluster.globalPosition;
+        ACTS_WARNING("Global-to-local fit failed on "
+                     << geoId << " (z dist: " << v[2]
+                     << ", projected on surface: " << std::boolalpha << inside
+                     << ") , skip hit");
+        continue;
+      }
+
+      // TODO is this in strip coordinates or in polar coordinates for annulus
+      // bounds?
+      localParams = std::vector<double>(loc->begin(), loc->end());
+    } else {
+      geoId = Acts::GeometryIdentifier(CLmoduleID[im]);
+      localParams = {CLloc_direction1[im], CLloc_direction2[im]};
+    }
+
     DigitizedParameters digiPars;
     if (type == ePixel) {
       digiPars.indices = {Acts::eBoundLoc0, Acts::eBoundLoc1};
-      digiPars.values = {CLloc_direction1[im], CLloc_direction2[im]};
       assert(locCov.size() == 4);
       digiPars.variances = {locCov[0], locCov[3]};
+      digiPars.values = localParams;
     } else {
-      digiPars.values = {CLloc_direction1[im]};
       digiPars.indices = {Acts::eBoundLoc0};
       assert(!locCov.empty());
       digiPars.variances = {locCov[0]};
+      digiPars.values = {localParams[0]};
     }
 
-    IndexSourceLink sl(Acts::GeometryIdentifier{CLmoduleID[im]}, im);
-
-    measurements.push_back(createMeasurement(digiPars, sl));
+    std::size_t measIndex = measurements.size();
+    createMeasurement(measurements, geoId, digiPars);
 
     // Create measurement particles map and particles container
-    for (const auto& [subevt, bc] : Acts::zip(CLparticleLink_eventIndex->at(im),
-                                              CLparticleLink_barcode->at(im))) {
-      auto barcode = barcodeConstructor.getBarcode(bc, subevt);
-      measPartMap.insert(std::pair<Index, ActsFatras::Barcode>{im, barcode});
+    for (const auto& [subevt, barcode] :
+         Acts::zip(CLparticleLink_eventIndex->at(im),
+                   CLparticleLink_barcode->at(im))) {
+      auto dummyBarcode = concatInts(barcode, subevt);
+      // If we don't find the particle, create one with default values
+      if (particles.find(dummyBarcode) == particles.end()) {
+        ACTS_VERBOSE("Particle with subevt " << subevt << ", barcode "
+                                             << barcode
+                                             << "not found, create dummy one");
+        particles.emplace(dummyBarcode, Acts::PdgParticle::eInvalid);
+      }
+      measPartMap.insert(
+          std::pair<Index, ActsFatras::Barcode>{measIndex, dummyBarcode});
     }
+
+    imIdxMap.emplace(im, measIndex);
+  }
+
+  if (measurements.size() < static_cast<std::size_t>(nCL)) {
+    ACTS_WARNING("Could not convert " << nCL - measurements.size() << " / "
+                                      << nCL << " measurements");
+  }
+
+  if (particles.size() - prevParticlesSize > 0) {
+    ACTS_DEBUG("Created " << particles.size() - prevParticlesSize
+                          << " dummy particles");
+  }
+
+  if (nTotalTotZero > 0) {
+    ACTS_WARNING(nTotalTotZero << " / " << nCL
+                               << " clusters have zero time-over-threshold");
   }
 
-  // Prepare pixel space points
+  return {clusters, measurements, measPartMap, imIdxMap};
+}
+
+std::tuple<SimSpacePointContainer, SimSpacePointContainer,
+           SimSpacePointContainer>
+RootAthenaDumpReader::readSpacepoints(
+    const std::optional<std::unordered_map<int, std::size_t>>& imIdxMap) const {
   SimSpacePointContainer pixelSpacePoints;
+  pixelSpacePoints.reserve(nSP);
+
+  SimSpacePointContainer stripSpacePoints;
+  stripSpacePoints.reserve(nSP);
 
-  // Prepare space-point container
-  // They contain both pixel and SCT space points
   SimSpacePointContainer spacePoints;
+  spacePoints.reserve(nSP);
 
   // Loop on space points
   std::size_t skippedSpacePoints = 0;
@@ -403,63 +513,215 @@ ActsExamples::ProcessCode ActsExamples::RootAthenaDumpReader::read(
       continue;
     }
 
-    Acts::Vector3 globalPos{SPx[isp], SPy[isp], SPz[isp]};
-    double sp_covr = SPcovr[isp];
-    double sp_covz = SPcovz[isp];
+    const Acts::Vector3 globalPos{SPx[isp], SPy[isp], SPz[isp]};
+    const double spCovr = SPcovr[isp];
+    const double spCovz = SPcovz[isp];
 
     // PIX=1  STRIP = 2
     auto type = SPCL2_index[isp] == -1 ? ePixel : eStrip;
 
     ACTS_VERBOSE("SP:: " << type << " [" << globalPos.transpose() << "] "
-                         << sp_covr << " " << sp_covz);
+                         << spCovr << " " << spCovz);
 
     boost::container::static_vector<Acts::SourceLink, 2> sLinks;
 
     const auto cl1Index = SPCL1_index[isp];
     assert(cl1Index >= 0 && cl1Index < nCL);
 
-    // NOTE This of course does not produce a valid Acts-stlye geometry id, but
-    // we can use it for the module map
-    IndexSourceLink first(Acts::GeometryIdentifier{CLmoduleID[cl1Index]},
-                          cl1Index);
-    sLinks.emplace_back(first);
-
-    if (type == eStrip) {
-      const auto cl2Index = SPCL2_index[isp];
-      assert(cl2Index >= 0 && cl2Index < nCL);
+    auto getGeoId =
+        [&](auto athenaId) -> std::optional<Acts::GeometryIdentifier> {
+      if (m_cfg.geometryIdMap == nullptr) {
+        return Acts::GeometryIdentifier{athenaId};
+      }
+      if (m_cfg.geometryIdMap->left.find(athenaId) ==
+          m_cfg.geometryIdMap->left.end()) {
+        return std::nullopt;
+      }
+      return m_cfg.geometryIdMap->left.at(athenaId);
+    };
+
+    auto cl1GeoId = getGeoId(CLmoduleID[cl1Index]);
+    if (!cl1GeoId) {
+      ACTS_WARNING("Could not find geoId for spacepoint cluster 1");
+      continue;
+    }
 
-      // NOTE This of course does not produce a valid Acts-stlye geometry id,
-      // but we can use it for the module map
-      IndexSourceLink second(Acts::GeometryIdentifier{CLmoduleID[cl2Index]},
-                             cl2Index);
-      sLinks.emplace_back(second);
+    if (imIdxMap && !imIdxMap->contains(cl1Index)) {
+      ACTS_WARNING("Measurement 1 for spacepoint " << isp << " not created");
+      continue;
     }
 
-    SimSpacePoint sp(globalPos, std::nullopt, sp_covr, sp_covz, std::nullopt,
+    IndexSourceLink first(*cl1GeoId,
+                          imIdxMap ? imIdxMap->at(cl1Index) : cl1Index);
+    sLinks.emplace_back(first);
+
+    // First create pixel spacepoint here, later maybe overwrite with strip
+    // spacepoint
+    SimSpacePoint sp(globalPos, std::nullopt, spCovr, spCovz, std::nullopt,
                      sLinks);
 
     if (type == ePixel) {
       pixelSpacePoints.push_back(sp);
+    } else {
+      const auto cl2Index = SPCL2_index[isp];
+      assert(cl2Index >= 0 && cl2Index < nCL);
+
+      auto cl2GeoId = getGeoId(CLmoduleID[cl1Index]);
+      if (!cl2GeoId) {
+        ACTS_WARNING("Could not find geoId for spacepoint cluster 2");
+        continue;
+      }
+
+      if (imIdxMap && !imIdxMap->contains(cl2Index)) {
+        ACTS_WARNING("Measurement 2 for spacepoint " << isp << " not created");
+        continue;
+      }
+
+      IndexSourceLink second(*cl2GeoId,
+                             imIdxMap ? imIdxMap->at(cl2Index) : cl2Index);
+      sLinks.emplace_back(second);
+
+      using Vector3f = Eigen::Matrix<float, 3, 1>;
+      Vector3f topStripDirection = Vector3f::Zero();
+      Vector3f bottomStripDirection = Vector3f::Zero();
+      Vector3f stripCenterDistance = Vector3f::Zero();
+      Vector3f topStripCenterPosition = Vector3f::Zero();
+
+      if (m_haveStripFeatures) {
+        topStripDirection = {SPtopStripDirection->at(isp).at(0),
+                             SPtopStripDirection->at(isp).at(1),
+                             SPtopStripDirection->at(isp).at(2)};
+        bottomStripDirection = {SPbottomStripDirection->at(isp).at(0),
+                                SPbottomStripDirection->at(isp).at(1),
+                                SPbottomStripDirection->at(isp).at(2)};
+        stripCenterDistance = {SPstripCenterDistance->at(isp).at(0),
+                               SPstripCenterDistance->at(isp).at(1),
+                               SPstripCenterDistance->at(isp).at(2)};
+        topStripCenterPosition = {SPtopStripCenterPosition->at(isp).at(0),
+                                  SPtopStripCenterPosition->at(isp).at(1),
+                                  SPtopStripCenterPosition->at(isp).at(2)};
+      }
+      sp = SimSpacePoint(globalPos, std::nullopt, spCovr, spCovz, std::nullopt,
+                         sLinks, SPhl_topstrip[isp], SPhl_botstrip[isp],
+                         topStripDirection.cast<double>(),
+                         bottomStripDirection.cast<double>(),
+                         stripCenterDistance.cast<double>(),
+                         topStripCenterPosition.cast<double>());
+
+      stripSpacePoints.push_back(sp);
     }
 
     spacePoints.push_back(sp);
   }
 
-  ACTS_DEBUG("Created " << particles.size() << " particles");
   if (m_cfg.skipOverlapSPsEta || m_cfg.skipOverlapSPsPhi) {
     ACTS_DEBUG("Skipped " << skippedSpacePoints
                           << " because of eta/phi overlaps");
   }
+  if (spacePoints.size() < static_cast<std::size_t>(nSP)) {
+    ACTS_WARNING("Could not convert " << nSP - spacePoints.size() << " of "
+                                      << nSP << " spacepoints");
+  }
+
   ACTS_DEBUG("Created " << spacePoints.size() << " overall space points");
   ACTS_DEBUG("Created " << pixelSpacePoints.size() << " "
                         << " pixel space points");
 
+  return {spacePoints, pixelSpacePoints, stripSpacePoints};
+}
+
+std::pair<SimParticleContainer, IndexMultimap<ActsFatras::Barcode>>
+RootAthenaDumpReader::reprocessParticles(
+    const SimParticleContainer& particles,
+    const IndexMultimap<ActsFatras::Barcode>& measPartMap) const {
+  std::vector<ActsExamples::SimParticle> newParticles;
+  newParticles.reserve(particles.size());
+  IndexMultimap<ActsFatras::Barcode> newMeasPartMap;
+
+  const auto partMeasMap = invertIndexMultimap(measPartMap);
+
+  std::uint16_t primaryCount = 0;
+  std::uint16_t secondaryCount = 0;
+
+  for (const auto& particle : particles) {
+    const auto [begin, end] = partMeasMap.equal_range(particle.particleId());
+
+    if (begin == end) {
+      ACTS_VERBOSE("Particle " << particle.particleId().value()
+                               << " has no measurements");
+      continue;
+    }
+
+    auto [athBarcode, athSubevent] = splitInt(particle.particleId().value());
+    auto primary = (athBarcode < s_maxBarcodeForPrimary);
+
+    ActsFatras::Barcode fatrasBarcode;
+
+    // vertex primary shouldn't be zero for a valid particle
+    fatrasBarcode.setVertexPrimary(1);
+    if (primary) {
+      fatrasBarcode.setVertexSecondary(0);
+      fatrasBarcode.setParticle(primaryCount);
+      assert(primaryCount < std::numeric_limits<std::uint16_t>::max());
+      primaryCount++;
+    } else {
+      fatrasBarcode.setVertexSecondary(1);
+      fatrasBarcode.setParticle(secondaryCount);
+      assert(primaryCount < std::numeric_limits<std::uint16_t>::max());
+      secondaryCount++;
+    }
+
+    auto newParticle = particle.withParticleId(fatrasBarcode);
+    newParticles.push_back(newParticle);
+
+    for (auto it = begin; it != end; ++it) {
+      newMeasPartMap.insert(
+          std::pair<Index, ActsFatras::Barcode>{it->second, fatrasBarcode});
+    }
+  }
+
+  ACTS_DEBUG("After reprocessing particles " << newParticles.size() << " of "
+                                             << particles.size() << " remain");
+  return {particleVectorToSet(newParticles), newMeasPartMap};
+}
+
+ProcessCode RootAthenaDumpReader::read(const AlgorithmContext& ctx) {
+  ACTS_DEBUG("Reading event " << ctx.eventNumber);
+  auto entry = ctx.eventNumber;
+  if (entry >= m_events) {
+    ACTS_ERROR("event out of bounds");
+    return ProcessCode::ABORT;
+  }
+
+  std::lock_guard<std::mutex> lock(m_read_mutex);
+
+  m_inputchain->GetEntry(entry);
+
+  std::optional<std::unordered_map<int, std::size_t>> optImIdxMap;
+
+  if (!m_cfg.onlySpacepoints) {
+    auto candidateParticles = readParticles();
+
+    auto [clusters, measurements, candidateMeasPartMap, imIdxMap] =
+        readMeasurements(candidateParticles, ctx.geoContext);
+    optImIdxMap.emplace(std::move(imIdxMap));
+
+    auto [particles, measPartMap] =
+        reprocessParticles(candidateParticles, candidateMeasPartMap);
+
+    m_outputClusters(ctx, std::move(clusters));
+    m_outputParticles(ctx, std::move(particles));
+    m_outputMeasParticleMap(ctx, std::move(measPartMap));
+    m_outputMeasurements(ctx, std::move(measurements));
+  }
+
+  auto [spacePoints, pixelSpacePoints, stripSpacePoints] =
+      readSpacepoints(optImIdxMap);
+
   m_outputPixelSpacePoints(ctx, std::move(pixelSpacePoints));
+  m_outputStripSpacePoints(ctx, std::move(stripSpacePoints));
   m_outputSpacePoints(ctx, std::move(spacePoints));
-  m_outputClusters(ctx, std::move(clusters));
-  m_outputParticles(ctx, std::move(particles));
-  m_outputMeasParticleMap(ctx, std::move(measPartMap));
-  m_outputMeasurements(ctx, std::move(measurements));
 
   return ProcessCode::SUCCESS;
 }
+}  // namespace ActsExamples
diff --git a/Examples/Io/Root/src/RootAthenaNTupleReader.cpp b/Examples/Io/Root/src/RootAthenaNTupleReader.cpp
index cd1183124ac..ac06349c595 100644
--- a/Examples/Io/Root/src/RootAthenaNTupleReader.cpp
+++ b/Examples/Io/Root/src/RootAthenaNTupleReader.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2022-2024 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include "ActsExamples/Io/Root/RootAthenaNTupleReader.hpp"
 
diff --git a/Examples/Io/Root/src/RootBFieldWriter.cpp b/Examples/Io/Root/src/RootBFieldWriter.cpp
index 6704180811f..b8cb8b6c104 100644
--- a/Examples/Io/Root/src/RootBFieldWriter.cpp
+++ b/Examples/Io/Root/src/RootBFieldWriter.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2021 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include "ActsExamples/Io/Root/RootBFieldWriter.hpp"
 
diff --git a/Examples/Io/Root/src/RootMaterialDecorator.cpp b/Examples/Io/Root/src/RootMaterialDecorator.cpp
index 1cdce413c52..37f396bb86c 100644
--- a/Examples/Io/Root/src/RootMaterialDecorator.cpp
+++ b/Examples/Io/Root/src/RootMaterialDecorator.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2017-2018 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include "ActsExamples/Io/Root/RootMaterialDecorator.hpp"
 
@@ -148,8 +148,8 @@ ActsExamples::RootMaterialDecorator::RootMaterialDecorator(
       std::vector<const TH1*> hists{n, v, o, min, max, t, x0, l0, A, Z, rho};
 
       // Only go on when you have all histograms
-      if (std::all_of(hists.begin(), hists.end(),
-                      [](const auto* hist) { return hist != nullptr; })) {
+      if (std::ranges::all_of(
+              hists, [](const auto* hist) { return hist != nullptr; })) {
         // Get the number of bins
         int nbins0 = t->GetNbinsX();
         int nbins1 = t->GetNbinsY();
diff --git a/Examples/Io/Root/src/RootMaterialTrackReader.cpp b/Examples/Io/Root/src/RootMaterialTrackReader.cpp
index 69934cd743b..8781b134559 100644
--- a/Examples/Io/Root/src/RootMaterialTrackReader.cpp
+++ b/Examples/Io/Root/src/RootMaterialTrackReader.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2017-2018 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include "ActsExamples/Io/Root/RootMaterialTrackReader.hpp"
 
diff --git a/Examples/Io/Root/src/RootMaterialTrackWriter.cpp b/Examples/Io/Root/src/RootMaterialTrackWriter.cpp
index e3a5172d2f2..a7a5ee39f8c 100644
--- a/Examples/Io/Root/src/RootMaterialTrackWriter.cpp
+++ b/Examples/Io/Root/src/RootMaterialTrackWriter.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2017-2018 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include "ActsExamples/Io/Root/RootMaterialTrackWriter.hpp"
 
diff --git a/Examples/Io/Root/src/RootMaterialWriter.cpp b/Examples/Io/Root/src/RootMaterialWriter.cpp
index be43994f192..5076ca62bd6 100644
--- a/Examples/Io/Root/src/RootMaterialWriter.cpp
+++ b/Examples/Io/Root/src/RootMaterialWriter.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2017-2018 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include "ActsExamples/Io/Root/RootMaterialWriter.hpp"
 
@@ -297,7 +297,7 @@ void ActsExamples::RootMaterialWriter::writeMaterial(
         Acts::MaterialGrid3D grid = bvMaterial3D->getMapper().getGrid();
         for (std::size_t point = 0; point < points; point++) {
           auto mat = Acts::Material(grid.at(point));
-          if (mat) {
+          if (mat.isValid()) {
             x0->SetBinContent(point + 1, mat.X0());
             l0->SetBinContent(point + 1, mat.L0());
             A->SetBinContent(point + 1, mat.Ar());
@@ -311,7 +311,7 @@ void ActsExamples::RootMaterialWriter::writeMaterial(
         Acts::MaterialGrid2D grid = bvMaterial2D->getMapper().getGrid();
         for (std::size_t point = 0; point < points; point++) {
           auto mat = Acts::Material(grid.at(point));
-          if (mat) {
+          if (mat.isValid()) {
             x0->SetBinContent(point + 1, mat.X0());
             l0->SetBinContent(point + 1, mat.L0());
             A->SetBinContent(point + 1, mat.Ar());
@@ -351,8 +351,8 @@ void ActsExamples::RootMaterialWriter::collectMaterial(
     const Acts::TrackingVolume& tVolume,
     Acts::DetectorMaterialMaps& detMatMap) {
   // If the volume has volume material, write that
-  if (tVolume.volumeMaterialSharedPtr() != nullptr && m_cfg.processVolumes) {
-    detMatMap.second[tVolume.geometryId()] = tVolume.volumeMaterialSharedPtr();
+  if (tVolume.volumeMaterialPtr() != nullptr && m_cfg.processVolumes) {
+    detMatMap.second[tVolume.geometryId()] = tVolume.volumeMaterialPtr();
   }
 
   // If confined layers exist, loop over them and collect the layer material
diff --git a/Examples/Io/Root/src/RootMeasurementWriter.cpp b/Examples/Io/Root/src/RootMeasurementWriter.cpp
index 0a476b031a1..b7ab332fdea 100644
--- a/Examples/Io/Root/src/RootMeasurementWriter.cpp
+++ b/Examples/Io/Root/src/RootMeasurementWriter.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2017-2024 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include "ActsExamples/Io/Root/RootMeasurementWriter.hpp"
 
@@ -12,7 +12,7 @@
 #include "Acts/Utilities/Enumerate.hpp"
 #include "ActsExamples/EventData/AverageSimHits.hpp"
 #include "ActsExamples/EventData/Index.hpp"
-#include "ActsExamples/EventData/IndexSourceLink.hpp"
+#include "ActsExamples/EventData/Measurement.hpp"
 #include "ActsExamples/Framework/AlgorithmContext.hpp"
 #include "ActsExamples/Utilities/Range.hpp"
 
@@ -152,12 +152,12 @@ struct RootMeasurementWriter::DigitizationTree {
   /// Convenience function to fill bound parameters
   ///
   /// @param m The measurement
-  void fillBoundMeasurement(const Measurement& m) {
+  void fillBoundMeasurement(const ConstVariableBoundMeasurementProxy& m) {
     for (unsigned int i = 0; i < m.size(); ++i) {
-      auto ib = m.subspace()[i];
+      auto ib = m.subspaceIndexVector()[i];
 
-      recBound[ib] = m.effectiveParameters()[i];
-      varBound[ib] = m.effectiveCovariance()(i, i);
+      recBound[ib] = m.parameters()[i];
+      varBound[ib] = m.covariance()(i, i);
 
       residual[ib] = recBound[ib] - trueBound[ib];
       pull[ib] = residual[ib] / std::sqrt(varBound[ib]);
@@ -266,10 +266,10 @@ ProcessCode RootMeasurementWriter::writeT(
   std::lock_guard<std::mutex> lock(m_writeMutex);
 
   for (Index hitIdx = 0u; hitIdx < measurements.size(); ++hitIdx) {
-    const auto& meas = measurements[hitIdx];
+    const ConstVariableBoundMeasurementProxy meas =
+        measurements.getMeasurement(hitIdx);
 
-    Acts::GeometryIdentifier geoId =
-        meas.sourceLink().template get<IndexSourceLink>().geometryId();
+    Acts::GeometryIdentifier geoId = meas.geometryId();
     // find the corresponding surface
     auto surfaceItr = m_cfg.surfaceByIdentifier.find(geoId);
     if (surfaceItr == m_cfg.surfaceByIdentifier.end()) {
diff --git a/Examples/Io/NuclearInteractions/src/RootNuclearInteractionParametersWriter.cpp b/Examples/Io/Root/src/RootNuclearInteractionParametersWriter.cpp
similarity index 95%
rename from Examples/Io/NuclearInteractions/src/RootNuclearInteractionParametersWriter.cpp
rename to Examples/Io/Root/src/RootNuclearInteractionParametersWriter.cpp
index d7b5a80fc4c..995f7bdf57d 100644
--- a/Examples/Io/NuclearInteractions/src/RootNuclearInteractionParametersWriter.cpp
+++ b/Examples/Io/Root/src/RootNuclearInteractionParametersWriter.cpp
@@ -1,12 +1,12 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2020-2021 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
-#include "ActsExamples/Io/NuclearInteractions/RootNuclearInteractionParametersWriter.hpp"
+#include "ActsExamples/Io/Root/RootNuclearInteractionParametersWriter.hpp"
 
 #include "Acts/Definitions/Algebra.hpp"
 #include "Acts/Definitions/Common.hpp"
@@ -227,7 +227,7 @@ std::pair<std::vector<float>, std::vector<std::uint32_t>> buildMap(
 }
 
 /// @brief This method builds decomposed cumulative probability distributions
-/// out of a vector of proability distributions
+/// out of a vector of probability distributions
 ///
 /// @param [in] histos Vector of probability distributions
 ///
@@ -410,27 +410,27 @@ ActsExamples::RootNuclearInteractionParametersWriter::finalize() {
   gDirectory->WriteObject(&mapNIprob.second, "NuclearInteractionBinContents");
   ACTS_DEBUG("Nuclear interaction probability parametrised");
 
-  ACTS_DEBUG("Starting calulcation of probability of interaction type");
-  // Write the interaction type proability
+  ACTS_DEBUG("Starting calculation of probability of interaction type");
+  // Write the interaction type probability
   const auto softProbability =
       Parametrisation::softProbability(m_eventFractionCollection);
 
   gDirectory->WriteObject(&softProbability, "SoftInteraction");
-  ACTS_DEBUG("Calulcation of probability of interaction type finished");
+  ACTS_DEBUG("Calculation of probability of interaction type finished");
 
   // Write the PDG id production distribution
   ACTS_DEBUG(
-      "Starting calulcation of transition probabilities between PDG IDs");
+      "Starting calculation of transition probabilities between PDG IDs");
   const auto pdgIdMap =
       Parametrisation::cumulativePDGprobability(m_eventFractionCollection);
   std::vector<int> branchingPdgIds;
   std::vector<int> targetPdgIds;
   std::vector<float> targetPdgProbability;
-  for (const auto& targetPdgIdMap : pdgIdMap) {
-    for (const auto& producedPdgIdMap : targetPdgIdMap.second) {
-      branchingPdgIds.push_back(targetPdgIdMap.first);
-      targetPdgIds.push_back(producedPdgIdMap.first);
-      targetPdgProbability.push_back(producedPdgIdMap.second);
+  for (const auto& [targetKey, targetValue] : pdgIdMap) {
+    for (const auto& [producedKey, producedValue] : targetValue) {
+      branchingPdgIds.push_back(targetKey);
+      targetPdgIds.push_back(producedKey);
+      targetPdgProbability.push_back(producedValue);
     }
   }
 
@@ -438,7 +438,7 @@ ActsExamples::RootNuclearInteractionParametersWriter::finalize() {
   gDirectory->WriteObject(&targetPdgIds, "TargetPdgIds");
   gDirectory->WriteObject(&targetPdgProbability, "TargetPdgProbability");
   ACTS_DEBUG(
-      "Calulcation of transition probabilities between PDG IDs finished");
+      "Calculation of transition probabilities between PDG IDs finished");
 
   // Write the multiplicity and kinematics distribution
   ACTS_DEBUG("Starting parametrisation of multiplicity probabilities");
diff --git a/Examples/Io/Root/src/RootParticleReader.cpp b/Examples/Io/Root/src/RootParticleReader.cpp
index 34a5bd12e12..a76255dbb4a 100644
--- a/Examples/Io/Root/src/RootParticleReader.cpp
+++ b/Examples/Io/Root/src/RootParticleReader.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2017-2024 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include "ActsExamples/Io/Root/RootParticleReader.hpp"
 
@@ -13,10 +13,9 @@
 #include "ActsExamples/EventData/SimParticle.hpp"
 #include "ActsExamples/Framework/AlgorithmContext.hpp"
 #include "ActsExamples/Io/Root/RootUtility.hpp"
+#include "ActsFatras/EventData/ParticleOutcome.hpp"
 #include "ActsFatras/EventData/ProcessType.hpp"
 
-#include <algorithm>
-#include <cstdint>
 #include <iostream>
 #include <stdexcept>
 
@@ -64,6 +63,12 @@ RootParticleReader::RootParticleReader(const RootParticleReader::Config& config,
   m_inputChain->SetBranchAddress("generation", &m_generation);
   m_inputChain->SetBranchAddress("sub_particle", &m_subParticle);
 
+  m_inputChain->SetBranchAddress("e_loss", &m_eLoss);
+  m_inputChain->SetBranchAddress("total_x0", &m_pathInX0);
+  m_inputChain->SetBranchAddress("total_l0", &m_pathInL0);
+  m_inputChain->SetBranchAddress("number_of_hits", &m_numberOfHits);
+  m_inputChain->SetBranchAddress("outcome", &m_outcome);
+
   auto path = m_cfg.filePath;
 
   // add file to the input chain
@@ -109,6 +114,12 @@ RootParticleReader::~RootParticleReader() {
   delete m_particle;
   delete m_generation;
   delete m_subParticle;
+
+  delete m_eLoss;
+  delete m_pathInX0;
+  delete m_pathInL0;
+  delete m_numberOfHits;
+  delete m_outcome;
 }
 
 ProcessCode RootParticleReader::read(const AlgorithmContext& context) {
@@ -136,18 +147,30 @@ ProcessCode RootParticleReader::read(const AlgorithmContext& context) {
   for (unsigned int i = 0; i < nParticles; i++) {
     SimParticle p;
 
-    p.setProcess(static_cast<ActsFatras::ProcessType>((*m_process)[i]));
-    p.setPdg(static_cast<Acts::PdgParticle>((*m_particleType)[i]));
-    p.setCharge((*m_q)[i] * Acts::UnitConstants::e);
-    p.setMass((*m_m)[i] * Acts::UnitConstants::GeV);
-    p.setParticleId((*m_particleId)[i]);
-    p.setPosition4((*m_vx)[i] * Acts::UnitConstants::mm,
-                   (*m_vy)[i] * Acts::UnitConstants::mm,
-                   (*m_vz)[i] * Acts::UnitConstants::mm,
-                   (*m_vt)[i] * Acts::UnitConstants::mm);
+    p.setProcess(static_cast<ActsFatras::ProcessType>((*m_process).at(i)));
+    p.setPdg(static_cast<Acts::PdgParticle>((*m_particleType).at(i)));
+    p.setCharge((*m_q).at(i) * Acts::UnitConstants::e);
+    p.setMass((*m_m).at(i) * Acts::UnitConstants::GeV);
+    p.setParticleId((*m_particleId).at(i));
+
+    SimParticleState& initialState = p.initial();
+
+    initialState.setPosition4((*m_vx).at(i) * Acts::UnitConstants::mm,
+                              (*m_vy).at(i) * Acts::UnitConstants::mm,
+                              (*m_vz).at(i) * Acts::UnitConstants::mm,
+                              (*m_vt).at(i) * Acts::UnitConstants::mm);
     // NOTE: direction is normalized inside `setDirection`
-    p.setDirection((*m_px)[i], (*m_py)[i], (*m_pz)[i]);
-    p.setAbsoluteMomentum((*m_p)[i] * Acts::UnitConstants::GeV);
+    initialState.setDirection((*m_px).at(i), (*m_py).at(i), (*m_pz).at(i));
+    initialState.setAbsoluteMomentum((*m_p).at(i) * Acts::UnitConstants::GeV);
+
+    SimParticleState& finalState = p.final();
+
+    // TODO eloss cannot be read since we need the final momentum
+    finalState.setMaterialPassed((*m_pathInX0).at(i) * Acts::UnitConstants::mm,
+                                 (*m_pathInL0).at(i) * Acts::UnitConstants::mm);
+    finalState.setNumberOfHits((*m_numberOfHits).at(i));
+    finalState.setOutcome(
+        static_cast<ActsFatras::ParticleOutcome>((*m_outcome).at(i)));
 
     particles.insert(p);
   }
diff --git a/Examples/Io/Root/src/RootParticleWriter.cpp b/Examples/Io/Root/src/RootParticleWriter.cpp
index 72e5b653be4..ac6d47d10da 100644
--- a/Examples/Io/Root/src/RootParticleWriter.cpp
+++ b/Examples/Io/Root/src/RootParticleWriter.cpp
@@ -1,23 +1,21 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2023-2024 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include "ActsExamples/Io/Root/RootParticleWriter.hpp"
 
 #include "Acts/Definitions/Units.hpp"
 #include "Acts/Utilities/Helpers.hpp"
 #include "Acts/Utilities/VectorHelpers.hpp"
+#include "ActsExamples/EventData/SimParticle.hpp"
 #include "ActsExamples/Framework/AlgorithmContext.hpp"
-#include "ActsFatras/EventData/Barcode.hpp"
-#include "ActsFatras/EventData/Particle.hpp"
 
 #include <cstdint>
 #include <ios>
-#include <limits>
 #include <ostream>
 #include <stdexcept>
 
@@ -36,8 +34,6 @@ ActsExamples::RootParticleWriter::RootParticleWriter(
     throw std::invalid_argument("Missing tree name");
   }
 
-  m_inputFinalParticles.maybeInitialize(m_cfg.inputFinalParticles);
-
   // open root file and create the tree
   m_outputFile = TFile::Open(m_cfg.filePath.c_str(), m_cfg.fileMode.c_str());
   if (m_outputFile == nullptr) {
@@ -73,13 +69,11 @@ ActsExamples::RootParticleWriter::RootParticleWriter(
   m_outputTree->Branch("generation", &m_generation);
   m_outputTree->Branch("sub_particle", &m_subParticle);
 
-  if (m_inputFinalParticles.isInitialized()) {
-    m_outputTree->Branch("e_loss", &m_eLoss);
-    m_outputTree->Branch("total_x0", &m_pathInX0);
-    m_outputTree->Branch("total_l0", &m_pathInL0);
-    m_outputTree->Branch("number_of_hits", &m_numberOfHits);
-    m_outputTree->Branch("outcome", &m_outcome);
-  }
+  m_outputTree->Branch("e_loss", &m_eLoss);
+  m_outputTree->Branch("total_x0", &m_pathInX0);
+  m_outputTree->Branch("total_l0", &m_pathInL0);
+  m_outputTree->Branch("number_of_hits", &m_numberOfHits);
+  m_outputTree->Branch("outcome", &m_outcome);
 }
 
 ActsExamples::RootParticleWriter::~RootParticleWriter() {
@@ -101,16 +95,9 @@ ActsExamples::ProcessCode ActsExamples::RootParticleWriter::finalize() {
 
 ActsExamples::ProcessCode ActsExamples::RootParticleWriter::writeT(
     const AlgorithmContext& ctx, const SimParticleContainer& particles) {
-  const SimParticleContainer* finalParticles = nullptr;
-  if (m_inputFinalParticles.isInitialized()) {
-    finalParticles = &m_inputFinalParticles(ctx);
-  }
-
   // ensure exclusive access to tree/file while writing
   std::lock_guard<std::mutex> lock(m_writeMutex);
 
-  auto nan = std::numeric_limits<float>::quiet_NaN();
-
   m_eventId = ctx.eventNumber;
   for (const auto& particle : particles) {
     m_particleId.push_back(particle.particleId().value());
@@ -150,41 +137,14 @@ ActsExamples::ProcessCode ActsExamples::RootParticleWriter::writeT(
     m_generation.push_back(particle.particleId().generation());
     m_subParticle.push_back(particle.particleId().subParticle());
 
-    bool wroteFinalParticle = false;
-    if (finalParticles != nullptr) {
-      // get the final particle
-      auto it = finalParticles->find(particle);
-      if (it == finalParticles->end()) {
-        ACTS_ERROR("Could not find final particle for "
-                   << particle.particleId() << " in event " << ctx.eventNumber);
-      } else {
-        const auto& finalParticle = *it;
-        // get the energy loss
-        m_eLoss.push_back(Acts::clampValue<float>(
-            (particle.energy() - finalParticle.energy()) /
-            Acts::UnitConstants::GeV));
-        // get the path in X0
-        m_pathInX0.push_back(Acts::clampValue<float>(finalParticle.pathInX0() /
-                                                     Acts::UnitConstants::mm));
-        // get the path in L0
-        m_pathInL0.push_back(Acts::clampValue<float>(finalParticle.pathInL0() /
-                                                     Acts::UnitConstants::mm));
-        // get the number of hits
-        m_numberOfHits.push_back(finalParticle.numberOfHits());
-        // get the particle outcome
-        m_outcome.push_back(
-            static_cast<std::uint32_t>(finalParticle.outcome()));
-
-        wroteFinalParticle = true;
-      }
-    }
-    if (!wroteFinalParticle) {
-      m_eLoss.push_back(nan);
-      m_pathInX0.push_back(nan);
-      m_pathInL0.push_back(nan);
-      m_numberOfHits.push_back(-1);
-      m_outcome.push_back(0);
-    }
+    m_eLoss.push_back(Acts::clampValue<float>(particle.energyLoss() /
+                                              Acts::UnitConstants::GeV));
+    m_pathInX0.push_back(
+        Acts::clampValue<float>(particle.pathInX0() / Acts::UnitConstants::mm));
+    m_pathInL0.push_back(
+        Acts::clampValue<float>(particle.pathInL0() / Acts::UnitConstants::mm));
+    m_numberOfHits.push_back(particle.numberOfHits());
+    m_outcome.push_back(static_cast<std::uint32_t>(particle.outcome()));
   }
 
   m_outputTree->Fill();
diff --git a/Examples/Io/Root/src/RootPropagationStepsWriter.cpp b/Examples/Io/Root/src/RootPropagationStepsWriter.cpp
index 5f157d519d6..c7866e056eb 100644
--- a/Examples/Io/Root/src/RootPropagationStepsWriter.cpp
+++ b/Examples/Io/Root/src/RootPropagationStepsWriter.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2017-2024 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include "ActsExamples/Io/Root/RootPropagationStepsWriter.hpp"
 
@@ -135,6 +135,7 @@ ActsExamples::ProcessCode ActsExamples::RootPropagationStepsWriter::writeT(
     m_x.clear();
     m_y.clear();
     m_z.clear();
+    m_r.clear();
     m_dx.clear();
     m_dy.clear();
     m_dz.clear();
diff --git a/Examples/Io/Root/src/RootPropagationSummaryWriter.cpp b/Examples/Io/Root/src/RootPropagationSummaryWriter.cpp
index 561d1bdc9e8..07a1cfa105f 100644
--- a/Examples/Io/Root/src/RootPropagationSummaryWriter.cpp
+++ b/Examples/Io/Root/src/RootPropagationSummaryWriter.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2024 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include "ActsExamples/Io/Root/RootPropagationSummaryWriter.hpp"
 
@@ -73,6 +73,10 @@ RootPropagationSummaryWriter::RootPropagationSummaryWriter(
   m_outputTree->Branch("pt", &m_pt);
   m_outputTree->Branch("p", &m_p);
 
+  m_outputTree->Branch("nSensitives", &m_nSensitives);
+  m_outputTree->Branch("nMaterials", &m_nMaterials);
+  m_outputTree->Branch("nPortals", &m_nPortals);
+
   m_outputTree->Branch("nSteps", &m_nSteps);
   m_outputTree->Branch("nStepTrials", &m_nStepTrials);
   m_outputTree->Branch("pathLength", &m_pathLength);
@@ -134,6 +138,28 @@ ProcessCode RootPropagationSummaryWriter::writeT(
     m_nStepTrials = static_cast<int>(summary.nStepTrials);
     m_pathLength = static_cast<int>(summary.pathLength);
 
+    m_nMaterials = 0;
+    m_nSensitives = 0;
+    m_nPortals = 0;
+
+    // Loop over the steps & count for the statistics
+    std::ranges::for_each(summary.steps, [&](const auto& step) {
+      // Check if the step is a sensitive step
+      if (step.geoID.sensitive() > 0) {
+        m_nSensitives++;
+      }
+      // Check if the step is a portal step
+      if (step.geoID.boundary() > 0) {
+        m_nPortals++;
+      }
+
+      if (step.surface != nullptr) {
+        // Check if the step is a material step
+        if (step.surface->surfaceMaterial() != nullptr) {
+          m_nMaterials++;
+        }
+      }
+    });
     m_outputTree->Fill();
   }
 
diff --git a/Examples/Io/Root/src/RootSeedWriter.cpp b/Examples/Io/Root/src/RootSeedWriter.cpp
index 4219e9539ce..8a03fde982b 100644
--- a/Examples/Io/Root/src/RootSeedWriter.cpp
+++ b/Examples/Io/Root/src/RootSeedWriter.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2022 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include "ActsExamples/Io/Root/RootSeedWriter.hpp"
 
diff --git a/Examples/Io/Root/src/RootSimHitReader.cpp b/Examples/Io/Root/src/RootSimHitReader.cpp
index cea62954727..4f0d805dc7e 100644
--- a/Examples/Io/Root/src/RootSimHitReader.cpp
+++ b/Examples/Io/Root/src/RootSimHitReader.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2023 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include "ActsExamples/Io/Root/RootSimHitReader.hpp"
 
@@ -72,6 +72,9 @@ RootSimHitReader::RootSimHitReader(const RootSimHitReader::Config& config,
   m_inputChain->SetBranchStatus("event_id", true);
 
   auto nEntries = static_cast<std::size_t>(m_inputChain->GetEntriesFast());
+  if (nEntries == 0) {
+    throw std::runtime_error("Did not find any entries in input file");
+  }
 
   // Add the first entry
   m_inputChain->GetEntry(0);
@@ -91,10 +94,8 @@ RootSimHitReader::RootSimHitReader(const RootSimHitReader::Config& config,
   std::get<2>(m_eventMap.back()) = nEntries;
 
   // Sort by event id
-  std::sort(m_eventMap.begin(), m_eventMap.end(),
-            [](const auto& a, const auto& b) {
-              return std::get<0>(a) < std::get<0>(b);
-            });
+  std::ranges::sort(m_eventMap, {},
+                    [](const auto& m) { return std::get<0>(m); });
 
   // Re-Enable all branches
   m_inputChain->SetBranchStatus("*", true);
@@ -107,9 +108,9 @@ std::pair<std::size_t, std::size_t> RootSimHitReader::availableEvents() const {
 }
 
 ProcessCode RootSimHitReader::read(const AlgorithmContext& context) {
-  auto it = std::find_if(
-      m_eventMap.begin(), m_eventMap.end(),
-      [&](const auto& a) { return std::get<0>(a) == context.eventNumber; });
+  auto it = std::ranges::find_if(m_eventMap, [&](const auto& a) {
+    return std::get<0>(a) == context.eventNumber;
+  });
 
   if (it == m_eventMap.end()) {
     // explicitly warn if it happens for the first or last event as that might
diff --git a/Examples/Io/Root/src/RootSimHitWriter.cpp b/Examples/Io/Root/src/RootSimHitWriter.cpp
index 2637886e72c..fbb698b50e3 100644
--- a/Examples/Io/Root/src/RootSimHitWriter.cpp
+++ b/Examples/Io/Root/src/RootSimHitWriter.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2017-2018 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include "ActsExamples/Io/Root/RootSimHitWriter.hpp"
 
diff --git a/Examples/Io/Root/src/RootSpacepointWriter.cpp b/Examples/Io/Root/src/RootSpacepointWriter.cpp
index e214d079a48..2fd0256afff 100644
--- a/Examples/Io/Root/src/RootSpacepointWriter.cpp
+++ b/Examples/Io/Root/src/RootSpacepointWriter.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2022 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include "ActsExamples/Io/Root/RootSpacepointWriter.hpp"
 
diff --git a/Examples/Io/Root/src/RootTrackParameterWriter.cpp b/Examples/Io/Root/src/RootTrackParameterWriter.cpp
index c64c9fd2f0a..a4e74a44e2c 100644
--- a/Examples/Io/Root/src/RootTrackParameterWriter.cpp
+++ b/Examples/Io/Root/src/RootTrackParameterWriter.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2017-2021 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include "ActsExamples/Io/Root/RootTrackParameterWriter.hpp"
 
@@ -13,6 +13,7 @@
 #include "Acts/Utilities/MultiIndex.hpp"
 #include "ActsExamples/EventData/AverageSimHits.hpp"
 #include "ActsExamples/Framework/AlgorithmContext.hpp"
+#include "ActsExamples/Framework/WriterT.hpp"
 #include "ActsExamples/Utilities/Range.hpp"
 #include "ActsExamples/Validation/TrackClassification.hpp"
 #include "ActsFatras/EventData/Barcode.hpp"
@@ -24,6 +25,7 @@
 #include <ios>
 #include <iostream>
 #include <memory>
+#include <numbers>
 #include <stdexcept>
 #include <tuple>
 #include <utility>
@@ -33,12 +35,14 @@
 #include <TTree.h>
 
 using Acts::VectorHelpers::eta;
+using Acts::VectorHelpers::perp;
 using Acts::VectorHelpers::phi;
 using Acts::VectorHelpers::theta;
 
-ActsExamples::RootTrackParameterWriter::RootTrackParameterWriter(
-    const ActsExamples::RootTrackParameterWriter::Config& config,
-    Acts::Logging::Level level)
+namespace ActsExamples {
+
+RootTrackParameterWriter::RootTrackParameterWriter(
+    const RootTrackParameterWriter::Config& config, Acts::Logging::Level level)
     : TrackParameterWriter(config.inputTrackParameters,
                            "RootTrackParameterWriter", level),
       m_cfg(config) {
@@ -83,37 +87,78 @@ ActsExamples::RootTrackParameterWriter::RootTrackParameterWriter(
   m_outputTree = new TTree(m_cfg.treeName.c_str(), m_cfg.treeName.c_str());
   if (m_outputTree == nullptr) {
     throw std::bad_alloc();
-  } else {
-    // The estimated track parameters
-    m_outputTree->Branch("event_nr", &m_eventNr);
-    m_outputTree->Branch("loc0", &m_loc0);
-    m_outputTree->Branch("loc1", &m_loc1);
-    m_outputTree->Branch("phi", &m_phi);
-    m_outputTree->Branch("theta", &m_theta);
-    m_outputTree->Branch("qop", &m_qop);
-    m_outputTree->Branch("time", &m_time);
-    m_outputTree->Branch("p", &m_p);
-    m_outputTree->Branch("pt", &m_pt);
-    m_outputTree->Branch("eta", &m_eta);
-    // The truth track parameters
-    m_outputTree->Branch("eventNr", &m_eventNr);
-    m_outputTree->Branch("t_loc0", &m_t_loc0);
-    m_outputTree->Branch("t_loc1", &m_t_loc1);
-    m_outputTree->Branch("t_phi", &m_t_phi);
-    m_outputTree->Branch("t_theta", &m_t_theta);
-    m_outputTree->Branch("t_qop", &m_t_qop);
-    m_outputTree->Branch("t_time", &m_t_time);
-    m_outputTree->Branch("truthMatched", &m_truthMatched);
   }
+
+  m_outputTree->Branch("event_nr", &m_eventNr);
+
+  m_outputTree->Branch("volumeId", &m_volumeId);
+  m_outputTree->Branch("layerId", &m_layerId);
+  m_outputTree->Branch("surfaceId", &m_surfaceId);
+
+  // The estimated track parameters
+  m_outputTree->Branch("loc0", &m_loc0);
+  m_outputTree->Branch("loc1", &m_loc1);
+  m_outputTree->Branch("phi", &m_phi);
+  m_outputTree->Branch("theta", &m_theta);
+  m_outputTree->Branch("qop", &m_qop);
+  m_outputTree->Branch("time", &m_time);
+
+  // The estimated track parameters errors
+  m_outputTree->Branch("err_loc0", &m_err_loc0);
+  m_outputTree->Branch("err_loc1", &m_err_loc1);
+  m_outputTree->Branch("err_phi", &m_err_phi);
+  m_outputTree->Branch("err_theta", &m_err_theta);
+  m_outputTree->Branch("err_qop", &m_err_qop);
+  m_outputTree->Branch("err_time", &m_err_time);
+
+  // Some derived quantities from the estimated track parameters
+  m_outputTree->Branch("charge", &m_charge);
+  m_outputTree->Branch("p", &m_p);
+  m_outputTree->Branch("pt", &m_pt);
+  m_outputTree->Branch("eta", &m_eta);
+
+  // The truth meta
+  m_outputTree->Branch("truthMatched", &m_t_matched);
+  m_outputTree->Branch("particleId", &m_t_particleId);
+  m_outputTree->Branch("nMajorityHits", &m_nMajorityHits);
+
+  // The truth track parameters
+  m_outputTree->Branch("particleId", &m_t_particleId);
+  m_outputTree->Branch("t_loc0", &m_t_loc0);
+  m_outputTree->Branch("t_loc1", &m_t_loc1);
+  m_outputTree->Branch("t_phi", &m_t_phi);
+  m_outputTree->Branch("t_theta", &m_t_theta);
+  m_outputTree->Branch("t_qop", &m_t_qop);
+  m_outputTree->Branch("t_time", &m_t_time);
+  m_outputTree->Branch("t_charge", &m_t_charge);
+  m_outputTree->Branch("t_p", &m_t_p);
+  m_outputTree->Branch("t_pt", &m_t_pt);
+  m_outputTree->Branch("t_eta", &m_t_eta);
+
+  // The residuals
+  m_outputTree->Branch("res_loc0", &m_res_loc0);
+  m_outputTree->Branch("res_loc1", &m_res_loc1);
+  m_outputTree->Branch("res_phi", &m_res_phi);
+  m_outputTree->Branch("res_theta", &m_res_theta);
+  m_outputTree->Branch("res_qop", &m_res_qop);
+  m_outputTree->Branch("res_time", &m_res_time);
+
+  // The pulls
+  m_outputTree->Branch("pull_loc0", &m_pull_loc0);
+  m_outputTree->Branch("pull_loc1", &m_pull_loc1);
+  m_outputTree->Branch("pull_phi", &m_pull_phi);
+  m_outputTree->Branch("pull_theta", &m_pull_theta);
+  m_outputTree->Branch("pull_qop", &m_pull_qop);
+  m_outputTree->Branch("pull_time", &m_pull_time);
 }
 
-ActsExamples::RootTrackParameterWriter::~RootTrackParameterWriter() {
+RootTrackParameterWriter::~RootTrackParameterWriter() {
   if (m_outputFile != nullptr) {
     m_outputFile->Close();
   }
 }
 
-ActsExamples::ProcessCode ActsExamples::RootTrackParameterWriter::finalize() {
+ProcessCode RootTrackParameterWriter::finalize() {
   m_outputFile->cd();
   m_outputTree->Write();
   m_outputFile->Close();
@@ -124,9 +169,8 @@ ActsExamples::ProcessCode ActsExamples::RootTrackParameterWriter::finalize() {
   return ProcessCode::SUCCESS;
 }
 
-ActsExamples::ProcessCode ActsExamples::RootTrackParameterWriter::writeT(
-    const ActsExamples::AlgorithmContext& ctx,
-    const TrackParametersContainer& trackParams) {
+ProcessCode RootTrackParameterWriter::writeT(
+    const AlgorithmContext& ctx, const TrackParametersContainer& trackParams) {
   // Read additional input collections
   const auto& protoTracks = m_inputProtoTracks(ctx);
   const auto& particles = m_inputParticles(ctx);
@@ -134,6 +178,8 @@ ActsExamples::ProcessCode ActsExamples::RootTrackParameterWriter::writeT(
   const auto& hitParticlesMap = m_inputMeasurementParticlesMap(ctx);
   const auto& hitSimHitsMap = m_inputMeasurementSimHitsMap(ctx);
 
+  std::vector<ParticleHitCount> particleHitCounts;
+
   // Exclusive access to the tree while writing
   std::lock_guard<std::mutex> lock(m_writeMutex);
 
@@ -144,65 +190,135 @@ ActsExamples::ProcessCode ActsExamples::RootTrackParameterWriter::writeT(
 
   // Loop over the estimated track parameters
   for (std::size_t iparams = 0; iparams < trackParams.size(); ++iparams) {
+    const auto& params = trackParams[iparams];
     // The reference surface of the parameters, i.e. also the reference surface
     // of the first space point
-    const auto& surface = trackParams[iparams].referenceSurface();
-    // The estimated bound parameters vector
-    const auto params = trackParams[iparams].parameters();
-    m_loc0 = params[Acts::eBoundLoc0];
-    m_loc1 = params[Acts::eBoundLoc1];
-    m_phi = params[Acts::eBoundPhi];
-    m_theta = params[Acts::eBoundTheta];
-    m_qop = params[Acts::eBoundQOverP];
-    m_time = params[Acts::eBoundTime];
-    m_p = std::abs(1.0 / m_qop);
-    m_pt = m_p * std::sin(m_theta);
-    m_eta = std::atanh(std::cos(m_theta));
+    const auto& surface = params.referenceSurface();
+
+    m_volumeId = surface.geometryId().volume();
+    m_layerId = surface.geometryId().layer();
+    m_surfaceId = surface.geometryId().sensitive();
+
+    m_loc0 = params.parameters()[Acts::eBoundLoc0];
+    m_loc1 = params.parameters()[Acts::eBoundLoc1];
+    m_phi = params.parameters()[Acts::eBoundPhi];
+    m_theta = params.parameters()[Acts::eBoundTheta];
+    m_qop = params.parameters()[Acts::eBoundQOverP];
+    m_time = params.parameters()[Acts::eBoundTime];
+
+    auto getError = [&params](std::size_t idx) -> float {
+      if (!params.covariance().has_value()) {
+        return NaNfloat;
+      }
+      const auto& cov = *params.covariance();
+      if (cov(idx, idx) < 0) {
+        return NaNfloat;
+      }
+      return std::sqrt(cov(idx, idx));
+    };
+
+    m_err_loc0 = getError(Acts::eBoundLoc0);
+    m_err_loc1 = getError(Acts::eBoundLoc1);
+    m_err_phi = getError(Acts::eBoundPhi);
+    m_err_theta = getError(Acts::eBoundTheta);
+    m_err_qop = getError(Acts::eBoundQOverP);
+    m_err_time = getError(Acts::eBoundTime);
+
+    m_charge = static_cast<int>(params.charge());
+    m_p = params.absoluteMomentum();
+    m_pt = params.transverseMomentum();
+    m_eta = eta(params.momentum());
 
     // Get the proto track from which the track parameters are estimated
     const auto& ptrack = protoTracks[iparams];
-    std::vector<ParticleHitCount> particleHitCounts;
     identifyContributingParticles(hitParticlesMap, ptrack, particleHitCounts);
-    m_truthMatched = false;
+
     if (particleHitCounts.size() == 1) {
-      m_truthMatched = true;
-    }
-    // Get the index of the first space point
-    const auto& hitIdx = ptrack.front();
-    // Get the sim hits via the measurement to sim hits map
-    auto indices = makeRange(hitSimHitsMap.equal_range(hitIdx));
-    auto [truthLocal, truthPos4, truthUnitDir] =
-        averageSimHits(ctx.geoContext, surface, simHits, indices, logger());
-    // Get the truth track parameter at the first space point
-    m_t_loc0 = truthLocal[Acts::ePos0];
-    m_t_loc1 = truthLocal[Acts::ePos1];
-    m_t_phi = phi(truthUnitDir);
-    m_t_theta = theta(truthUnitDir);
-    m_t_time = truthPos4[Acts::eTime];
-    // momentum averaging makes even less sense than averaging position and
-    // direction. use the first momentum or set q/p to zero
-    if (!indices.empty()) {
-      // we assume that the indices are within valid ranges so we do not
-      // need to check their validity again.
-      const auto simHitIdx0 = indices.begin()->second;
-      const auto& simHit0 = *simHits.nth(simHitIdx0);
-      const auto p =
-          simHit0.momentum4Before().template segment<3>(Acts::eMom0).norm();
-      const auto& particleId = simHit0.particleId();
-      // The truth charge has to be retrieved from the sim particle
-      auto ip = particles.find(particleId);
-      if (ip != particles.end()) {
-        const auto& particle = *ip;
-        m_t_charge = static_cast<int>(particle.charge());
-        if (p != 0.0) {
-          m_t_qop = m_t_charge / p;
+      m_t_matched = true;
+      m_t_particleId = particleHitCounts.front().particleId.value();
+      m_nMajorityHits = particleHitCounts.front().hitCount;
+
+      // Get the index of the first space point
+      const auto& hitIdx = ptrack.front();
+      // Get the sim hits via the measurement to sim hits map
+      auto indices = makeRange(hitSimHitsMap.equal_range(hitIdx));
+      auto [truthLocal, truthPos4, truthUnitDir] =
+          averageSimHits(ctx.geoContext, surface, simHits, indices, logger());
+
+      // Get the truth track parameter at the first space point
+      m_t_loc0 = truthLocal[Acts::ePos0];
+      m_t_loc1 = truthLocal[Acts::ePos1];
+      m_t_phi = phi(truthUnitDir);
+      m_t_theta = theta(truthUnitDir);
+      m_t_qop = NaNfloat;
+      m_t_time = truthPos4[Acts::eTime];
+
+      m_t_charge = 0;
+      m_t_p = NaNfloat;
+      m_t_pt = NaNfloat;
+      m_t_eta = eta(truthUnitDir);
+
+      // momentum averaging makes even less sense than averaging position and
+      // direction. use the first momentum or set q/p to zero
+      if (!indices.empty()) {
+        // we assume that the indices are within valid ranges so we do not
+        // need to check their validity again.
+        const auto simHitIdx0 = indices.begin()->second;
+        const auto& simHit0 = *simHits.nth(simHitIdx0);
+        const auto p =
+            simHit0.momentum4Before().template segment<3>(Acts::eMom0);
+        const auto& particleId = simHit0.particleId();
+        // The truth charge has to be retrieved from the sim particle
+        if (auto ip = particles.find(particleId); ip != particles.end()) {
+          const auto& particle = *ip;
+          m_t_charge = static_cast<int>(particle.charge());
+          m_t_qop = particle.hypothesis().qOverP(p.norm(), particle.charge());
+          m_t_p = p.norm();
+          m_t_pt = perp(p);
         } else {
-          m_t_qop = std::numeric_limits<double>::quiet_NaN();
+          ACTS_WARNING("Truth particle with barcode " << particleId << "="
+                                                      << particleId.value()
+                                                      << " not found!");
         }
-      } else {
-        ACTS_DEBUG("Truth particle with barcode "
-                   << particleId << "=" << particleId.value() << " not found!");
       }
+
+      m_res_loc0 = m_loc0 - m_t_loc0;
+      m_res_loc1 = m_loc1 - m_t_loc1;
+      m_res_phi = Acts::detail::difference_periodic(
+          m_phi, m_t_phi, static_cast<float>(2 * std::numbers::pi));
+      m_res_theta = m_theta - m_t_theta;
+      m_res_qop = m_qop - m_t_qop;
+      m_res_time = m_time - m_t_time;
+
+      auto getPull = [](float res, float err) -> float {
+        if (std::isnan(err) || std::abs(err) < 1e-6) {
+          return NaNfloat;
+        }
+        return res / err;
+      };
+
+      m_pull_loc0 = getPull(m_res_loc0, m_err_loc0);
+      m_pull_loc1 = getPull(m_res_loc1, m_err_loc1);
+      m_pull_phi = getPull(m_res_phi, m_err_phi);
+      m_pull_theta = getPull(m_res_theta, m_err_theta);
+      m_pull_qop = getPull(m_res_qop, m_err_qop);
+      m_pull_time = getPull(m_res_time, m_err_time);
+    } else {
+      m_t_matched = false;
+      m_t_particleId = 0;
+      m_nMajorityHits = 0;
+
+      m_t_loc0 = NaNfloat;
+      m_t_loc1 = NaNfloat;
+      m_t_phi = NaNfloat;
+      m_t_theta = NaNfloat;
+      m_t_qop = NaNfloat;
+      m_t_time = NaNfloat;
+
+      m_t_charge = 0;
+      m_t_p = NaNfloat;
+      m_t_pt = NaNfloat;
+      m_t_eta = NaNfloat;
     }
 
     m_outputTree->Fill();
@@ -210,3 +326,5 @@ ActsExamples::ProcessCode ActsExamples::RootTrackParameterWriter::writeT(
 
   return ProcessCode::SUCCESS;
 }
+
+}  // namespace ActsExamples
diff --git a/Examples/Io/Root/src/RootTrackStatesWriter.cpp b/Examples/Io/Root/src/RootTrackStatesWriter.cpp
index ca3ec0485ac..edf396384de 100644
--- a/Examples/Io/Root/src/RootTrackStatesWriter.cpp
+++ b/Examples/Io/Root/src/RootTrackStatesWriter.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2019-2024 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include "ActsExamples/Io/Root/RootTrackStatesWriter.hpp"
 
@@ -34,6 +34,7 @@
 #include <ios>
 #include <limits>
 #include <memory>
+#include <numbers>
 #include <optional>
 #include <ostream>
 #include <stdexcept>
@@ -44,8 +45,6 @@
 
 namespace ActsExamples {
 
-class IndexSourceLink;
-
 using Acts::VectorHelpers::eta;
 using Acts::VectorHelpers::perp;
 using Acts::VectorHelpers::phi;
@@ -380,13 +379,8 @@ ProcessCode RootTrackStatesWriter::writeT(const AlgorithmContext& ctx,
       // fill the chi2
       m_chi2.push_back(state.chi2());
 
-      // get the truth track parameter at this track State
-      float truthLOC0 = nan;
-      float truthLOC1 = nan;
-      float truthTIME = nan;
-      float truthPHI = nan;
-      float truthTHETA = nan;
-      float truthQOP = nan;
+      // the truth track parameter at this track state
+      Acts::BoundVector truthParams;
 
       particleIds.clear();
 
@@ -428,7 +422,7 @@ ProcessCode RootTrackStatesWriter::writeT(const AlgorithmContext& ctx,
           const auto& simHit0 = *simHits.nth(simHitIdx0);
           const auto p =
               simHit0.momentum4Before().template segment<3>(Acts::eMom0).norm();
-          truthQOP = truthQ / p;
+          truthParams[Acts::eBoundQOverP] = truthQ / p;
 
           // extract particle ids contributed to this track state
           for (auto const& [key, simHitIdx] : indices) {
@@ -438,28 +432,30 @@ ProcessCode RootTrackStatesWriter::writeT(const AlgorithmContext& ctx,
         }
 
         // fill the truth hit info
-        m_t_x.push_back(truthPos4[Acts::ePos0]);
-        m_t_y.push_back(truthPos4[Acts::ePos1]);
-        m_t_z.push_back(truthPos4[Acts::ePos2]);
-        m_t_r.push_back(perp(truthPos4.template segment<3>(Acts::ePos0)));
-        m_t_dx.push_back(truthUnitDir[Acts::eMom0]);
-        m_t_dy.push_back(truthUnitDir[Acts::eMom1]);
-        m_t_dz.push_back(truthUnitDir[Acts::eMom2]);
+        m_t_x.push_back(static_cast<float>(truthPos4[Acts::ePos0]));
+        m_t_y.push_back(static_cast<float>(truthPos4[Acts::ePos1]));
+        m_t_z.push_back(static_cast<float>(truthPos4[Acts::ePos2]));
+        m_t_r.push_back(static_cast<float>(
+            perp(truthPos4.template segment<3>(Acts::ePos0))));
+        m_t_dx.push_back(static_cast<float>(truthUnitDir[Acts::eMom0]));
+        m_t_dy.push_back(static_cast<float>(truthUnitDir[Acts::eMom1]));
+        m_t_dz.push_back(static_cast<float>(truthUnitDir[Acts::eMom2]));
 
         // get the truth track parameter at this track State
-        truthLOC0 = truthLocal[Acts::ePos0];
-        truthLOC1 = truthLocal[Acts::ePos1];
-        truthTIME = truthPos4[Acts::eTime];
-        truthPHI = phi(truthUnitDir);
-        truthTHETA = theta(truthUnitDir);
+        truthParams[Acts::eBoundLoc0] = truthLocal[Acts::ePos0];
+        truthParams[Acts::eBoundLoc1] = truthLocal[Acts::ePos1];
+        truthParams[Acts::eBoundPhi] = phi(truthUnitDir);
+        truthParams[Acts::eBoundTheta] = theta(truthUnitDir);
+        truthParams[Acts::eBoundTime] = truthPos4[Acts::eTime];
 
         // fill the truth track parameter at this track State
-        m_t_eLOC0.push_back(truthLOC0);
-        m_t_eLOC1.push_back(truthLOC1);
-        m_t_ePHI.push_back(truthPHI);
-        m_t_eTHETA.push_back(truthTHETA);
-        m_t_eQOP.push_back(truthQOP);
-        m_t_eT.push_back(truthTIME);
+        m_t_eLOC0.push_back(static_cast<float>(truthParams[Acts::eBoundLoc0]));
+        m_t_eLOC1.push_back(static_cast<float>(truthParams[Acts::eBoundLoc1]));
+        m_t_ePHI.push_back(static_cast<float>(truthParams[Acts::eBoundPhi]));
+        m_t_eTHETA.push_back(
+            static_cast<float>(truthParams[Acts::eBoundTheta]));
+        m_t_eQOP.push_back(static_cast<float>(truthParams[Acts::eBoundQOverP]));
+        m_t_eT.push_back(static_cast<float>(truthParams[Acts::eBoundTime]));
 
         // expand the local measurements into the full bound space
         Acts::BoundVector meas = state.effectiveProjector().transpose() *
@@ -470,11 +466,11 @@ ProcessCode RootTrackStatesWriter::writeT(const AlgorithmContext& ctx,
             surface.localToGlobal(ctx.geoContext, local, truthUnitDir);
 
         // fill the measurement info
-        m_lx_hit.push_back(local[Acts::ePos0]);
-        m_ly_hit.push_back(local[Acts::ePos1]);
-        m_x_hit.push_back(global[Acts::ePos0]);
-        m_y_hit.push_back(global[Acts::ePos1]);
-        m_z_hit.push_back(global[Acts::ePos2]);
+        m_lx_hit.push_back(static_cast<float>(local[Acts::ePos0]));
+        m_ly_hit.push_back(static_cast<float>(local[Acts::ePos1]));
+        m_x_hit.push_back(static_cast<float>(global[Acts::ePos0]));
+        m_y_hit.push_back(static_cast<float>(global[Acts::ePos1]));
+        m_z_hit.push_back(static_cast<float>(global[Acts::ePos2]));
       }
 
       // lambda to get the fitted track parameters
@@ -489,7 +485,8 @@ ProcessCode RootTrackStatesWriter::writeT(const AlgorithmContext& ctx,
         if (ipar == eSmoothed && state.hasSmoothed()) {
           return std::make_pair(state.smoothed(), state.smoothedCovariance());
         }
-        if (ipar == eUnbiased && state.hasSmoothed() && state.hasProjector()) {
+        if (ipar == eUnbiased && state.hasSmoothed() && state.hasProjector() &&
+            state.hasCalibrated()) {
           // calculate the unbiased track parameters (i.e. fitted track
           // parameters with this measurement removed) using Eq.(12a)-Eq.(12c)
           // of NIMA 262, 444 (1987)
@@ -506,39 +503,6 @@ ProcessCode RootTrackStatesWriter::writeT(const AlgorithmContext& ctx,
               state.smoothedCovariance() - K * H * state.smoothedCovariance();
           return std::make_pair(unbiasedParamsVec, unbiasedParamsCov);
         }
-        if (ipar == eUnbiased && !state.hasSmoothed() && state.hasFiltered() &&
-            state.hasProjector() && state.hasCalibrated()) {
-          // Same calculation as above but using the filtered states.
-          auto m = state.effectiveCalibrated();
-          auto H = state.effectiveProjector();
-          auto V = state.effectiveCalibratedCovariance();
-          auto K =
-              (state.filteredCovariance() * H.transpose() *
-               (H * state.filteredCovariance() * H.transpose() - V).inverse())
-                  .eval();
-          auto unbiasedParamsVec =
-              state.filtered() + K * (m - H * state.filtered());
-          auto unbiasedParamsCov =
-              state.filteredCovariance() - K * H * state.filteredCovariance();
-          return std::make_pair(unbiasedParamsVec, unbiasedParamsCov);
-        }
-        if (ipar == eUnbiased && !state.hasSmoothed() && !state.hasFiltered() &&
-            state.hasPredicted() && state.hasProjector() &&
-            state.hasCalibrated()) {
-          // Same calculation as above but using the predicted states.
-          auto m = state.effectiveCalibrated();
-          auto H = state.effectiveProjector();
-          auto V = state.effectiveCalibratedCovariance();
-          auto K =
-              (state.predictedCovariance() * H.transpose() *
-               (H * state.predictedCovariance() * H.transpose() - V).inverse())
-                  .eval();
-          auto unbiasedParamsVec =
-              state.predicted() + K * (m - H * state.predicted());
-          auto unbiasedParamsCov =
-              state.predictedCovariance() - K * H * state.predictedCovariance();
-          return std::make_pair(unbiasedParamsVec, unbiasedParamsCov);
-        }
         return std::nullopt;
       };
 
@@ -549,7 +513,7 @@ ProcessCode RootTrackStatesWriter::writeT(const AlgorithmContext& ctx,
         // fill the track parameters status
         m_hasParams[ipar].push_back(trackParamsOpt.has_value());
 
-        if (!trackParamsOpt) {
+        if (!trackParamsOpt.has_value()) {
           if (ipar == ePredicted) {
             // push default values if no track parameters
             m_res_x_hit.push_back(nan);
@@ -602,28 +566,33 @@ ProcessCode RootTrackStatesWriter::writeT(const AlgorithmContext& ctx,
         const auto& [parameters, covariance] = *trackParamsOpt;
 
         // track parameters
-        m_eLOC0[ipar].push_back(parameters[Acts::eBoundLoc0]);
-        m_eLOC1[ipar].push_back(parameters[Acts::eBoundLoc1]);
-        m_ePHI[ipar].push_back(parameters[Acts::eBoundPhi]);
-        m_eTHETA[ipar].push_back(parameters[Acts::eBoundTheta]);
-        m_eQOP[ipar].push_back(parameters[Acts::eBoundQOverP]);
-        m_eT[ipar].push_back(parameters[Acts::eBoundTime]);
+        m_eLOC0[ipar].push_back(
+            static_cast<float>(parameters[Acts::eBoundLoc0]));
+        m_eLOC1[ipar].push_back(
+            static_cast<float>(parameters[Acts::eBoundLoc1]));
+        m_ePHI[ipar].push_back(static_cast<float>(parameters[Acts::eBoundPhi]));
+        m_eTHETA[ipar].push_back(
+            static_cast<float>(parameters[Acts::eBoundTheta]));
+        m_eQOP[ipar].push_back(
+            static_cast<float>(parameters[Acts::eBoundQOverP]));
+        m_eT[ipar].push_back(static_cast<float>(parameters[Acts::eBoundTime]));
 
         // track parameters error
-        // MARK: fpeMaskBegin(FLTINV, 1, #2348)
+        Acts::BoundVector errors;
+        for (Eigen::Index i = 0; i < parameters.size(); ++i) {
+          double variance = covariance(i, i);
+          errors[i] = variance >= 0 ? std::sqrt(variance) : nan;
+        }
         m_err_eLOC0[ipar].push_back(
-            std::sqrt(covariance(Acts::eBoundLoc0, Acts::eBoundLoc0)));
+            static_cast<float>(errors[Acts::eBoundLoc0]));
         m_err_eLOC1[ipar].push_back(
-            std::sqrt(covariance(Acts::eBoundLoc1, Acts::eBoundLoc1)));
-        m_err_ePHI[ipar].push_back(
-            std::sqrt(covariance(Acts::eBoundPhi, Acts::eBoundPhi)));
+            static_cast<float>(errors[Acts::eBoundLoc1]));
+        m_err_ePHI[ipar].push_back(static_cast<float>(errors[Acts::eBoundPhi]));
         m_err_eTHETA[ipar].push_back(
-            std::sqrt(covariance(Acts::eBoundTheta, Acts::eBoundTheta)));
+            static_cast<float>(errors[Acts::eBoundTheta]));
         m_err_eQOP[ipar].push_back(
-            std::sqrt(covariance(Acts::eBoundQOverP, Acts::eBoundQOverP)));
-        m_err_eT[ipar].push_back(
-            std::sqrt(covariance(Acts::eBoundTime, Acts::eBoundTime)));
-        // MARK: fpeMaskEnd(FLTINV)
+            static_cast<float>(errors[Acts::eBoundQOverP]));
+        m_err_eT[ipar].push_back(static_cast<float>(errors[Acts::eBoundTime]));
 
         // further track parameter info
         Acts::FreeVector freeParams =
@@ -631,6 +600,7 @@ ProcessCode RootTrackStatesWriter::writeT(const AlgorithmContext& ctx,
         m_x[ipar].push_back(freeParams[Acts::eFreePos0]);
         m_y[ipar].push_back(freeParams[Acts::eFreePos1]);
         m_z[ipar].push_back(freeParams[Acts::eFreePos2]);
+        // single charge assumption
         auto p = std::abs(1 / freeParams[Acts::eFreeQOverP]);
         m_px[ipar].push_back(p * freeParams[Acts::eFreeDir0]);
         m_py[ipar].push_back(p * freeParams[Acts::eFreeDir1]);
@@ -645,63 +615,76 @@ ProcessCode RootTrackStatesWriter::writeT(const AlgorithmContext& ctx,
         }
 
         // track parameters residual
-        m_res_eLOC0[ipar].push_back(parameters[Acts::eBoundLoc0] - truthLOC0);
-        m_res_eLOC1[ipar].push_back(parameters[Acts::eBoundLoc1] - truthLOC1);
-        float resPhi = Acts::detail::difference_periodic<float>(
-            parameters[Acts::eBoundPhi], truthPHI,
-            static_cast<float>(2 * M_PI));
-        m_res_ePHI[ipar].push_back(resPhi);
-        m_res_eTHETA[ipar].push_back(parameters[Acts::eBoundTheta] -
-                                     truthTHETA);
-        m_res_eQOP[ipar].push_back(parameters[Acts::eBoundQOverP] - truthQOP);
-        m_res_eT[ipar].push_back(parameters[Acts::eBoundTime] - truthTIME);
+        Acts::BoundVector residuals;
+        residuals = parameters - truthParams;
+        residuals[Acts::eBoundPhi] = Acts::detail::difference_periodic(
+            parameters[Acts::eBoundPhi], truthParams[Acts::eBoundPhi],
+            2 * std::numbers::pi);
+        m_res_eLOC0[ipar].push_back(
+            static_cast<float>(residuals[Acts::eBoundLoc0]));
+        m_res_eLOC1[ipar].push_back(
+            static_cast<float>(residuals[Acts::eBoundLoc1]));
+        m_res_ePHI[ipar].push_back(
+            static_cast<float>(residuals[Acts::eBoundPhi]));
+        m_res_eTHETA[ipar].push_back(
+            static_cast<float>(residuals[Acts::eBoundTheta]));
+        m_res_eQOP[ipar].push_back(
+            static_cast<float>(residuals[Acts::eBoundQOverP]));
+        m_res_eT[ipar].push_back(
+            static_cast<float>(residuals[Acts::eBoundTime]));
 
         // track parameters pull
+        Acts::BoundVector pulls;
+        for (Eigen::Index i = 0; i < parameters.size(); ++i) {
+          pulls[i] = (!std::isnan(errors[i]) && errors[i] > 0)
+                         ? residuals[i] / errors[i]
+                         : nan;
+        }
         m_pull_eLOC0[ipar].push_back(
-            (parameters[Acts::eBoundLoc0] - truthLOC0) /
-            std::sqrt(covariance(Acts::eBoundLoc0, Acts::eBoundLoc0)));
+            static_cast<float>(pulls[Acts::eBoundLoc0]));
         m_pull_eLOC1[ipar].push_back(
-            (parameters[Acts::eBoundLoc1] - truthLOC1) /
-            std::sqrt(covariance(Acts::eBoundLoc1, Acts::eBoundLoc1)));
-        m_pull_ePHI[ipar].push_back(
-            resPhi / std::sqrt(covariance(Acts::eBoundPhi, Acts::eBoundPhi)));
+            static_cast<float>(pulls[Acts::eBoundLoc1]));
+        m_pull_ePHI[ipar].push_back(static_cast<float>(pulls[Acts::eBoundPhi]));
         m_pull_eTHETA[ipar].push_back(
-            (parameters[Acts::eBoundTheta] - truthTHETA) /
-            std::sqrt(covariance(Acts::eBoundTheta, Acts::eBoundTheta)));
+            static_cast<float>(pulls[Acts::eBoundTheta]));
         m_pull_eQOP[ipar].push_back(
-            (parameters[Acts::eBoundQOverP] - truthQOP) /
-            std::sqrt(covariance(Acts::eBoundQOverP, Acts::eBoundQOverP)));
-        double sigmaTime =
-            std::sqrt(covariance(Acts::eBoundTime, Acts::eBoundTime));
-        m_pull_eT[ipar].push_back(
-            sigmaTime == 0.0
-                ? nan
-                : (parameters[Acts::eBoundTime] - truthTIME) / sigmaTime);
+            static_cast<float>(pulls[Acts::eBoundQOverP]));
+        m_pull_eT[ipar].push_back(static_cast<float>(pulls[Acts::eBoundTime]));
 
         if (ipar == ePredicted) {
           // local hit residual info
           auto H = state.effectiveProjector();
           auto V = state.effectiveCalibratedCovariance();
           auto resCov = V + H * covariance * H.transpose();
-          Acts::ActsDynamicVector res(state.calibratedSize());
-          res.setZero();
-
-          res = state.effectiveCalibrated() - H * parameters;
-
-          m_res_x_hit.push_back(res[Acts::eBoundLoc0]);
-          m_err_x_hit.push_back(
-              std::sqrt(V(Acts::eBoundLoc0, Acts::eBoundLoc0)));
-          m_pull_x_hit.push_back(
-              res[Acts::eBoundLoc0] /
-              std::sqrt(resCov(Acts::eBoundLoc0, Acts::eBoundLoc0)));
+          Acts::ActsDynamicVector res =
+              state.effectiveCalibrated() - H * parameters;
+
+          double resX = res[Acts::eBoundLoc0];
+          double errX = V(Acts::eBoundLoc0, Acts::eBoundLoc0) >= 0
+                            ? std::sqrt(V(Acts::eBoundLoc0, Acts::eBoundLoc0))
+                            : nan;
+          double pullX =
+              resCov(Acts::eBoundLoc0, Acts::eBoundLoc0) > 0
+                  ? resX / std::sqrt(resCov(Acts::eBoundLoc0, Acts::eBoundLoc0))
+                  : nan;
+
+          m_res_x_hit.push_back(static_cast<float>(resX));
+          m_err_x_hit.push_back(static_cast<float>(errX));
+          m_pull_x_hit.push_back(static_cast<float>(pullX));
 
           if (state.calibratedSize() >= 2) {
-            m_res_y_hit.push_back(res[Acts::eBoundLoc1]);
-            m_err_y_hit.push_back(
-                std::sqrt(V(Acts::eBoundLoc1, Acts::eBoundLoc1)));
-            m_pull_y_hit.push_back(
-                res[Acts::eBoundLoc1] /
-                std::sqrt(resCov(Acts::eBoundLoc1, Acts::eBoundLoc1)));
+            double resY = res[Acts::eBoundLoc1];
+            double errY = V(Acts::eBoundLoc1, Acts::eBoundLoc1) >= 0
+                              ? std::sqrt(V(Acts::eBoundLoc1, Acts::eBoundLoc1))
+                              : nan;
+            double pullY = resCov(Acts::eBoundLoc1, Acts::eBoundLoc1) > 0
+                               ? resY / std::sqrt(resCov(Acts::eBoundLoc1,
+                                                         Acts::eBoundLoc1))
+                               : nan;
+
+            m_res_y_hit.push_back(static_cast<float>(resY));
+            m_err_y_hit.push_back(static_cast<float>(errY));
+            m_pull_y_hit.push_back(static_cast<float>(pullY));
           } else {
             m_res_y_hit.push_back(nan);
             m_err_y_hit.push_back(nan);
diff --git a/Examples/Io/Root/src/RootTrackSummaryReader.cpp b/Examples/Io/Root/src/RootTrackSummaryReader.cpp
index 5ce1fee3ee8..1827c26ad30 100644
--- a/Examples/Io/Root/src/RootTrackSummaryReader.cpp
+++ b/Examples/Io/Root/src/RootTrackSummaryReader.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2021 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include "ActsExamples/Io/Root/RootTrackSummaryReader.hpp"
 
@@ -208,7 +208,7 @@ ProcessCode RootTrackSummaryReader::read(const AlgorithmContext& context) {
 
     unsigned int nTruthParticles = m_t_vx->size();
     for (unsigned int i = 0; i < nTruthParticles; i++) {
-      ActsFatras::Particle truthParticle;
+      SimParticleState truthParticle;
 
       truthParticle.setPosition4((*m_t_vx)[i], (*m_t_vy)[i], (*m_t_vz)[i],
                                  (*m_t_time)[i]);
@@ -216,7 +216,7 @@ ProcessCode RootTrackSummaryReader::read(const AlgorithmContext& context) {
       truthParticle.setParticleId((*m_majorityParticleId)[i]);
 
       truthParticleCollection.insert(truthParticleCollection.end(),
-                                     truthParticle);
+                                     SimParticle(truthParticle, truthParticle));
     }
     // Write the collections to the EventStore
     m_outputTrackParameters(context, std::move(trackParameterCollection));
diff --git a/Examples/Io/Root/src/RootTrackSummaryWriter.cpp b/Examples/Io/Root/src/RootTrackSummaryWriter.cpp
index 66af91e60b1..ad23b4e6195 100644
--- a/Examples/Io/Root/src/RootTrackSummaryWriter.cpp
+++ b/Examples/Io/Root/src/RootTrackSummaryWriter.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2019-2024 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include "ActsExamples/Io/Root/RootTrackSummaryWriter.hpp"
 
@@ -33,6 +33,7 @@
 #include <ios>
 #include <limits>
 #include <memory>
+#include <numbers>
 #include <optional>
 #include <ostream>
 #include <stdexcept>
@@ -418,8 +419,9 @@ ProcessCode RootTrackSummaryWriter::writeT(const AlgorithmContext& ctx,
     if (foundMajorityParticle && hasFittedParams) {
       res = {param[Acts::eBoundLoc0] - t_d0,
              param[Acts::eBoundLoc1] - t_z0,
-             Acts::detail::difference_periodic(param[Acts::eBoundPhi], t_phi,
-                                               static_cast<float>(2 * M_PI)),
+             Acts::detail::difference_periodic(
+                 param[Acts::eBoundPhi], t_phi,
+                 static_cast<float>(2 * std::numbers::pi)),
              param[Acts::eBoundTheta] - t_theta,
              param[Acts::eBoundQOverP] - t_qop,
              param[Acts::eBoundTime] - t_time};
diff --git a/Examples/Io/Root/src/RootVertexReader.cpp b/Examples/Io/Root/src/RootVertexReader.cpp
index f9619c68a07..336e0364f9b 100644
--- a/Examples/Io/Root/src/RootVertexReader.cpp
+++ b/Examples/Io/Root/src/RootVertexReader.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2024 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include "ActsExamples/Io/Root/RootVertexReader.hpp"
 
@@ -114,7 +114,7 @@ ProcessCode RootVertexReader::read(const AlgorithmContext& context) {
   for (unsigned int i = 0; i < nVertices; i++) {
     SimVertex v;
 
-    v.id = (*m_vertexId)[i];
+    v.id = SimVertexBarcode{(*m_vertexId)[i]};
     v.process = static_cast<ActsFatras::ProcessType>((*m_process)[i]);
     v.position4 = Acts::Vector4((*m_vx)[i] * Acts::UnitConstants::mm,
                                 (*m_vy)[i] * Acts::UnitConstants::mm,
diff --git a/Examples/Io/Root/src/RootVertexWriter.cpp b/Examples/Io/Root/src/RootVertexWriter.cpp
index 9408ca9af4f..fc9f57cd918 100644
--- a/Examples/Io/Root/src/RootVertexWriter.cpp
+++ b/Examples/Io/Root/src/RootVertexWriter.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2024 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include "ActsExamples/Io/Root/RootVertexWriter.hpp"
 
diff --git a/Examples/Io/Performance/ActsExamples/Io/Performance/SeedingPerformanceWriter.cpp b/Examples/Io/Root/src/SeedingPerformanceWriter.cpp
similarity index 93%
rename from Examples/Io/Performance/ActsExamples/Io/Performance/SeedingPerformanceWriter.cpp
rename to Examples/Io/Root/src/SeedingPerformanceWriter.cpp
index c1612169fb0..e37f115093d 100644
--- a/Examples/Io/Performance/ActsExamples/Io/Performance/SeedingPerformanceWriter.cpp
+++ b/Examples/Io/Root/src/SeedingPerformanceWriter.cpp
@@ -1,19 +1,18 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2020-2021 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
-#include "SeedingPerformanceWriter.hpp"
+#include "ActsExamples/Io/Root/SeedingPerformanceWriter.hpp"
 
 #include "Acts/Utilities/MultiIndex.hpp"
 #include "Acts/Utilities/VectorHelpers.hpp"
 #include "ActsExamples/Utilities/EventDataTransforms.hpp"
 #include "ActsExamples/Validation/TrackClassification.hpp"
 #include "ActsFatras/EventData/Barcode.hpp"
-#include "ActsFatras/EventData/Particle.hpp"
 
 #include <cstddef>
 #include <ostream>
@@ -28,10 +27,6 @@
 using Acts::VectorHelpers::eta;
 using Acts::VectorHelpers::phi;
 
-namespace ActsExamples {
-struct AlgorithmContext;
-}  // namespace ActsExamples
-
 ActsExamples::SeedingPerformanceWriter::SeedingPerformanceWriter(
     ActsExamples::SeedingPerformanceWriter::Config config,
     Acts::Logging::Level level)
@@ -127,6 +122,9 @@ ActsExamples::ProcessCode ActsExamples::SeedingPerformanceWriter::writeT(
   const auto& particles = m_inputParticles(ctx);
   const auto& hitParticlesMap = m_inputMeasurementParticlesMap(ctx);
 
+  // Exclusive access to the tree while writing
+  std::lock_guard<std::mutex> lock(m_writeMutex);
+
   std::size_t nSeeds = seeds.size();
   std::size_t nMatchedSeeds = 0;
   // Map from particles to how many times they were successfully found by a seed
@@ -177,8 +175,9 @@ ActsExamples::ProcessCode ActsExamples::SeedingPerformanceWriter::writeT(
         minDeltaR = distance;
       }
     }
-    m_effPlotTool.fill(m_effPlotCache, particle, minDeltaR, isMatched);
-    m_duplicationPlotTool.fill(m_duplicationPlotCache, particle,
+    m_effPlotTool.fill(m_effPlotCache, particle.initial(), minDeltaR,
+                       isMatched);
+    m_duplicationPlotTool.fill(m_duplicationPlotCache, particle.initial(),
                                nMatchedSeedsForParticle - 1);
   }
   ACTS_DEBUG("Number of seeds: " << nSeeds);
diff --git a/Examples/Io/Performance/ActsExamples/Io/Performance/TrackFinderPerformanceWriter.cpp b/Examples/Io/Root/src/TrackFinderNTupleWriter.cpp
similarity index 90%
rename from Examples/Io/Performance/ActsExamples/Io/Performance/TrackFinderPerformanceWriter.cpp
rename to Examples/Io/Root/src/TrackFinderNTupleWriter.cpp
index b8e2f980ec7..3ddfc2b6f84 100644
--- a/Examples/Io/Performance/ActsExamples/Io/Performance/TrackFinderPerformanceWriter.cpp
+++ b/Examples/Io/Root/src/TrackFinderNTupleWriter.cpp
@@ -1,12 +1,12 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2019-2024 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
-#include "ActsExamples/Io/Performance/TrackFinderPerformanceWriter.hpp"
+#include "ActsExamples/Io/Root/TrackFinderNTupleWriter.hpp"
 
 #include "Acts/Definitions/Units.hpp"
 #include "ActsExamples/EventData/Index.hpp"
@@ -32,7 +32,7 @@
 #include <TFile.h>
 #include <TTree.h>
 
-struct ActsExamples::TrackFinderPerformanceWriter::Impl {
+struct ActsExamples::TrackFinderNTupleWriter::Impl {
   Config cfg;
 
   ReadDataHandle<SimParticleContainer> inputParticles;
@@ -86,7 +86,7 @@ struct ActsExamples::TrackFinderPerformanceWriter::Impl {
   // extra logger reference for the logging macros
   const Acts::Logger& _logger;
 
-  Impl(TrackFinderPerformanceWriter* parent, Config&& c, const Acts::Logger& l)
+  Impl(TrackFinderNTupleWriter* parent, Config&& c, const Acts::Logger& l)
       : cfg(std::move(c)),
         inputParticles{parent, "InputParticles"},
         inputMeasurementParticlesMap{parent, "InputMeasurementParticlesMap"},
@@ -153,7 +153,7 @@ struct ActsExamples::TrackFinderPerformanceWriter::Impl {
 
   const Acts::Logger& logger() const { return _logger; }
 
-  void write(std::uint64_t eventId, const TrackContainer& tracks,
+  void write(std::uint64_t eventId, const ConstTrackContainer& tracks,
              const SimParticleContainer& particles,
              const HitParticlesMap& hitParticlesMap,
              const TrackParticleMatching& trackParticleMatching) {
@@ -265,18 +265,17 @@ struct ActsExamples::TrackFinderPerformanceWriter::Impl {
   }
 };
 
-ActsExamples::TrackFinderPerformanceWriter::TrackFinderPerformanceWriter(
-    ActsExamples::TrackFinderPerformanceWriter::Config config,
+ActsExamples::TrackFinderNTupleWriter::TrackFinderNTupleWriter(
+    ActsExamples::TrackFinderNTupleWriter::Config config,
     Acts::Logging::Level level)
-    : WriterT(config.inputTracks, "TrackFinderPerformanceWriter", level),
+    : WriterT(config.inputTracks, "TrackFinderNTupleWriter", level),
       m_impl(std::make_unique<Impl>(this, std::move(config), logger())) {}
 
-ActsExamples::TrackFinderPerformanceWriter::~TrackFinderPerformanceWriter() =
-    default;
+ActsExamples::TrackFinderNTupleWriter::~TrackFinderNTupleWriter() = default;
 
-ActsExamples::ProcessCode ActsExamples::TrackFinderPerformanceWriter::writeT(
+ActsExamples::ProcessCode ActsExamples::TrackFinderNTupleWriter::writeT(
     const ActsExamples::AlgorithmContext& ctx,
-    const ActsExamples::TrackContainer& tracks) {
+    const ActsExamples::ConstTrackContainer& tracks) {
   const auto& particles = m_impl->inputParticles(ctx);
   const auto& hitParticlesMap = m_impl->inputMeasurementParticlesMap(ctx);
   const auto& trackParticleMatching = m_impl->inputTrackParticleMatching(ctx);
@@ -285,13 +284,12 @@ ActsExamples::ProcessCode ActsExamples::TrackFinderPerformanceWriter::writeT(
   return ProcessCode::SUCCESS;
 }
 
-ActsExamples::ProcessCode
-ActsExamples::TrackFinderPerformanceWriter::finalize() {
+ActsExamples::ProcessCode ActsExamples::TrackFinderNTupleWriter::finalize() {
   m_impl->close();
   return ProcessCode::SUCCESS;
 }
 
-const ActsExamples::TrackFinderPerformanceWriter::Config&
-ActsExamples::TrackFinderPerformanceWriter::config() const {
+const ActsExamples::TrackFinderNTupleWriter::Config&
+ActsExamples::TrackFinderNTupleWriter::config() const {
   return m_impl->cfg;
 }
diff --git a/Examples/Io/Performance/ActsExamples/Io/Performance/CKFPerformanceWriter.cpp b/Examples/Io/Root/src/TrackFinderPerformanceWriter.cpp
similarity index 90%
rename from Examples/Io/Performance/ActsExamples/Io/Performance/CKFPerformanceWriter.cpp
rename to Examples/Io/Root/src/TrackFinderPerformanceWriter.cpp
index 3caad01b002..0265aa3ea8b 100644
--- a/Examples/Io/Performance/ActsExamples/Io/Performance/CKFPerformanceWriter.cpp
+++ b/Examples/Io/Root/src/TrackFinderPerformanceWriter.cpp
@@ -1,12 +1,12 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2020 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
-#include "ActsExamples/Io/Performance/CKFPerformanceWriter.hpp"
+#include "ActsExamples/Io/Root/TrackFinderPerformanceWriter.hpp"
 
 #include "Acts/EventData/TrackParameters.hpp"
 #include "Acts/Utilities/VectorHelpers.hpp"
@@ -27,9 +27,9 @@ using Acts::VectorHelpers::phi;
 
 namespace ActsExamples {
 
-CKFPerformanceWriter::CKFPerformanceWriter(CKFPerformanceWriter::Config cfg,
-                                           Acts::Logging::Level lvl)
-    : WriterT(cfg.inputTracks, "CKFPerformanceWriter", lvl),
+TrackFinderPerformanceWriter::TrackFinderPerformanceWriter(
+    TrackFinderPerformanceWriter::Config cfg, Acts::Logging::Level lvl)
+    : WriterT(cfg.inputTracks, "TrackFinderPerformanceWriter", lvl),
       m_cfg(std::move(cfg)),
       m_effPlotTool(m_cfg.effPlotToolConfig, lvl),
       m_fakeRatePlotTool(m_cfg.fakeRatePlotToolConfig, lvl),
@@ -76,7 +76,7 @@ CKFPerformanceWriter::CKFPerformanceWriter(CKFPerformanceWriter::Config cfg,
   m_trackSummaryPlotTool.book(m_trackSummaryPlotCache);
 }
 
-CKFPerformanceWriter::~CKFPerformanceWriter() {
+TrackFinderPerformanceWriter::~TrackFinderPerformanceWriter() {
   m_effPlotTool.clear(m_effPlotCache);
   m_fakeRatePlotTool.clear(m_fakeRatePlotCache);
   m_duplicationPlotTool.clear(m_duplicationPlotCache);
@@ -86,7 +86,7 @@ CKFPerformanceWriter::~CKFPerformanceWriter() {
   }
 }
 
-ProcessCode CKFPerformanceWriter::finalize() {
+ProcessCode TrackFinderPerformanceWriter::finalize() {
   float eff_tracks = static_cast<float>(m_nTotalMatchedTracks) / m_nTotalTracks;
   float fakeRate_tracks =
       static_cast<float>(m_nTotalFakeTracks) / m_nTotalTracks;
@@ -147,8 +147,8 @@ ProcessCode CKFPerformanceWriter::finalize() {
   return ProcessCode::SUCCESS;
 }
 
-ProcessCode CKFPerformanceWriter::writeT(const AlgorithmContext& ctx,
-                                         const ConstTrackContainer& tracks) {
+ProcessCode TrackFinderPerformanceWriter::writeT(
+    const AlgorithmContext& ctx, const ConstTrackContainer& tracks) {
   // The number of majority particle hits and fitted track parameters
   using Acts::VectorHelpers::perp;
 
@@ -260,14 +260,15 @@ ProcessCode CKFPerformanceWriter::writeT(const AlgorithmContext& ctx,
     }
 
     // Fill efficiency plots
-    m_effPlotTool.fill(m_effPlotCache, particle, minDeltaR, isReconstructed);
+    m_effPlotTool.fill(m_effPlotCache, particle.initial(), minDeltaR,
+                       isReconstructed);
     // Fill number of duplicated tracks for this particle
-    m_duplicationPlotTool.fill(m_duplicationPlotCache, particle,
+    m_duplicationPlotTool.fill(m_duplicationPlotCache, particle.initial(),
                                nMatchedTracks - 1);
 
     // Fill number of reconstructed/truth-matched/fake tracks for this particle
-    m_fakeRatePlotTool.fill(m_fakeRatePlotCache, particle, nMatchedTracks,
-                            nFakeTracks);
+    m_fakeRatePlotTool.fill(m_fakeRatePlotCache, particle.initial(),
+                            nMatchedTracks, nFakeTracks);
 
     m_nTotalParticles += 1;
   }
diff --git a/Examples/Io/Performance/ActsExamples/Io/Performance/TrackFitterPerformanceWriter.cpp b/Examples/Io/Root/src/TrackFitterPerformanceWriter.cpp
similarity index 91%
rename from Examples/Io/Performance/ActsExamples/Io/Performance/TrackFitterPerformanceWriter.cpp
rename to Examples/Io/Root/src/TrackFitterPerformanceWriter.cpp
index 3c4c263b533..6a183cef4dd 100644
--- a/Examples/Io/Performance/ActsExamples/Io/Performance/TrackFitterPerformanceWriter.cpp
+++ b/Examples/Io/Root/src/TrackFitterPerformanceWriter.cpp
@@ -1,12 +1,12 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2019-2020 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
-#include "ActsExamples/Io/Performance/TrackFitterPerformanceWriter.hpp"
+#include "ActsExamples/Io/Root/TrackFitterPerformanceWriter.hpp"
 
 #include "Acts/EventData/MultiTrajectoryHelpers.hpp"
 #include "Acts/EventData/TrackParameters.hpp"
@@ -148,7 +148,8 @@ ActsExamples::ProcessCode ActsExamples::TrackFitterPerformanceWriter::writeT(
     // Record this majority particle ID of this trajectory
     reconParticleIds.push_back(ip->particleId());
     // Fill the residual plots
-    m_resPlotTool.fill(m_resPlotCache, ctx.geoContext, *ip, fittedParameters);
+    m_resPlotTool.fill(m_resPlotCache, ctx.geoContext, ip->initial(),
+                       fittedParameters);
     // Fill the trajectory summary info
     m_trackSummaryPlotTool.fill(m_trackSummaryPlotCache, fittedParameters,
                                 track.nTrackStates(), track.nMeasurements(),
@@ -161,10 +162,8 @@ ActsExamples::ProcessCode ActsExamples::TrackFitterPerformanceWriter::writeT(
   // one truth track)
   for (const auto& particle : particles) {
     bool isReconstructed = false;
-    // Find if the particle has been reconstructed
-    auto it = std::find(reconParticleIds.begin(), reconParticleIds.end(),
-                        particle.particleId());
-    if (it != reconParticleIds.end()) {
+    // Check if the particle has been reconstructed
+    if (rangeContainsValue(reconParticleIds, particle.particleId())) {
       isReconstructed = true;
     }
     // Loop over all the other truth particle and find the distance to the
@@ -183,7 +182,8 @@ ActsExamples::ProcessCode ActsExamples::TrackFitterPerformanceWriter::writeT(
         minDeltaR = distance;
       }
     }
-    m_effPlotTool.fill(m_effPlotCache, particle, minDeltaR, isReconstructed);
+    m_effPlotTool.fill(m_effPlotCache, particle.initial(), minDeltaR,
+                       isReconstructed);
   }
 
   return ProcessCode::SUCCESS;
diff --git a/Examples/Io/Performance/ActsExamples/Io/Performance/VertexPerformanceWriter.cpp b/Examples/Io/Root/src/VertexNTupleWriter.cpp
similarity index 97%
rename from Examples/Io/Performance/ActsExamples/Io/Performance/VertexPerformanceWriter.cpp
rename to Examples/Io/Root/src/VertexNTupleWriter.cpp
index 240b7f7f3b8..07c71f115c1 100644
--- a/Examples/Io/Performance/ActsExamples/Io/Performance/VertexPerformanceWriter.cpp
+++ b/Examples/Io/Root/src/VertexNTupleWriter.cpp
@@ -1,12 +1,12 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2019-2024 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
-#include "ActsExamples/Io/Performance/VertexPerformanceWriter.hpp"
+#include "ActsExamples/Io/Root/VertexNTupleWriter.hpp"
 
 #include "Acts/Definitions/Algebra.hpp"
 #include "Acts/Definitions/TrackParametrization.hpp"
@@ -39,6 +39,7 @@
 #include <limits>
 #include <map>
 #include <memory>
+#include <numbers>
 #include <optional>
 #include <ostream>
 #include <set>
@@ -106,9 +107,9 @@ std::uint32_t getNumberOfTruePriVertices(
 
 }  // namespace
 
-VertexPerformanceWriter::VertexPerformanceWriter(
-    const VertexPerformanceWriter::Config& config, Acts::Logging::Level level)
-    : WriterT(config.inputVertices, "VertexPerformanceWriter", level),
+VertexNTupleWriter::VertexNTupleWriter(const VertexNTupleWriter::Config& config,
+                                       Acts::Logging::Level level)
+    : WriterT(config.inputVertices, "VertexNTupleWriter", level),
       m_cfg(config) {
   if (m_cfg.filePath.empty()) {
     throw std::invalid_argument("Missing output filename");
@@ -253,13 +254,13 @@ VertexPerformanceWriter::VertexPerformanceWriter(
   m_outputTree->Branch("trk_pullQOverPFitted", &m_pullQOverPFitted);
 }
 
-VertexPerformanceWriter::~VertexPerformanceWriter() {
+VertexNTupleWriter::~VertexNTupleWriter() {
   if (m_outputFile != nullptr) {
     m_outputFile->Close();
   }
 }
 
-ProcessCode VertexPerformanceWriter::finalize() {
+ProcessCode VertexNTupleWriter::finalize() {
   m_outputFile->cd();
   m_outputTree->Write();
   m_outputFile->Close();
@@ -267,7 +268,7 @@ ProcessCode VertexPerformanceWriter::finalize() {
   return ProcessCode::SUCCESS;
 }
 
-ProcessCode VertexPerformanceWriter::writeT(
+ProcessCode VertexNTupleWriter::writeT(
     const AlgorithmContext& ctx, const std::vector<Acts::Vertex>& vertices) {
   const double nan = std::numeric_limits<double>::quiet_NaN();
 
@@ -497,7 +498,7 @@ ProcessCode VertexPerformanceWriter::writeT(
       fmap[vtxId].second += weight;
     }
     double truthMajorityVertexTrackWeights = 0;
-    SimVertexBarcode truthMajorityVertexId = 0;
+    SimVertexBarcode truthMajorityVertexId{0};
     for (const auto& [vtxId, counter] : fmap) {
       if (counter.second > truthMajorityVertexTrackWeights) {
         truthMajorityVertexId = vtxId;
@@ -629,7 +630,8 @@ ProcessCode VertexPerformanceWriter::writeT(
       // Count number of reconstructible tracks on truth vertex
       int nTracksOnTruthVertex = 0;
       for (const auto& particle : selectedParticles) {
-        if (particle.particleId().vertexId() == truthVertex.vertexId()) {
+        if (static_cast<SimVertexBarcode>(particle.particleId().vertexId()) ==
+            truthVertex.vertexId()) {
           ++nTracksOnTruthVertex;
         }
       }
@@ -846,7 +848,7 @@ ProcessCode VertexPerformanceWriter::writeT(
           // Accounting for the periodicity of phi. We overwrite the
           // previously computed value for better readability.
           diffMom[0] = Acts::detail::difference_periodic(recoMom(0), trueMom(0),
-                                                         2 * M_PI);
+                                                         2 * std::numbers::pi);
           innerResPhi.push_back(diffMom[0]);
           innerResTheta.push_back(diffMom[1]);
           innerResQOverP.push_back(diffMom[2]);
@@ -899,7 +901,7 @@ ProcessCode VertexPerformanceWriter::writeT(
           // Accounting for the periodicity of phi. We overwrite the
           // previously computed value for better readability.
           diffMomFitted[0] = Acts::detail::difference_periodic(
-              recoMomFitted(0), trueMom(0), 2 * M_PI);
+              recoMomFitted(0), trueMom(0), 2 * std::numbers::pi);
           innerResPhiFitted.push_back(diffMomFitted[0]);
           innerResThetaFitted.push_back(diffMomFitted[1]);
           innerResQOverPFitted.push_back(diffMomFitted[2]);
diff --git a/Examples/Io/NuclearInteractions/src/detail/NuclearInteractionParametrisation.cpp b/Examples/Io/Root/src/detail/NuclearInteractionParametrisation.cpp
similarity index 94%
rename from Examples/Io/NuclearInteractions/src/detail/NuclearInteractionParametrisation.cpp
rename to Examples/Io/Root/src/detail/NuclearInteractionParametrisation.cpp
index a11e4880b9b..174f3648ce1 100644
--- a/Examples/Io/NuclearInteractions/src/detail/NuclearInteractionParametrisation.cpp
+++ b/Examples/Io/Root/src/detail/NuclearInteractionParametrisation.cpp
@@ -1,21 +1,18 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2020-2021 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
-#include "ActsExamples/Io/NuclearInteractions/detail/NuclearInteractionParametrisation.hpp"
+#include "ActsExamples/Io/Root/detail/NuclearInteractionParametrisation.hpp"
 
 #include "Acts/Definitions/Common.hpp"
-#include "ActsFatras/EventData/Particle.hpp"
 
 #include <cmath>
-#include <complex>
 #include <iterator>
 #include <limits>
-#include <memory>
 
 #include <Eigen/Eigenvalues>
 #include <TMath.h>
@@ -23,6 +20,7 @@
 #include <TVectorT.h>
 
 namespace ActsExamples::detail::NuclearInteractionParametrisation {
+
 namespace {
 
 /// @brief Evaluate the location in a standard normal distribution for a value
@@ -52,14 +50,14 @@ float gaussianValue(TH1F const* histo, const float mom) {
 /// @param [in] fourVector2 The other four vector
 ///
 /// @return The invariant mass
-float invariantMass(const ActsExamples::SimParticle::Vector4& fourVector1,
-                    const ActsExamples::SimParticle::Vector4& fourVector2) {
-  ActsExamples::SimParticle::Vector4 sum = fourVector1 + fourVector2;
-  const ActsExamples::SimParticle::Scalar energy = sum[Acts::eEnergy];
-  ActsExamples::SimParticle::Scalar momentum =
-      sum.template segment<3>(Acts::eMom0).norm();
+float invariantMass(const Acts::Vector4& fourVector1,
+                    const Acts::Vector4& fourVector2) {
+  Acts::Vector4 sum = fourVector1 + fourVector2;
+  const Acts::ActsScalar energy = sum[Acts::eEnergy];
+  Acts::ActsScalar momentum = sum.template segment<3>(Acts::eMom0).norm();
   return std::sqrt(energy * energy - momentum * momentum);
 }
+
 }  // namespace
 
 std::pair<Vector, Matrix> calculateMeanAndCovariance(
@@ -377,4 +375,5 @@ CumulativeDistribution cumulativeNuclearInteractionProbability(
   return histo;  // TODO: in this case the normalisation is not taking into
                  // account
 }
+
 }  // namespace ActsExamples::detail::NuclearInteractionParametrisation
diff --git a/Examples/Io/Svg/include/ActsExamples/Io/Svg/SvgDefaults.hpp b/Examples/Io/Svg/include/ActsExamples/Io/Svg/SvgDefaults.hpp
index 16cde4add16..b4e6c4f8178 100644
--- a/Examples/Io/Svg/include/ActsExamples/Io/Svg/SvgDefaults.hpp
+++ b/Examples/Io/Svg/include/ActsExamples/Io/Svg/SvgDefaults.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2022 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
@@ -22,7 +22,7 @@ static inline Acts::Svg::Style layerStyle() {
   lStyle.highlights = {"mouseover", "mouseout"};
   lStyle.strokeColor = {25, 25, 25};
   lStyle.strokeWidth = 0.5;
-  lStyle.nSegments = 72u;
+  lStyle.quarterSegments = 72u;
 
   return lStyle;
 }
@@ -43,7 +43,7 @@ static inline Acts::Svg::Style backgroundStyle() {
   bgStyle.highlights = {};
   bgStyle.strokeColor = {25, 25, 25};
   bgStyle.strokeWidth = 0.5;
-  bgStyle.nSegments = 72u;
+  bgStyle.quarterSegments = 72u;
   return bgStyle;
 }
 
@@ -55,7 +55,7 @@ static inline Acts::Svg::Style pointStyle() {
   pStyle.highlights = {"mouseover", "mouseout"};
   pStyle.strokeColor = {0, 0, 0};
   pStyle.strokeWidth = 0.5;
-  pStyle.nSegments = 72u;
+  pStyle.quarterSegments = 72u;
 
   return pStyle;
 }
diff --git a/Examples/Io/Svg/include/ActsExamples/Io/Svg/SvgPointWriter.hpp b/Examples/Io/Svg/include/ActsExamples/Io/Svg/SvgPointWriter.hpp
index e7ad17f0e4b..3ad6527a882 100644
--- a/Examples/Io/Svg/include/ActsExamples/Io/Svg/SvgPointWriter.hpp
+++ b/Examples/Io/Svg/include/ActsExamples/Io/Svg/SvgPointWriter.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2022 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
@@ -87,6 +87,7 @@ class SvgPointWriter final : public WriterT<GeometryIdMultiset<T>> {
         s_pointStyle;  //!< The style of the space point to be drawn
 
     std::string infoBoxTitle = "";  //!< If an info box title is set, draw it
+    Acts::Svg::Style infoTitleStyle = s_infoStyle;
     Acts::Svg::Style infoBoxStyle = s_infoStyle;  // The style of the info box
 
     bool projectionXY = true;  ///< xy projection
@@ -170,7 +171,8 @@ ActsExamples::ProcessCode ActsExamples::SvgPointWriter<T, Acc>::writeT(
         auto xyIbox = Acts::Svg::infoBox(
             static_cast<actsvg::scalar>(point3D.x() + 10.),
             static_cast<actsvg::scalar>(point3D.y() - 10.), m_cfg.infoBoxTitle,
-            {"Position: " + Acts::toString(point3D)}, m_cfg.infoBoxStyle, p);
+            m_cfg.infoTitleStyle, {"Position: " + Acts::toString(point3D)},
+            m_cfg.infoBoxStyle, p);
         xyView.add_object(xyIbox);
       }
     }
diff --git a/Examples/Io/Svg/include/ActsExamples/Io/Svg/SvgTrackingGeometryWriter.hpp b/Examples/Io/Svg/include/ActsExamples/Io/Svg/SvgTrackingGeometryWriter.hpp
index ecf68ccf0dd..6126685303e 100644
--- a/Examples/Io/Svg/include/ActsExamples/Io/Svg/SvgTrackingGeometryWriter.hpp
+++ b/Examples/Io/Svg/include/ActsExamples/Io/Svg/SvgTrackingGeometryWriter.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2022 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
diff --git a/Examples/Io/Svg/src/SvgTrackingGeometryWriter.cpp b/Examples/Io/Svg/src/SvgTrackingGeometryWriter.cpp
index 07b0b4e0d6a..672995e9705 100644
--- a/Examples/Io/Svg/src/SvgTrackingGeometryWriter.cpp
+++ b/Examples/Io/Svg/src/SvgTrackingGeometryWriter.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2022 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include "ActsExamples/Io/Svg/SvgTrackingGeometryWriter.hpp"
 
diff --git a/Examples/Python/CMakeLists.txt b/Examples/Python/CMakeLists.txt
index 56721a3eb7c..0eb4b1ff4ec 100644
--- a/Examples/Python/CMakeLists.txt
+++ b/Examples/Python/CMakeLists.txt
@@ -15,11 +15,13 @@ pybind11_add_module(ActsPythonBindings
   src/Digitization.cpp
   src/Material.cpp
   src/Geometry.cpp
+  src/GeometryBuildingGen1.cpp
   src/ExampleAlgorithms.cpp
   src/MagneticField.cpp
   src/Output.cpp
   src/Input.cpp
   src/Propagation.cpp
+  src/Navigation.cpp
   src/Generators.cpp
   src/Obj.cpp
   src/TruthTracking.cpp
@@ -53,11 +55,9 @@ target_link_libraries(
         ActsExamplesDetectorTGeo
         ActsExamplesMagneticField
         ActsExamplesIoRoot
-        ActsExamplesIoNuclearInteractions
         ActsExamplesIoCsv
         ActsExamplesIoObj
         ActsExamplesIoJson
-        ActsExamplesIoPerformance
         ActsExamplesGenerators
         ActsExamplesPrinters
         ActsExamplesTrackFinding
@@ -67,6 +67,10 @@ target_link_libraries(
         ActsExamplesDetectorTelescope
         ActsExamplesUtilities
         ActsExamplesAmbiguityResolution
+        ActsExamplesTruthTracking
+        ActsExamplesDigitization
+        ActsExamplesPropagation
+        ActsExamplesMaterialMapping
 )
 
 set(py_files
@@ -96,8 +100,14 @@ endif()
 if(ACTS_BUILD_PLUGIN_TRACCC)
     target_link_libraries(ActsPythonBindings PUBLIC ActsPluginDetray)
     target_sources(ActsPythonBindings PRIVATE src/Detray.cpp)
+    target_link_libraries(ActsPythonBindings PUBLIC ActsPluginCovfie)
+    target_sources(ActsPythonBindings PRIVATE src/Covfie.cpp)
+    target_link_libraries(ActsPythonBindings PUBLIC ActsExamplesTraccc)
+    target_sources(ActsPythonBindings PRIVATE src/Traccc.cpp)
 else()
     target_sources(ActsPythonBindings PRIVATE src/DetrayStub.cpp)
+    target_sources(ActsPythonBindings PRIVATE src/CovfieStub.cpp)
+    target_sources(ActsPythonBindings PRIVATE src/TracccStub.cpp)
 endif()
 
 if(ACTS_BUILD_PLUGIN_ACTSVG)
@@ -277,6 +287,14 @@ else()
     target_sources(ActsPythonBindings PRIVATE src/OnnxNeuralCalibratorStub.cpp)
 endif()
 
+if(ACTS_BUILD_EXAMPLES_HASHING)
+    target_link_libraries(ActsPythonBindings PUBLIC ActsPluginHashing)
+    target_sources(ActsPythonBindings PRIVATE src/Hashing.cpp)
+    list(APPEND py_files examples/hashing.py)
+else()
+    target_sources(ActsPythonBindings PRIVATE src/HashingStub.cpp)
+endif()
+
 configure_file(setup.sh.in ${_python_dir}/setup.sh @ONLY)
 install(FILES ${_python_dir}/setup.sh DESTINATION "python")
 
diff --git a/Examples/Python/include/Acts/Plugins/Python/Utilities.hpp b/Examples/Python/include/Acts/Plugins/Python/Utilities.hpp
index 8cd5d4202db..64f8b73fed5 100644
--- a/Examples/Python/include/Acts/Plugins/Python/Utilities.hpp
+++ b/Examples/Python/include/Acts/Plugins/Python/Utilities.hpp
@@ -1,14 +1,15 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2021 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
-#include "Acts/Utilities/TypeTraits.hpp"
+#include "ActsExamples/Framework/AlgorithmContext.hpp"
+#include "ActsExamples/Framework/ProcessCode.hpp"
 
 #include <string>
 #include <unordered_map>
@@ -17,15 +18,26 @@
 #include <boost/preprocessor/variadic/to_seq.hpp>
 #include <pybind11/pybind11.h>
 
-namespace Acts::Python {
+namespace Acts {
+namespace Concepts {
+template <typename T>
+concept has_write_method =
+    requires(T& t, const ActsExamples::AlgorithmContext& ctx) {
+      { t.write(ctx) } -> std::same_as<ActsExamples::ProcessCode>;
+    };
+}  // namespace Concepts
+
+namespace Python {
 
 struct Context {
   std::unordered_map<std::string, pybind11::module_> modules;
 
   pybind11::module_& get(const std::string& name) { return modules.at(name); }
 
-  template <typename... Args, typename = std::enable_if_t<sizeof...(Args) >= 2>>
-  auto get(Args&&... args) {
+  template <typename... Args>
+  auto get(Args&&... args)
+    requires(sizeof...(Args) >= 2)
+  {
     return std::make_tuple((modules.at(args))...);
   }
 };
@@ -49,10 +61,8 @@ template <typename T>
 void patchKwargsConstructor(T& c) {
   pybind11::module::import("acts._adapter").attr("_patchKwargsConstructor")(c);
 }
-
-METHOD_TRAIT(write_method_trait_t, write);
-
-}  // namespace Acts::Python
+}  // namespace Python
+}  // namespace Acts
 
 #define ACTS_PYTHON_MEMBER(name) \
   _binding_instance.def_readwrite(#name, &_struct_type::name)
@@ -105,9 +115,7 @@ METHOD_TRAIT(write_method_trait_t, write);
             .def_property_readonly("config", &Writer::config);              \
                                                                             \
     constexpr bool has_write_method =                                       \
-        Acts::Concepts::has_method<Writer, ActsExamples::ProcessCode,       \
-                                   Acts::Python::write_method_trait_t,      \
-                                   const ActsExamples::AlgorithmContext&>;  \
+        Acts::Concepts::has_write_method<Writer>;                           \
                                                                             \
     if constexpr (has_write_method) {                                       \
       w.def("write", &Writer::write);                                       \
diff --git a/Examples/Python/python/acts/examples/hashing.py b/Examples/Python/python/acts/examples/hashing.py
new file mode 100644
index 00000000000..3d15983ee9e
--- /dev/null
+++ b/Examples/Python/python/acts/examples/hashing.py
@@ -0,0 +1,9 @@
+from acts._adapter import _patch_config
+from acts import ActsPythonBindings
+
+if not hasattr(ActsPythonBindings._examples, "_hashing"):
+    raise ImportError("ActsPythonBindings._examples._hashing not found")
+
+_patch_config(ActsPythonBindings._examples._hashing)
+
+from acts.ActsPythonBindings._examples._hashing import *
diff --git a/Examples/Python/python/acts/examples/itk.py b/Examples/Python/python/acts/examples/itk.py
index b9d92b04001..b8e2eba8796 100644
--- a/Examples/Python/python/acts/examples/itk.py
+++ b/Examples/Python/python/acts/examples/itk.py
@@ -372,8 +372,8 @@ def itkSeedingAlgConfig(
     )
     zOriginWeightFactor = 1
     compatSeedWeight = 100
-    phiMin = 0
-    phiMax = 2 * math.pi
+    phiMin = -math.pi
+    phiMax = math.pi
     phiBinDeflectionCoverage = 3
     numPhiNeighbors = 1
     maxPhiBins = 200
diff --git a/Examples/Python/python/acts/examples/odd.py b/Examples/Python/python/acts/examples/odd.py
index 4e1efb1c783..5e187948ee2 100644
--- a/Examples/Python/python/acts/examples/odd.py
+++ b/Examples/Python/python/acts/examples/odd.py
@@ -76,8 +76,9 @@ def getOpenDataDetector(
     }
 
     def geoid_hook(geoid, surface):
+        gctx = acts.GeometryContext()
         if geoid.volume() in volumeRadiusCutsMap:
-            r = math.sqrt(surface.center()[0] ** 2 + surface.center()[1] ** 2)
+            r = math.sqrt(surface.center(gctx)[0] ** 2 + surface.center(gctx)[1] ** 2)
 
             geoid.setExtra(1)
             for cut in volumeRadiusCutsMap[geoid.volume()]:
@@ -89,7 +90,7 @@ def geoid_hook(geoid, surface):
     dd4hepConfig = acts.examples.dd4hep.DD4hepGeometryService.Config(
         xmlFileNames=[str(odd_xml)],
         logLevel=customLogLevel(),
-        dd4hepLogLevel=customLogLevel(),
+        dd4hepLogLevel=customLogLevel(minLevel=acts.logging.WARNING),
         geometryIdentifierHook=acts.GeometryIdentifierHook(geoid_hook),
     )
     detector = acts.examples.dd4hep.DD4hepDetector()
diff --git a/Examples/Python/python/acts/examples/reconstruction.py b/Examples/Python/python/acts/examples/reconstruction.py
index 4a903a2b7c9..bc1b1d4df9d 100644
--- a/Examples/Python/python/acts/examples/reconstruction.py
+++ b/Examples/Python/python/acts/examples/reconstruction.py
@@ -10,13 +10,7 @@
 
 SeedingAlgorithm = Enum(
     "SeedingAlgorithm",
-    "Default TruthSmeared TruthEstimated Orthogonal HoughTransform Gbts",
-)
-
-TruthSeedRanges = namedtuple(
-    "TruthSeedRanges",
-    ["rho", "z", "phi", "eta", "absEta", "pt", "nHits"],
-    defaults=[(None, None)] * 7,
+    "Default TruthSmeared TruthEstimated Orthogonal HoughTransform Gbts Hashing",
 )
 
 ParticleSmearingSigmas = namedtuple(
@@ -125,17 +119,19 @@
         "nMeasurementsMin",
         "maxHoles",
         "maxOutliers",
+        "maxHolesAndOutliers",
         "maxSharedHits",
         "maxChi2",
         "nMeasurementsGroupMin",
     ],
-    defaults=[(None, None)] * 7 + [None] * 6,
+    defaults=[(None, None)] * 7 + [None] * 7,
 )
 
 CkfConfig = namedtuple(
     "CkfConfig",
     [
-        "chi2CutOff",
+        "chi2CutOffMeasurement",
+        "chi2CutOffOutlier",
         "numMeasurementsCutOff",
         "maxSteps",
         "seedDeduplication",
@@ -144,8 +140,25 @@
         "stripVolumes",
         "maxPixelHoles",
         "maxStripHoles",
+        "trimTracks",
+        "constrainToVolumes",
+        "endOfWorldVolumes",
+    ],
+    defaults=[
+        15.0,
+        25.0,
+        10,
+        None,
+        None,
+        None,
+        None,
+        None,
+        None,
+        None,
+        None,
+        None,
+        None,
     ],
-    defaults=[15.0, 10, None, None, None, None, None, None, None],
 )
 
 AmbiguityResolutionConfig = namedtuple(
@@ -190,6 +203,18 @@
     defaults=[None] * 3,
 )
 
+HashingTrainingConfigArg = namedtuple(
+    "HashingTrainingConfig",
+    ["annoySeed", "f"],
+    defaults=[None] * 2,
+)
+
+HashingAlgorithmConfigArg = namedtuple(
+    "HashingAlgorithmConfig",
+    ["bucketSize", "zBins", "phiBins"],
+    defaults=[None] * 3,
+)
+
 
 class VertexFinder(Enum):
     Truth = (1,)
@@ -199,13 +224,14 @@ class VertexFinder(Enum):
 
 @acts.examples.NamedTypeArgs(
     seedingAlgorithm=SeedingAlgorithm,
-    truthSeedRanges=TruthSeedRanges,
     particleSmearingSigmas=ParticleSmearingSigmas,
     seedFinderConfigArg=SeedFinderConfigArg,
     seedFinderOptionsArg=SeedFinderOptionsArg,
     seedFilterConfigArg=SeedFilterConfigArg,
     spacePointGridConfigArg=SpacePointGridConfigArg,
     seedingAlgorithmConfigArg=SeedingAlgorithmConfigArg,
+    hashingTrainingConfigArg=HashingTrainingConfigArg,
+    hashingAlgorithmConfigArg=HashingAlgorithmConfigArg,
     truthEstimatedSeedingAlgorithmConfigArg=TruthEstimatedSeedingAlgorithmConfigArg,
     logLevel=acts.logging.Level,
 )
@@ -217,7 +243,6 @@ def addSeeding(
     layerMappingConfigFile: Optional[Union[Path, str]] = None,
     connector_inputConfigFile: Optional[Union[Path, str]] = None,
     seedingAlgorithm: SeedingAlgorithm = SeedingAlgorithm.Default,
-    truthSeedRanges: Optional[TruthSeedRanges] = TruthSeedRanges(),
     particleSmearingSigmas: ParticleSmearingSigmas = ParticleSmearingSigmas(),
     initialSigmas: Optional[list] = None,
     initialSigmaPtRel: Optional[float] = None,
@@ -228,11 +253,18 @@ def addSeeding(
     spacePointGridConfigArg: SpacePointGridConfigArg = SpacePointGridConfigArg(),
     seedingAlgorithmConfigArg: SeedingAlgorithmConfigArg = SeedingAlgorithmConfigArg(),
     houghTransformConfig: acts.examples.HoughTransformSeeder.Config = acts.examples.HoughTransformSeeder.Config(),
+    hashingTrainingConfigArg: Optional[
+        HashingTrainingConfigArg
+    ] = HashingTrainingConfigArg(),
+    hashingAlgorithmConfigArg: Optional[
+        HashingAlgorithmConfigArg
+    ] = HashingAlgorithmConfigArg(),
     truthEstimatedSeedingAlgorithmConfigArg: TruthEstimatedSeedingAlgorithmConfigArg = TruthEstimatedSeedingAlgorithmConfigArg(),
     particleHypothesis: Optional[
         acts.ParticleHypothesis
     ] = acts.ParticleHypothesis.pion,
     inputParticles: str = "particles",
+    selectedParticles: str = "particles_selected",
     outputDirRoot: Optional[Union[Path, str]] = None,
     outputDirCsv: Optional[Union[Path, str]] = None,
     logLevel: Optional[acts.logging.Level] = None,
@@ -249,10 +281,6 @@ def addSeeding(
         Json file for space point geometry selection. Not required for SeedingAlgorithm.TruthSmeared.
     seedingAlgorithm : SeedingAlgorithm, Default
         seeding algorithm to use: one of Default (no truth information used), TruthSmeared, TruthEstimated
-    truthSeedRanges : TruthSeedRanges(rho, z, phi, eta, absEta, pt, nHits)
-        TruthSeedSelector configuration. Each range is specified as a tuple of (min,max).
-        Defaults of no cuts specified in Examples/Algorithms/TruthTracking/ActsExamples/TruthTracking/TruthSeedSelector.hpp
-        If specified as None, don't run ParticleSmearing at all (and use addCKFTracks(selectedParticles="particles"))
     particleSmearingSigmas : ParticleSmearingSigmas(d0, d0PtA, d0PtB, z0, z0PtA, z0PtB, t0, phi, theta, ptRel)
         ParticleSmearing configuration.
         Defaults specified in Examples/Algorithms/TruthTracking/ActsExamples/TruthTracking/ParticleSmearing.hpp
@@ -274,12 +302,18 @@ def addSeeding(
         Defaults specified in Core/include/Acts/Seeding/SpacePointGrid.hpp
     seedingAlgorithmConfigArg : SeedingAlgorithmConfigArg(allowSeparateRMax, zBinNeighborsTop, zBinNeighborsBottom, numPhiNeighbors, useExtraCuts)
                                 Defaults specified in Examples/Algorithms/TrackFinding/include/ActsExamples/TrackFinding/SeedingAlgorithm.hpp
+    hashingTrainingConfigArg : HashingTrainingConfigArg(annoySeed, f)
+                                Defaults specified in Plugins/Hashing/include/Acts/Plugins/Hashing/HashingTrainingConfig.hpp
+    hashingAlgorithmConfigArg : HashingAlgorithmConfigArg(bucketSize, zBins, phiBins)
+                                Defaults specified in Plugins/Hashing/include/Acts/Plugins/Hashing/HashingAlgorithmConfig.hpp
     truthEstimatedSeedingAlgorithmConfigArg : TruthEstimatedSeedingAlgorithmConfigArg(deltaR)
         Currently only deltaR=(min,max) range specified here.
     particleHypothesis : Optional[acts.ParticleHypothesis]
         The hypothesis used for track finding. Defaults to pion.
     inputParticles : str, "particles"
         input particles name in the WhiteBoard
+    selectedParticles : str, "particles_selected"
+        selected particles name in the WhiteBoard
     outputDirRoot : Path|str, path, None
         the output folder for the Root output, None triggers no output
     logLevel : acts.logging.Level, None
@@ -292,18 +326,6 @@ def addSeeding(
     logger = acts.logging.getLogger("addSeeding")
     logger.setLevel(logLevel)
 
-    if truthSeedRanges is not None:
-        selectedParticles = "truth_seeds_selected"
-        addSeedingTruthSelection(
-            s,
-            inputParticles,
-            selectedParticles,
-            truthSeedRanges,
-            logLevel,
-        )
-    else:
-        selectedParticles = inputParticles
-
     # Create starting parameters from either particle smearing or combined seed
     # finding and track parameters estimation
     if seedingAlgorithm == SeedingAlgorithm.TruthSmeared:
@@ -359,7 +381,6 @@ def addSeeding(
             logger.info("Using Hough Transform seeding")
             houghTransformConfig.inputSpacePoints = [spacePoints]
             houghTransformConfig.inputMeasurements = "measurements"
-            houghTransformConfig.inputSourceLinks = "sourcelinks"
             houghTransformConfig.outputProtoTracks = "prototracks"
             houghTransformConfig.outputSeeds = "seeds"
             houghTransformConfig.trackingGeometry = trackingGeometry
@@ -379,6 +400,20 @@ def addSeeding(
                 geoSelectionConfigFile,
                 connector_inputConfigFile,
             )
+        elif seedingAlgorithm == SeedingAlgorithm.Hashing:
+            logger.info("Using Hashing seeding")
+            seeds, buckets = addHashingSeeding(
+                s,
+                spacePoints,
+                seedingAlgorithmConfigArg,
+                seedFinderConfigArg,
+                seedFinderOptionsArg,
+                seedFilterConfigArg,
+                spacePointGridConfigArg,
+                hashingTrainingConfigArg,
+                hashingAlgorithmConfigArg,
+                logLevel,
+            )
         else:
             logger.fatal("unknown seedingAlgorithm %s", seedingAlgorithm)
 
@@ -437,42 +472,16 @@ def addSeeding(
             )
             s.addWriter(csvSeedWriter)
 
-    return s
-
+            if seedingAlgorithm == SeedingAlgorithm.Hashing:
+                s.addWriter(
+                    acts.examples.CsvSpacePointsBucketWriter(
+                        level=logLevel,
+                        inputBuckets=buckets,
+                        outputDir=str(outputDirCsv),
+                    )
+                )
 
-def addSeedingTruthSelection(
-    s: acts.examples.Sequencer,
-    inputParticles: str,
-    outputParticles: str,
-    truthSeedRanges: TruthSeedRanges,
-    logLevel: acts.logging.Level = None,
-):
-    """adds truth particles filtering before filtering
-    For parameters description see addSeeding
-    """
-    selAlg = acts.examples.TruthSeedSelector(
-        **acts.examples.defaultKWArgs(
-            ptMin=truthSeedRanges.pt[0],
-            ptMax=truthSeedRanges.pt[1],
-            etaMin=truthSeedRanges.eta[0],
-            etaMax=truthSeedRanges.eta[1],
-            nHitsMin=truthSeedRanges.nHits[0],
-            nHitsMax=truthSeedRanges.nHits[1],
-            rhoMin=truthSeedRanges.rho[0],
-            rhoMax=truthSeedRanges.rho[1],
-            zMin=truthSeedRanges.z[0],
-            zMax=truthSeedRanges.z[1],
-            phiMin=truthSeedRanges.phi[0],
-            phiMax=truthSeedRanges.phi[1],
-            absEtaMin=truthSeedRanges.absEta[0],
-            absEtaMax=truthSeedRanges.absEta[1],
-        ),
-        level=logLevel,
-        inputParticles=inputParticles,
-        inputMeasurementParticlesMap="measurement_particles_map",
-        outputParticles=outputParticles,
-    )
-    s.addAlgorithm(selAlg)
+    return s
 
 
 def addTruthSmearedSeeding(
@@ -568,7 +577,6 @@ def addSpacePointsMaking(
     logLevel = acts.examples.defaultLogging(sequence, logLevel)()
     spAlg = acts.examples.SpacePointMaker(
         level=logLevel,
-        inputSourceLinks="sourcelinks",
         inputMeasurements="measurements",
         outputSpacePoints="spacepoints",
         trackingGeometry=trackingGeometry,
@@ -836,6 +844,183 @@ def addOrthogonalSeeding(
     return seedingAlg.config.outputSeeds
 
 
+def addHashingSeeding(
+    sequence: acts.examples.Sequencer,
+    spacePoints: str,
+    seedingAlgorithmConfigArg: SeedingAlgorithmConfigArg,
+    seedFinderConfigArg: SeedFinderConfigArg,
+    seedFinderOptionsArg: SeedFinderOptionsArg,
+    seedFilterConfigArg: SeedFilterConfigArg,
+    spacePointGridConfigArg: SpacePointGridConfigArg,
+    hashingTrainingConfigArg: HashingTrainingConfigArg,
+    hashingAlgorithmConfigArg: HashingAlgorithmConfigArg,
+    logLevel: acts.logging.Level = None,
+):
+    """adds Hashing seeding
+    For parameters description see addSeeding docstring
+    """
+    logLevel = acts.examples.defaultLogging(sequence, logLevel)()
+    from acts.examples.hashing import SeedingAlgorithmHashing
+
+    # Same configuration than the standard seeding
+    seedFinderConfig = acts.SeedFinderConfig(
+        **acts.examples.defaultKWArgs(
+            rMin=seedFinderConfigArg.r[0],
+            rMax=seedFinderConfigArg.r[1],
+            deltaRMin=seedFinderConfigArg.deltaR[0],
+            deltaRMax=seedFinderConfigArg.deltaR[1],
+            deltaRMinTopSP=(
+                seedFinderConfigArg.deltaR[0]
+                if seedFinderConfigArg.deltaRTopSP[0] is None
+                else seedFinderConfigArg.deltaRTopSP[0]
+            ),
+            deltaRMaxTopSP=(
+                seedFinderConfigArg.deltaR[1]
+                if seedFinderConfigArg.deltaRTopSP[1] is None
+                else seedFinderConfigArg.deltaRTopSP[1]
+            ),
+            deltaRMinBottomSP=(
+                seedFinderConfigArg.deltaR[0]
+                if seedFinderConfigArg.deltaRBottomSP[0] is None
+                else seedFinderConfigArg.deltaRBottomSP[0]
+            ),
+            deltaRMaxBottomSP=(
+                seedFinderConfigArg.deltaR[1]
+                if seedFinderConfigArg.deltaRBottomSP[1] is None
+                else seedFinderConfigArg.deltaRBottomSP[1]
+            ),
+            deltaRMiddleMinSPRange=seedFinderConfigArg.deltaRMiddleSPRange[0],
+            deltaRMiddleMaxSPRange=seedFinderConfigArg.deltaRMiddleSPRange[1],
+            collisionRegionMin=seedFinderConfigArg.collisionRegion[0],
+            collisionRegionMax=seedFinderConfigArg.collisionRegion[1],
+            zMin=seedFinderConfigArg.z[0],
+            zMax=seedFinderConfigArg.z[1],
+            maxSeedsPerSpM=seedFinderConfigArg.maxSeedsPerSpM,
+            cotThetaMax=seedFinderConfigArg.cotThetaMax,
+            sigmaScattering=seedFinderConfigArg.sigmaScattering,
+            radLengthPerSeed=seedFinderConfigArg.radLengthPerSeed,
+            minPt=seedFinderConfigArg.minPt,
+            impactMax=seedFinderConfigArg.impactMax,
+            interactionPointCut=seedFinderConfigArg.interactionPointCut,
+            deltaZMax=seedFinderConfigArg.deltaZMax,
+            maxPtScattering=seedFinderConfigArg.maxPtScattering,
+            zBinEdges=seedFinderConfigArg.zBinEdges,
+            zBinsCustomLooping=seedFinderConfigArg.zBinsCustomLooping,
+            rRangeMiddleSP=seedFinderConfigArg.rRangeMiddleSP,
+            useVariableMiddleSPRange=seedFinderConfigArg.useVariableMiddleSPRange,
+            binSizeR=seedFinderConfigArg.binSizeR,
+            seedConfirmation=seedFinderConfigArg.seedConfirmation,
+            centralSeedConfirmationRange=seedFinderConfigArg.centralSeedConfirmationRange,
+            forwardSeedConfirmationRange=seedFinderConfigArg.forwardSeedConfirmationRange,
+        ),
+    )
+    seedFinderOptions = acts.SeedFinderOptions(
+        **acts.examples.defaultKWArgs(
+            beamPos=(
+                acts.Vector2(0.0, 0.0)
+                if seedFinderOptionsArg.beamPos == (None, None)
+                else acts.Vector2(
+                    seedFinderOptionsArg.beamPos[0], seedFinderOptionsArg.beamPos[1]
+                )
+            ),
+            bFieldInZ=seedFinderOptionsArg.bFieldInZ,
+        )
+    )
+    seedFilterConfig = acts.SeedFilterConfig(
+        **acts.examples.defaultKWArgs(
+            maxSeedsPerSpM=seedFinderConfig.maxSeedsPerSpM,
+            deltaRMin=(
+                seedFinderConfig.deltaRMin
+                if seedFilterConfigArg.deltaRMin is None
+                else seedFilterConfigArg.deltaRMin
+            ),
+            impactWeightFactor=seedFilterConfigArg.impactWeightFactor,
+            zOriginWeightFactor=seedFilterConfigArg.zOriginWeightFactor,
+            compatSeedWeight=seedFilterConfigArg.compatSeedWeight,
+            compatSeedLimit=seedFilterConfigArg.compatSeedLimit,
+            numSeedIncrement=seedFilterConfigArg.numSeedIncrement,
+            seedWeightIncrement=seedFilterConfigArg.seedWeightIncrement,
+            seedConfirmation=seedFilterConfigArg.seedConfirmation,
+            centralSeedConfirmationRange=seedFinderConfig.centralSeedConfirmationRange,
+            forwardSeedConfirmationRange=seedFinderConfig.forwardSeedConfirmationRange,
+            maxSeedsPerSpMConf=seedFilterConfigArg.maxSeedsPerSpMConf,
+            maxQualitySeedsPerSpMConf=seedFilterConfigArg.maxQualitySeedsPerSpMConf,
+            useDeltaRorTopRadius=seedFilterConfigArg.useDeltaRorTopRadius,
+        )
+    )
+
+    gridConfig = acts.SpacePointGridConfig(
+        **acts.examples.defaultKWArgs(
+            minPt=seedFinderConfig.minPt,
+            rMax=(
+                seedFinderConfig.rMax
+                if spacePointGridConfigArg.rMax is None
+                else spacePointGridConfigArg.rMax
+            ),
+            zMax=seedFinderConfig.zMax,
+            zMin=seedFinderConfig.zMin,
+            deltaRMax=(
+                seedFinderConfig.deltaRMax
+                if spacePointGridConfigArg.deltaRMax is None
+                else spacePointGridConfigArg.deltaRMax
+            ),
+            cotThetaMax=seedFinderConfig.cotThetaMax,
+            phiMin=spacePointGridConfigArg.phi[0],
+            phiMax=spacePointGridConfigArg.phi[1],
+            maxPhiBins=spacePointGridConfigArg.maxPhiBins,
+            impactMax=spacePointGridConfigArg.impactMax,
+            zBinEdges=spacePointGridConfigArg.zBinEdges,
+            phiBinDeflectionCoverage=spacePointGridConfigArg.phiBinDeflectionCoverage,
+        )
+    )
+
+    gridOptions = acts.SpacePointGridOptions(
+        **acts.examples.defaultKWArgs(
+            bFieldInZ=seedFinderOptions.bFieldInZ,
+        )
+    )
+
+    # Hashing configuration
+    hashingTrainingConfig = acts.hashing.HashingTrainingConfig(
+        **acts.examples.defaultKWArgs(
+            annoySeed=hashingTrainingConfigArg.annoySeed,
+            f=hashingTrainingConfigArg.f,
+        ),
+    )
+
+    hashingConfig = acts.hashing.HashingAlgorithmConfig(
+        **acts.examples.defaultKWArgs(
+            bucketSize=hashingAlgorithmConfigArg.bucketSize,
+            zBins=hashingAlgorithmConfigArg.zBins,
+            phiBins=hashingAlgorithmConfigArg.phiBins,
+        ),
+    )
+
+    # Seeding algorithm
+    seedingAlg = SeedingAlgorithmHashing(
+        level=logLevel,
+        inputSpacePoints=[spacePoints],
+        outputSeeds="seeds",
+        outputBuckets="buckets",
+        **acts.examples.defaultKWArgs(
+            allowSeparateRMax=seedingAlgorithmConfigArg.allowSeparateRMax,
+            zBinNeighborsTop=seedingAlgorithmConfigArg.zBinNeighborsTop,
+            zBinNeighborsBottom=seedingAlgorithmConfigArg.zBinNeighborsBottom,
+            numPhiNeighbors=seedingAlgorithmConfigArg.numPhiNeighbors,
+        ),
+        gridConfig=gridConfig,
+        gridOptions=gridOptions,
+        seedFilterConfig=seedFilterConfig,
+        seedFinderConfig=seedFinderConfig,
+        seedFinderOptions=seedFinderOptions,
+        hashingConfig=hashingConfig,
+        hashingTrainingConfig=hashingTrainingConfig,
+    )
+    sequence.addAlgorithm(seedingAlg)
+
+    return seedingAlg.config.outputSeeds, seedingAlg.config.outputBuckets
+
+
 def addHoughTransformSeeding(
     sequence: acts.examples.Sequencer,
     config: acts.examples.HoughTransformSeeder.Config,
@@ -924,7 +1109,6 @@ def addGbtsSeeding(
         geometrySelection=acts.examples.readJsonGeometryList(
             str(geoSelectionConfigFile)
         ),
-        inputSourceLinks="sourcelinks",
         trackingGeometry=trackingGeometry,
         fill_module_csv=False,
         inputClusters="clusters",
@@ -992,7 +1176,7 @@ def addSeedFilterML(
     from acts.examples.onnx import SeedFilterMLAlgorithm
 
     inputParticles = "particles"
-    selectedParticles = "truth_seeds_selected"
+    selectedParticles = "particles_selected"
     seeds = "seeds"
     estParams = "estimatedparameters"
 
@@ -1092,7 +1276,6 @@ def addKalmanTracks(
     fitAlg = acts.examples.TrackFittingAlgorithm(
         level=customLogLevel(),
         inputMeasurements="measurements",
-        inputSourceLinks="sourcelinks",
         inputProtoTracks=inputProtoTracks,
         inputInitialTrackParameters="estimatedparameters",
         inputClusters=clusters if clusters is not None else "",
@@ -1135,8 +1318,13 @@ def addTruthTrackingGsf(
 ) -> None:
     customLogLevel = acts.examples.defaultLogging(s, logLevel)
 
+    # NOTE we specify clampToRange as True to silence warnings in the test about
+    # queries to the loss distribution outside the specified range, since no dedicated
+    # approximation for the ODD is done yet.
+    bha = acts.examples.AtlasBetheHeitlerApprox.makeDefault(clampToRange=True)
+
     gsfOptions = {
-        "betheHeitlerApprox": acts.examples.AtlasBetheHeitlerApprox.makeDefault(),
+        "betheHeitlerApprox": bha,
         "maxComponents": 12,
         "componentMergeMethod": acts.examples.ComponentMergeMethod.maxWeight,
         "mixtureReductionAlgorithm": acts.examples.MixtureReductionAlgorithm.KLDistance,
@@ -1147,7 +1335,6 @@ def addTruthTrackingGsf(
     gsfAlg = acts.examples.TrackFittingAlgorithm(
         level=customLogLevel(),
         inputMeasurements="measurements",
-        inputSourceLinks="sourcelinks",
         inputProtoTracks=inputProtoTracks,
         inputInitialTrackParameters="estimatedparameters",
         outputTracks="gsf_tracks",
@@ -1194,9 +1381,11 @@ def addCKFTracks(
     reverseSearch: bool = False,
     outputDirCsv: Optional[Union[Path, str]] = None,
     outputDirRoot: Optional[Union[Path, str]] = None,
-    writeTrajectories: bool = True,
-    logLevel: Optional[acts.logging.Level] = None,
+    writeTrackSummary: bool = True,
+    writeTrackStates: bool = False,
+    writePerformance: bool = True,
     writeCovMat=False,
+    logLevel: Optional[acts.logging.Level] = None,
 ) -> None:
     """This function steers the seeding
 
@@ -1214,8 +1403,14 @@ def addCKFTracks(
         TrackSelector configuration. Each range is specified as a tuple of (min,max).
         Specify as a list(TrackSelectorConfig) for eta-dependent cuts, with binning specified by absEta[1].
         Defaults of no cuts specified in Examples/Algorithms/TruthTracking/ActsExamples/TruthTracking/TrackSelector.hpp
-    writeTrajectories : bool, True
-        write trackstates_ckf.root and tracksummary_ckf.root ntuples? These can be quite large.
+    writeTrackSummary : bool, True
+        write tracksummary_ckf.root ntuple?
+    writeTrackStates : bool, False
+        write trackstates_ckf.root ntuple? This can be quite large.
+    writePerformance : bool, True
+        write performance_fitting_ckf.root and performance_finding_ckf.root ntuples?
+    writeCovMat : bool, False
+        write covaraiance matrices to tracksummary_ckf.root ntuple?
     """
 
     customLogLevel = acts.examples.defaultLogging(s, logLevel)
@@ -1249,6 +1444,7 @@ def addCKFTracks(
                 minMeasurements=c.nMeasurementsMin,
                 maxHoles=c.maxHoles,
                 maxOutliers=c.maxOutliers,
+                maxHolesAndOutliers=c.maxHolesAndOutliers,
                 maxSharedHits=c.maxSharedHits,
                 maxChi2=c.maxChi2,
                 measurementCounter=c.nMeasurementsGroupMin,
@@ -1277,14 +1473,14 @@ def addCKFTracks(
                     acts.GeometryIdentifier(),
                     (
                         [],
-                        [ckfConfig.chi2CutOff],
+                        [ckfConfig.chi2CutOffMeasurement],
+                        [ckfConfig.chi2CutOffOutlier],
                         [ckfConfig.numMeasurementsCutOff],
                     ),
                 )
             ]
         ),
         inputMeasurements="measurements",
-        inputSourceLinks="sourcelinks",
         inputInitialTrackParameters="estimatedparameters",
         inputSeeds=(
             "estimatedseeds"
@@ -1304,10 +1500,13 @@ def addCKFTracks(
             reverseSearch=reverseSearch,
             seedDeduplication=ckfConfig.seedDeduplication,
             stayOnSeed=ckfConfig.stayOnSeed,
-            pixelVolumes=ckfConfig.pixelVolumes,
-            stripVolumes=ckfConfig.stripVolumes,
+            pixelVolumeIds=ckfConfig.pixelVolumes,
+            stripVolumeIds=ckfConfig.stripVolumes,
             maxPixelHoles=ckfConfig.maxPixelHoles,
             maxStripHoles=ckfConfig.maxStripHoles,
+            trimTracks=ckfConfig.trimTracks,
+            constrainToVolumeIds=ckfConfig.constrainToVolumes,
+            endOfWorldVolumeIds=ckfConfig.endOfWorldVolumes,
         ),
     )
     s.addAlgorithm(trackFinder)
@@ -1336,11 +1535,12 @@ def addCKFTracks(
         tracks=trackFinder.config.outputTracks,
         outputDirCsv=outputDirCsv,
         outputDirRoot=outputDirRoot,
-        writeStates=writeTrajectories,
-        writeSummary=writeTrajectories,
-        writeCKFperformance=True,
-        logLevel=logLevel,
+        writeSummary=writeTrackSummary,
+        writeStates=writeTrackStates,
+        writeFitterPerformance=writePerformance,
+        writeFinderPerformance=writePerformance,
         writeCovMat=writeCovMat,
+        logLevel=logLevel,
     )
 
     return s
@@ -1373,7 +1573,6 @@ def addGx2fTracks(
     fitAlg = acts.examples.TrackFittingAlgorithm(
         level=customLogLevel(),
         inputMeasurements="measurements",
-        inputSourceLinks="sourcelinks",
         inputProtoTracks=inputProtoTracks,
         inputInitialTrackParameters="estimatedparameters",
         inputClusters=clusters if clusters is not None else "",
@@ -1413,9 +1612,10 @@ def addTrackWriters(
     tracks: str = "tracks",
     outputDirCsv: Optional[Union[Path, str]] = None,
     outputDirRoot: Optional[Union[Path, str]] = None,
-    writeStates: bool = True,
     writeSummary: bool = True,
-    writeCKFperformance: bool = True,
+    writeStates: bool = False,
+    writeFitterPerformance: bool = False,
+    writeFinderPerformance: bool = False,
     logLevel: Optional[acts.logging.Level] = None,
     writeCovMat=False,
 ):
@@ -1426,15 +1626,22 @@ def addTrackWriters(
         if not outputDirRoot.exists():
             outputDirRoot.mkdir()
 
+        if writeSummary:
+            trackSummaryWriter = acts.examples.RootTrackSummaryWriter(
+                level=customLogLevel(),
+                inputTracks=tracks,
+                inputParticles="particles_selected",
+                inputTrackParticleMatching="track_particle_matching",
+                filePath=str(outputDirRoot / f"tracksummary_{name}.root"),
+                treeName="tracksummary",
+                writeCovMat=writeCovMat,
+            )
+            s.addWriter(trackSummaryWriter)
+
         if writeStates:
-            # write track states from CKF
             trackStatesWriter = acts.examples.RootTrackStatesWriter(
                 level=customLogLevel(),
                 inputTracks=tracks,
-                # @note The full particles collection is used here to avoid lots of warnings
-                # since the unselected CKF track might have a majority particle not in the
-                # filtered particle collection. This could be avoided when a separate track
-                # selection algorithm is used.
                 inputParticles="particles_selected",
                 inputTrackParticleMatching="track_particle_matching",
                 inputSimHits="simhits",
@@ -1444,34 +1651,26 @@ def addTrackWriters(
             )
             s.addWriter(trackStatesWriter)
 
-        if writeSummary:
-            # write track summary from CKF
-            trackSummaryWriter = acts.examples.RootTrackSummaryWriter(
+        if writeFitterPerformance:
+            trackFitterPerformanceWriter = acts.examples.TrackFitterPerformanceWriter(
                 level=customLogLevel(),
                 inputTracks=tracks,
-                # @note The full particles collection is used here to avoid lots of warnings
-                # since the unselected CKF track might have a majority particle not in the
-                # filtered particle collection. This could be avoided when a separate track
-                # selection algorithm is used.
                 inputParticles="particles_selected",
                 inputTrackParticleMatching="track_particle_matching",
-                filePath=str(outputDirRoot / f"tracksummary_{name}.root"),
-                treeName="tracksummary",
-                writeCovMat=writeCovMat,
+                filePath=str(outputDirRoot / f"performance_fitting_{name}.root"),
             )
-            s.addWriter(trackSummaryWriter)
+            s.addWriter(trackFitterPerformanceWriter)
 
-        if writeCKFperformance:
-            # Write CKF performance data
-            ckfPerfWriter = acts.examples.CKFPerformanceWriter(
+        if writeFinderPerformance:
+            trackFinderPerfWriter = acts.examples.TrackFinderPerformanceWriter(
                 level=customLogLevel(),
                 inputTracks=tracks,
-                inputParticles="truth_seeds_selected",
+                inputParticles="particles_selected",
                 inputTrackParticleMatching="track_particle_matching",
                 inputParticleTrackMatching="particle_track_matching",
-                filePath=str(outputDirRoot / f"performance_{name}.root"),
+                filePath=str(outputDirRoot / f"performance_finding_{name}.root"),
             )
-            s.addWriter(ckfPerfWriter)
+            s.addWriter(trackFinderPerfWriter)
 
     if outputDirCsv is not None:
         outputDirCsv = Path(outputDirCsv)
@@ -1548,26 +1747,10 @@ def addExaTrkX(
 ) -> None:
     customLogLevel = acts.examples.defaultLogging(s, logLevel)
 
-    # Run the particle selection
-    # The pre-selection will select truth particles satisfying provided criteria
-    # from all particles read in by particle reader for further processing. It
-    # has no impact on the truth hits themselves
-    s.addAlgorithm(
-        acts.examples.TruthSeedSelector(
-            level=customLogLevel(),
-            ptMin=500 * u.MeV,
-            nHitsMin=9,
-            inputParticles="particles_initial",
-            inputMeasurementParticlesMap="measurement_particles_map",
-            outputParticles="particles_seed_selected",
-        )
-    )
-
     # Create space points
     s.addAlgorithm(
         acts.examples.SpacePointMaker(
             level=customLogLevel(),
-            inputSourceLinks="sourcelinks",
             inputMeasurements="measurements",
             outputSpacePoints="spacepoints",
             trackingGeometry=trackingGeometry,
@@ -1656,7 +1839,7 @@ def addExaTrkX(
     # Write truth track finding / seeding performance
     if outputDirRoot is not None:
         s.addWriter(
-            acts.examples.TrackFinderPerformanceWriter(
+            acts.examples.TrackFinderNTupleWriter(
                 level=customLogLevel(),
                 inputProtoTracks=findingAlg.config.outputProtoTracks,
                 # the original selected particles after digitization
@@ -1679,9 +1862,11 @@ def addAmbiguityResolution(
     tracks: str = "tracks",
     outputDirCsv: Optional[Union[Path, str]] = None,
     outputDirRoot: Optional[Union[Path, str]] = None,
-    writeTrajectories: bool = True,
-    logLevel: Optional[acts.logging.Level] = None,
+    writeTrackSummary: bool = True,
+    writeTrackStates: bool = False,
+    writePerformance: bool = True,
     writeCovMat=False,
+    logLevel: Optional[acts.logging.Level] = None,
 ) -> None:
     from acts.examples import GreedyAmbiguityResolutionAlgorithm
 
@@ -1723,11 +1908,12 @@ def addAmbiguityResolution(
         tracks=alg.config.outputTracks,
         outputDirCsv=outputDirCsv,
         outputDirRoot=outputDirRoot,
-        writeStates=writeTrajectories,
-        writeSummary=writeTrajectories,
-        writeCKFperformance=True,
-        logLevel=logLevel,
+        writeSummary=writeTrackSummary,
+        writeStates=writeTrackStates,
+        writeFitterPerformance=writePerformance,
+        writeFinderPerformance=writePerformance,
         writeCovMat=writeCovMat,
+        logLevel=logLevel,
     )
 
     return s
@@ -1743,9 +1929,11 @@ def addScoreBasedAmbiguityResolution(
     outputDirCsv: Optional[Union[Path, str]] = None,
     outputDirRoot: Optional[Union[Path, str]] = None,
     ambiVolumeFile: Optional[Union[Path, str]] = None,
-    writeTrajectories: bool = True,
-    logLevel: Optional[acts.logging.Level] = None,
+    writeTrackSummary: bool = True,
+    writeTrackStates: bool = False,
+    writePerformance: bool = True,
     writeCovMat=False,
+    logLevel: Optional[acts.logging.Level] = None,
 ) -> None:
     from acts.examples import ScoreBasedAmbiguityResolutionAlgorithm
 
@@ -1777,11 +1965,12 @@ def addScoreBasedAmbiguityResolution(
         tracks=algScoreBased.config.outputTracks,
         outputDirCsv=outputDirCsv,
         outputDirRoot=outputDirRoot,
-        writeStates=writeTrajectories,
-        writeSummary=writeTrajectories,
-        writeCKFperformance=True,
-        logLevel=logLevel,
+        writeSummary=writeTrackStates,
+        writeStates=writeTrackSummary,
+        writeFitterPerformance=writePerformance,
+        writeFinderPerformance=writePerformance,
         writeCovMat=writeCovMat,
+        logLevel=logLevel,
     )
 
     return s
@@ -1796,7 +1985,10 @@ def addAmbiguityResolutionML(
     onnxModelFile: Optional[Union[Path, str]] = None,
     outputDirCsv: Optional[Union[Path, str]] = None,
     outputDirRoot: Optional[Union[Path, str]] = None,
-    writeTrajectories: bool = True,
+    writeTrackSummary: bool = True,
+    writeTrackStates: bool = False,
+    writePerformance: bool = True,
+    writeCovMat=False,
     logLevel: Optional[acts.logging.Level] = None,
 ) -> None:
     from acts.examples.onnx import AmbiguityResolutionMLAlgorithm
@@ -1834,9 +2026,11 @@ def addAmbiguityResolutionML(
         tracks=algGreedy.config.outputTracks,
         outputDirCsv=outputDirCsv,
         outputDirRoot=outputDirRoot,
-        writeStates=writeTrajectories,
-        writeSummary=writeTrajectories,
-        writeCKFperformance=True,
+        writeSummary=writeTrackStates,
+        writeStates=writeTrackSummary,
+        writeFitterPerformance=writePerformance,
+        writeFinderPerformance=writePerformance,
+        writeCovMat=writeCovMat,
         logLevel=logLevel,
     )
 
@@ -1852,7 +2046,10 @@ def addAmbiguityResolutionMLDBScan(
     onnxModelFile: Optional[Union[Path, str]] = None,
     outputDirCsv: Optional[Union[Path, str]] = None,
     outputDirRoot: Optional[Union[Path, str]] = None,
-    writeTrajectories: bool = True,
+    writeTrackSummary: bool = True,
+    writeTrackStates: bool = False,
+    writePerformance: bool = True,
+    writeCovMat=False,
     logLevel: Optional[acts.logging.Level] = None,
 ) -> None:
     from acts.examples import AmbiguityResolutionMLDBScanAlgorithm
@@ -1878,9 +2075,11 @@ def addAmbiguityResolutionMLDBScan(
         trajectories=alg.config.outputTracks,
         outputDirRoot=outputDirRoot,
         outputDirCsv=outputDirCsv,
-        writeStates=writeTrajectories,
-        writeSummary=writeTrajectories,
-        writeCKFperformance=True,
+        writeSummary=writeTrackStates,
+        writeStates=writeTrackSummary,
+        writeFitterPerformance=writePerformance,
+        writeFinderPerformance=writePerformance,
+        writeCovMat=writeCovMat,
         logLevel=logLevel,
     )
 
@@ -1939,7 +2138,7 @@ def addVertexFitting(
         VertexFitterAlgorithm,
         IterativeVertexFinderAlgorithm,
         AdaptiveMultiVertexFinderAlgorithm,
-        VertexPerformanceWriter,
+        VertexNTupleWriter,
     )
 
     customLogLevel = acts.examples.defaultLogging(s, logLevel)
@@ -2022,7 +2221,7 @@ def addVertexFitting(
         if not outputDirRoot.exists():
             outputDirRoot.mkdir()
         s.addWriter(
-            VertexPerformanceWriter(
+            VertexNTupleWriter(
                 level=customLogLevel(),
                 inputVertices=outputVertices,
                 inputTracks=tracks,
@@ -2048,7 +2247,7 @@ def addSingleSeedVertexFinding(
 ) -> None:
     from acts.examples import (
         SingleSeedVertexFinderAlgorithm,
-        VertexPerformanceWriter,
+        VertexNTupleWriter,
     )
 
     customLogLevel = acts.examples.defaultLogging(s, logLevel)
@@ -2069,7 +2268,7 @@ def addSingleSeedVertexFinding(
             outputDirRoot.mkdir()
 
         s.addWriter(
-            VertexPerformanceWriter(
+            VertexNTupleWriter(
                 level=customLogLevel(),
                 inputAllTruthParticles=inputParticles,
                 inputSelectedTruthParticles=selectedParticles,
diff --git a/Examples/Python/python/acts/examples/simulation.py b/Examples/Python/python/acts/examples/simulation.py
index 5b1ddccee26..21c4149661f 100644
--- a/Examples/Python/python/acts/examples/simulation.py
+++ b/Examples/Python/python/acts/examples/simulation.py
@@ -18,8 +18,8 @@
 # Examples/Algorithms/Generators/ActsExamples/Generators/ParametricParticleGenerator.hpp
 MomentumConfig = namedtuple(
     "MomentumConfig",
-    ["min", "max", "transverse"],
-    defaults=[None, None, None],
+    ["min", "max", "transverse", "logUniform"],
+    defaults=[None, None, None, None],
 )
 EtaConfig = namedtuple(
     "EtaConfig", ["min", "max", "uniform"], defaults=[None, None, None]
@@ -80,8 +80,8 @@ def addParticleGun(
         the output folder for the Csv output, None triggers no output
     outputDirRoot : Path|str, path, None
         the output folder for the Root output, None triggers no output
-    momentumConfig : MomentumConfig(min, max, transverse)
-        momentum configuration: minimum momentum, maximum momentum, transverse
+    momentumConfig : MomentumConfig(min, max, transverse, logUniform)
+        momentum configuration: minimum momentum, maximum momentum, transverse, log-uniform
     etaConfig : EtaConfig(min, max, uniform)
         pseudorapidity configuration: eta min, eta max, uniform
     phiConfig : PhiConfig(min, max)
@@ -118,6 +118,7 @@ def addParticleGun(
                     **acts.examples.defaultKWArgs(
                         p=(momentumConfig.min, momentumConfig.max),
                         pTransverse=momentumConfig.transverse,
+                        pLogUniform=momentumConfig.logUniform,
                         eta=(etaConfig.min, etaConfig.max),
                         phi=(phiConfig.min, phiConfig.max),
                         etaUniform=etaConfig.uniform,
@@ -335,7 +336,7 @@ def addPythia8(
             acts.examples.RootParticleWriter(
                 level=customLogLevel(),
                 inputParticles=evGen.config.outputParticles,
-                filePath=str(outputDirRoot / "pythia8_particles.root"),
+                filePath=str(outputDirRoot / "particles.root"),
             )
         )
 
@@ -343,7 +344,7 @@ def addPythia8(
             acts.examples.RootVertexWriter(
                 level=customLogLevel(),
                 inputVertices=evGen.config.outputVertices,
-                filePath=str(outputDirRoot / "pythia8_vertices.root"),
+                filePath=str(outputDirRoot / "vertices.root"),
             )
         )
 
@@ -355,7 +356,6 @@ def addParticleSelection(
     config: ParticleSelectorConfig,
     inputParticles: str,
     outputParticles: str,
-    inputMeasurementParticlesMap: str = "",
     logLevel: Optional[acts.logging.Level] = None,
 ) -> None:
     """
@@ -370,7 +370,7 @@ def addParticleSelection(
     inputParticles: str
         the identifier for the input particles to be selected
     outputParticles: str
-        the identifier for the final selected particle collection
+        the identifier for the selected particle collection
     """
     customLogLevel = acts.examples.defaultLogging(s, logLevel)
 
@@ -402,7 +402,6 @@ def addParticleSelection(
             level=customLogLevel(),
             inputParticles=inputParticles,
             outputParticles=outputParticles,
-            inputMeasurementParticlesMap=inputMeasurementParticlesMap,
         )
     )
 
@@ -417,8 +416,7 @@ def addFatras(
     enableInteractions: bool = True,
     pMin: Optional[float] = None,
     inputParticles: str = "particles_input",
-    outputParticlesInitial: str = "particles_initial",
-    outputParticlesFinal: str = "particles_final",
+    outputParticles: str = "particles_simulated",
     outputSimHits: str = "simhits",
     outputDirCsv: Optional[Union[Path, str]] = None,
     outputDirRoot: Optional[Union[Path, str]] = None,
@@ -439,7 +437,7 @@ def addFatras(
         Default of no selections specified in Examples/Algorithms/TruthTracking/ActsExamples/TruthTracking/ParticleSelector.hpp
         Specify preSelectParticles=None to inhibit ParticleSelector altogether.
     postSelectParticles : ParticleSelectorConfig(rho, absZ, time, phi, eta, absEta, pt, removeCharged, removeNeutral), None
-        Similar to preSelectParticles but applied after simulation to "particles_initial", therefore also filters secondaries.
+        Similar to preSelectParticles but applied after simulation to "particles_simulated", therefore also filters secondaries.
     enableInteractions : Enable the particle interactions in the simulation
     pMin : Minimum monmentum of particles simulated by FATRAS
     outputDirCsv : Path|str, path, None
@@ -452,24 +450,24 @@ def addFatras(
 
     # Selector
     if preSelectParticles is not None:
-        particlesSelected = "fatras_particles_preselected"
+        particlesPreSelected = "fatras_particles_preselected"
         addParticleSelection(
             s,
             preSelectParticles,
             inputParticles=inputParticles,
-            outputParticles=particlesSelected,
+            outputParticles=particlesPreSelected,
         )
-        s.addWhiteboardAlias("particles_selected", particlesSelected)
     else:
-        particlesSelected = inputParticles
+        particlesPreSelected = inputParticles
+
+    s.addWhiteboardAlias("particles_selected", particlesPreSelected)
 
     # Simulation
     alg = acts.examples.FatrasSimulation(
         **acts.examples.defaultKWArgs(
             level=customLogLevel(),
-            inputParticles=particlesSelected,
-            outputParticlesInitial=outputParticlesInitial,
-            outputParticlesFinal=outputParticlesFinal,
+            inputParticles=particlesPreSelected,
+            outputParticles=outputParticles,
             outputSimHits=outputSimHits,
             randomNumbers=rnd,
             trackingGeometry=trackingGeometry,
@@ -486,37 +484,27 @@ def addFatras(
     # Sequencer
     s.addAlgorithm(alg)
 
+    s.addWhiteboardAlias("particles", outputParticles)
+
     # Selector
     if postSelectParticles is not None:
-        particlesInitial = "fatras_particles_initial_selected"
+        particlesPostSelected = "fatras_particles_postselected"
         addParticleSelection(
             s,
             postSelectParticles,
-            inputParticles=alg.config.outputParticlesInitial,
-            outputParticles=particlesInitial,
+            inputParticles=outputParticles,
+            outputParticles=particlesPostSelected,
         )
-
-        particlesFinal = "fatras_particles_final_selected"
-        addParticleSelection(
-            s,
-            postSelectParticles,
-            inputParticles=alg.config.outputParticlesFinal,
-            outputParticles=particlesFinal,
-        )
-        s.addWhiteboardAlias("particles_selected", particlesFinal)
     else:
-        particlesInitial = alg.config.outputParticlesInitial
-        particlesFinal = alg.config.outputParticlesFinal
+        particlesPostSelected = outputParticles
 
-    # Only add alias for 'particles_initial' as this is the one we use most
-    s.addWhiteboardAlias("particles", particlesInitial)
+    s.addWhiteboardAlias("particles_selected", particlesPostSelected)
 
     # Output
     addSimWriters(
         s,
         alg.config.outputSimHits,
-        particlesInitial,
-        particlesFinal,
+        particlesPostSelected,
         outputDirCsv,
         outputDirRoot,
         logLevel,
@@ -527,9 +515,8 @@ def addFatras(
 
 def addSimWriters(
     s: acts.examples.Sequencer,
-    simHits: Optional[str] = None,
-    particlesInitial="particles_initial",
-    particlesFinal="particles_final",
+    simHits: str = "simhits",
+    particlesSimulated: str = "particles_simulated",
     outputDirCsv: Optional[Union[Path, str]] = None,
     outputDirRoot: Optional[Union[Path, str]] = None,
     logLevel: Optional[acts.logging.Level] = None,
@@ -544,16 +531,8 @@ def addSimWriters(
             acts.examples.CsvParticleWriter(
                 level=customLogLevel(),
                 outputDir=str(outputDirCsv),
-                inputParticles=particlesInitial,
-                outputStem="particles_initial",
-            )
-        )
-        s.addWriter(
-            acts.examples.CsvParticleWriter(
-                level=customLogLevel(),
-                outputDir=str(outputDirCsv),
-                inputParticles=particlesFinal,
-                outputStem="particles_final",
+                inputParticles=particlesSimulated,
+                outputStem="particles_simulated",
             )
         )
         s.addWriter(
@@ -572,8 +551,7 @@ def addSimWriters(
         s.addWriter(
             acts.examples.RootParticleWriter(
                 level=customLogLevel(),
-                inputParticles=particlesInitial,
-                inputFinalParticles=particlesFinal,
+                inputParticles=particlesSimulated,
                 filePath=str(outputDirRoot / "particles_simulation.root"),
             )
         )
@@ -608,6 +586,15 @@ def getG4DetectorConstructionFactory(
     except Exception as e:
         print(e)
 
+    try:
+        from acts import geomodel as gm
+        from acts.examples.geant4.geomodel import GeoModelDetectorConstructionFactory
+
+        if type(detector) is gm.GeoModelTree:
+            return GeoModelDetectorConstructionFactory(detector, regionList)
+    except Exception as e:
+        print(e)
+
     raise AttributeError(f"cannot find a suitable detector construction for {detector}")
 
 
@@ -625,8 +612,7 @@ def addGeant4(
     volumeMappings: List[str] = [],
     materialMappings: List[str] = ["Silicon"],
     inputParticles: str = "particles_input",
-    outputParticlesInitial: str = "particles_initial",
-    outputParticlesFinal: str = "particles_final",
+    outputParticles: str = "particles_simulated",
     outputSimHits: str = "simhits",
     preSelectParticles: Optional[ParticleSelectorConfig] = ParticleSelectorConfig(),
     postSelectParticles: Optional[ParticleSelectorConfig] = None,
@@ -656,7 +642,7 @@ def addGeant4(
         Default of no selections specified in Examples/Algorithms/TruthTracking/ActsExamples/TruthTracking/ParticleSelector.hpp
         Specify preSelectParticles=None to inhibit ParticleSelector altogether.
     postSelectParticles : ParticleSelectorConfig(rho, absZ, time, phi, eta, absEta, pt, removeCharged, removeNeutral), None
-        Similar to preSelectParticles but applied after simulation to "particles_initial", therefore also filters secondaries.
+        Similar to preSelectParticles but applied after simulation to "particles_simulated", therefore also filters secondaries.
     outputDirCsv : Path|str, path, None
         the output folder for the Csv output, None triggers no output
     outputDirRoot : Path|str, path, None
@@ -675,16 +661,17 @@ def addGeant4(
 
     # Selector
     if preSelectParticles is not None:
-        particlesSelected = "geant4_particles_preselected"
+        particlesPreSelected = "geant4_particles_preselected"
         addParticleSelection(
             s,
             preSelectParticles,
             inputParticles=inputParticles,
-            outputParticles=particlesSelected,
+            outputParticles=particlesPreSelected,
         )
-        s.addWhiteboardAlias("particles_selected", particlesSelected)
     else:
-        particlesSelected = inputParticles
+        particlesPreSelected = inputParticles
+
+    s.addWhiteboardAlias("particles_selected", particlesPreSelected)
 
     if g4DetectorConstructionFactory is None:
         if detector is None:
@@ -699,7 +686,7 @@ def addGeant4(
     smmConfig.volumeMappings = volumeMappings
     smmConfig.materialMappings = materialMappings
     sensitiveMapper = SensitiveSurfaceMapper.create(
-        smmConfig, acts.logging.INFO, trackingGeometry
+        smmConfig, customLogLevel(), trackingGeometry
     )
 
     # Simulation
@@ -708,15 +695,12 @@ def addGeant4(
         geant4Handle=__geant4Handle,
         detectorConstructionFactory=g4DetectorConstructionFactory,
         randomNumbers=rnd,
-        inputParticles=particlesSelected,
-        outputParticlesInitial=outputParticlesInitial,
-        outputParticlesFinal=outputParticlesFinal,
+        inputParticles=particlesPreSelected,
+        outputParticles=outputParticles,
         outputSimHits=outputSimHits,
         sensitiveSurfaceMapper=sensitiveMapper,
         magneticField=field,
         physicsList=physicsList,
-        volumeMappings=volumeMappings,
-        materialMappings=materialMappings,
         killVolume=killVolume,
         killAfterTime=killAfterTime,
         killSecondaries=killSecondaries,
@@ -729,40 +713,30 @@ def addGeant4(
     # Sequencer
     s.addAlgorithm(alg)
 
+    s.addWhiteboardAlias("particles", outputParticles)
+
     # Selector
     if postSelectParticles is not None:
-        particlesInitial = "geant4_particles_initial_postselected"
+        particlesPostSelected = "geant4_particles_postselected"
         addParticleSelection(
             s,
             postSelectParticles,
-            inputParticles=alg.config.outputParticlesInitial,
-            outputParticles=particlesInitial,
+            inputParticles=outputParticles,
+            outputParticles=particlesPostSelected,
         )
-
-        particlesFinal = "geant4_particles_final_postselected"
-        addParticleSelection(
-            s,
-            postSelectParticles,
-            inputParticles=alg.config.outputParticlesFinal,
-            outputParticles=particlesFinal,
-        )
-        s.addWhiteboardAlias("particles_selected", particlesFinal)
     else:
-        particlesInitial = alg.config.outputParticlesInitial
-        particlesFinal = alg.config.outputParticlesFinal
+        particlesPostSelected = outputParticles
 
-    # Only add alias for 'particles_initial' as this is the one we use most
-    s.addWhiteboardAlias("particles", particlesInitial)
+    s.addWhiteboardAlias("particles_selected", particlesPostSelected)
 
     # Output
     addSimWriters(
         s,
         alg.config.outputSimHits,
-        particlesInitial,
-        particlesFinal,
+        particlesPostSelected,
         outputDirCsv,
         outputDirRoot,
-        logLevel=logLevel,
+        logLevel,
     )
 
     return s
@@ -811,7 +785,6 @@ def addDigitization(
         surfaceByIdentifier=trackingGeometry.geoIdSurfaceMap(),
         randomNumbers=rnd,
         inputSimHits="simhits",
-        outputSourceLinks="sourcelinks",
         outputMeasurements="measurements",
         outputMeasurementParticlesMap="measurement_particles_map",
         outputMeasurementSimHitsMap="measurement_simhits_map",
diff --git a/Examples/Python/setup.sh.in b/Examples/Python/setup.sh.in
index 3c9de89ba16..dd06c1556a4 100644
--- a/Examples/Python/setup.sh.in
+++ b/Examples/Python/setup.sh.in
@@ -1,10 +1,10 @@
-# This file is part of the Acts project.
+# This file is part of the ACTS project.
 #
-# Copyright (C) 2021-2022 CERN for the benefit of the Acts project
+# Copyright (C) 2016 CERN for the benefit of the ACTS project
 #
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+# file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 # This script sets up the ACTS Python bindings in the environment in a somewhat
 # robust way.
diff --git a/Examples/Python/src/AmbiguityResolution.cpp b/Examples/Python/src/AmbiguityResolution.cpp
index 7c8f6a69a03..2075a522609 100644
--- a/Examples/Python/src/AmbiguityResolution.cpp
+++ b/Examples/Python/src/AmbiguityResolution.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2023 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include "Acts/Plugins/Python/Utilities.hpp"
 #include "ActsExamples/AmbiguityResolution/GreedyAmbiguityResolutionAlgorithm.hpp"
diff --git a/Examples/Python/src/Base.cpp b/Examples/Python/src/Base.cpp
index e720857c4f0..cc8a5f67dc1 100644
--- a/Examples/Python/src/Base.cpp
+++ b/Examples/Python/src/Base.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2021-2024 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include "Acts/Definitions/Algebra.hpp"
 #include "Acts/Definitions/PdgParticle.hpp"
@@ -12,6 +12,7 @@
 #include "Acts/Geometry/GeometryContext.hpp"
 #include "Acts/MagneticField/MagneticFieldContext.hpp"
 #include "Acts/Plugins/Python/Utilities.hpp"
+#include "Acts/Utilities/Any.hpp"
 #include "Acts/Utilities/AxisFwd.hpp"
 #include "Acts/Utilities/BinningData.hpp"
 #include "Acts/Utilities/CalibrationContext.hpp"
@@ -25,6 +26,7 @@
 
 #include <pybind11/eval.h>
 #include <pybind11/pybind11.h>
+#include <pybind11/pytypes.h>
 #include <pybind11/stl.h>
 
 namespace py = pybind11;
@@ -42,6 +44,12 @@ void addContext(Context& ctx) {
       .def(py::init<>());
 }
 
+void addAny(Context& ctx) {
+  auto& m = ctx.get("main");
+
+  py::class_<Acts::AnyBase<512>>(m, "AnyBase512").def(py::init<>());
+}
+
 void addUnits(Context& ctx) {
   auto& m = ctx.get("main");
   auto u = m.def_submodule("UnitConstants");
@@ -169,7 +177,7 @@ void addLogging(Acts::Python::Context& ctx) {
   logging.def(
       "getLogger",
       [](const std::string& name) {
-        if (pythonLoggers.find(name) == pythonLoggers.end()) {
+        if (!pythonLoggers.contains(name)) {
           pythonLoggers[name] =
               std::make_shared<PythonLogger>(name, Acts::Logging::INFO);
         }
@@ -261,7 +269,12 @@ void addAlgebra(Acts::Python::Context& ctx) {
         return v;
       }))
       .def("__getitem__",
-           [](const Acts::Vector2& self, Eigen::Index i) { return self[i]; });
+           [](const Acts::Vector2& self, Eigen::Index i) { return self[i]; })
+      .def("__str__", [](const Acts::Vector3& self) {
+        std::stringstream ss;
+        ss << self.transpose();
+        return ss.str();
+      });
 
   py::class_<Acts::Vector3>(m, "Vector3")
       .def(py::init<double, double, double>())
@@ -270,8 +283,17 @@ void addAlgebra(Acts::Python::Context& ctx) {
         v << a[0], a[1], a[2];
         return v;
       }))
+      .def_static("UnitX", []() -> Vector3 { return Acts::Vector3::UnitX(); })
+      .def_static("UnitY", []() -> Vector3 { return Acts::Vector3::UnitY(); })
+      .def_static("UnitZ", []() -> Vector3 { return Acts::Vector3::UnitZ(); })
+
       .def("__getitem__",
-           [](const Acts::Vector3& self, Eigen::Index i) { return self[i]; });
+           [](const Acts::Vector3& self, Eigen::Index i) { return self[i]; })
+      .def("__str__", [](const Acts::Vector3& self) {
+        std::stringstream ss;
+        ss << self.transpose();
+        return ss.str();
+      });
 
   py::class_<Acts::Vector4>(m, "Vector4")
       .def(py::init<double, double, double, double>())
@@ -284,40 +306,78 @@ void addAlgebra(Acts::Python::Context& ctx) {
            [](const Acts::Vector4& self, Eigen::Index i) { return self[i]; });
 
   py::class_<Acts::Transform3>(m, "Transform3")
-      .def(py::init([](std::array<double, 3> translation) {
-        Acts::Transform3 t = Acts::Transform3::Identity();
-        t.pretranslate(
-            Acts::Vector3(translation[0], translation[1], translation[2]));
-        return t;
+      .def(py::init<>())
+      .def(py::init([](const Vector3& translation) -> Transform3 {
+        return Transform3{Translation3{translation}};
       }))
-      .def("getTranslation", [](const Acts::Transform3& self) {
-        return Vector3(self.translation());
+      .def_property_readonly("translation",
+                             [](const Acts::Transform3& self) -> Vector3 {
+                               return self.translation();
+                             })
+      .def_static("Identity", &Acts::Transform3::Identity)
+      .def("__mul__",
+           [](const Acts::Transform3& self, const Acts::Transform3& other) {
+             return self * other;
+           })
+      .def("__mul__",
+           [](const Acts::Transform3& self, const Acts::Translation3& other) {
+             return self * other;
+           })
+      .def("__mul__",
+           [](const Acts::Transform3& self, const Acts::AngleAxis3& other) {
+             return self * other;
+           })
+      .def("__str__", [](const Acts::Transform3& self) {
+        std::stringstream ss;
+        ss << self.matrix();
+        return ss.str();
+      });
+
+  py::class_<Acts::Translation3>(m, "Translation3")
+      .def(py::init(
+          [](const Acts::Vector3& a) { return Acts::Translation3(a); }))
+      .def(py::init([](std::array<double, 3> a) {
+        return Acts::Translation3(Acts::Vector3(a[0], a[1], a[2]));
+      }))
+      .def("__str__", [](const Acts::Translation3& self) {
+        std::stringstream ss;
+        ss << self.translation().transpose();
+        return ss.str();
+      });
+
+  py::class_<Acts::AngleAxis3>(m, "AngleAxis3")
+      .def(py::init([](double angle, const Acts::Vector3& axis) {
+        return Acts::AngleAxis3(angle, axis);
+      }))
+      .def("__str__", [](const Acts::Transform3& self) {
+        std::stringstream ss;
+        ss << self.matrix();
+        return ss.str();
       });
 }
 
 void addBinning(Context& ctx) {
   auto& m = ctx.get("main");
-  auto binning = m.def_submodule("Binning", "");
-
-  auto binningValue = py::enum_<Acts::BinningValue>(binning, "BinningValue")
-                          .value("x", Acts::BinningValue::binX)
-                          .value("y", Acts::BinningValue::binY)
-                          .value("z", Acts::BinningValue::binZ)
-                          .value("r", Acts::BinningValue::binR)
-                          .value("phi", Acts::BinningValue::binPhi)
-                          .export_values();
-
-  auto boundaryType =
-      py::enum_<Acts::AxisBoundaryType>(binning, "AxisBoundaryType")
-          .value("bound", Acts::AxisBoundaryType::Bound)
-          .value("closed", Acts::AxisBoundaryType::Closed)
-          .value("open", Acts::AxisBoundaryType::Open)
-          .export_values();
-
-  auto axisType = py::enum_<Acts::AxisType>(binning, "AxisType")
+
+  auto binningValue = py::enum_<Acts::BinningValue>(m, "BinningValue")
+                          .value("binX", Acts::BinningValue::binX)
+                          .value("binY", Acts::BinningValue::binY)
+                          .value("binZ", Acts::BinningValue::binZ)
+                          .value("binR", Acts::BinningValue::binR)
+                          .value("binPhi", Acts::BinningValue::binPhi)
+                          .value("binRPhi", Acts::BinningValue::binRPhi)
+                          .value("binH", Acts::BinningValue::binH)
+                          .value("binEta", Acts::BinningValue::binEta)
+                          .value("binMag", Acts::BinningValue::binMag);
+
+  auto boundaryType = py::enum_<Acts::AxisBoundaryType>(m, "AxisBoundaryType")
+                          .value("Bound", Acts::AxisBoundaryType::Bound)
+                          .value("Closed", Acts::AxisBoundaryType::Closed)
+                          .value("Open", Acts::AxisBoundaryType::Open);
+
+  auto axisType = py::enum_<Acts::AxisType>(m, "AxisType")
                       .value("equidistant", Acts::AxisType::Equidistant)
-                      .value("variable", Acts::AxisType::Variable)
-                      .export_values();
+                      .value("variable", Acts::AxisType::Variable);
 }
 
 }  // namespace Acts::Python
diff --git a/Examples/Python/src/Covfie.cpp b/Examples/Python/src/Covfie.cpp
new file mode 100644
index 00000000000..5a630400d88
--- /dev/null
+++ b/Examples/Python/src/Covfie.cpp
@@ -0,0 +1,55 @@
+// This file is part of the ACTS project.
+//
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
+//
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
+
+#include "Acts/Plugins/Covfie/FieldConversion.hpp"
+#include "Acts/Plugins/Python/Utilities.hpp"
+
+#include <pybind11/pybind11.h>
+#include <pybind11/stl.h>
+
+namespace py = pybind11;
+using namespace pybind11::literals;
+
+namespace Acts::Python {
+
+namespace {
+template <typename field_t>
+void declareCovfieField(py::module& m, const std::string& fieldName) {
+  using view_t = typename field_t::view_t;
+  m.def("toView",
+        [](const field_t& field) { return typename field_t::view_t(field); });
+  py::class_<field_t, std::shared_ptr<field_t>>(m, fieldName.c_str());
+  py::class_<view_t, std::shared_ptr<view_t>>(
+      m, (fieldName + std::string("View")).c_str())
+      .def("at", &view_t::template at<float, float, float>);
+}
+}  // namespace
+
+void addCovfie(Context& ctx) {
+  auto main = ctx.get("main");
+  auto m = main.def_submodule("covfie", "Submodule for covfie conversion");
+
+  declareCovfieField<Acts::CovfiePlugin::ConstantField>(m,
+                                                        "CovfieConstantField");
+  declareCovfieField<Acts::CovfiePlugin::InterpolatedField>(
+      m, "CovfieAffineLinearStridedField");
+
+  m.def("makeCovfieField",
+        py::overload_cast<const Acts::InterpolatedMagneticField&>(
+            &Acts::CovfiePlugin::covfieField));
+  m.def("makeCovfieField", py::overload_cast<const Acts::ConstantBField&>(
+                               &Acts::CovfiePlugin::covfieField));
+  m.def("makeCovfieField",
+        py::overload_cast<const Acts::MagneticFieldProvider&,
+                          Acts::MagneticFieldProvider::Cache&,
+                          const std::array<std::size_t, 3>&,
+                          const Acts::Vector3&, const Acts::Vector3&>(
+            &Acts::CovfiePlugin::covfieField));
+}
+
+}  // namespace Acts::Python
diff --git a/Examples/Python/src/CovfieStub.cpp b/Examples/Python/src/CovfieStub.cpp
new file mode 100644
index 00000000000..542d969eef9
--- /dev/null
+++ b/Examples/Python/src/CovfieStub.cpp
@@ -0,0 +1,13 @@
+// This file is part of the ACTS project.
+//
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
+//
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
+
+#include "Acts/Plugins/Python/Utilities.hpp"
+
+namespace Acts::Python {
+void addCovfie(Context& /* ctx */) {}
+}  // namespace Acts::Python
diff --git a/Examples/Python/src/DD4hepComponent.cpp b/Examples/Python/src/DD4hepComponent.cpp
index be4d30b5f5e..f4ad0277aea 100644
--- a/Examples/Python/src/DD4hepComponent.cpp
+++ b/Examples/Python/src/DD4hepComponent.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2021-2024 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include "Acts/Detector/GeometryIdGenerator.hpp"
 #include "Acts/Plugins/DD4hep/DD4hepDetectorElement.hpp"
diff --git a/Examples/Python/src/Detector.cpp b/Examples/Python/src/Detector.cpp
index 524aa867383..6b9ef68f927 100644
--- a/Examples/Python/src/Detector.cpp
+++ b/Examples/Python/src/Detector.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2021 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include "Acts/Geometry/TrackingGeometry.hpp"
 #include "Acts/Material/IMaterialDecorator.hpp"
diff --git a/Examples/Python/src/Detray.cpp b/Examples/Python/src/Detray.cpp
index 34d23aad495..a409d80c4bf 100644
--- a/Examples/Python/src/Detray.cpp
+++ b/Examples/Python/src/Detray.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2024 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include "Acts/Detector/Detector.hpp"
 #include "Acts/Plugins/Detray/DetrayConverter.hpp"
@@ -13,13 +13,11 @@
 #include <memory>
 #include <string>
 
+#include <detray/builders/detector_builder.hpp>
 #include <pybind11/pybind11.h>
 #include <vecmem/memory/host_memory_resource.hpp>
 #include <vecmem/memory/memory_resource.hpp>
 
-#include "detray/builders/detector_builder.hpp"
-#include "detray/io/frontend/detector_reader_config.hpp"
-
 namespace py = pybind11;
 using namespace pybind11::literals;
 
@@ -32,33 +30,42 @@ namespace Acts::Python {
 void addDetray(Context& ctx) {
   auto [m, mex] = ctx.get("main", "examples");
 
+  auto detray = m.def_submodule("detray");
   {
     py::class_<detector<default_metadata>,
-               std::shared_ptr<detector<default_metadata>>>(m,
+               std::shared_ptr<detector<default_metadata>>>(detray,
                                                             "detray_detector");
   }
 
-  { mex.def("writeToJson", &DetrayConverter::writeToJson); }
-  /**
-          {
-              /// @brief Converts an Acts::Detector to a detray::detector
-              mex.def("convertDetectorToDetray",
-                      [](const Acts::GeometryContext& gctx,
-                      const Acts::Experimental::Detector& acts_detector,
-                      const std::string& name) -> auto
-     {//detector<default_metadata>
+  {
+    // This test function will convert an ACTS detector into a detray detector
+    // and write it to the corresponding json files.
+    //
+    // The memory resource and the detector are destroyed after the function
+    detray.def("writeToJson", [](const GeometryContext& gctx,
+                                 const Experimental::Detector& detector) {
+      auto memoryResource = vecmem::host_memory_resource();
 
-                          // Create a host memory resource
-                          vecmem::host_memory_resource host_mr;
-                          // Convert Acts detector to detray detector using the
-     detray converter function auto det_tuple =
-     DetrayConverter::detrayConvert(acts_detector, gctx, host_mr);
+      DetrayConverter::Options options;
+      options.writeToJson = true;
+      options.convertMaterial = false;
+      options.convertSurfaceGrids = true;
+      auto DetrayHostDetector =
+          DetrayConverter().convert<>(gctx, detector, memoryResource, options);
+    });
+  }
 
-                          return true; //TO DO:: cannot return tuple
+  {
+    auto converter = py::class_<DetrayConverter>(detray, "DetrayConverter");
 
-                      });
-          }
+    auto options = py::class_<DetrayConverter::Options>(converter, "Options")
+                       .def(py::init<>());
 
-          **/
+    ACTS_PYTHON_STRUCT_BEGIN(options, DetrayConverter::Options);
+    ACTS_PYTHON_MEMBER(convertMaterial);
+    ACTS_PYTHON_MEMBER(convertSurfaceGrids);
+    ACTS_PYTHON_MEMBER(writeToJson);
+    ACTS_PYTHON_STRUCT_END();
+  }
 }
 }  // namespace Acts::Python
diff --git a/Examples/Python/src/DetrayStub.cpp b/Examples/Python/src/DetrayStub.cpp
index 2ade0dd8bc5..05589950017 100644
--- a/Examples/Python/src/DetrayStub.cpp
+++ b/Examples/Python/src/DetrayStub.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2024 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include "Acts/Plugins/Python/Utilities.hpp"
 
diff --git a/Examples/Python/src/Digitization.cpp b/Examples/Python/src/Digitization.cpp
index 54ec8934ac1..948bcc9593b 100644
--- a/Examples/Python/src/Digitization.cpp
+++ b/Examples/Python/src/Digitization.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2021 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include "Acts/Definitions/Algebra.hpp"
 #include "Acts/Geometry/GeometryHierarchyMap.hpp"
@@ -13,6 +13,7 @@
 #include "ActsExamples/Digitization/DigitizationAlgorithm.hpp"
 #include "ActsExamples/Digitization/DigitizationConfig.hpp"
 #include "ActsExamples/Digitization/DigitizationConfigurator.hpp"
+#include "ActsExamples/Digitization/DigitizationCoordinatesConverter.hpp"
 #include "ActsExamples/Framework/AlgorithmContext.hpp"
 #include "ActsExamples/Io/Json/JsonDigitizationConfig.hpp"
 
@@ -62,13 +63,14 @@ void addDigitization(Context& ctx) {
 
     ACTS_PYTHON_STRUCT_BEGIN(c, Config);
     ACTS_PYTHON_MEMBER(inputSimHits);
-    ACTS_PYTHON_MEMBER(outputSourceLinks);
     ACTS_PYTHON_MEMBER(outputMeasurements);
     ACTS_PYTHON_MEMBER(outputClusters);
     ACTS_PYTHON_MEMBER(outputMeasurementParticlesMap);
     ACTS_PYTHON_MEMBER(outputMeasurementSimHitsMap);
     ACTS_PYTHON_MEMBER(surfaceByIdentifier);
     ACTS_PYTHON_MEMBER(randomNumbers);
+    ACTS_PYTHON_MEMBER(doOutputCells);
+    ACTS_PYTHON_MEMBER(doClusterization);
     ACTS_PYTHON_MEMBER(doMerge);
     ACTS_PYTHON_MEMBER(minEnergyDeposit);
     ACTS_PYTHON_MEMBER(digitizationConfigs);
@@ -100,6 +102,19 @@ void addDigitization(Context& ctx) {
     ACTS_PYTHON_MEMBER(outputDigiComponents);
     ACTS_PYTHON_STRUCT_END();
   }
+
+  {
+    py::class_<ActsExamples::DigitizationCoordinatesConverter,
+               std::shared_ptr<ActsExamples::DigitizationCoordinatesConverter>>(
+        mex, "DigitizationCoordinatesConverter")
+        .def(py::init<ActsExamples::DigitizationConfig&>(), py::arg("config"))
+        .def_property_readonly(
+            "config", &ActsExamples::DigitizationCoordinatesConverter::config)
+        .def("globalToLocal",
+             &ActsExamples::DigitizationCoordinatesConverter::globalToLocal)
+        .def("localToGlobal",
+             &ActsExamples::DigitizationCoordinatesConverter::localToGlobal);
+  }
 }
 
 }  // namespace Acts::Python
diff --git a/Examples/Python/src/EDM4hepComponent.cpp b/Examples/Python/src/EDM4hepComponent.cpp
index 3f780230c4e..f7b4c949172 100644
--- a/Examples/Python/src/EDM4hepComponent.cpp
+++ b/Examples/Python/src/EDM4hepComponent.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2022 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include "Acts/Plugins/Python/Utilities.hpp"
 #include "ActsExamples/DD4hepDetector/DD4hepDetector.hpp"
@@ -17,8 +17,6 @@
 #include "ActsExamples/Io/EDM4hep/EDM4hepTrackReader.hpp"
 #include "ActsExamples/Io/EDM4hep/EDM4hepTrackWriter.hpp"
 
-#include <memory>
-
 #include <pybind11/pybind11.h>
 #include <pybind11/stl.h>
 
@@ -31,9 +29,9 @@ using namespace Acts::Python;
 PYBIND11_MODULE(ActsPythonBindingsEDM4hep, m) {
   ACTS_PYTHON_DECLARE_READER(
       ActsExamples::EDM4hepReader, m, "EDM4hepReader", inputPath,
-      inputParticles, inputSimHits, outputParticlesInitial,
-      outputParticlesFinal, outputParticlesGenerator, outputSimHits,
-      graphvizOutput, dd4hepDetector, trackingGeometry, sortSimHitsInTime);
+      inputParticles, inputSimHits, outputParticlesGenerator,
+      outputParticlesSimulation, outputSimHits, graphvizOutput, dd4hepDetector,
+      trackingGeometry, sortSimHitsInTime);
 
   ACTS_PYTHON_DECLARE_WRITER(
       ActsExamples::EDM4hepSimHitWriter, m, "EDM4hepSimHitWriter", inputSimHits,
@@ -42,7 +40,7 @@ PYBIND11_MODULE(ActsPythonBindingsEDM4hep, m) {
   ACTS_PYTHON_DECLARE_READER(ActsExamples::EDM4hepMeasurementReader, m,
                              "EDM4hepMeasurementReader", inputPath,
                              outputMeasurements, outputMeasurementSimHitsMap,
-                             outputSourceLinks, outputClusters);
+                             outputClusters);
 
   ACTS_PYTHON_DECLARE_WRITER(ActsExamples::EDM4hepMeasurementWriter, m,
                              "EDM4hepMeasurementWriter", inputMeasurements,
diff --git a/Examples/Python/src/EventData.cpp b/Examples/Python/src/EventData.cpp
index 98861ed8840..3f8cfa50342 100644
--- a/Examples/Python/src/EventData.cpp
+++ b/Examples/Python/src/EventData.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2023 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include "Acts/Definitions/PdgParticle.hpp"
 #include "Acts/EventData/ParticleHypothesis.hpp"
diff --git a/Examples/Python/src/ExaTrkXTrackFinding.cpp b/Examples/Python/src/ExaTrkXTrackFinding.cpp
index 2d9d0341362..3778e8576f5 100644
--- a/Examples/Python/src/ExaTrkXTrackFinding.cpp
+++ b/Examples/Python/src/ExaTrkXTrackFinding.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2021 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include "Acts/Plugins/ExaTrkX/BoostTrackBuilding.hpp"
 #include "Acts/Plugins/ExaTrkX/CugraphTrackBuilding.hpp"
@@ -251,9 +251,8 @@ void addExaTrkXTrackFinding(Context &ctx) {
   ACTS_PYTHON_DECLARE_ALGORITHM(
       ActsExamples::TrackFindingFromPrototrackAlgorithm, mex,
       "TrackFindingFromPrototrackAlgorithm", inputProtoTracks,
-      inputMeasurements, inputSourceLinks, inputInitialTrackParameters,
-      outputTracks, measurementSelectorCfg, trackingGeometry, magneticField,
-      findTracks, tag);
+      inputMeasurements, inputInitialTrackParameters, outputTracks,
+      measurementSelectorCfg, trackingGeometry, magneticField, findTracks, tag);
 }
 
 }  // namespace Acts::Python
diff --git a/Examples/Python/src/ExaTrkXTrackFindingStub.cpp b/Examples/Python/src/ExaTrkXTrackFindingStub.cpp
index 00275ef1bea..79d6b1e9eb4 100644
--- a/Examples/Python/src/ExaTrkXTrackFindingStub.cpp
+++ b/Examples/Python/src/ExaTrkXTrackFindingStub.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2022 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 namespace Acts::Python {
 struct Context;
diff --git a/Examples/Python/src/ExampleAlgorithms.cpp b/Examples/Python/src/ExampleAlgorithms.cpp
index c943a7393dc..7d9007183e8 100644
--- a/Examples/Python/src/ExampleAlgorithms.cpp
+++ b/Examples/Python/src/ExampleAlgorithms.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2021 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include "Acts/Definitions/Algebra.hpp"
 #include "Acts/Plugins/Python/Utilities.hpp"
@@ -35,11 +35,11 @@ void addExampleAlgorithms(Context& ctx) {
 
   ACTS_PYTHON_DECLARE_ALGORITHM(
       ActsExamples::FatrasSimulation, mex, "FatrasSimulation", inputParticles,
-      outputParticlesInitial, outputParticlesFinal, outputSimHits,
-      imputParametrisationNuclearInteraction, randomNumbers, trackingGeometry,
-      magneticField, pMin, emScattering, emEnergyLossIonisation,
-      emEnergyLossRadiation, emPhotonConversion, generateHitsOnSensitive,
-      generateHitsOnMaterial, generateHitsOnPassive, averageHitsPerParticle);
+      outputParticles, outputSimHits, imputParametrisationNuclearInteraction,
+      randomNumbers, trackingGeometry, magneticField, pMin, emScattering,
+      emEnergyLossIonisation, emEnergyLossRadiation, emPhotonConversion,
+      generateHitsOnSensitive, generateHitsOnMaterial, generateHitsOnPassive,
+      averageHitsPerParticle);
 
   ACTS_PYTHON_DECLARE_ALGORITHM(ActsExamples::ParticlesPrinter, mex,
                                 "ParticlesPrinter", inputParticles);
@@ -105,6 +105,7 @@ void addExampleAlgorithms(Context& ctx) {
       ACTS_PYTHON_MEMBER(minMeasurements);
       ACTS_PYTHON_MEMBER(maxHoles);
       ACTS_PYTHON_MEMBER(maxOutliers);
+      ACTS_PYTHON_MEMBER(maxHolesAndOutliers);
       ACTS_PYTHON_MEMBER(maxSharedHits);
       ACTS_PYTHON_MEMBER(maxChi2);
       ACTS_PYTHON_MEMBER(measurementCounter);
diff --git a/Examples/Python/src/Framework.cpp b/Examples/Python/src/Framework.cpp
index 6664af7be31..a1953d4cbd5 100644
--- a/Examples/Python/src/Framework.cpp
+++ b/Examples/Python/src/Framework.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2023-2024 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include "Acts/Plugins/Python/Utilities.hpp"
 #include "ActsExamples/Framework/AlgorithmContext.hpp"
diff --git a/Examples/Python/src/Geant4Component.cpp b/Examples/Python/src/Geant4Component.cpp
index b366440c89f..1a7edd58e7f 100644
--- a/Examples/Python/src/Geant4Component.cpp
+++ b/Examples/Python/src/Geant4Component.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2021-2024 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include "Acts/Definitions/Algebra.hpp"
 #include "Acts/Detector/Detector.hpp"
@@ -14,6 +14,7 @@
 #include "Acts/Plugins/Geant4/Geant4DetectorSurfaceFactory.hpp"
 #include "Acts/Plugins/Geant4/Geant4PhysicalVolumeSelectors.hpp"
 #include "Acts/Plugins/Python/Utilities.hpp"
+#include "Acts/Surfaces/SurfaceVisitorConcept.hpp"
 #include "Acts/Utilities/Logger.hpp"
 #include "ActsExamples/Framework/AlgorithmContext.hpp"
 #include "ActsExamples/Framework/IContextDecorator.hpp"
@@ -28,9 +29,7 @@
 #include "ActsExamples/TelescopeDetector/TelescopeDetector.hpp"
 #include "ActsExamples/TelescopeDetector/TelescopeG4DetectorConstruction.hpp"
 
-#include <array>
 #include <memory>
-#include <optional>
 #include <string>
 #include <tuple>
 #include <unordered_map>
@@ -66,6 +65,37 @@ namespace Acts::Python {
 void addGeant4HepMC3(Context& ctx);
 }
 
+struct ExperimentalSensitiveCandidates : public SensitiveCandidatesBase {
+  std::shared_ptr<const Experimental::Detector> detector;
+
+  /// Find the sensitive surfaces for a given position
+  std::vector<const Acts::Surface*> queryPosition(
+      const Acts::GeometryContext& gctx,
+      const Acts::Vector3& position) const override {
+    std::vector<const Acts::Surface*> surfaces;
+    // Here's the detector volume
+    auto volume = detector->findDetectorVolume(gctx, position);
+    if (volume != nullptr) {
+      for (const auto& surface : volume->surfaces()) {
+        if (surface->associatedDetectorElement() != nullptr) {
+          surfaces.push_back(surface);
+        }
+      }
+    }
+    return surfaces;
+  }
+
+  std::vector<const Acts::Surface*> queryAll() const override {
+    std::vector<const Acts::Surface*> surfaces;
+    detector->visitSurfaces([&](const Acts::Surface* surface) {
+      if (surface->associatedDetectorElement() != nullptr) {
+        surfaces.push_back(surface);
+      }
+    });
+    return surfaces;
+  }
+};
+
 PYBIND11_MODULE(ActsPythonBindingsGeant4, mod) {
   py::class_<DetectorConstructionFactory,
              std::shared_ptr<DetectorConstructionFactory>>(
@@ -100,6 +130,7 @@ PYBIND11_MODULE(ActsPythonBindingsGeant4, mod) {
 
   {
     using Config = SensitiveSurfaceMapper::Config;
+    using State = SensitiveSurfaceMapper::State;
     auto sm =
         py::class_<SensitiveSurfaceMapper,
                    std::shared_ptr<SensitiveSurfaceMapper>>(
@@ -109,6 +140,8 @@ PYBIND11_MODULE(ActsPythonBindingsGeant4, mod) {
                   cfg, getDefaultLogger("SensitiveSurfaceMapper", level));
             }));
 
+    py::class_<State>(sm, "State").def(py::init<>());
+
     auto c = py::class_<Config>(sm, "Config").def(py::init<>());
     ACTS_PYTHON_STRUCT_BEGIN(c, Config);
     ACTS_PYTHON_MEMBER(materialMappings);
@@ -116,46 +149,44 @@ PYBIND11_MODULE(ActsPythonBindingsGeant4, mod) {
     ACTS_PYTHON_MEMBER(candidateSurfaces);
     ACTS_PYTHON_STRUCT_END();
 
-    sm.def(
-        "create", [](const Config& cfg, Acts::Logging::Level level,
-                     const std::shared_ptr<const TrackingGeometry> tGeometry) {
-          // Set a new surface finder
-          Config ccfg = cfg;
-          ccfg.candidateSurfaces = ActsExamples::SensitiveCandidates{tGeometry};
-          return std::make_shared<SensitiveSurfaceMapper>(
-              ccfg, getDefaultLogger("SensitiveSurfaceMapper", level));
-        });
+    sm.def("create",
+           [](const Config& cfg, Acts::Logging::Level level,
+              const std::shared_ptr<const TrackingGeometry> tGeometry) {
+             // Set a new surface finder
+             Config ccfg = cfg;
+             auto candidateSurfaces =
+                 std::make_shared<ActsExamples::SensitiveCandidates>();
+             candidateSurfaces->trackingGeometry = tGeometry;
+             ccfg.candidateSurfaces = candidateSurfaces;
+             return std::make_shared<SensitiveSurfaceMapper>(
+                 ccfg, getDefaultLogger("SensitiveSurfaceMapper", level));
+           });
 
     sm.def("create",
            [](const Config& cfg, Acts::Logging::Level level,
               const std::shared_ptr<const Experimental::Detector>& detector) {
              // Helper struct to find the sensitive surface candidates
-             struct SensitiveCandidates {
-               std::shared_ptr<const Experimental::Detector> detector;
-
-               /// Find the sensitive surfaces for a given position
-               std::vector<const Acts::Surface*> operator()(
-                   const Acts::GeometryContext& gctx,
-                   const Acts::Vector3& position) const {
-                 std::vector<const Acts::Surface*> surfaces;
-                 // Here's the detector volume
-                 auto volume = detector->findDetectorVolume(gctx, position);
-                 if (volume != nullptr) {
-                   for (const auto& surface : volume->surfaces()) {
-                     if (surface->associatedDetectorElement() != nullptr) {
-                       surfaces.push_back(surface);
-                     }
-                   }
-                 }
-                 return surfaces;
-               }
-             };
+
              // Set a new surface finder
              Config ccfg = cfg;
-             ccfg.candidateSurfaces = SensitiveCandidates{detector};
+             auto candidateSurfaces =
+                 std::make_shared<ExperimentalSensitiveCandidates>();
+             candidateSurfaces->detector = detector;
+             ccfg.candidateSurfaces = candidateSurfaces;
              return std::make_shared<SensitiveSurfaceMapper>(
                  ccfg, getDefaultLogger("SensitiveSurfaceMapper", level));
            });
+
+    sm.def(
+        "remapSensitiveNames",
+        [](SensitiveSurfaceMapper& self, State& state, GeometryContext& gctx,
+           DetectorConstructionFactory& factory, Transform3& transform) {
+          return self.remapSensitiveNames(
+              state, gctx, factory.factorize()->Construct(), transform);
+        },
+        "state"_a, "gctx"_a, "g4physicalVolume"_a, "motherTransform"_a);
+    sm.def("checkMapping", &SensitiveSurfaceMapper::checkMapping, "state"_a,
+           "gctx"_a, "writeMappedAsObj"_a, "writeMissingAsObj"_a);
   }
 
   {
@@ -173,16 +204,14 @@ PYBIND11_MODULE(ActsPythonBindingsGeant4, mod) {
                   .def(py::init<>());
     ACTS_PYTHON_STRUCT_BEGIN(c1, Config);
     ACTS_PYTHON_MEMBER(outputSimHits);
-    ACTS_PYTHON_MEMBER(outputParticlesInitial);
-    ACTS_PYTHON_MEMBER(outputParticlesFinal);
+    ACTS_PYTHON_MEMBER(outputParticles);
     ACTS_PYTHON_MEMBER(sensitiveSurfaceMapper);
     ACTS_PYTHON_MEMBER(magneticField);
     ACTS_PYTHON_MEMBER(physicsList);
-    ACTS_PYTHON_MEMBER(volumeMappings);
-    ACTS_PYTHON_MEMBER(materialMappings);
     ACTS_PYTHON_MEMBER(killVolume);
     ACTS_PYTHON_MEMBER(killAfterTime);
     ACTS_PYTHON_MEMBER(killSecondaries);
+    ACTS_PYTHON_MEMBER(recordHitsOfNeutrals);
     ACTS_PYTHON_MEMBER(recordHitsOfSecondaries);
     ACTS_PYTHON_MEMBER(keepParticlesWithoutHits);
     ACTS_PYTHON_STRUCT_END();
@@ -302,7 +331,8 @@ PYBIND11_MODULE(ActsPythonBindingsGeant4, mod) {
                                   const std::vector<std::string>&
                                       sensitiveMatches,
                                   const std::vector<std::string>&
-                                      passiveMatches) {
+                                      passiveMatches,
+                                  bool convertMaterial) {
       // Initiate the detector construction & retrieve world
       ActsExamples::GdmlDetectorConstruction gdmlContruction(gdmlFileName);
       const auto* world = gdmlContruction.Construct();
@@ -319,6 +349,7 @@ PYBIND11_MODULE(ActsPythonBindingsGeant4, mod) {
       Acts::Geant4DetectorSurfaceFactory::Options options;
       options.sensitiveSurfaceSelector = sensitiveSelectors;
       options.passiveSurfaceSelector = passiveSelectors;
+      options.convertMaterial = convertMaterial;
 
       G4Transform3D nominal;
       Acts::Geant4DetectorSurfaceFactory factory;
diff --git a/Examples/Python/src/Geant4DD4hepComponent.cpp b/Examples/Python/src/Geant4DD4hepComponent.cpp
index cf2f5a87b8c..16ed3b40223 100644
--- a/Examples/Python/src/Geant4DD4hepComponent.cpp
+++ b/Examples/Python/src/Geant4DD4hepComponent.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2021-2024 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include "ActsExamples/DD4hepDetector/DD4hepDetector.hpp"
 #include "ActsExamples/DDG4/DDG4DetectorConstruction.hpp"
diff --git a/Examples/Python/src/Geant4GeoModelComponent.cpp b/Examples/Python/src/Geant4GeoModelComponent.cpp
index d4e3576b00b..80f6f89eec8 100644
--- a/Examples/Python/src/Geant4GeoModelComponent.cpp
+++ b/Examples/Python/src/Geant4GeoModelComponent.cpp
@@ -1,12 +1,11 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2024 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
-#include "Acts/Utilities/TypeTraits.hpp"
 #include "ActsExamples/Framework/ProcessCode.hpp"
 #include "ActsExamples/Geant4/DetectorConstructionFactory.hpp"
 #include "ActsExamples/Geant4/RegionCreator.hpp"
diff --git a/Examples/Python/src/Geant4HepMC3.cpp b/Examples/Python/src/Geant4HepMC3.cpp
index 0d9e2ac967d..913a23da60f 100644
--- a/Examples/Python/src/Geant4HepMC3.cpp
+++ b/Examples/Python/src/Geant4HepMC3.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2021 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include "Acts/Plugins/Python/Utilities.hpp"
 #include "ActsExamples/Geant4/DetectorConstructionFactory.hpp"
diff --git a/Examples/Python/src/Geant4HepMC3Stub.cpp b/Examples/Python/src/Geant4HepMC3Stub.cpp
index 667a81ba2ca..9f59490b9d2 100644
--- a/Examples/Python/src/Geant4HepMC3Stub.cpp
+++ b/Examples/Python/src/Geant4HepMC3Stub.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2021 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 namespace Acts {
 namespace Python {
diff --git a/Examples/Python/src/Generators.cpp b/Examples/Python/src/Generators.cpp
index e6f02fb6900..454227ddbf6 100644
--- a/Examples/Python/src/Generators.cpp
+++ b/Examples/Python/src/Generators.cpp
@@ -1,31 +1,27 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2021 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include "Acts/Definitions/Algebra.hpp"
-#include "Acts/Definitions/PdgParticle.hpp"
 #include "Acts/Plugins/Python/Utilities.hpp"
+#include "Acts/Utilities/AngleHelpers.hpp"
 #include "Acts/Utilities/Logger.hpp"
 #include "ActsExamples/EventData/SimParticle.hpp"
-#include "ActsExamples/Framework/RandomNumbers.hpp"
 #include "ActsExamples/Generators/EventGenerator.hpp"
 #include "ActsExamples/Generators/MultiplicityGenerators.hpp"
 #include "ActsExamples/Generators/ParametricParticleGenerator.hpp"
 #include "ActsExamples/Generators/VertexGenerators.hpp"
 
-#include <array>
 #include <cassert>
 #include <cmath>
 #include <cstddef>
 #include <memory>
-#include <optional>
 #include <string>
 #include <utility>
-#include <vector>
 
 #include <pybind11/pybind11.h>
 #include <pybind11/stl.h>
@@ -36,16 +32,6 @@ class IReader;
 
 namespace py = pybind11;
 
-namespace {
-double thetaToEta(double theta) {
-  assert(theta != 0);
-  return -1 * std::log(std::tan(theta / 2.));
-}
-double etaToTheta(double eta) {
-  return 2 * std::atan(std::exp(-eta));
-}
-}  // namespace
-
 namespace Acts::Python {
 
 void addGenerators(Context& ctx) {
@@ -115,6 +101,43 @@ void addGenerators(Context& ctx) {
           &ActsExamples::GaussianPrimaryVertexPositionGenerator::stddev)
       .def_readwrite(
           "mean", &ActsExamples::GaussianPrimaryVertexPositionGenerator::mean);
+  py::class_<
+      ActsExamples::GaussianDisplacedVertexPositionGenerator,
+      ActsExamples::EventGenerator::PrimaryVertexPositionGenerator,
+      std::shared_ptr<ActsExamples::GaussianDisplacedVertexPositionGenerator>>(
+      mex, "GaussianDisplacedVertexPositionGenerator")
+      .def(py::init<>())
+      .def(py::init([](double rMean, double rStdDev, double zMean,
+                       double zStdDev, double tMean, double tStdDev) {
+             ActsExamples::GaussianDisplacedVertexPositionGenerator g;
+             g.rMean = rMean;
+             g.rStdDev = rStdDev;
+             g.zMean = zMean;
+             g.zStdDev = zStdDev;
+             g.tMean = tMean;
+             g.tStdDev = tStdDev;
+             return g;
+           }),
+           py::arg("rMean"), py::arg("rStdDev"), py::arg("zMean"),
+           py::arg("zStdDev"), py::arg("tMean"), py::arg("tStdDev"))
+      .def_readwrite(
+          "rMean",
+          &ActsExamples::GaussianDisplacedVertexPositionGenerator::rMean)
+      .def_readwrite(
+          "rStdDev",
+          &ActsExamples::GaussianDisplacedVertexPositionGenerator::rStdDev)
+      .def_readwrite(
+          "zMean",
+          &ActsExamples::GaussianDisplacedVertexPositionGenerator::zMean)
+      .def_readwrite(
+          "zStdDev",
+          &ActsExamples::GaussianDisplacedVertexPositionGenerator::zStdDev)
+      .def_readwrite(
+          "tMean",
+          &ActsExamples::GaussianDisplacedVertexPositionGenerator::tMean)
+      .def_readwrite(
+          "tStdDev",
+          &ActsExamples::GaussianDisplacedVertexPositionGenerator::tStdDev);
 
   py::class_<
       ActsExamples::FixedPrimaryVertexPositionGenerator,
@@ -153,6 +176,7 @@ void addGenerators(Context& ctx) {
         .def_readwrite("pMin", &Config::pMin)
         .def_readwrite("pMax", &Config::pMax)
         .def_readwrite("pTransverse", &Config::pTransverse)
+        .def_readwrite("pLogUniform", &Config::pLogUniform)
         .def_readwrite("pdg", &Config::pdg)
         .def_readwrite("randomizeCharge", &Config::randomizeCharge)
         .def_readwrite("numParticles", &Config::numParticles)
@@ -181,12 +205,12 @@ void addGenerators(Context& ctx) {
         .def_property(
             "eta",
             [](Config& cfg) {
-              return std::pair{thetaToEta(cfg.thetaMin),
-                               thetaToEta(cfg.thetaMax)};
+              return std::pair{Acts::AngleHelpers::etaFromTheta(cfg.thetaMin),
+                               Acts::AngleHelpers::etaFromTheta(cfg.thetaMax)};
             },
             [](Config& cfg, std::pair<double, double> value) {
-              cfg.thetaMin = etaToTheta(value.first);
-              cfg.thetaMax = etaToTheta(value.second);
+              cfg.thetaMin = Acts::AngleHelpers::thetaFromEta(value.first);
+              cfg.thetaMax = Acts::AngleHelpers::thetaFromEta(value.second);
             });
   }
 
diff --git a/Examples/Python/src/GeoModel.cpp b/Examples/Python/src/GeoModel.cpp
index dd190179b0a..58609a573d5 100644
--- a/Examples/Python/src/GeoModel.cpp
+++ b/Examples/Python/src/GeoModel.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2024 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 // Must be on top to avoid some conflict between forward declare and typedef
 // Needed until https://gitlab.cern.ch/GeoModelDev/GeoModel/-/merge_requests/351
@@ -17,12 +17,17 @@
 #include "Acts/Plugins/GeoModel/GeoModelBlueprintCreater.hpp"
 #include "Acts/Plugins/GeoModel/GeoModelConverters.hpp"
 #include "Acts/Plugins/GeoModel/GeoModelDetectorElement.hpp"
-#include "Acts/Plugins/GeoModel/GeoModelDetectorSurfaceFactory.hpp"
+#include "Acts/Plugins/GeoModel/GeoModelDetectorElementITk.hpp"
+#include "Acts/Plugins/GeoModel/GeoModelDetectorObjectFactory.hpp"
 #include "Acts/Plugins/GeoModel/GeoModelReader.hpp"
 #include "Acts/Plugins/GeoModel/GeoModelTree.hpp"
 #include "Acts/Plugins/GeoModel/IGeoShapeConverter.hpp"
 #include "Acts/Plugins/Python/Utilities.hpp"
-#include "Acts/Surfaces/Surface.hpp"
+#include "Acts/Surfaces/AnnulusBounds.hpp"
+#include "Acts/Surfaces/DiscSurface.hpp"
+#include "Acts/Surfaces/PlaneSurface.hpp"
+#include "Acts/Surfaces/RectangleBounds.hpp"
+#include "ActsExamples/ITkModuleSplitting/ITkModuleSplitting.hpp"
 
 #include <string>
 
@@ -46,7 +51,13 @@ void addGeoModel(Context& ctx) {
 
   py::class_<Acts::GeoModelDetectorElement,
              std::shared_ptr<Acts::GeoModelDetectorElement>>(
-      gm, "GeoModelDetectorElement");
+      gm, "GeoModelDetectorElement")
+      .def("logVolName", &Acts::GeoModelDetectorElement::logVolName)
+      .def("databaseEntryName",
+           &Acts::GeoModelDetectorElement::databaseEntryName)
+      .def("surface", [](Acts::GeoModelDetectorElement self) {
+        return self.surface().getSharedPtr();
+      });
 
   // Shape converters
   {
@@ -98,42 +109,47 @@ void addGeoModel(Context& ctx) {
         .def("toPassiveSurface", &Acts::GeoShiftConverter::toPassiveSurface);
   }
 
-  // Surface factory
+  // Volume factory
   {
-    auto f =
-        py::class_<Acts::GeoModelDetectorSurfaceFactory,
-                   std::shared_ptr<Acts::GeoModelDetectorSurfaceFactory>>(
-            gm, "GeoModelDetectorSurfaceFactory")
+    auto a =
+        py::class_<Acts::GeoModelDetectorObjectFactory,
+                   std::shared_ptr<Acts::GeoModelDetectorObjectFactory>>(
+            gm, "GeoModelDetectorObjectFactory")
             .def(py::init(
-                [](const Acts::GeoModelDetectorSurfaceFactory::Config& cfg,
+                [](const Acts::GeoModelDetectorObjectFactory::Config& cfg,
                    Acts::Logging::Level level) {
-                  return std::make_shared<Acts::GeoModelDetectorSurfaceFactory>(
+                  return std::make_shared<Acts::GeoModelDetectorObjectFactory>(
                       cfg, Acts::getDefaultLogger(
-                               "GeoModelDetectorSurfaceFactory", level));
+                               "GeoModelDetectorObjectFactory", level));
                 }))
-            .def("construct", &Acts::GeoModelDetectorSurfaceFactory::construct);
+            .def("construct", &Acts::GeoModelDetectorObjectFactory::construct);
 
-    py::class_<Acts::GeoModelDetectorSurfaceFactory::Config>(f, "Config")
+    py::class_<Acts::GeoModelDetectorObjectFactory::Config>(a, "Config")
         .def(py::init<>())
         .def_readwrite(
-            "shapeConverters",
-            &Acts::GeoModelDetectorSurfaceFactory::Config::shapeConverters)
+            "convertSubVolumes",
+            &Acts::GeoModelDetectorObjectFactory::Config::convertSubVolumes)
         .def_readwrite("nameList",
-                       &Acts::GeoModelDetectorSurfaceFactory::Config::nameList)
+                       &Acts::GeoModelDetectorObjectFactory::Config::nameList)
+        .def_readwrite("convertBox",
+                       &Acts::GeoModelDetectorObjectFactory::Config::convertBox)
         .def_readwrite(
             "materialList",
-            &Acts::GeoModelDetectorSurfaceFactory::Config::materialList);
+            &Acts::GeoModelDetectorObjectFactory::Config::materialList);
 
-    py::class_<Acts::GeoModelDetectorSurfaceFactory::Cache>(f, "Cache")
+    py::class_<Acts::GeoModelDetectorObjectFactory::Cache>(a, "Cache")
         .def(py::init<>())
         .def_readwrite(
             "sensitiveSurfaces",
-            &Acts::GeoModelDetectorSurfaceFactory::Cache::sensitiveSurfaces);
+            &Acts::GeoModelDetectorObjectFactory::Cache::sensitiveSurfaces)
+        .def_readwrite(
+            "boundingBoxes",
+            &Acts::GeoModelDetectorObjectFactory::Cache::boundingBoxes);
 
-    py::class_<Acts::GeoModelDetectorSurfaceFactory::Options>(f, "Options")
+    py::class_<Acts::GeoModelDetectorObjectFactory::Options>(a, "Options")
         .def(py::init<>())
         .def_readwrite("queries",
-                       &Acts::GeoModelDetectorSurfaceFactory::Options::queries);
+                       &Acts::GeoModelDetectorObjectFactory::Options::queries);
   }
 
   {
@@ -176,8 +192,60 @@ void addGeoModel(Context& ctx) {
         .def_readwrite(
             "topBoundsOverride",
             &Acts::GeoModelBlueprintCreater::Options::topBoundsOverride)
-        .def_readwrite("table",
-                       &Acts::GeoModelBlueprintCreater::Options::table);
+        .def_readwrite("table", &Acts::GeoModelBlueprintCreater::Options::table)
+        .def_readwrite("dotGraph",
+                       &Acts::GeoModelBlueprintCreater::Options::dotGraph);
   }
+
+  gm.def(
+      "splitBarrelModule",
+      [](const Acts::GeometryContext& gctx,
+         std::shared_ptr<const GeoModelDetectorElement> detElement,
+         unsigned nSegments, Acts::Logging::Level logLevel) {
+        auto logger = Acts::getDefaultLogger("ITkSlitBarrel", logLevel);
+        auto name = detElement->databaseEntryName();
+
+        auto factory = [&](const auto& trafo, const auto& bounds) {
+          return Acts::GeoModelDetectorElement::createDetectorElement<
+              Acts::PlaneSurface, Acts::RectangleBounds>(
+              detElement->physicalVolume(), bounds, trafo,
+              detElement->thickness());
+        };
+
+        return ActsExamples::ITk::splitBarrelModule(gctx, detElement, nSegments,
+                                                    factory, name, *logger);
+      },
+      "gxtx"_a, "detElement"_a, "nSegments"_a,
+      "logLevel"_a = Acts::Logging::INFO);
+
+  gm.def(
+      "splitDiscModule",
+      [](const Acts::GeometryContext& gctx,
+         std::shared_ptr<const GeoModelDetectorElement> detElement,
+         const std::vector<std::pair<double, double>>& patterns,
+         Acts::Logging::Level logLevel) {
+        auto logger = Acts::getDefaultLogger("ITkSlitBarrel", logLevel);
+        auto name = detElement->databaseEntryName();
+
+        auto factory = [&](const auto& trafo, const auto& bounds) {
+          return Acts::GeoModelDetectorElement::createDetectorElement<
+              Acts::DiscSurface, Acts::AnnulusBounds>(
+              detElement->physicalVolume(), bounds, trafo,
+              detElement->thickness());
+        };
+
+        return ActsExamples::ITk::splitDiscModule(gctx, detElement, patterns,
+                                                  factory, name, *logger);
+      },
+      "gxtx"_a, "detElement"_a, "splitRanges"_a,
+      "logLevel"_a = Acts::Logging::INFO);
+
+  py::class_<Acts::GeoModelDetectorElementITk,
+             std::shared_ptr<Acts::GeoModelDetectorElementITk>>(
+      gm, "GeoModelDetectorElementITk")
+      .def("surface", [](Acts::GeoModelDetectorElementITk& self) {
+        return self.surface().getSharedPtr();
+      });
+  gm.def("convertToItk", &GeoModelDetectorElementITk::convertFromGeomodel);
 }
 }  // namespace Acts::Python
diff --git a/Examples/Python/src/GeoModelStub.cpp b/Examples/Python/src/GeoModelStub.cpp
index 8ec521b9619..9dc40e01997 100644
--- a/Examples/Python/src/GeoModelStub.cpp
+++ b/Examples/Python/src/GeoModelStub.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2024 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 namespace Acts::Python {
 struct Context;
diff --git a/Examples/Python/src/Geometry.cpp b/Examples/Python/src/Geometry.cpp
index f8c4390d8c8..ee98bac3fb5 100644
--- a/Examples/Python/src/Geometry.cpp
+++ b/Examples/Python/src/Geometry.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2021 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include "Acts/Definitions/Algebra.hpp"
 #include "Acts/Detector/CuboidalContainerBuilder.hpp"
@@ -25,6 +25,7 @@
 #include "Acts/Detector/interface/IInternalStructureBuilder.hpp"
 #include "Acts/Detector/interface/IRootVolumeFinderBuilder.hpp"
 #include "Acts/Geometry/CylinderVolumeBounds.hpp"
+#include "Acts/Geometry/CylinderVolumeStack.hpp"
 #include "Acts/Geometry/Extent.hpp"
 #include "Acts/Geometry/GeometryContext.hpp"
 #include "Acts/Geometry/GeometryHierarchyMap.hpp"
@@ -32,17 +33,23 @@
 #include "Acts/Geometry/TrackingGeometry.hpp"
 #include "Acts/Geometry/Volume.hpp"
 #include "Acts/Geometry/VolumeBounds.hpp"
+#include "Acts/Material/ISurfaceMaterial.hpp"
 #include "Acts/Plugins/Python/Utilities.hpp"
 #include "Acts/Surfaces/Surface.hpp"
 #include "Acts/Surfaces/SurfaceArray.hpp"
+#include "Acts/Utilities/BinningType.hpp"
+#include "Acts/Utilities/Helpers.hpp"
 #include "Acts/Utilities/RangeXD.hpp"
+#include "Acts/Visualization/ViewConfig.hpp"
 #include "ActsExamples/Geometry/VolumeAssociationTest.hpp"
 
 #include <array>
 #include <memory>
+#include <numbers>
 #include <unordered_map>
 #include <vector>
 
+#include <boost/algorithm/string/join.hpp>
 #include <pybind11/pybind11.h>
 #include <pybind11/stl.h>
 
@@ -66,11 +73,9 @@ struct MaterialSurfaceSelector {
 
   /// @param surface is the test surface
   void operator()(const Acts::Surface* surface) {
-    if (surface->surfaceMaterial() != nullptr) {
-      if (std::find(surfaces.begin(), surfaces.end(), surface) ==
-          surfaces.end()) {
-        surfaces.push_back(surface);
-      }
+    if (surface->surfaceMaterial() != nullptr &&
+        !rangeContainsValue(surfaces, surface)) {
+      surfaces.push_back(surface);
     }
   }
 };
@@ -105,18 +110,23 @@ void addGeometry(Context& ctx) {
         .def("approach", &Acts::GeometryIdentifier::approach)
         .def("sensitive", &Acts::GeometryIdentifier::sensitive)
         .def("extra", &Acts::GeometryIdentifier::extra)
-        .def("value", &Acts::GeometryIdentifier::value);
+        .def("value", &Acts::GeometryIdentifier::value)
+        .def("__str__", [](const Acts::GeometryIdentifier& self) {
+          std::stringstream ss;
+          ss << self;
+          return ss.str();
+        });
   }
 
   {
     py::class_<Acts::Surface, std::shared_ptr<Acts::Surface>>(m, "Surface")
+        // Can't bind directly because GeometryObject is virtual base of Surface
         .def("geometryId",
-             [](Acts::Surface& self) { return self.geometryId(); })
-        .def("center",
-             [](Acts::Surface& self) {
-               return self.center(Acts::GeometryContext{});
-             })
-        .def("type", [](Acts::Surface& self) { return self.type(); });
+             [](const Surface& self) { return self.geometryId(); })
+        .def("center", &Surface::center)
+        .def("type", &Surface::type)
+        .def("visualize", &Surface::visualize)
+        .def("surfaceMaterial", &Acts::Surface::surfaceMaterialSharedPtr);
   }
 
   {
@@ -146,6 +156,15 @@ void addGeometry(Context& ctx) {
   {
     py::class_<Acts::TrackingGeometry, std::shared_ptr<Acts::TrackingGeometry>>(
         m, "TrackingGeometry")
+        .def(py::init([](const MutableTrackingVolumePtr& volPtr,
+                         std::shared_ptr<const IMaterialDecorator> matDec,
+                         const GeometryIdentifierHook& hook,
+                         Acts::Logging::Level level) {
+          auto logger = Acts::getDefaultLogger("TrackingGeometry", level);
+          auto trkGeo = std::make_shared<Acts::TrackingGeometry>(
+              volPtr, matDec.get(), hook, *logger);
+          return trkGeo;
+        }))
         .def("visitSurfaces",
              [](Acts::TrackingGeometry& self, py::function& func) {
                self.visitSurfaces(func);
@@ -158,26 +177,50 @@ void addGeometry(Context& ctx) {
                return selector.surfaces;
              })
         .def_property_readonly(
-            "worldVolume",
-            &Acts::TrackingGeometry::highestTrackingVolumeShared);
+            "highestTrackingVolume",
+            &Acts::TrackingGeometry::highestTrackingVolumePtr)
+        .def("visualize", &Acts::TrackingGeometry::visualize, py::arg("helper"),
+             py::arg("gctx"), py::arg("viewConfig") = s_viewVolume,
+             py::arg("portalViewConfig") = s_viewPortal,
+             py::arg("sensitiveViewConfig") = s_viewSensitive);
   }
 
   {
-    py::class_<Acts::Volume, std::shared_ptr<Acts::Volume>>(m, "Volume")
-        .def_static(
-            "makeCylinderVolume",
-            [](double r, double halfZ) {
-              auto bounds =
-                  std::make_shared<Acts::CylinderVolumeBounds>(0, r, halfZ);
-              return std::make_shared<Acts::Volume>(Transform3::Identity(),
-                                                    bounds);
-            },
-            "r"_a, "halfZ"_a);
+    py::class_<Acts::VolumeBounds, std::shared_ptr<Acts::VolumeBounds>>(
+        m, "VolumeBounds")
+        .def("type", &Acts::VolumeBounds::type)
+        .def("__str__", [](const Acts::VolumeBounds& self) {
+          std::stringstream ss;
+          ss << self;
+          return ss.str();
+        });
+
+    auto cvb =
+        py::class_<Acts::CylinderVolumeBounds,
+                   std::shared_ptr<Acts::CylinderVolumeBounds>,
+                   Acts::VolumeBounds>(m, "CylinderVolumeBounds")
+            .def(py::init<ActsScalar, ActsScalar, ActsScalar, ActsScalar,
+                          ActsScalar, ActsScalar, ActsScalar>(),
+                 "rmin"_a, "rmax"_a, "halfz"_a, "halfphi"_a = std::numbers::pi,
+                 "avgphi"_a = 0., "bevelMinZ"_a = 0., "bevelMaxZ"_a = 0.);
+
+    py::enum_<CylinderVolumeBounds::Face>(cvb, "Face")
+        .value("PositiveDisc", CylinderVolumeBounds::Face::PositiveDisc)
+        .value("NegativeDisc", CylinderVolumeBounds::Face::NegativeDisc)
+        .value("OuterCylinder", CylinderVolumeBounds::Face::OuterCylinder)
+        .value("InnerCylinder", CylinderVolumeBounds::Face::InnerCylinder)
+        .value("NegativePhiPlane", CylinderVolumeBounds::Face::NegativePhiPlane)
+        .value("PositivePhiPlane",
+               CylinderVolumeBounds::Face::PositivePhiPlane);
   }
 
   {
+    py::class_<Acts::Volume, std::shared_ptr<Acts::Volume>>(m, "Volume");
+
     py::class_<Acts::TrackingVolume, Acts::Volume,
-               std::shared_ptr<Acts::TrackingVolume>>(m, "TrackingVolume");
+               std::shared_ptr<Acts::TrackingVolume>>(m, "TrackingVolume")
+        .def(py::init<const Transform3&, std::shared_ptr<Acts::VolumeBounds>,
+                      std::string>());
   }
 
   {
@@ -191,22 +234,72 @@ void addGeometry(Context& ctx) {
         }));
   }
 
+  py::class_<ExtentEnvelope>(m, "ExtentEnvelope")
+      .def(py::init<>())
+      .def(py::init<const Envelope&>())
+      .def(py::init([](Envelope x, Envelope y, Envelope z, Envelope r,
+                       Envelope phi, Envelope rPhi, Envelope h, Envelope eta,
+                       Envelope mag) {
+             return ExtentEnvelope({.x = x,
+                                    .y = y,
+                                    .z = z,
+                                    .r = r,
+                                    .phi = phi,
+                                    .rPhi = rPhi,
+                                    .h = h,
+                                    .eta = eta,
+                                    .mag = mag});
+           }),
+           py::arg("x") = zeroEnvelope, py::arg("y") = zeroEnvelope,
+           py::arg("z") = zeroEnvelope, py::arg("r") = zeroEnvelope,
+           py::arg("phi") = zeroEnvelope, py::arg("rPhi") = zeroEnvelope,
+           py::arg("h") = zeroEnvelope, py::arg("eta") = zeroEnvelope,
+           py::arg("mag") = zeroEnvelope)
+      .def_static("Zero", &ExtentEnvelope::Zero)
+      .def("__getitem__", [](ExtentEnvelope& self,
+                             BinningValue bValue) { return self[bValue]; })
+      .def("__setitem__", [](ExtentEnvelope& self, BinningValue bValue,
+                             const Envelope& value) { self[bValue] = value; })
+      .def("__str__", [](const ExtentEnvelope& self) {
+        std::array<std::string, numBinningValues()> values;
+
+        std::stringstream ss;
+        for (BinningValue val : allBinningValues()) {
+          ss << val << "=(" << self[val][0] << ", " << self[val][1] << ")";
+          values.at(toUnderlying(val)) = ss.str();
+          ss.str("");
+        }
+
+        ss.str("");
+        ss << "ExtentEnvelope(";
+        ss << boost::algorithm::join(values, ", ");
+        ss << ")";
+        return ss.str();
+      });
+
+  py::class_<Extent>(m, "Extent")
+      .def(py::init<const ExtentEnvelope&>(),
+           py::arg("envelope") = ExtentEnvelope::Zero())
+      .def("range",
+           [](const Acts::Extent& self,
+              Acts::BinningValue bval) -> std::array<ActsScalar, 2> {
+             return {self.min(bval), self.max(bval)};
+           })
+      .def("__str__", &Extent::toString);
+
   {
-    py::class_<Acts::Extent>(m, "Extent")
-        .def(py::init(
-            [](const std::vector<std::tuple<Acts::BinningValue,
-                                            std::array<Acts::ActsScalar, 2u>>>&
-                   franges) {
-              Acts::Extent extent;
-              for (const auto& [bval, frange] : franges) {
-                extent.set(bval, frange[0], frange[1]);
-              }
-              return extent;
-            }))
-        .def("range", [](const Acts::Extent& self, Acts::BinningValue bval) {
-          return std::array<Acts::ActsScalar, 2u>{self.min(bval),
-                                                  self.max(bval)};
-        });
+    auto cylStack = py::class_<CylinderVolumeStack>(m, "CylinderVolumeStack");
+
+    py::enum_<CylinderVolumeStack::AttachmentStrategy>(cylStack,
+                                                       "AttachmentStrategy")
+        .value("Gap", CylinderVolumeStack::AttachmentStrategy::Gap)
+        .value("First", CylinderVolumeStack::AttachmentStrategy::First)
+        .value("Second", CylinderVolumeStack::AttachmentStrategy::Second)
+        .value("Midpoint", CylinderVolumeStack::AttachmentStrategy::Midpoint);
+
+    py::enum_<CylinderVolumeStack::ResizeStrategy>(cylStack, "ResizeStrategy")
+        .value("Gap", CylinderVolumeStack::ResizeStrategy::Gap)
+        .value("Expand", CylinderVolumeStack::ResizeStrategy::Expand);
   }
 }
 
@@ -226,21 +319,37 @@ void addExperimentalGeometry(Context& ctx) {
       .def("volumes", &Detector::volumes)
       .def("volumePtrs", &Detector::volumePtrs)
       .def("numberVolumes",
-           [](Detector& self) { return self.volumes().size(); })
+           [](const Detector& self) { return self.volumes().size(); })
       .def("extractMaterialSurfaces",
-           [](Detector& self) {
+           [](const Detector& self) {
              MaterialSurfaceSelector selector;
              self.visitSurfaces(selector);
              return selector.surfaces;
            })
-      .def("geoIdSurfaceMap", [](Detector& self) {
-        IdentifierSurfacesCollector collector;
-        self.visitSurfaces(collector);
-        return collector.surfaces;
-      });
+      .def("geoIdSurfaceMap",
+           [](const Detector& self) {
+             IdentifierSurfacesCollector collector;
+             self.visitSurfaces(collector);
+             return collector.surfaces;
+           })
+      .def("cylindricalVolumeRepresentation",
+           [](const Detector& self, const Acts::GeometryContext& gctx) {
+             // Loop over the volumes and gather the extent
+             Extent extent;
+             for (const auto& volume : self.volumes()) {
+               extent.extend(volume->extent(gctx));
+             }
+             auto bounds = std::make_shared<Acts::CylinderVolumeBounds>(
+                 0., extent.max(Acts::BinningValue::binR),
+                 extent.max(Acts::BinningValue::binZ));
+
+             return std::make_shared<Acts::Volume>(Transform3::Identity(),
+                                                   std::move(bounds));
+           });
 
   // Portal definition
-  py::class_<Portal, std::shared_ptr<Portal>>(m, "Portal");
+  py::class_<Experimental::Portal, std::shared_ptr<Experimental::Portal>>(
+      m, "Portal");
 
   {
     // The surface hierarchy map
@@ -259,7 +368,7 @@ void addExperimentalGeometry(Context& ctx) {
       for (const auto& surface : smap) {
         auto gid = surface->geometryId();
         // Exclusion criteria
-        if (sensitiveOnly and gid.sensitive() == 0) {
+        if (sensitiveOnly && gid.sensitive() == 0) {
           continue;
         };
         surfaceVolumeLayerMap[gid.volume()][gid.layer()].push_back(surface);
@@ -273,10 +382,15 @@ void addExperimentalGeometry(Context& ctx) {
     // Be able to construct a proto binning
     py::class_<ProtoBinning>(m, "ProtoBinning")
         .def(py::init<Acts::BinningValue, Acts::AxisBoundaryType,
-                      const std::vector<Acts::ActsScalar>&, std::size_t>())
+                      const std::vector<Acts::ActsScalar>&, std::size_t>(),
+             "bValue"_a, "bType"_a, "e"_a, "exp"_a = 0u)
         .def(py::init<Acts::BinningValue, Acts::AxisBoundaryType,
                       Acts::ActsScalar, Acts::ActsScalar, std::size_t,
-                      std::size_t>());
+                      std::size_t>(),
+             "bValue"_a, "bType"_a, "minE"_a, "maxE"_a, "nbins"_a, "exp"_a = 0u)
+        .def(py::init<Acts::BinningValue, Acts::AxisBoundaryType, std::size_t,
+                      std::size_t>(),
+             "bValue"_a, "bType"_a, "nbins"_a, "exp"_a = 0u);
   }
 
   {
@@ -305,7 +419,7 @@ void addExperimentalGeometry(Context& ctx) {
     ACTS_PYTHON_MEMBER(surfacesProvider);
     ACTS_PYTHON_MEMBER(supports);
     ACTS_PYTHON_MEMBER(binnings);
-    ACTS_PYTHON_MEMBER(nSegments);
+    ACTS_PYTHON_MEMBER(quarterSegments);
     ACTS_PYTHON_MEMBER(auxiliary);
     ACTS_PYTHON_STRUCT_END();
 
diff --git a/Examples/Python/src/GeometryBuildingGen1.cpp b/Examples/Python/src/GeometryBuildingGen1.cpp
new file mode 100644
index 00000000000..2886c41e1d5
--- /dev/null
+++ b/Examples/Python/src/GeometryBuildingGen1.cpp
@@ -0,0 +1,137 @@
+// This file is part of the ACTS project.
+//
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
+//
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
+
+#include "Acts/Geometry/CylinderVolumeBounds.hpp"
+#include "Acts/Geometry/CylinderVolumeHelper.hpp"
+#include "Acts/Geometry/Layer.hpp"
+#include "Acts/Geometry/LayerArrayCreator.hpp"
+#include "Acts/Geometry/LayerCreator.hpp"
+#include "Acts/Geometry/SurfaceArrayCreator.hpp"
+#include "Acts/Geometry/TrackingVolume.hpp"
+#include "Acts/Geometry/TrackingVolumeArrayCreator.hpp"
+#include "Acts/Geometry/VolumeBounds.hpp"
+#include "Acts/Plugins/Python/Utilities.hpp"
+
+#include <array>
+#include <memory>
+#include <unordered_map>
+#include <vector>
+
+#include <pybind11/pybind11.h>
+#include <pybind11/stl.h>
+
+namespace py = pybind11;
+using namespace pybind11::literals;
+
+namespace Acts::Python {
+void addGeometryBuildingGen1(Context &ctx) {
+  auto m = ctx.get("main");
+
+  using SurfacePtrVector = std::vector<std::shared_ptr<const Surface>>;
+
+  py::class_<Acts::Layer, std::shared_ptr<Acts::Layer>>(m, "Layer");
+
+  {
+    auto creator =
+        py::class_<Acts::LayerCreator>(m, "LayerCreator")
+            .def(py::init<Acts::LayerCreator::Config>())
+            .def("cylinderLayer",
+                 [](const Acts::LayerCreator &self, const GeometryContext &gctx,
+                    SurfacePtrVector surfaces, std::size_t binsPhi,
+                    std::size_t binsZ) {
+                   return self.cylinderLayer(gctx, surfaces, binsPhi, binsZ);
+                 })
+            .def("discLayer",
+                 [](const Acts::LayerCreator &self, const GeometryContext &gctx,
+                    SurfacePtrVector surfaces, std::size_t binsR,
+                    std::size_t binsPhi) {
+                   return self.discLayer(gctx, surfaces, binsR, binsPhi);
+                 });
+
+    auto config =
+        py::class_<LayerCreator::Config>(creator, "Config").def(py::init<>());
+
+    ACTS_PYTHON_STRUCT_BEGIN(config, LayerCreator::Config);
+    ACTS_PYTHON_MEMBER(surfaceArrayCreator);
+    ACTS_PYTHON_MEMBER(cylinderZtolerance);
+    ACTS_PYTHON_MEMBER(cylinderPhiTolerance);
+    ACTS_PYTHON_STRUCT_END();
+  }
+
+  {
+    using Creator = Acts::SurfaceArrayCreator;
+    using Config = typename Creator::Config;
+
+    auto creator =
+        py::class_<Creator, std::shared_ptr<Creator>>(m, "SurfaceArrayCreator")
+            .def(py::init<Config>());
+
+    py::class_<Config>(creator, "Config").def(py::init<>());
+  }
+
+  {
+    using Base = Acts::ILayerArrayCreator;
+    using Creator = Acts::LayerArrayCreator;
+    using Config = typename Creator::Config;
+
+    py::class_<Base, std::shared_ptr<Base>>(m, "ILayerArrayCreator");
+
+    auto creator = py::class_<Creator, std::shared_ptr<Creator>, Base>(
+                       m, "LayerArrayCreator")
+                       .def(py::init<Config>());
+
+    py::class_<Config>(creator, "Config").def(py::init<>());
+  }
+
+  {
+    using Base = Acts::ITrackingVolumeArrayCreator;
+    using Creator = Acts::TrackingVolumeArrayCreator;
+    using Config = typename Creator::Config;
+
+    py::class_<Base, std::shared_ptr<Base>>(m, "ITrackingVolumeArrayCreator");
+
+    auto creator = py::class_<Creator, std::shared_ptr<Creator>, Base>(
+                       m, "TrackingVolumeArrayCreator")
+                       .def(py::init<Config>());
+
+    py::class_<Config>(creator, "Config").def(py::init<>());
+  }
+
+  {
+    auto helper =
+        py::class_<Acts::CylinderVolumeHelper>(m, "CylinderVolumeHelper")
+            .def(py::init([](const Acts::CylinderVolumeHelper::Config &cfg,
+                             Acts::Logging::Level level) {
+              return Acts::CylinderVolumeHelper(
+                  cfg, Acts::getDefaultLogger("CylinderVolumeHelper", level));
+            }))
+            .def("createTrackingVolume",
+                 [](const Acts::CylinderVolumeHelper &self,
+                    GeometryContext gctx, const LayerVector &layers,
+                    std::shared_ptr<VolumeBounds> volumeBounds,
+                    const Transform3 &trafo, const std::string &name) {
+                   return self.createTrackingVolume(
+                       gctx, layers, {}, volumeBounds, {}, trafo, name);
+                 })
+            .def("createContainerTrackingVolume",
+                 &Acts::CylinderVolumeHelper::createContainerTrackingVolume);
+
+    auto config = py::class_<CylinderVolumeHelper::Config>(helper, "Config")
+                      .def(py::init<>());
+
+    ACTS_PYTHON_STRUCT_BEGIN(config, CylinderVolumeHelper::Config);
+    ACTS_PYTHON_MEMBER(layerArrayCreator);
+    ACTS_PYTHON_MEMBER(trackingVolumeArrayCreator);
+    ACTS_PYTHON_MEMBER(passiveLayerThickness);
+    ACTS_PYTHON_MEMBER(passiveLayerPhiBins);
+    ACTS_PYTHON_MEMBER(passiveLayerRzBins);
+    ACTS_PYTHON_STRUCT_END();
+  }
+}
+
+}  // namespace Acts::Python
diff --git a/Examples/Python/src/Hashing.cpp b/Examples/Python/src/Hashing.cpp
new file mode 100644
index 00000000000..57883557846
--- /dev/null
+++ b/Examples/Python/src/Hashing.cpp
@@ -0,0 +1,63 @@
+// This file is part of the ACTS project.
+//
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
+//
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
+
+#include "Acts/Plugins/Hashing/HashingAlgorithmConfig.hpp"
+#include "Acts/Plugins/Hashing/HashingTrainingConfig.hpp"
+#include "Acts/Plugins/Python/Utilities.hpp"
+#include "ActsExamples/TrackFinding/SeedingAlgorithmHashing.hpp"
+
+#include <memory>
+
+#include <pybind11/pybind11.h>
+#include <pybind11/stl.h>
+
+namespace py = pybind11;
+
+using namespace ActsExamples;
+using namespace Acts;
+
+namespace Acts::Python {
+
+void addHashing(Context& ctx) {
+  auto [m, mex] = ctx.get("main", "examples");
+
+  auto hashingModule = m.def_submodule("hashing");
+  auto hashingExampleModule = mex.def_submodule("_hashing");
+
+  {
+    using Config = Acts::HashingAlgorithmConfig;
+    auto c = py::class_<Config>(hashingModule, "HashingAlgorithmConfig")
+                 .def(py::init<>());
+    ACTS_PYTHON_STRUCT_BEGIN(c, Config);
+    ACTS_PYTHON_MEMBER(bucketSize);
+    ACTS_PYTHON_MEMBER(zBins);
+    ACTS_PYTHON_MEMBER(phiBins);
+    ACTS_PYTHON_STRUCT_END();
+    patchKwargsConstructor(c);
+  }
+
+  {
+    using Config = Acts::HashingTrainingConfig;
+    auto c = py::class_<Config>(hashingModule, "HashingTrainingConfig")
+                 .def(py::init<>());
+    ACTS_PYTHON_STRUCT_BEGIN(c, Config);
+    ACTS_PYTHON_MEMBER(annoySeed);
+    ACTS_PYTHON_MEMBER(f);
+    ACTS_PYTHON_STRUCT_END();
+    patchKwargsConstructor(c);
+  }
+
+  ACTS_PYTHON_DECLARE_ALGORITHM(
+      ActsExamples::SeedingAlgorithmHashing, hashingExampleModule,
+      "SeedingAlgorithmHashing", inputSpacePoints, outputSeeds, outputBuckets,
+      seedFilterConfig, seedFinderConfig, seedFinderOptions, gridConfig,
+      gridOptions, allowSeparateRMax, zBinNeighborsTop, zBinNeighborsBottom,
+      numPhiNeighbors, hashingConfig, hashingTrainingConfig, useExtraCuts);
+}
+
+}  // namespace Acts::Python
diff --git a/Examples/Python/src/HashingStub.cpp b/Examples/Python/src/HashingStub.cpp
new file mode 100644
index 00000000000..7168ef2b0a6
--- /dev/null
+++ b/Examples/Python/src/HashingStub.cpp
@@ -0,0 +1,15 @@
+// This file is part of the ACTS project.
+//
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
+//
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
+
+namespace Acts::Python {
+struct Context;
+}  // namespace Acts::Python
+
+namespace Acts::Python {
+void addHashing(Context& /*ctx*/) {}
+}  // namespace Acts::Python
diff --git a/Examples/Python/src/HepMC3.cpp b/Examples/Python/src/HepMC3.cpp
index a8c51fa0c29..63c67b6a42b 100644
--- a/Examples/Python/src/HepMC3.cpp
+++ b/Examples/Python/src/HepMC3.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2021 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include "Acts/Plugins/Python/Utilities.hpp"
 #include "ActsExamples/HepMC/HepMCProcessExtractor.hpp"
diff --git a/Examples/Python/src/HepMC3Stub.cpp b/Examples/Python/src/HepMC3Stub.cpp
index 7e3919d9dca..40aae062eb8 100644
--- a/Examples/Python/src/HepMC3Stub.cpp
+++ b/Examples/Python/src/HepMC3Stub.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2021 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 namespace Acts::Python {
 struct Context;
diff --git a/Examples/Python/src/Input.cpp b/Examples/Python/src/Input.cpp
index 2036e51674a..b3ad9e1f657 100644
--- a/Examples/Python/src/Input.cpp
+++ b/Examples/Python/src/Input.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2021 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include "Acts/Plugins/Python/Utilities.hpp"
 #include "ActsExamples/EventData/Cluster.hpp"
@@ -63,8 +63,8 @@ void addInput(Context& ctx) {
 
   ACTS_PYTHON_DECLARE_READER(
       ActsExamples::CsvMeasurementReader, mex, "CsvMeasurementReader", inputDir,
-      outputMeasurements, outputMeasurementSimHitsMap, outputSourceLinks,
-      outputClusters, outputMeasurementParticlesMap, inputSimHits);
+      outputMeasurements, outputMeasurementSimHitsMap, outputClusters,
+      outputMeasurementParticlesMap, inputSimHits);
 
   ACTS_PYTHON_DECLARE_READER(ActsExamples::CsvSimHitReader, mex,
                              "CsvSimHitReader", inputDir, inputStem,
@@ -93,7 +93,16 @@ void addInput(Context& ctx) {
   ACTS_PYTHON_DECLARE_READER(
       ActsExamples::RootAthenaDumpReader, mex, "RootAthenaDumpReader", treename,
       inputfile, outputMeasurements, outputPixelSpacePoints,
-      outputStripSpacePoints, outputSpacePoints, outputClusters);
+      outputStripSpacePoints, outputSpacePoints, outputClusters,
+      outputMeasurementParticlesMap, outputParticles, onlyPassedParticles,
+      skipOverlapSPsPhi, skipOverlapSPsEta, geometryIdMap, trackingGeometry,
+      absBoundaryTolerance);
+
+#ifdef WITH_GEOMODEL_PLUGIN
+  ACTS_PYTHON_DECLARE_READER(ActsExamples::RootAthenaDumpGeoIdCollector, mex,
+                             "RootAthenaDumpGeoIdCollector", treename,
+                             inputfile, trackingGeometry, geometryIdMap);
+#endif
 
   ACTS_PYTHON_DECLARE_READER(ActsExamples::RootSimHitReader, mex,
                              "RootSimHitReader", treeName, filePath,
diff --git a/Examples/Python/src/Json.cpp b/Examples/Python/src/Json.cpp
index fce16c5d558..be367612ac2 100644
--- a/Examples/Python/src/Json.cpp
+++ b/Examples/Python/src/Json.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2021 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include "Acts/Definitions/Algebra.hpp"
 #include "Acts/Detector/Detector.hpp"
@@ -163,7 +163,11 @@ void addJson(Context& ctx) {
     ACTS_PYTHON_MEMBER(jsonEntryPath);
     ACTS_PYTHON_STRUCT_END();
 
-    mex.def("readSurfaceFromJson", ActsExamples::JsonSurfacesReader::read);
+    mex.def("readSurfaceHierarchyMapFromJson",
+            ActsExamples::JsonSurfacesReader::readHierarchyMap);
+
+    mex.def("readSurfaceVectorFromJson",
+            ActsExamples::JsonSurfacesReader::readVector);
   }
 
   {
diff --git a/Examples/Python/src/JsonStub.cpp b/Examples/Python/src/JsonStub.cpp
index 3eea9438e08..5e5f6c0ba38 100644
--- a/Examples/Python/src/JsonStub.cpp
+++ b/Examples/Python/src/JsonStub.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2021 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include "Acts/Plugins/Python/Utilities.hpp"
 
diff --git a/Examples/Python/src/MagneticField.cpp b/Examples/Python/src/MagneticField.cpp
index a8279675696..6e0c1728941 100644
--- a/Examples/Python/src/MagneticField.cpp
+++ b/Examples/Python/src/MagneticField.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2021 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include "ActsExamples/MagneticField/MagneticField.hpp"
 
@@ -36,12 +36,30 @@ using namespace pybind11::literals;
 
 namespace Acts::Python {
 
+/// @brief Get the value of a field, throwing an exception if the result is
+/// invalid.
+Acts::Vector3 getField(Acts::MagneticFieldProvider& self,
+                       const Acts::Vector3& position,
+                       Acts::MagneticFieldProvider::Cache& cache) {
+  if (Result<Vector3> res = self.getField(position, cache); !res.ok()) {
+    std::stringstream ss;
+
+    ss << "Field lookup failure with error: \"" << res.error() << "\"";
+
+    throw std::runtime_error{ss.str()};
+  } else {
+    return *res;
+  }
+}
+
 void addMagneticField(Context& ctx) {
   auto [m, mex, prop] = ctx.get("main", "examples", "propagation");
 
   py::class_<Acts::MagneticFieldProvider,
              std::shared_ptr<Acts::MagneticFieldProvider>>(
-      m, "MagneticFieldProvider");
+      m, "MagneticFieldProvider")
+      .def("getField", &getField)
+      .def("makeCache", &Acts::MagneticFieldProvider::makeCache);
 
   py::class_<Acts::InterpolatedMagneticField,
              std::shared_ptr<Acts::InterpolatedMagneticField>>(
diff --git a/Examples/Python/src/Material.cpp b/Examples/Python/src/Material.cpp
index ed7a2b5216e..6855fdc1737 100644
--- a/Examples/Python/src/Material.cpp
+++ b/Examples/Python/src/Material.cpp
@@ -1,14 +1,15 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2021 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include "Acts/Geometry/GeometryContext.hpp"
 #include "Acts/MagneticField/MagneticFieldContext.hpp"
 #include "Acts/Material/BinnedSurfaceMaterialAccumulater.hpp"
+#include "Acts/Material/HomogeneousSurfaceMaterial.hpp"
 #include "Acts/Material/IMaterialDecorator.hpp"
 #include "Acts/Material/ISurfaceMaterial.hpp"
 #include "Acts/Material/IVolumeMaterial.hpp"
@@ -16,6 +17,7 @@
 #include "Acts/Material/MaterialMapper.hpp"
 #include "Acts/Material/MaterialValidater.hpp"
 #include "Acts/Material/PropagatorMaterialAssigner.hpp"
+#include "Acts/Material/ProtoSurfaceMaterial.hpp"
 #include "Acts/Material/SurfaceMaterialMapper.hpp"
 #include "Acts/Material/VolumeMaterialMapper.hpp"
 #include "Acts/Plugins/Json/ActsJson.hpp"
@@ -57,7 +59,20 @@ void addMaterial(Context& ctx) {
 
   {
     py::class_<Acts::ISurfaceMaterial, std::shared_ptr<ISurfaceMaterial>>(
-        m, "ISurfaceMaterial");
+        m, "ISurfaceMaterial")
+        .def("toString", &Acts::ISurfaceMaterial::toString);
+
+    py::class_<Acts::ProtoGridSurfaceMaterial, Acts::ISurfaceMaterial,
+               std::shared_ptr<ProtoGridSurfaceMaterial>>(
+        m, "ProtoGridSurfaceMaterial");
+
+    py::class_<Acts::ProtoSurfaceMaterial, Acts::ISurfaceMaterial,
+               std::shared_ptr<ProtoSurfaceMaterial>>(m,
+                                                      "ProtoSurfaceMaterial");
+
+    py::class_<Acts::HomogeneousSurfaceMaterial, Acts::ISurfaceMaterial,
+               std::shared_ptr<HomogeneousSurfaceMaterial>>(
+        m, "HomogeneousSurfaceMaterial");
 
     py::class_<Acts::IVolumeMaterial, std::shared_ptr<IVolumeMaterial>>(
         m, "IVolumeMaterial");
@@ -66,7 +81,9 @@ void addMaterial(Context& ctx) {
   {
     py::class_<Acts::IMaterialDecorator,
                std::shared_ptr<Acts::IMaterialDecorator>>(m,
-                                                          "IMaterialDecorator");
+                                                          "IMaterialDecorator")
+        .def("decorate", py::overload_cast<Surface&>(
+                             &Acts::IMaterialDecorator::decorate, py::const_));
   }
 
   {
diff --git a/Examples/Python/src/ModuleEntry.cpp b/Examples/Python/src/ModuleEntry.cpp
index a4411e52114..a74d277f7a5 100644
--- a/Examples/Python/src/ModuleEntry.cpp
+++ b/Examples/Python/src/ModuleEntry.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2021-2024 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include "Acts/ActsVersion.hpp"
 #include "Acts/Geometry/GeometryContext.hpp"
@@ -40,6 +40,7 @@ using namespace Acts::Python;
 
 namespace Acts::Python {
 void addContext(Context& ctx);
+void addAny(Context& ctx);
 void addUnits(Context& ctx);
 void addFramework(Context& ctx);
 void addLogging(Context& ctx);
@@ -49,8 +50,10 @@ void addBinning(Context& ctx);
 void addEventData(Context& ctx);
 
 void addPropagation(Context& ctx);
+void addNavigation(Context& ctx);
 
 void addGeometry(Context& ctx);
+void addGeometryBuildingGen1(Context& ctx);
 void addExperimentalGeometry(Context& ctx);
 
 void addMagneticField(Context& ctx);
@@ -80,6 +83,9 @@ void addSvg(Context& ctx);
 void addObj(Context& ctx);
 void addOnnx(Context& ctx);
 void addOnnxNeuralCalibrator(Context& ctx);
+void addCovfie(Context& ctx);
+void addTraccc(Context& ctx);
+void addHashing(Context& ctx);
 
 }  // namespace Acts::Python
 
@@ -107,6 +113,7 @@ PYBIND11_MODULE(ActsPythonBindings, m) {
   }
 
   addContext(ctx);
+  addAny(ctx);
   addUnits(ctx);
   addFramework(ctx);
   addLogging(ctx);
@@ -114,14 +121,16 @@ PYBIND11_MODULE(ActsPythonBindings, m) {
   addAlgebra(ctx);
   addBinning(ctx);
   addEventData(ctx);
+  addOutput(ctx);
 
   addPropagation(ctx);
+  addNavigation(ctx);
+  addGeometryBuildingGen1(ctx);
   addGeometry(ctx);
   addExperimentalGeometry(ctx);
 
   addMagneticField(ctx);
   addMaterial(ctx);
-  addOutput(ctx);
   addDetector(ctx);
   addExampleAlgorithms(ctx);
   addInput(ctx);
@@ -144,4 +153,7 @@ PYBIND11_MODULE(ActsPythonBindings, m) {
   addSvg(ctx);
   addOnnx(ctx);
   addOnnxNeuralCalibrator(ctx);
+  addCovfie(ctx);
+  addTraccc(ctx);
+  addHashing(ctx);
 }
diff --git a/Examples/Python/src/Navigation.cpp b/Examples/Python/src/Navigation.cpp
new file mode 100644
index 00000000000..a4f55a532ac
--- /dev/null
+++ b/Examples/Python/src/Navigation.cpp
@@ -0,0 +1,229 @@
+// This file is part of the ACTS project.
+//
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
+//
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
+
+#include "Acts/Geometry/CylinderVolumeBounds.hpp"
+#include "Acts/Geometry/NavigationPolicyFactory.hpp"
+#include "Acts/Geometry/TrackingVolume.hpp"
+#include "Acts/Navigation/SurfaceArrayNavigationPolicy.hpp"
+#include "Acts/Navigation/TryAllNavigationPolicy.hpp"
+#include "Acts/Plugins/Python/Utilities.hpp"
+#include "Acts/Surfaces/CylinderBounds.hpp"
+#include "Acts/Surfaces/CylinderSurface.hpp"
+#include "Acts/Utilities/Logger.hpp"
+#include "Acts/Utilities/TypeTag.hpp"
+
+#include <memory>
+#include <stdexcept>
+#include <utility>
+
+#include <boost/core/demangle.hpp>
+#include <pybind11/pybind11.h>
+#include <pybind11/stl.h>
+
+namespace py = pybind11;
+using namespace pybind11::literals;
+
+namespace Acts::Python {
+
+struct AnyNavigationPolicyFactory : public Acts::NavigationPolicyFactory {
+  virtual std::unique_ptr<AnyNavigationPolicyFactory> add(
+      TypeTag<TryAllNavigationPolicy> /*type*/) = 0;
+
+  virtual std::unique_ptr<AnyNavigationPolicyFactory> add(
+      TypeTag<SurfaceArrayNavigationPolicy> /*type*/,
+      SurfaceArrayNavigationPolicy::Config config) = 0;
+
+  virtual std::unique_ptr<AnyNavigationPolicyFactory> add(
+      TypeTag<TryAllNavigationPolicy> /*type*/,
+      TryAllNavigationPolicy::Config config) = 0;
+};
+
+template <typename Factory = detail::NavigationPolicyFactoryImpl<>,
+          typename... Policies>
+struct NavigationPolicyFactoryT : public AnyNavigationPolicyFactory {
+  explicit NavigationPolicyFactoryT(Factory impl)
+    requires(sizeof...(Policies) > 0)
+      : m_impl(std::move(impl)) {}
+
+  NavigationPolicyFactoryT()
+    requires(sizeof...(Policies) == 0)
+      : m_impl{} {}
+
+  std::unique_ptr<AnyNavigationPolicyFactory> add(
+      TypeTag<TryAllNavigationPolicy> /*type*/) override {
+    return add<TryAllNavigationPolicy>();
+  }
+
+  std::unique_ptr<AnyNavigationPolicyFactory> add(
+      TypeTag<SurfaceArrayNavigationPolicy> /*type*/,
+      SurfaceArrayNavigationPolicy::Config config) override {
+    return add<SurfaceArrayNavigationPolicy>(std::move(config));
+  }
+
+  std::unique_ptr<AnyNavigationPolicyFactory> add(
+      TypeTag<TryAllNavigationPolicy> /*type*/,
+      TryAllNavigationPolicy::Config config) override {
+    return add<TryAllNavigationPolicy>(config);
+  }
+
+  std::unique_ptr<INavigationPolicy> build(
+      const GeometryContext& gctx, const TrackingVolume& volume,
+      const Logger& logger) const override {
+    if constexpr (sizeof...(Policies) > 0) {
+      return m_impl.build(gctx, volume, logger);
+    } else {
+      throw std::runtime_error("No policies added to the factory");
+    }
+  }
+
+ private:
+  template <typename T, typename... Args>
+  std::unique_ptr<AnyNavigationPolicyFactory> add(Args&&... args) {
+    if constexpr (!(std::is_same_v<T, Policies> || ...)) {
+      auto impl =
+          std::move(m_impl).template add<T>(std::forward<Args>(args)...);
+      return std::make_unique<
+          NavigationPolicyFactoryT<decltype(impl), Policies..., T>>(
+          std::move(impl));
+    } else {
+      throw std::invalid_argument("Policy already added to the factory");
+    }
+  }
+
+  Factory m_impl;
+};
+
+class NavigationPolicyFactory : public Acts::NavigationPolicyFactory {
+ public:
+  // This overload is for all the navigation policies that don't have extra
+  // arguments
+  NavigationPolicyFactory& addNoArguments(const py::object& cls) {
+    auto m = py::module_::import("acts");
+    if (py::object o = m.attr("TryAllNavigationPolicy"); cls.is(o)) {
+      m_impl = m_impl->add(Type<TryAllNavigationPolicy>);
+    }
+    // Add other policies here
+    return *this;
+  }
+
+  NavigationPolicyFactory& addSurfaceArray(
+      const py::object& /*cls*/,
+      const SurfaceArrayNavigationPolicy::Config& config) {
+    m_impl = m_impl->add(Type<SurfaceArrayNavigationPolicy>, config);
+    return *this;
+  }
+
+  NavigationPolicyFactory& addTryAll(
+      const py::object& /*cls*/, const TryAllNavigationPolicy::Config& config) {
+    m_impl = m_impl->add(Type<TryAllNavigationPolicy>, config);
+    return *this;
+  }
+
+  std::unique_ptr<INavigationPolicy> build(
+      const GeometryContext& gctx, const TrackingVolume& volume,
+      const Logger& logger) const override {
+    return m_impl->build(gctx, volume, logger);
+  }
+
+ private:
+  std::unique_ptr<AnyNavigationPolicyFactory> m_impl =
+      std::make_unique<NavigationPolicyFactoryT<>>();
+};
+
+namespace Test {
+class DetectorElementStub : public DetectorElementBase {
+ public:
+  DetectorElementStub() : DetectorElementBase() {}
+
+  const Transform3& transform(const GeometryContext&) const override {
+    return m_transform;
+  }
+
+  /// Return surface representation - const return pattern
+  const Surface& surface() const override {
+    throw std::runtime_error("Not implemented");
+  }
+
+  /// Non-const return pattern
+  Surface& surface() override { throw std::runtime_error("Not implemented"); }
+
+  /// Returns the thickness of the module
+  /// @return double that indicates the thickness of the module
+  double thickness() const override { return 0; }
+
+ private:
+  Transform3 m_transform;
+};
+
+}  // namespace Test
+
+void addNavigation(Context& ctx) {
+  auto m = ctx.get("main");
+
+  py::class_<Acts::NavigationPolicyFactory,
+             std::shared_ptr<Acts::NavigationPolicyFactory>>(
+      m, "_NavigationPolicyFactory");
+
+  {
+    auto tryAll =
+        py::class_<TryAllNavigationPolicy>(m, "TryAllNavigationPolicy");
+    using Config = TryAllNavigationPolicy::Config;
+    auto c = py::class_<Config>(tryAll, "Config").def(py::init<>());
+    ACTS_PYTHON_STRUCT_BEGIN(c, Config);
+    ACTS_PYTHON_MEMBER(portals);
+    ACTS_PYTHON_MEMBER(sensitives);
+    ACTS_PYTHON_STRUCT_END();
+  }
+
+  py::class_<NavigationPolicyFactory, Acts::NavigationPolicyFactory,
+             std::shared_ptr<NavigationPolicyFactory>>(
+      m, "NavigationPolicyFactory")
+      // only to mirror the C++ API
+      .def_static("make", []() { return NavigationPolicyFactory{}; })
+      .def("add", &NavigationPolicyFactory::addNoArguments)
+      .def("add", &NavigationPolicyFactory::addSurfaceArray)
+      .def("add", &NavigationPolicyFactory::addTryAll)
+      .def("_buildTest", [](NavigationPolicyFactory& self) {
+        auto vol1 = std::make_shared<TrackingVolume>(
+            Transform3::Identity(),
+            std::make_shared<CylinderVolumeBounds>(30, 40, 100));
+        vol1->setVolumeName("TestVolume");
+
+        auto detElem = std::make_unique<Test::DetectorElementStub>();
+
+        auto surface = Surface::makeShared<CylinderSurface>(
+            Transform3::Identity(), std::make_shared<CylinderBounds>(30, 40));
+        surface->assignDetectorElement(*detElem);
+
+        vol1->addSurface(std::move(surface));
+
+        std::unique_ptr<INavigationPolicy> result =
+            self.build(GeometryContext{}, *vol1,
+                       *getDefaultLogger("Test", Logging::VERBOSE));
+      });
+
+  {
+    auto saPolicy = py::class_<SurfaceArrayNavigationPolicy>(
+        m, "SurfaceArrayNavigationPolicy");
+
+    using LayerType = SurfaceArrayNavigationPolicy::LayerType;
+    py::enum_<LayerType>(saPolicy, "LayerType")
+        .value("Cylinder", LayerType::Cylinder)
+        .value("Disc", LayerType::Disc)
+        .value("Plane", LayerType::Plane);
+
+    using Config = SurfaceArrayNavigationPolicy::Config;
+    auto c = py::class_<Config>(saPolicy, "Config").def(py::init<>());
+    ACTS_PYTHON_STRUCT_BEGIN(c, Config);
+    ACTS_PYTHON_MEMBER(layerType);
+    ACTS_PYTHON_MEMBER(bins);
+    ACTS_PYTHON_STRUCT_END();
+  }
+}
+
+}  // namespace Acts::Python
diff --git a/Examples/Python/src/Obj.cpp b/Examples/Python/src/Obj.cpp
index 378b548707c..09acb0c53b6 100644
--- a/Examples/Python/src/Obj.cpp
+++ b/Examples/Python/src/Obj.cpp
@@ -1,12 +1,14 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2023 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
+#include "Acts/Visualization/IVisualization3D.hpp"
 #include <Acts/Definitions/Algebra.hpp>
+#include <Acts/Detector/DetectorVolume.hpp>
 #include <Acts/Geometry/GeometryContext.hpp>
 #include <Acts/Plugins/Python/Utilities.hpp>
 #include <Acts/Surfaces/Surface.hpp>
@@ -18,6 +20,7 @@
 
 #include <pybind11/pybind11.h>
 #include <pybind11/stl.h>
+#include <pybind11/stl/filesystem.h>
 
 namespace py = pybind11;
 using namespace pybind11::literals;
@@ -34,25 +37,60 @@ void addObj(Context& ctx) {
     /// @param surfaces is the collection of surfaces
     /// @param viewContext is the geometry context
     /// @param viewRgb is the color of the surfaces
-    /// @param viewSegements is the number of segments to approximate a full circle
+    /// @param viewSegments is the number of segments to approximate a quarter of a circle
     /// @param fileName is the path to the output file
     ///
     mex.def("writeSurfacesObj",
             [](const std::vector<std::shared_ptr<Surface>>& surfaces,
-               const GeometryContext& viewContext,
-               const std::array<int, 3>& viewRgb, unsigned int viewSegements,
+               const GeometryContext& viewContext, const ViewConfig& viewConfig,
                const std::string& fileName) {
-              Acts::ViewConfig sConfig = Acts::ViewConfig{viewRgb};
-              sConfig.nSegments = viewSegements;
               Acts::GeometryView3D view3D;
               Acts::ObjVisualization3D obj;
 
               for (const auto& surface : surfaces) {
                 view3D.drawSurface(obj, *surface, viewContext,
-                                   Acts::Transform3::Identity(), sConfig);
+                                   Acts::Transform3::Identity(), viewConfig);
+              }
+              obj.write(fileName);
+            });
+    mex.def("writeVolumesObj",
+            [](const std::vector<std::shared_ptr<Experimental::DetectorVolume>>&
+                   Volumes,
+               const GeometryContext& viewContext, const ViewConfig& viewConfig,
+               const std::string& fileName) {
+              Acts::GeometryView3D view3D;
+              Acts::ObjVisualization3D obj;
+
+              for (const auto& volume : Volumes) {
+                view3D.drawDetectorVolume(obj, *volume, viewContext,
+                                          Acts::Transform3::Identity(),
+                                          viewConfig);
+              }
+              obj.write(fileName);
+            });
+    mex.def("writeVolumesSurfacesObj",
+            [](const std::vector<std::shared_ptr<Surface>>& surfaces,
+               const std::vector<std::shared_ptr<Experimental::DetectorVolume>>&
+                   Volumes,
+               const GeometryContext& viewContext, const ViewConfig& viewConfig,
+               const std::string& fileName) {
+              Acts::GeometryView3D view3D;
+              Acts::ObjVisualization3D obj;
+
+              for (const auto& volume : Volumes) {
+                view3D.drawDetectorVolume(obj, *volume, viewContext,
+                                          Acts::Transform3::Identity(),
+                                          viewConfig);
+              }
+              for (const auto& surface : surfaces) {
+                view3D.drawSurface(obj, *surface, viewContext,
+                                   Acts::Transform3::Identity(), viewConfig);
               }
               obj.write(fileName);
             });
   }
+
+  py::class_<ObjVisualization3D, IVisualization3D>(m, "ObjVisualization3D")
+      .def(py::init<>());
 }
 }  // namespace Acts::Python
diff --git a/Examples/Python/src/Onnx.cpp b/Examples/Python/src/Onnx.cpp
index edc9c627efd..c22e595bb43 100644
--- a/Examples/Python/src/Onnx.cpp
+++ b/Examples/Python/src/Onnx.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2023 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include "Acts/Plugins/Python/Utilities.hpp"
 #include "ActsExamples/TrackFindingML/AmbiguityResolutionMLAlgorithm.hpp"
diff --git a/Examples/Python/src/OnnxNeuralCalibrator.cpp b/Examples/Python/src/OnnxNeuralCalibrator.cpp
index e0358262be2..e70b6e077a7 100644
--- a/Examples/Python/src/OnnxNeuralCalibrator.cpp
+++ b/Examples/Python/src/OnnxNeuralCalibrator.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2023 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include "Acts/Plugins/Python/Utilities.hpp"
 #include <ActsExamples/EventData/NeuralCalibrator.hpp>
diff --git a/Examples/Python/src/OnnxNeuralCalibratorStub.cpp b/Examples/Python/src/OnnxNeuralCalibratorStub.cpp
index bb7b38ef3ac..5be9c65535e 100644
--- a/Examples/Python/src/OnnxNeuralCalibratorStub.cpp
+++ b/Examples/Python/src/OnnxNeuralCalibratorStub.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2023 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include "Acts/Plugins/Python/Utilities.hpp"
 
diff --git a/Examples/Python/src/OnnxStub.cpp b/Examples/Python/src/OnnxStub.cpp
index 304ee45475e..436297c7087 100644
--- a/Examples/Python/src/OnnxStub.cpp
+++ b/Examples/Python/src/OnnxStub.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2023 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 namespace Acts::Python {
 struct Context;
diff --git a/Examples/Python/src/Output.cpp b/Examples/Python/src/Output.cpp
index 5e405c5fa23..5adead2a9b4 100644
--- a/Examples/Python/src/Output.cpp
+++ b/Examples/Python/src/Output.cpp
@@ -1,15 +1,16 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2021-2024 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include "Acts/Definitions/TrackParametrization.hpp"
 #include "Acts/Geometry/GeometryHierarchyMap.hpp"
 #include "Acts/Plugins/Python/Utilities.hpp"
 #include "Acts/Utilities/Logger.hpp"
+#include "Acts/Visualization/IVisualization3D.hpp"
 #include "Acts/Visualization/ViewConfig.hpp"
 #include "ActsExamples/Digitization/DigitizationConfig.hpp"
 #include "ActsExamples/Framework/ProcessCode.hpp"
@@ -20,20 +21,16 @@
 #include "ActsExamples/Io/Csv/CsvProtoTrackWriter.hpp"
 #include "ActsExamples/Io/Csv/CsvSeedWriter.hpp"
 #include "ActsExamples/Io/Csv/CsvSimHitWriter.hpp"
+#include "ActsExamples/Io/Csv/CsvSpacePointsBucketWriter.hpp"
 #include "ActsExamples/Io/Csv/CsvSpacepointWriter.hpp"
 #include "ActsExamples/Io/Csv/CsvTrackParameterWriter.hpp"
 #include "ActsExamples/Io/Csv/CsvTrackWriter.hpp"
 #include "ActsExamples/Io/Csv/CsvTrackingGeometryWriter.hpp"
-#include "ActsExamples/Io/NuclearInteractions/RootNuclearInteractionParametersWriter.hpp"
-#include "ActsExamples/Io/Performance/CKFPerformanceWriter.hpp"
-#include "ActsExamples/Io/Performance/SeedingPerformanceWriter.hpp"
-#include "ActsExamples/Io/Performance/TrackFinderPerformanceWriter.hpp"
-#include "ActsExamples/Io/Performance/TrackFitterPerformanceWriter.hpp"
-#include "ActsExamples/Io/Performance/VertexPerformanceWriter.hpp"
 #include "ActsExamples/Io/Root/RootBFieldWriter.hpp"
 #include "ActsExamples/Io/Root/RootMaterialTrackWriter.hpp"
 #include "ActsExamples/Io/Root/RootMaterialWriter.hpp"
 #include "ActsExamples/Io/Root/RootMeasurementWriter.hpp"
+#include "ActsExamples/Io/Root/RootNuclearInteractionParametersWriter.hpp"
 #include "ActsExamples/Io/Root/RootParticleWriter.hpp"
 #include "ActsExamples/Io/Root/RootPropagationStepsWriter.hpp"
 #include "ActsExamples/Io/Root/RootPropagationSummaryWriter.hpp"
@@ -44,6 +41,11 @@
 #include "ActsExamples/Io/Root/RootTrackStatesWriter.hpp"
 #include "ActsExamples/Io/Root/RootTrackSummaryWriter.hpp"
 #include "ActsExamples/Io/Root/RootVertexWriter.hpp"
+#include "ActsExamples/Io/Root/SeedingPerformanceWriter.hpp"
+#include "ActsExamples/Io/Root/TrackFinderNTupleWriter.hpp"
+#include "ActsExamples/Io/Root/TrackFinderPerformanceWriter.hpp"
+#include "ActsExamples/Io/Root/TrackFitterPerformanceWriter.hpp"
+#include "ActsExamples/Io/Root/VertexNTupleWriter.hpp"
 #include "ActsExamples/MaterialMapping/IMaterialWriter.hpp"
 #include "ActsExamples/Plugins/Obj/ObjPropagationStepsWriter.hpp"
 #include "ActsExamples/Plugins/Obj/ObjTrackingGeometryWriter.hpp"
@@ -56,6 +58,7 @@
 
 #include <pybind11/pybind11.h>
 #include <pybind11/stl.h>
+#include <pybind11/stl/filesystem.h>
 
 namespace Acts {
 class TrackingGeometry;
@@ -118,14 +121,25 @@ void addOutput(Context& ctx) {
     ACTS_PYTHON_MEMBER(offset);
     ACTS_PYTHON_MEMBER(lineThickness);
     ACTS_PYTHON_MEMBER(surfaceThickness);
-    ACTS_PYTHON_MEMBER(nSegments);
+    ACTS_PYTHON_MEMBER(quarterSegments);
     ACTS_PYTHON_MEMBER(triangulate);
     ACTS_PYTHON_MEMBER(outputName);
     ACTS_PYTHON_STRUCT_END();
 
     patchKwargsConstructor(c);
+
+    py::class_<Color>(m, "Color")
+        .def(py::init<>())
+        .def(py::init<int, int, int>())
+        .def(py::init<double, double, double>())
+        .def(py::init<std::string_view>())
+        .def_readonly("rgb", &Color::rgb);
   }
 
+  py::class_<IVisualization3D>(m, "IVisualization3D")
+      .def("write", py::overload_cast<const std::filesystem::path&>(
+                        &IVisualization3D::write, py::const_));
+
   {
     using Writer = ActsExamples::ObjTrackingGeometryWriter;
     auto w = py::class_<Writer, std::shared_ptr<Writer>>(
@@ -149,7 +163,7 @@ void addOutput(Context& ctx) {
     ACTS_PYTHON_STRUCT_END();
   }
 
-  // Bindings for the binning in e.g., CKFPerformanceWriter
+  // Bindings for the binning in e.g., TrackFinderPerformanceWriter
   {
     py::class_<PlotHelpers::Binning>(mex, "Binning")
         .def(py::init<std::string, int, double, double>(), "title"_a, "bins"_a,
@@ -179,15 +193,15 @@ void addOutput(Context& ctx) {
                              inputSummaryCollection, filePath, fileMode);
 
   ACTS_PYTHON_DECLARE_WRITER(ActsExamples::RootParticleWriter, mex,
-                             "RootParticleWriter", inputParticles,
-                             inputFinalParticles, filePath, fileMode, treeName);
+                             "RootParticleWriter", inputParticles, filePath,
+                             fileMode, treeName);
 
   ACTS_PYTHON_DECLARE_WRITER(ActsExamples::RootVertexWriter, mex,
                              "RootVertexWriter", inputVertices, filePath,
                              fileMode, treeName);
 
-  ACTS_PYTHON_DECLARE_WRITER(ActsExamples::TrackFinderPerformanceWriter, mex,
-                             "TrackFinderPerformanceWriter", inputTracks,
+  ACTS_PYTHON_DECLARE_WRITER(ActsExamples::TrackFinderNTupleWriter, mex,
+                             "TrackFinderNTupleWriter", inputTracks,
                              inputParticles, inputMeasurementParticlesMap,
                              inputTrackParticleMatching, filePath, fileMode,
                              treeNameTracks, treeNameParticles);
@@ -339,7 +353,7 @@ void addOutput(Context& ctx) {
       treeName, fileMode, writeCovMat, writeGsfSpecific, writeGx2fSpecific);
 
   ACTS_PYTHON_DECLARE_WRITER(
-      ActsExamples::VertexPerformanceWriter, mex, "VertexPerformanceWriter",
+      ActsExamples::VertexNTupleWriter, mex, "VertexNTupleWriter",
       inputVertices, inputTracks, inputTruthVertices, inputParticles,
       inputSelectedParticles, inputTrackParticleMatching, bField, filePath,
       treeName, fileMode, vertexMatchThreshold, trackMatchThreshold, useTracks);
@@ -362,6 +376,10 @@ void addOutput(Context& ctx) {
                              "CsvSpacepointWriter", inputSpacepoints, outputDir,
                              outputPrecision);
 
+  ACTS_PYTHON_DECLARE_WRITER(ActsExamples::CsvSpacePointsBucketWriter, mex,
+                             "CsvSpacePointsBucketWriter", inputBuckets,
+                             outputDir, outputPrecision);
+
   ACTS_PYTHON_DECLARE_WRITER(ActsExamples::CsvTrackWriter, mex,
                              "CsvTrackWriter", inputTracks, outputDir, fileName,
                              inputMeasurementParticlesMap, outputPrecision,
@@ -377,12 +395,13 @@ void addOutput(Context& ctx) {
       trackingGeometry, outputDir, outputPrecision, writeSensitive,
       writeBoundary, writeSurfaceGrid, writeLayerVolume, writePerEvent);
 
-  ACTS_PYTHON_DECLARE_WRITER(
-      ActsExamples::CKFPerformanceWriter, mex, "CKFPerformanceWriter",
-      inputTracks, inputParticles, inputTrackParticleMatching,
-      inputParticleTrackMatching, filePath, fileMode, effPlotToolConfig,
-      fakeRatePlotToolConfig, duplicationPlotToolConfig,
-      trackSummaryPlotToolConfig, writeMatchingDetails);
+  ACTS_PYTHON_DECLARE_WRITER(ActsExamples::TrackFinderPerformanceWriter, mex,
+                             "TrackFinderPerformanceWriter", inputTracks,
+                             inputParticles, inputTrackParticleMatching,
+                             inputParticleTrackMatching, filePath, fileMode,
+                             effPlotToolConfig, fakeRatePlotToolConfig,
+                             duplicationPlotToolConfig,
+                             trackSummaryPlotToolConfig, writeMatchingDetails);
 
   ACTS_PYTHON_DECLARE_WRITER(
       ActsExamples::RootNuclearInteractionParametersWriter, mex,
diff --git a/Examples/Python/src/Propagation.cpp b/Examples/Python/src/Propagation.cpp
index 6e872e29558..5356b7c4337 100644
--- a/Examples/Python/src/Propagation.cpp
+++ b/Examples/Python/src/Propagation.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2021-2024 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include "Acts/Definitions/Direction.hpp"
 #include "Acts/EventData/TrackParameters.hpp"
@@ -19,6 +19,7 @@
 #include "Acts/Utilities/Logger.hpp"
 #include "ActsExamples/Propagation/PropagationAlgorithm.hpp"
 #include "ActsExamples/Propagation/PropagatorInterface.hpp"
+#include "ActsExamples/Propagation/SimHitToSummaryConversion.hpp"
 
 #include <algorithm>
 #include <array>
@@ -119,6 +120,11 @@ void addPropagation(Context& ctx) {
       covarianceTransport, inputTrackParameters, outputSummaryCollection,
       outputMaterialCollection);
 
+  ACTS_PYTHON_DECLARE_ALGORITHM(ActsExamples::SimHitToSummaryConversion, mex,
+                                "SimHitToSummaryConversion", inputSimHits,
+                                inputParticles, outputSummaryCollection,
+                                surfaceByIdentifier);
+
   py::class_<ActsExamples::PropagatorInterface,
              std::shared_ptr<ActsExamples::PropagatorInterface>>(
       mex, "PropagatorInterface");
diff --git a/Examples/Python/src/Pythia8.cpp b/Examples/Python/src/Pythia8.cpp
index 9865c9d5231..45ba043531e 100644
--- a/Examples/Python/src/Pythia8.cpp
+++ b/Examples/Python/src/Pythia8.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2021 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include "Acts/Definitions/PdgParticle.hpp"
 #include "Acts/Plugins/Python/Utilities.hpp"
diff --git a/Examples/Python/src/Pythia8Stub.cpp b/Examples/Python/src/Pythia8Stub.cpp
index 547be16e167..bd9765f5cbf 100644
--- a/Examples/Python/src/Pythia8Stub.cpp
+++ b/Examples/Python/src/Pythia8Stub.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2021 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include "Acts/Plugins/Python/Utilities.hpp"
 
diff --git a/Examples/Python/src/Svg.cpp b/Examples/Python/src/Svg.cpp
index 74d6197ea2f..301ceea1af3 100644
--- a/Examples/Python/src/Svg.cpp
+++ b/Examples/Python/src/Svg.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2022-2024 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include "Acts/Detector/Detector.hpp"
 #include "Acts/Detector/DetectorVolume.hpp"
@@ -20,6 +20,7 @@
 #include "Acts/Plugins/ActSVG/TrackingGeometrySvgConverter.hpp"
 #include "Acts/Plugins/Python/Utilities.hpp"
 #include "Acts/Utilities/Enumerate.hpp"
+#include "Acts/Utilities/Helpers.hpp"
 #include "ActsExamples/EventData/GeometryContainers.hpp"
 #include "ActsExamples/EventData/SimHit.hpp"
 #include "ActsExamples/EventData/SimSpacePoint.hpp"
@@ -60,7 +61,7 @@ using ViewAndRange =
 /// @param portalCache is a portal cache to avoid multiple drawings of the same portal
 ///
 /// Returns an svg object in the right view
-actsvg::svg::object viewDetectorVolume(const Svg::ProtoVolume& pVolume,
+actsvg::svg::object drawDetectorVolume(const Svg::ProtoVolume& pVolume,
                                        const std::string& identification,
                                        const ViewAndRange& viewAndRange,
                                        PortalCache& portalCache) {
@@ -68,22 +69,17 @@ actsvg::svg::object viewDetectorVolume(const Svg::ProtoVolume& pVolume,
   svgDet._id = identification;
   svgDet._tag = "g";
 
-  auto [view, selection, viewRange] = viewAndRange;
+  const auto& [view, selection, viewRange] = viewAndRange;
 
   // Translate selection into booleans
-  bool all =
-      std::find(selection.begin(), selection.end(), "all") != selection.end();
-  bool sensitives = std::find(selection.begin(), selection.end(),
-                              "sensitives") != selection.end();
-  bool portals = std::find(selection.begin(), selection.end(), "portals") !=
-                 selection.end();
-  bool materials = std::find(selection.begin(), selection.end(), "materials") !=
-                   selection.end();
+  const bool all = rangeContainsValue(selection, "all");
+  const bool sensitives = rangeContainsValue(selection, "sensitives");
+  const bool portals = rangeContainsValue(selection, "portals");
+  const bool materials = rangeContainsValue(selection, "materials");
 
   // Helper lambda for material selection
   auto materialSel = [&](const Svg::ProtoSurface& s) -> bool {
-    return (materials &&
-            s._decorations.find("material") != s._decorations.end());
+    return (materials && s._decorations.contains("material"));
   };
 
   // Helper lambda for view range selection
@@ -138,8 +134,7 @@ actsvg::svg::object viewDetectorVolume(const Svg::ProtoVolume& pVolume,
       gpIDs = pgID->second._id;
     }
 
-    if (std::find(portalCache.begin(), portalCache.end(), gpIDs) !=
-        portalCache.end()) {
+    if (rangeContainsValue(portalCache, gpIDs)) {
       continue;
     }
 
@@ -158,13 +153,13 @@ actsvg::svg::object viewDetectorVolume(const Svg::ProtoVolume& pVolume,
 }
 
 // Helper function to be picked in different access patterns
-void viewDetector(
+std::vector<actsvg::svg::object> drawDetector(
     const Acts::GeometryContext& gctx,
     const Acts::Experimental::Detector& detector,
     const std::string& identification,
     const std::vector<std::tuple<int, Svg::DetectorVolumeConverter::Options>>&
         volumeIdxOpts,
-    const std::vector<ViewAndRange>& viewAndRanges, const std::string& saveAs) {
+    const std::vector<ViewAndRange>& viewAndRanges) {
   PortalCache portalCache;
 
   // The svg object to be returned
@@ -186,17 +181,13 @@ void viewDetector(
     for (auto [iv, var] : Acts::enumerate(viewAndRanges)) {
       auto [view, selection, range] = var;
       // Get the view and the range
-      auto svgVolView = viewDetectorVolume(
+      auto svgVolView = drawDetectorVolume(
           pVolume, identification + "_vol" + std::to_string(vidx) + "_" + view,
           var, portalCache);
       svgDetViews[iv].add_object(svgVolView);
     }
   }
-
-  for (auto [iv, var] : Acts::enumerate(viewAndRanges)) {
-    auto [view, selection, range] = var;
-    Svg::toFile({svgDetViews[iv]}, saveAs + "_" + view + ".svg");
-  }
+  return svgDetViews;
 }
 
 }  // namespace
@@ -210,6 +201,20 @@ void addSvg(Context& ctx) {
   // Some basics
   py::class_<actsvg::svg::object>(svg, "object");
 
+  py::class_<actsvg::svg::file>(svg, "file")
+      .def(py::init<>())
+      .def("addObject", &actsvg::svg::file::add_object)
+      .def("addObjects", &actsvg::svg::file::add_objects)
+      .def("clip",
+           [](actsvg::svg::file& self, std::array<actsvg::scalar, 4> box) {
+             self.set_view_box(box);
+           })
+      .def("write", [](actsvg::svg::file& self, const std::string& filename) {
+        std::ofstream file(filename);
+        file << self;
+        file.close();
+      });
+
   // Core components, added as an acts.svg submodule
   {
     auto c = py::class_<Svg::Style>(svg, "Style").def(py::init<>());
@@ -220,7 +225,11 @@ void addSvg(Context& ctx) {
     ACTS_PYTHON_MEMBER(highlights);
     ACTS_PYTHON_MEMBER(strokeWidth);
     ACTS_PYTHON_MEMBER(strokeColor);
-    ACTS_PYTHON_MEMBER(nSegments);
+    ACTS_PYTHON_MEMBER(highlightStrokeWidth);
+    ACTS_PYTHON_MEMBER(highlightStrokeColor);
+    ACTS_PYTHON_MEMBER(fontSize);
+    ACTS_PYTHON_MEMBER(fontColor);
+    ACTS_PYTHON_MEMBER(quarterSegments);
     ACTS_PYTHON_STRUCT_END();
   }
 
@@ -287,6 +296,59 @@ void addSvg(Context& ctx) {
     });
   }
 
+  // Draw primitives
+  {
+    svg.def("drawArrow", &actsvg::draw::arrow);
+
+    svg.def("drawText", &actsvg::draw::text);
+
+    svg.def("drawInfoBox", &Svg::infoBox);
+  }
+
+  // Draw Eta Lines
+  {
+    svg.def(
+        "drawEtaLines",
+        [](const std::string& id, actsvg ::scalar z, actsvg::scalar r,
+           const std::vector<actsvg::scalar>& etaMain,
+           actsvg::scalar strokeWidthMain, unsigned int sizeMain,
+           bool labelMain, const std::vector<actsvg::scalar>& etaSub,
+           actsvg::scalar strokeWidthSub, const std::vector<int> strokeDashSub,
+           unsigned int sizeSub, bool labelSub) {
+          // The main eta lines
+          actsvg::style::stroke strokeMain;
+          strokeMain._width = strokeWidthMain;
+          actsvg::style::font fontMain;
+          fontMain._size = sizeMain;
+
+          actsvg::style::stroke strokeSub;
+          strokeSub._width = strokeWidthSub;
+          strokeSub._dasharray = strokeDashSub;
+          actsvg::style::font fontSub;
+          fontSub._size = sizeSub;
+
+          return actsvg::display::eta_lines(
+              id, z, r,
+              {std::tie(etaMain, strokeMain, labelMain, fontMain),
+               std::tie(etaSub, strokeSub, labelSub, fontSub)});
+        });
+  }
+
+  {
+    auto gco = py::class_<Svg::GridConverter::Options>(svg, "GridOptions")
+                   .def(py::init<>());
+    ACTS_PYTHON_STRUCT_BEGIN(gco, Svg::GridConverter::Options);
+    ACTS_PYTHON_MEMBER(style);
+    ACTS_PYTHON_STRUCT_END();
+
+    auto isco = py::class_<Svg::IndexedSurfacesConverter::Options>(
+                    svg, "IndexedSurfacesOptions")
+                    .def(py::init<>());
+    ACTS_PYTHON_STRUCT_BEGIN(isco, Svg::IndexedSurfacesConverter::Options);
+    ACTS_PYTHON_MEMBER(gridOptions);
+    ACTS_PYTHON_STRUCT_END();
+  }
+
   // How detector volumes are drawn: Svg DetectorVolume options & drawning
   {
     auto c = py::class_<Svg::DetectorVolumeConverter::Options>(
@@ -297,22 +359,35 @@ void addSvg(Context& ctx) {
     ACTS_PYTHON_MEMBER(portalIndices);
     ACTS_PYTHON_MEMBER(portalOptions);
     ACTS_PYTHON_MEMBER(surfaceOptions);
+    ACTS_PYTHON_MEMBER(indexedSurfacesOptions);
     ACTS_PYTHON_STRUCT_END();
 
     // Define the proto volume & indexed surface grid
     py::class_<Svg::ProtoVolume>(svg, "ProtoVolume");
     py::class_<Svg::ProtoIndexedSurfaceGrid>(svg, "ProtoIndexedSurfaceGrid");
 
+    // Define the proto grid
+    py::class_<Svg::ProtoGrid>(svg, "ProtoGrid");
+
     // Convert an Acts::Experimental::DetectorVolume object into an
     // acts::svg::proto::volume
     svg.def("convertDetectorVolume", &Svg::DetectorVolumeConverter::convert);
 
     // Define the view functions
-    svg.def("viewDetectorVolume", &viewDetectorVolume);
+    svg.def("drawDetectorVolume", &drawDetectorVolume);
+  }
+
+  // Draw the ProtoIndexedSurfaceGrid
+  {
+    svg.def("drawIndexedSurfaces",
+            [](const Svg::ProtoIndexedSurfaceGrid& pIndexedSurfaceGrid,
+               const std::string& identification) {
+              return Svg::View::xy(pIndexedSurfaceGrid, identification);
+            });
   }
 
   // How a detector is drawn: Svg Detector options & drawning
-  { svg.def("viewDetector", &viewDetector); }
+  { svg.def("drawDetector", &drawDetector); }
 
   // Legacy geometry drawing
   {
diff --git a/Examples/Python/src/SvgStub.cpp b/Examples/Python/src/SvgStub.cpp
index 61bce57b319..b6980999e1c 100644
--- a/Examples/Python/src/SvgStub.cpp
+++ b/Examples/Python/src/SvgStub.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2022 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 namespace Acts::Python {
 struct Context;
diff --git a/Examples/Python/src/Traccc.cpp b/Examples/Python/src/Traccc.cpp
new file mode 100644
index 00000000000..71f6ca29147
--- /dev/null
+++ b/Examples/Python/src/Traccc.cpp
@@ -0,0 +1,71 @@
+// This file is part of the ACTS project.
+//
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
+//
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
+
+#include "Acts/Plugins/Detray/DetrayConversionUtils.hpp"
+#include "Acts/Plugins/Detray/DetrayConverter.hpp"
+#include "Acts/Plugins/Python/Utilities.hpp"
+#include "ActsExamples/Propagation/PropagatorInterface.hpp"
+#include "ActsExamples/Traccc/DetrayPropagator.hpp"
+#include "ActsExamples/Traccc/DetrayStore.hpp"
+
+#include <detray/propagator/line_stepper.hpp>
+#include <pybind11/pybind11.h>
+#include <vecmem/memory/host_memory_resource.hpp>
+#include <vecmem/memory/memory_resource.hpp>
+
+namespace py = pybind11;
+using namespace pybind11::literals;
+
+using namespace Acts;
+using namespace ActsExamples;
+
+namespace Acts::Python {
+
+void addTraccc(Context& ctx) {
+  auto [m, mex] = ctx.get("main", "examples");
+
+  auto traccc = mex.def_submodule("traccc");
+
+  /// Define host detray store
+  {
+    py::class_<DetrayHostStore, std::shared_ptr<DetrayHostStore>>(
+        traccc, "DetrayHostStore");
+
+    /// Convert the detector and create a DetrayHostStore
+    ///
+    /// @param gctx the geometry context
+    /// @param detector the detector to be converted
+    /// @param options the conversion options
+    traccc.def("convertDetectorHost", [](const GeometryContext& gctx,
+                                         const Experimental::Detector& detector,
+                                         DetrayConverter::Options options) {
+      return DetrayHostStore::create(gctx, detector, options);
+    });
+  }
+
+  /// Define the DetrayPropagator
+  {
+    traccc.def(
+        "createSlPropagatorHost",
+        [](std::shared_ptr<const DetrayHostStore> detrayStore,
+           bool sterile = false) {
+          std::shared_ptr<PropagatorInterface> detrayProagator = nullptr;
+
+          using DetrayLineStepper =
+              detray::line_stepper<typename DetrayHostDetector::algebra_type>;
+
+          using DetrayPropagator =
+              DetrayPropagator<DetrayLineStepper, DetrayHostStore>;
+
+          DetrayPropagator::Config cfg{detrayStore, sterile};
+          detrayProagator = std::make_shared<DetrayPropagator>(cfg);
+          return detrayProagator;
+        });
+  }
+}
+}  // namespace Acts::Python
diff --git a/Examples/Python/src/TracccStub.cpp b/Examples/Python/src/TracccStub.cpp
new file mode 100644
index 00000000000..cadd3a6b04b
--- /dev/null
+++ b/Examples/Python/src/TracccStub.cpp
@@ -0,0 +1,13 @@
+// This file is part of the ACTS project.
+//
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
+//
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
+
+#include "Acts/Plugins/Python/Utilities.hpp"
+
+namespace Acts::Python {
+void addTraccc(Context& /*ctx*/) {}
+}  // namespace Acts::Python
diff --git a/Examples/Python/src/TrackFinding.cpp b/Examples/Python/src/TrackFinding.cpp
index 5a0e6ec59b9..ad3ad364ce7 100644
--- a/Examples/Python/src/TrackFinding.cpp
+++ b/Examples/Python/src/TrackFinding.cpp
@@ -1,11 +1,12 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2021-2024 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
+#include "Acts/EventData/SpacePointContainer.hpp"
 #include "Acts/Geometry/GeometryHierarchyMap.hpp"
 #include "Acts/Geometry/GeometryIdentifier.hpp"
 #include "Acts/Plugins/Python/Utilities.hpp"
@@ -17,7 +18,7 @@
 #include "Acts/Seeding/SpacePointGrid.hpp"
 #include "Acts/TrackFinding/MeasurementSelector.hpp"
 #include "Acts/Utilities/Logger.hpp"
-#include "Acts/Utilities/TypeTraits.hpp"
+#include "ActsExamples/EventData/SpacePointContainer.hpp"
 #include "ActsExamples/EventData/Track.hpp"
 #include "ActsExamples/TrackFinding/GbtsSeedingAlgorithm.hpp"
 #include "ActsExamples/TrackFinding/HoughTransformSeeder.hpp"
@@ -57,10 +58,9 @@ namespace Acts::Python {
 void addTrackFinding(Context& ctx) {
   auto [m, mex] = ctx.get("main", "examples");
 
-  ACTS_PYTHON_DECLARE_ALGORITHM(ActsExamples::SpacePointMaker, mex,
-                                "SpacePointMaker", inputSourceLinks,
-                                inputMeasurements, outputSpacePoints,
-                                trackingGeometry, geometrySelection);
+  ACTS_PYTHON_DECLARE_ALGORITHM(
+      ActsExamples::SpacePointMaker, mex, "SpacePointMaker", inputMeasurements,
+      outputSpacePoints, trackingGeometry, geometrySelection);
 
   {
     using Config = Acts::SeedFilterConfig;
@@ -86,7 +86,9 @@ void addTrackFinding(Context& ctx) {
   }
 
   {
-    using Config = Acts::SeedFinderConfig<SimSpacePoint>;
+    using Config = Acts::SeedFinderConfig<typename Acts::SpacePointContainer<
+        ActsExamples::SpacePointContainer<std::vector<const SimSpacePoint*>>,
+        Acts::detail::RefHolder>::SpacePointProxyType>;
     auto c = py::class_<Config>(m, "SeedFinderConfig").def(py::init<>());
     ACTS_PYTHON_STRUCT_BEGIN(c, Config);
     ACTS_PYTHON_MEMBER(minPt);
@@ -145,7 +147,11 @@ void addTrackFinding(Context& ctx) {
     patchKwargsConstructor(c);
   }
   {
-    using Config = Acts::SeedFinderOrthogonalConfig<SimSpacePoint>;
+    using Config =
+        Acts::SeedFinderOrthogonalConfig<typename Acts::SpacePointContainer<
+            ActsExamples::SpacePointContainer<
+                std::vector<const SimSpacePoint*>>,
+            Acts::detail::RefHolder>::SpacePointProxyType>;
     auto c =
         py::class_<Config>(m, "SeedFinderOrthogonalConfig").def(py::init<>());
     ACTS_PYTHON_STRUCT_BEGIN(c, Config);
@@ -267,14 +273,14 @@ void addTrackFinding(Context& ctx) {
   ACTS_PYTHON_DECLARE_ALGORITHM(
       ActsExamples::GbtsSeedingAlgorithm, mex, "GbtsSeedingAlgorithm",
       inputSpacePoints, outputSeeds, seedFilterConfig, seedFinderConfig,
-      seedFinderOptions, layerMappingFile, geometrySelection, inputSourceLinks,
-      trackingGeometry, ActsGbtsMap, fill_module_csv, inputClusters);
+      seedFinderOptions, layerMappingFile, geometrySelection, trackingGeometry,
+      ActsGbtsMap, fill_module_csv, inputClusters);
 
   ACTS_PYTHON_DECLARE_ALGORITHM(
       ActsExamples::HoughTransformSeeder, mex, "HoughTransformSeeder",
-      inputSpacePoints, outputProtoTracks, inputSourceLinks, trackingGeometry,
-      geometrySelection, inputMeasurements, subRegions, nLayers, xMin, xMax,
-      yMin, yMax, houghHistSize_x, houghHistSize_y, hitExtend_x, threshold,
+      inputSpacePoints, outputProtoTracks, trackingGeometry, geometrySelection,
+      inputMeasurements, subRegions, nLayers, xMin, xMax, yMin, yMax,
+      houghHistSize_x, houghHistSize_y, hitExtend_x, threshold,
       localMaxWindowSize, kA);
 
   ACTS_PYTHON_DECLARE_ALGORITHM(ActsExamples::MuonHoughSeeder, mex,
@@ -304,7 +310,8 @@ void addTrackFinding(Context& ctx) {
                                magneticField,
                            Logging::Level level) {
                           return Alg::makeTrackFinderFunction(
-                              trackingGeometry, magneticField,
+                              std::move(trackingGeometry),
+                              std::move(magneticField),
                               *Acts::getDefaultLogger("TrackFinding", level));
                         });
 
@@ -315,7 +322,6 @@ void addTrackFinding(Context& ctx) {
     auto c = py::class_<Config>(alg, "Config").def(py::init<>());
     ACTS_PYTHON_STRUCT_BEGIN(c, Config);
     ACTS_PYTHON_MEMBER(inputMeasurements);
-    ACTS_PYTHON_MEMBER(inputSourceLinks);
     ACTS_PYTHON_MEMBER(inputInitialTrackParameters);
     ACTS_PYTHON_MEMBER(inputSeeds);
     ACTS_PYTHON_MEMBER(outputTracks);
@@ -329,26 +335,31 @@ void addTrackFinding(Context& ctx) {
     ACTS_PYTHON_MEMBER(reverseSearch);
     ACTS_PYTHON_MEMBER(seedDeduplication);
     ACTS_PYTHON_MEMBER(stayOnSeed);
-    ACTS_PYTHON_MEMBER(pixelVolumes);
-    ACTS_PYTHON_MEMBER(stripVolumes);
+    ACTS_PYTHON_MEMBER(pixelVolumeIds);
+    ACTS_PYTHON_MEMBER(stripVolumeIds);
     ACTS_PYTHON_MEMBER(maxPixelHoles);
     ACTS_PYTHON_MEMBER(maxStripHoles);
+    ACTS_PYTHON_MEMBER(trimTracks);
+    ACTS_PYTHON_MEMBER(constrainToVolumeIds);
+    ACTS_PYTHON_MEMBER(endOfWorldVolumeIds);
     ACTS_PYTHON_STRUCT_END();
   }
 
   {
     auto constructor =
-        [](const std::vector<
-            std::pair<GeometryIdentifier,
-                      std::tuple<std::vector<double>, std::vector<double>,
-                                 std::vector<std::size_t>>>>& input) {
+        [](const std::vector<std::pair<
+               GeometryIdentifier,
+               std::tuple<std::vector<double>, std::vector<double>,
+                          std::vector<double>, std::vector<std::size_t>>>>&
+               input) {
           std::vector<std::pair<GeometryIdentifier, MeasurementSelectorCuts>>
               converted;
           converted.reserve(input.size());
           for (const auto& [id, cuts] : input) {
-            const auto& [bins, chi2, num] = cuts;
-            converted.emplace_back(id,
-                                   MeasurementSelectorCuts{bins, chi2, num});
+            const auto& [bins, chi2Measurement, chi2Outlier, num] = cuts;
+            converted.emplace_back(
+                id, MeasurementSelectorCuts{bins, chi2Measurement, num,
+                                            chi2Outlier});
           }
           return std::make_unique<MeasurementSelector::Config>(converted);
         };
@@ -356,9 +367,12 @@ void addTrackFinding(Context& ctx) {
     py::class_<MeasurementSelectorCuts>(m, "MeasurementSelectorCuts")
         .def(py::init<>())
         .def(py::init<std::vector<double>, std::vector<double>,
-                      std::vector<std::size_t>>())
+                      std::vector<std::size_t>, std::vector<double>>())
         .def_readwrite("etaBins", &MeasurementSelectorCuts::etaBins)
-        .def_readwrite("chi2CutOff", &MeasurementSelectorCuts::chi2CutOff)
+        .def_readwrite("chi2CutOffMeasurement",
+                       &MeasurementSelectorCuts::chi2CutOff)
+        .def_readwrite("chi2CutOffOutlier",
+                       &MeasurementSelectorCuts::chi2CutOffOutlier)
         .def_readwrite("numMeasurementsCutOff",
                        &MeasurementSelectorCuts::numMeasurementsCutOff);
 
diff --git a/Examples/Python/src/TrackFitting.cpp b/Examples/Python/src/TrackFitting.cpp
index a5a11333275..c8dc72f9eef 100644
--- a/Examples/Python/src/TrackFitting.cpp
+++ b/Examples/Python/src/TrackFitting.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2021-2023 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include "Acts/Definitions/Algebra.hpp"
 #include "Acts/EventData/detail/CorrectedTransformationFreeToBound.hpp"
@@ -39,6 +39,7 @@ namespace py = pybind11;
 
 using namespace ActsExamples;
 using namespace Acts;
+using namespace py::literals;
 
 namespace Acts::Python {
 
@@ -50,11 +51,10 @@ void addTrackFitting(Context& ctx) {
                                 inputSimHits, inputMeasurementSimHitsMap,
                                 outputProtoTracks);
 
-  ACTS_PYTHON_DECLARE_ALGORITHM(ActsExamples::TrackFittingAlgorithm, mex,
-                                "TrackFittingAlgorithm", inputMeasurements,
-                                inputSourceLinks, inputProtoTracks,
-                                inputInitialTrackParameters, inputClusters,
-                                outputTracks, fit, pickTrack, calibrator);
+  ACTS_PYTHON_DECLARE_ALGORITHM(
+      ActsExamples::TrackFittingAlgorithm, mex, "TrackFittingAlgorithm",
+      inputMeasurements, inputProtoTracks, inputInitialTrackParameters,
+      inputClusters, outputTracks, fit, pickTrack, calibrator);
 
   ACTS_PYTHON_DECLARE_ALGORITHM(ActsExamples::RefittingAlgorithm, mex,
                                 "RefittingAlgorithm", inputTracks, outputTracks,
@@ -107,12 +107,17 @@ void addTrackFitting(Context& ctx) {
         .value("KLDistance", MixtureReductionAlgorithm::KLDistance);
 
     py::class_<ActsExamples::BetheHeitlerApprox>(mex, "AtlasBetheHeitlerApprox")
-        .def_static("loadFromFiles",
-                    &ActsExamples::BetheHeitlerApprox::loadFromFiles,
-                    py::arg("lowParametersPath"), py::arg("highParametersPath"),
-                    py::arg("lowLimit") = 0.1, py::arg("highLimit") = 0.2)
-        .def_static("makeDefault",
-                    []() { return Acts::makeDefaultBetheHeitlerApprox(); });
+        .def_static(
+            "loadFromFiles", &ActsExamples::BetheHeitlerApprox::loadFromFiles,
+            "lowParametersPath"_a, "highParametersPath"_a, "lowLimit"_a = 0.1,
+            "highLimit"_a = 0.2, "clampToRange"_a = false)
+        .def_static(
+            "makeDefault",
+            [](bool clampToRange) {
+              return Acts::makeDefaultBetheHeitlerApprox(clampToRange);
+            },
+            "clampToRange"_a = false);
+
     mex.def(
         "makeGsfFitterFunction",
         [](std::shared_ptr<const Acts::TrackingGeometry> trackingGeometry,
diff --git a/Examples/Python/src/TruthTracking.cpp b/Examples/Python/src/TruthTracking.cpp
index d6e6bd042a6..3f0d8a0915a 100644
--- a/Examples/Python/src/TruthTracking.cpp
+++ b/Examples/Python/src/TruthTracking.cpp
@@ -1,28 +1,23 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2021-2024 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include "Acts/Plugins/Python/Utilities.hpp"
 #include "Acts/Utilities/Logger.hpp"
-#include "Acts/Utilities/TypeTraits.hpp"
 #include "ActsExamples/TruthTracking/ParticleSelector.hpp"
 #include "ActsExamples/TruthTracking/ParticleSmearing.hpp"
 #include "ActsExamples/TruthTracking/TrackModifier.hpp"
 #include "ActsExamples/TruthTracking/TrackParameterSelector.hpp"
 #include "ActsExamples/TruthTracking/TrackTruthMatcher.hpp"
-#include "ActsExamples/TruthTracking/TruthSeedSelector.hpp"
 #include "ActsExamples/TruthTracking/TruthSeedingAlgorithm.hpp"
 #include "ActsExamples/TruthTracking/TruthTrackFinder.hpp"
 #include "ActsExamples/TruthTracking/TruthVertexFinder.hpp"
 #include "ActsExamples/Utilities/HitSelector.hpp"
-#include "ActsExamples/Utilities/Range.hpp"
 
-#include <array>
-#include <cstddef>
 #include <memory>
 
 #include <pybind11/pybind11.h>
@@ -46,48 +41,6 @@ void addTruthTracking(Context& ctx) {
       ActsExamples::TruthTrackFinder, mex, "TruthTrackFinder", inputParticles,
       inputMeasurementParticlesMap, outputProtoTracks);
 
-  {
-    using Alg = ActsExamples::TruthSeedSelector;
-    using Config = Alg::Config;
-
-    auto alg = py::class_<Alg, IAlgorithm, std::shared_ptr<Alg>>(
-                   mex, "TruthSeedSelector")
-                   .def(py::init<const Alg::Config&, Acts::Logging::Level>(),
-                        py::arg("config"), py::arg("level"))
-                   .def_property_readonly("config", &Alg::config);
-
-    auto c = py::class_<Config>(alg, "Config").def(py::init<>());
-
-    ACTS_PYTHON_STRUCT_BEGIN(c, Config);
-    ACTS_PYTHON_MEMBER(inputParticles);
-    ACTS_PYTHON_MEMBER(inputMeasurementParticlesMap);
-    ACTS_PYTHON_MEMBER(outputParticles);
-    ACTS_PYTHON_MEMBER(rhoMin);
-    ACTS_PYTHON_MEMBER(rhoMax);
-    ACTS_PYTHON_MEMBER(zMin);
-    ACTS_PYTHON_MEMBER(zMax);
-    ACTS_PYTHON_MEMBER(phiMin);
-    ACTS_PYTHON_MEMBER(phiMax);
-    ACTS_PYTHON_MEMBER(etaMin);
-    ACTS_PYTHON_MEMBER(etaMax);
-    ACTS_PYTHON_MEMBER(absEtaMin);
-    ACTS_PYTHON_MEMBER(absEtaMax);
-    ACTS_PYTHON_MEMBER(ptMin);
-    ACTS_PYTHON_MEMBER(ptMax);
-    ACTS_PYTHON_MEMBER(keepNeutral);
-    ACTS_PYTHON_MEMBER(nHitsMin);
-    ACTS_PYTHON_MEMBER(nHitsMax);
-    ACTS_PYTHON_STRUCT_END();
-
-    pythonRangeProperty(c, "rho", &Config::rhoMin, &Config::rhoMax);
-    pythonRangeProperty(c, "z", &Config::zMin, &Config::zMax);
-    pythonRangeProperty(c, "phi", &Config::phiMin, &Config::phiMax);
-    pythonRangeProperty(c, "eta", &Config::etaMin, &Config::etaMax);
-    pythonRangeProperty(c, "absEta", &Config::absEtaMin, &Config::absEtaMax);
-    pythonRangeProperty(c, "pt", &Config::ptMin, &Config::ptMax);
-    pythonRangeProperty(c, "nHits", &Config::nHitsMin, &Config::nHitsMax);
-  }
-
   ACTS_PYTHON_DECLARE_ALGORITHM(
       ActsExamples::ParticleSmearing, mex, "ParticleSmearing", inputParticles,
       outputTrackParameters, sigmaD0, sigmaD0PtA, sigmaD0PtB, sigmaZ0,
@@ -109,7 +62,6 @@ void addTruthTracking(Context& ctx) {
 
     ACTS_PYTHON_STRUCT_BEGIN(c, Config);
     ACTS_PYTHON_MEMBER(inputParticles);
-    ACTS_PYTHON_MEMBER(inputMeasurementParticlesMap);
     ACTS_PYTHON_MEMBER(outputParticles);
     ACTS_PYTHON_MEMBER(rhoMin);
     ACTS_PYTHON_MEMBER(rhoMax);
diff --git a/Examples/Python/src/Utilities.cpp b/Examples/Python/src/Utilities.cpp
index 05852a03645..8993da1c46a 100644
--- a/Examples/Python/src/Utilities.cpp
+++ b/Examples/Python/src/Utilities.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2024 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include "Acts/Plugins/Python/Utilities.hpp"
 
@@ -51,7 +51,7 @@ void addUtilities(Context& ctx) {
 
   ACTS_PYTHON_DECLARE_ALGORITHM(
       ActsExamples::MeasurementMapSelector, mex, "MeasurementMapSelector",
-      inputMeasurementParticleMap, inputSourceLinks,
+      inputMeasurements, inputMeasurementParticleMap,
       outputMeasurementParticleMap, geometrySelection);
 
   ACTS_PYTHON_DECLARE_ALGORITHM(ActsExamples::PrototracksToTracks, mex,
diff --git a/Examples/Python/src/Vertexing.cpp b/Examples/Python/src/Vertexing.cpp
index 44f2ebb8433..1c4638739a9 100644
--- a/Examples/Python/src/Vertexing.cpp
+++ b/Examples/Python/src/Vertexing.cpp
@@ -1,13 +1,12 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2021 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include "Acts/Plugins/Python/Utilities.hpp"
-#include "Acts/Utilities/TypeTraits.hpp"
 #include "ActsExamples/EventData/Index.hpp"
 #include "ActsExamples/Vertexing/AdaptiveMultiVertexFinderAlgorithm.hpp"
 #include "ActsExamples/Vertexing/IterativeVertexFinderAlgorithm.hpp"
diff --git a/Examples/Python/tests/conftest.py b/Examples/Python/tests/conftest.py
index f4e0abbcadd..b2015c3f6a0 100644
--- a/Examples/Python/tests/conftest.py
+++ b/Examples/Python/tests/conftest.py
@@ -342,8 +342,7 @@ def _factory(s):
         simAlg = acts.examples.FatrasSimulation(
             level=acts.logging.INFO,
             inputParticles=evGen.config.outputParticles,
-            outputParticlesInitial="particles_initial",
-            outputParticlesFinal="particles_final",
+            outputParticles="particles_simulated",
             outputSimHits="simhits",
             randomNumbers=rng,
             trackingGeometry=trk_geo,
diff --git a/Examples/Python/tests/helpers/__init__.py b/Examples/Python/tests/helpers/__init__.py
index 67f337609c7..e476c522079 100644
--- a/Examples/Python/tests/helpers/__init__.py
+++ b/Examples/Python/tests/helpers/__init__.py
@@ -58,6 +58,13 @@
 except ImportError:
     onnxEnabled = False
 
+try:
+    from acts import covfie
+
+    covfieEnabled = True
+except ImportError:
+    covfieEnabled = False
+
 
 try:
     import acts.examples
@@ -66,6 +73,13 @@
 except ImportError:
     pythia8Enabled = False
 
+try:
+    import acts.examples
+
+    hashingSeedingEnabled = hasattr(acts.examples, "hashing")
+except ImportError:
+    hashingSeedingEnabled = False
+
 
 exatrkxEnabled = shutil.which("nvidia-smi") is not None
 if exatrkxEnabled:
diff --git a/Examples/Python/tests/requirements_ubuntu2004.in b/Examples/Python/tests/requirements_ubuntu2004.in
deleted file mode 100644
index 86f307d37e4..00000000000
--- a/Examples/Python/tests/requirements_ubuntu2004.in
+++ /dev/null
@@ -1,9 +0,0 @@
-# to support python 3.8 in CI: test_exatrkx_python (ubuntu2004)
-# higher versions of numpy don't support python 3.8
-numpy==1.24.4
-
-pytest
-pytest-check
-uproot
-awkward
-pyyaml
diff --git a/Examples/Python/tests/requirements_ubuntu2004.txt b/Examples/Python/tests/requirements_ubuntu2004.txt
deleted file mode 100644
index 04521b16770..00000000000
--- a/Examples/Python/tests/requirements_ubuntu2004.txt
+++ /dev/null
@@ -1,53 +0,0 @@
-#
-# This file is autogenerated by pip-compile with Python 3.10
-# by the following command:
-#
-#    pip-compile Examples/Python/tests/requirements_ubuntu2004.in
-#
-awkward==2.6.1
-    # via
-    #   -r Examples/Python/tests/requirements_ubuntu2004.in
-    #   uproot
-awkward-cpp==29
-    # via awkward
-exceptiongroup==1.2.0
-    # via pytest
-fsspec==2024.2.0
-    # via
-    #   awkward
-    #   uproot
-importlib-metadata==7.0.1
-    # via awkward
-iniconfig==2.0.0
-    # via pytest
-numpy==1.24.4
-    # via
-    #   -r Examples/Python/tests/requirements_ubuntu2004.in
-    #   awkward
-    #   awkward-cpp
-    #   uproot
-packaging==23.2
-    # via
-    #   awkward
-    #   pytest
-    #   uproot
-pluggy==1.4.0
-    # via pytest
-pytest==8.0.0
-    # via
-    #   -r Examples/Python/tests/requirements_ubuntu2004.in
-    #   pytest-check
-pytest-check==2.3.1
-    # via -r Examples/Python/tests/requirements_ubuntu2004.in
-pyyaml==6.0.1
-    # via -r Examples/Python/tests/requirements_ubuntu2004.in
-tomli==2.0.1
-    # via pytest
-typing-extensions==4.9.0
-    # via
-    #   awkward
-    #   uproot
-uproot==5.2.2
-    # via -r Examples/Python/tests/requirements_ubuntu2004.in
-zipp==3.17.0
-    # via importlib-metadata
diff --git a/Examples/Python/tests/root_file_hashes.txt b/Examples/Python/tests/root_file_hashes.txt
index cf99adafefc..c6ed65f4564 100644
--- a/Examples/Python/tests/root_file_hashes.txt
+++ b/Examples/Python/tests/root_file_hashes.txt
@@ -1,53 +1,54 @@
-test_pythia8__pythia8_particles.root: a8b53c12e771091bc2f5ace0198e9f6c5ac1909e2e6d0e3e4945e8174048ef62
+test_pythia8__particles.root: 125182a9647ef3cec71afbc1b9e1676e40c13826c8333d6704345dd5133d5e91
 test_fatras__particles_simulation.root: bc970873fef0c2efd86ed5413623802353d2cd04abea72de14e8cdfc0e40076f
 test_fatras__hits.root: 6e4beb045fa1712c4d14c280ba33c3fa13e4aff9de88d55c3e32f62ad226f724
-test_geant4__particles_simulation.root: 3c9c6265183b04c9d62ed5f2d0709c6dd74e33fbb53ac0aeb3274f6600257fc1
-test_geant4__hits.root: adf5dcdf000a580412dc5089e17460897d6535c978eafa021584ba4281d0a1ac
-test_seeding__estimatedparams.root: d18718704a9ba5bf6627a0e4bf60581c640d80d66fc46dbd3e7c1d051ad99f71
+test_geant4__particles_simulation.root: 49926c71a9b54e13aa1cc7596d3302baf3c87d8e2c1d0267cb4523f6abdc0ac2
+test_geant4__hits.root: 4c9e704a75f47ed2e61652679a1d6f18fa4d9cf53faa8f8f5bbf7995634207aa
+test_seeding__estimatedparams.root: 69c0e268f9025a0991a212ea2a7f26f53112fecf614b475605bd1cb08415ba56
 test_seeding__performance_seeding.root: 992f9c611d30dde0d3f3ab676bab19ada61ab6a4442828e27b65ec5e5b7a2880
-test_seeding__particles.root: 7855b021f39ad238bca098e4282667be0666f2d1630e5bcb9d51d3b5ee39fa14
-test_seeding__particles_simulation.root: 87d9c6c82422ca381a17735096b36c547eacb5dda2f26d7377614bd97a70ab1a
-test_seeding_orthogonal__estimatedparams.root: 974b9f45c43b81504c24439b47895a5d0a0501f205d2c377923d303fc10adc31
+test_seeding__particles.root: c423bc666df3674f1a1140dec68ea13f44173232b8057e8a02572aee4f3e7d5b
+test_seeding__particles_simulation.root: f937a4cc474e80cfbb6eac4384e42e9c5c7ac981fcd6870d624cc898d1a0c006
+test_hashing_seeding__estimatedparams.root: 8daa3f04342c265f32f1608ccc921ab0041686a6280b956f811638ad4328330e
+test_seeding_orthogonal__estimatedparams.root: ca5896ec325daf5c8012291bc454269c61c32fe3d7e33bd1fa3b812826930299
 test_seeding_orthogonal__performance_seeding.root: 60fbedcf5cb2b37cd8e526251940564432890d3a159d231ed819e915a904682c
-test_seeding_orthogonal__particles.root: 7855b021f39ad238bca098e4282667be0666f2d1630e5bcb9d51d3b5ee39fa14
-test_seeding_orthogonal__particles_simulation.root: 87d9c6c82422ca381a17735096b36c547eacb5dda2f26d7377614bd97a70ab1a
-test_itk_seeding__estimatedparams.root: 7e3acb54fcaabae19fe5b8601bd5bd3e5f65d6a1e6d5a2b59c4e8affd27e526c
+test_seeding_orthogonal__particles.root: c423bc666df3674f1a1140dec68ea13f44173232b8057e8a02572aee4f3e7d5b
+test_seeding_orthogonal__particles_simulation.root: f937a4cc474e80cfbb6eac4384e42e9c5c7ac981fcd6870d624cc898d1a0c006
+test_itk_seeding__estimatedparams.root: 1cc05f9f2aefb5f71a85b31e97bc4e5845fedfcef6c53199495a6340c6b6210b
 test_itk_seeding__performance_seeding.root: 78ebda54cd0f026ba4b7f316724ffd946de56a932735914baf1b7bba9505c29d
-test_itk_seeding__particles.root: 0b6f4ad438010ac48803d48ed98e80b5e87d310bae6c2c02b16cd94d7a4d7d07
+test_itk_seeding__particles.root: 907ff693262c0db14b12c74b16586cb20d79caf5f03f93b178943e41ed35a1b6
 test_itk_seeding__particles_simulation.root: ef0246069aa697019f28a8b270a68de95312cae5f2f2c74848566c3ce4f70363
-test_propagation__propagation_summary.root: 85d877c3a48a6235d3d5a398b47130d5d17d4d3724128ccb339d8174e71a5bb0
+test_propagation__propagation_summary.root: 280c1a6fcfe71974ac39587b4afad27a31640bec42ca6537cc92e2d5e09d7ed6
 test_material_recording__geant4_material_tracks.root: c022b9362249b29f57a07926b20644e3ab4ab8ebcf03f773fbf46c446fc1a0a1
-test_truth_tracking_gsf[generic]__trackstates_gsf.root: 1466671bee7b7cfffe90459d9aef316dcee104e6c32a2df4f2f11ea9f12ddc14
-test_truth_tracking_gsf[generic]__tracksummary_gsf.root: b698e3d21eacc34fc8b0ce1d3fbe07405a4b8b549e07f0160573e64c3b401f04
-test_truth_tracking_gsf[odd]__trackstates_gsf.root: 194198c9c9657b02192e573ba9969230663f179104e32e180101ffcd677b4745
-test_truth_tracking_gsf[odd]__tracksummary_gsf.root: 80e60784d4d6eabe734f6fc1ffe04aefa0276cf8798430c590a06f40a07a484f
-test_particle_gun__particles.root: 5fe7dda2933ee6b9615b064d192322fe07831133cd998e5ed99a3b992b713a10
+test_truth_tracking_gsf[generic]__trackstates_gsf.root: 4df2c69d5dd7d5446a547651e4e962daf17924f5c8617165a93a3223c8ba18fd
+test_truth_tracking_gsf[generic]__tracksummary_gsf.root: 8c01d139cb865afa1959c62dbca76f3a1fb8b684c57ea4c2968baa6ffedadb6f
+test_truth_tracking_gsf[odd]__trackstates_gsf.root: c7397e53ea093f2432943ae263fc99bc9aa774504ea6152c6907066a06d21caf
+test_truth_tracking_gsf[odd]__tracksummary_gsf.root: 4562341f12a61ea0d5e25872b6bf466b79a73781dc95fc18ef9c6515f0a47916
+test_particle_gun__particles.root: 669d0304eb8bcf244aa627809a117944e5e3b994fdfcfb8710f2b9a8f9a62d3b
 test_material_mapping__material-map_tracks.root: 938b1a855369e9304401cb10d2751df3fd7acf32a2573f2057eb1691cd94edf3
 test_material_mapping__propagation-material.root: 5eacd0cb804d381171c8fb65d7b2d36e1d57db9f4cb2b58c0f24703479218cbf
 test_volume_material_mapping__material-map-volume_tracks.root: 98e212d32ca054fa3d01af4167c1f49755a139d43b82c57908197f5985e0a4ff
 test_volume_material_mapping__propagation-volume-material.root: 3e9d38cc541a1956b2f33be320d457559bb230311130a8531bf09371c272f913
 test_digitization_example[smeared]__measurements.root: 2b583b886b76f94786c6c2832aa84d176059cbbc35882fb34b4fd1f22dd4c006
 test_digitization_example[geometric]__measurements.root: 85efa861d14207fd7d1798dab093edcd0a2685bc189b4fc9a96b07d1001013a0
-test_digitization_example_input[smeared]__particles.root: 5fe7dda2933ee6b9615b064d192322fe07831133cd998e5ed99a3b992b713a10
+test_digitization_example_input[smeared]__particles.root: 669d0304eb8bcf244aa627809a117944e5e3b994fdfcfb8710f2b9a8f9a62d3b
 test_digitization_example_input[smeared]__measurements.root: 243c2f69b7b0db9dbeaa7494d4ea0f3dd1691dc90f16e10df6c0491ff4dc7d62
-test_digitization_example_input[geometric]__particles.root: 5fe7dda2933ee6b9615b064d192322fe07831133cd998e5ed99a3b992b713a10
+test_digitization_example_input[geometric]__particles.root: 669d0304eb8bcf244aa627809a117944e5e3b994fdfcfb8710f2b9a8f9a62d3b
 test_digitization_example_input[geometric]__measurements.root: 63ec81635979058fb8976f94455bf490cf92b7b142c4a05cc39de6225f5de2fb
-test_ckf_tracks_example[generic-full_seeding]__trackstates_ckf.root: d17d81d46bc2fd8d62868530dbc54762df4409ad35df1baeb11c33889e9933e8
-test_ckf_tracks_example[generic-full_seeding]__tracksummary_ckf.root: 112943712fa29d70a1396cd0d842027e95e77554e95b19d97db74e27acd22bbc
+test_ckf_tracks_example[generic-full_seeding]__trackstates_ckf.root: 7c48ec32a2cb1723416a9791a8067ef09825fcf71a6cf561c1f6d2ab9dc1c1ad
+test_ckf_tracks_example[generic-full_seeding]__tracksummary_ckf.root: e6b9e539998ba007e9b7d2c8d9d022c47726a39e8ab9b1724c52b1d78234be03
 test_ckf_tracks_example[generic-full_seeding]__performance_seeding_trees.root: 0e0676ffafdb27112fbda50d1cf627859fa745760f98073261dcf6db3f2f991e
-test_ckf_tracks_example[generic-truth_estimated]__trackstates_ckf.root: 7679bbbdb47abcbee87048ce373966d5f58bab6b04312844ede351ea653a573f
-test_ckf_tracks_example[generic-truth_estimated]__tracksummary_ckf.root: 0df341fc0833c33474cd8835d2e3318b6bd492a07b3b4ae5aa74068593679854
+test_ckf_tracks_example[generic-truth_estimated]__trackstates_ckf.root: df730fd00a7e6a0941f5f94c07ea9cffdb763853272d284d25bec0eb2072bb2e
+test_ckf_tracks_example[generic-truth_estimated]__tracksummary_ckf.root: 417f7326e1e1bb4519f1378145ac733bdda6653eb9871fd69e455e0269d996a6
 test_ckf_tracks_example[generic-truth_estimated]__performance_seeding.root: 1facb05c066221f6361b61f015cdf0918e94d9f3fce2269ec7b6a4dffeb2bc7e
-test_ckf_tracks_example[generic-truth_smeared]__trackstates_ckf.root: 25b985218418c91782696daab1b3fd3eaf7d15cd05681c7dfe2e4c3e44977e16
-test_ckf_tracks_example[generic-truth_smeared]__tracksummary_ckf.root: be592112183bd6554ed5e00dcb62eb4a5a5f4a9bb7efa4b1e1ce699dec13157b
-test_ckf_tracks_example[odd-full_seeding]__trackstates_ckf.root: 935359233aa503a077faf2394ba988d0da97ea5db4f6d3294a95fb93c5625c68
-test_ckf_tracks_example[odd-full_seeding]__tracksummary_ckf.root: 59537c52d23a77dbed9230c7b92cf653f7592c72fb882e8a24a2b33f1d27019e
+test_ckf_tracks_example[generic-truth_smeared]__trackstates_ckf.root: 82a6744980553e6274df78eea15f0dec22676b1c04e14afc3828bff9bbf5e1b1
+test_ckf_tracks_example[generic-truth_smeared]__tracksummary_ckf.root: 06d6ae1d05cb611b19df3c59531997c9b0108f5ef6027d76c4827bd2d9edb921
+test_ckf_tracks_example[odd-full_seeding]__trackstates_ckf.root: 0fb43661cc3a7973c28940a283dc168ceb13bc60badf1f520096edaa5982a039
+test_ckf_tracks_example[odd-full_seeding]__tracksummary_ckf.root: c2e029e462d4ca77df2c7f8963093da43be66c8279ca2cc9aee8c0bc35259eec
 test_ckf_tracks_example[odd-full_seeding]__performance_seeding_trees.root: 43c58577aafe07645e5660c4f43904efadf91d8cda45c5c04c248bbe0f59814f
-test_ckf_tracks_example[odd-truth_estimated]__trackstates_ckf.root: 89fad58add1ead7c0d38a952391d3c4a720feda6e37c37ed53f994a99fe15f57
-test_ckf_tracks_example[odd-truth_estimated]__tracksummary_ckf.root: 3a092423e717b1fe76f78f6b95eb6df67648a196e8c4da32158061d4bc490578
+test_ckf_tracks_example[odd-truth_estimated]__trackstates_ckf.root: 39ac67c47f371c576d7094bca987a04e0315bd286dc79503a63a5f568b58ac97
+test_ckf_tracks_example[odd-truth_estimated]__tracksummary_ckf.root: 59e2c75e9524653a80a9fd62fe99e958f73f80aa09240dcbb4ea469372e4811d
 test_ckf_tracks_example[odd-truth_estimated]__performance_seeding.root: 1a36b7017e59f1c08602ef3c2cb0483c51df248f112e3780c66594110719c575
-test_ckf_tracks_example[odd-truth_smeared]__trackstates_ckf.root: 268357818ee53cc13b26aa23af06d7f839d112e9dc2eb3ac4c5b6e6eda48e6af
-test_ckf_tracks_example[odd-truth_smeared]__tracksummary_ckf.root: 98c9e97240f541c22dd41d05c2114d7e9455b117162d64baad2c3ecb5b7d52f7
+test_ckf_tracks_example[odd-truth_smeared]__trackstates_ckf.root: 35a65e15a6f479f628a96f56ee78e1ac371d71a686ee0c974944d681499fe6bd
+test_ckf_tracks_example[odd-truth_smeared]__tracksummary_ckf.root: 3e257de624674fa9a19dcc72598c78c29a52633821acaa56dc2aa39a1395f1b5
 test_vertex_fitting_reading[Truth-False-100]__performance_vertexing.root: 76ef6084d758dfdfc0151ddec2170e12d73394424e3dac4ffe46f0f339ec8293
 test_vertex_fitting_reading[Iterative-False-100]__performance_vertexing.root: 60372210c830a04f95ceb78c6c68a9b0de217746ff59e8e73053750c837b57eb
 test_vertex_fitting_reading[Iterative-True-100]__performance_vertexing.root: e34f217d524a5051dbb04a811d3407df3ebe2cc4bb7f54f6bda0847dbd7b52c3
@@ -55,12 +56,12 @@ test_vertex_fitting_reading[AMVF-False-100]__performance_vertexing.root: 009e4b1
 test_vertex_fitting_reading[AMVF-True-100]__performance_vertexing.root: 2d0dc1e02bfd1f7eaae26ef8ac657ce0291f70c7e4efddd35d171d31988a631e
 test_bfield_writing__solenoid.root: 7be51f0ed9cb99f59ae0271ba79cdb84635e6ee3d2109ea8a4b521875029c21d
 test_bfield_writing__solenoid2.root: 2db149336c9cd749dc50025076b49f9bc0586d53792b87a0fdd7f21a649a01a5
-test_root_prop_step_writer[configPosConstructor]__prop_steps.root: c0a4898c1f2539d9e3e72587d5a377fc700fed6deb156952daeff670ab7a6f55
-test_root_prop_step_writer[configKwConstructor]__prop_steps.root: c0a4898c1f2539d9e3e72587d5a377fc700fed6deb156952daeff670ab7a6f55
-test_root_prop_step_writer[kwargsConstructor]__prop_steps.root: c0a4898c1f2539d9e3e72587d5a377fc700fed6deb156952daeff670ab7a6f55
-test_root_particle_writer[configPosConstructor]__particles.root: 759f7c0225a30afc28c3dda6010295207254ebb0194b88f692d538b8c65d4326
-test_root_particle_writer[configKwConstructor]__particles.root: 759f7c0225a30afc28c3dda6010295207254ebb0194b88f692d538b8c65d4326
-test_root_particle_writer[kwargsConstructor]__particles.root: 759f7c0225a30afc28c3dda6010295207254ebb0194b88f692d538b8c65d4326
+test_root_prop_step_writer[configPosConstructor]__prop_steps.root: a783d525eebb4737e6e6bcf20d63d6f35520f4bcf23301ae8c4657309cbccdda
+test_root_prop_step_writer[configKwConstructor]__prop_steps.root: a783d525eebb4737e6e6bcf20d63d6f35520f4bcf23301ae8c4657309cbccdda
+test_root_prop_step_writer[kwargsConstructor]__prop_steps.root: a783d525eebb4737e6e6bcf20d63d6f35520f4bcf23301ae8c4657309cbccdda
+test_root_particle_writer[configPosConstructor]__particles.root: e5d723e138b4e121c6e74a6dba072072f622995e117a40b8e63755ac784baad6
+test_root_particle_writer[configKwConstructor]__particles.root: e5d723e138b4e121c6e74a6dba072072f622995e117a40b8e63755ac784baad6
+test_root_particle_writer[kwargsConstructor]__particles.root: e5d723e138b4e121c6e74a6dba072072f622995e117a40b8e63755ac784baad6
 test_root_meas_writer__meas.root: 0f7e51c3c6e0133c6c1fc0da6d936e16f59ca2b579d15108e6c7b82bdf0a1e73
 test_root_simhits_writer[configPosConstructor]__meas.root: 66fee65a672bbf28098aac7af59ef181c2ac8331f87a379132873da86bdb1ba5
 test_root_simhits_writer[configKwConstructor]__meas.root: 66fee65a672bbf28098aac7af59ef181c2ac8331f87a379132873da86bdb1ba5
@@ -72,24 +73,24 @@ test_root_clusters_writer[kwargsConstructor]__clusters.root: e842df4fe04eefff3df
 test_exatrkx[cpu-torch]__performance_track_finding.root: 36b3045589c4c17c038dbc87943366f4af4440f7eea6887afb763871ac149b05
 test_exatrkx[gpu-onnx]__performance_track_finding.root: 9090de10ffb1489d3f1993e2a3081a3038227e3e5c453e98a9a4f33ea3d6d817
 test_exatrkx[gpu-torch]__performance_track_finding.root: 36b3045589c4c17c038dbc87943366f4af4440f7eea6887afb763871ac149b05
-test_ML_Ambiguity_Solver__performance_ambiML.root: 284ff5c3a08c0b810938e4ac2f8ba8fe2babb17d4c202b624ed69fff731a9006
-test_refitting[odd]__trackstates_gsf_refit.root: 1071ab66ec9a7d1ddddfb12beac8da6e9c489242f5fe2aee238b88aee0744823
-test_refitting[odd]__tracksummary_gsf_refit.root: 16951808df6363d2acb99e385aec35ad723b634403ca0724a552ae9d3a2ae237
-test_refitting[generic]__trackstates_gsf_refit.root: dbad2648b761e021bd21296755a0c73230da6e4796b306f6ac59424c40c9b80b
-test_refitting[generic]__tracksummary_gsf_refit.root: bf46a89e429fa77a380d5ee48babb8af2044196eff872825e84c0d4401357114
-test_truth_tracking_kalman[generic-False-0.0]__trackstates_kf.root: a87b908ee14a3de3e8f894cb69dc011e23ec2de6fd92a71a91c367f18a7934f6
-test_truth_tracking_kalman[generic-False-0.0]__tracksummary_kf.root: bf46a89e429fa77a380d5ee48babb8af2044196eff872825e84c0d4401357114
-test_truth_tracking_kalman[generic-False-1000.0]__trackstates_kf.root: 5b945782c1ff59c7c30d3d2a23992292735bc3da27da6424309da9c9e9660322
-test_truth_tracking_kalman[generic-False-1000.0]__tracksummary_kf.root: 055a74d2747d360398cc846cc2791204491528896de78cca66b188e3ff530dc1
-test_truth_tracking_kalman[generic-True-0.0]__trackstates_kf.root: a87b908ee14a3de3e8f894cb69dc011e23ec2de6fd92a71a91c367f18a7934f6
-test_truth_tracking_kalman[generic-True-0.0]__tracksummary_kf.root: bf46a89e429fa77a380d5ee48babb8af2044196eff872825e84c0d4401357114
-test_truth_tracking_kalman[generic-True-1000.0]__trackstates_kf.root: 5b945782c1ff59c7c30d3d2a23992292735bc3da27da6424309da9c9e9660322
-test_truth_tracking_kalman[generic-True-1000.0]__tracksummary_kf.root: 055a74d2747d360398cc846cc2791204491528896de78cca66b188e3ff530dc1
-test_truth_tracking_kalman[odd-False-0.0]__trackstates_kf.root: 6e4a34638a4d76607597db1e02525f6c6a386ca44727cae255a0aa0c2b588c7f
-test_truth_tracking_kalman[odd-False-0.0]__tracksummary_kf.root: a45dbd0b6d221ec1b153f6e90d84601fe7a799134604c63be8e94bf8cd22af43
-test_truth_tracking_kalman[odd-False-1000.0]__trackstates_kf.root: 7e0b19d1f8c818269925b95817b9c92c68af3b841fdbd21560aa55688ddec786
-test_truth_tracking_kalman[odd-False-1000.0]__tracksummary_kf.root: 15a542955428dec0776c8317a33b7ef6c14858888ffc7406b00ac7044694b137
-test_truth_tracking_kalman[odd-True-0.0]__trackstates_kf.root: 6e4a34638a4d76607597db1e02525f6c6a386ca44727cae255a0aa0c2b588c7f
-test_truth_tracking_kalman[odd-True-0.0]__tracksummary_kf.root: a45dbd0b6d221ec1b153f6e90d84601fe7a799134604c63be8e94bf8cd22af43
-test_truth_tracking_kalman[odd-True-1000.0]__trackstates_kf.root: 7e0b19d1f8c818269925b95817b9c92c68af3b841fdbd21560aa55688ddec786
-test_truth_tracking_kalman[odd-True-1000.0]__tracksummary_kf.root: 15a542955428dec0776c8317a33b7ef6c14858888ffc7406b00ac7044694b137
+test_ML_Ambiguity_Solver__performance_finding_ambiML.root: 166dd8bb189097c4957b7b02c04c41267868d72d9a08c4bb892985b06849cb76
+test_refitting[odd]__trackstates_gsf_refit.root: e297749dc1e7eda3b8dea13defa0499986c584740d93e723a901b498b8e90c71
+test_refitting[odd]__tracksummary_gsf_refit.root: d5085882e45a0b699194dff9f40a36e9291227bf65f9aaaf9087f9242ef5ae22
+test_refitting[generic]__trackstates_gsf_refit.root: 4424fdf2f27575db825c1a59f8e53a1595946211cbd5b2c8d3a2f71cdcc77ae9
+test_refitting[generic]__tracksummary_gsf_refit.root: 562deecee4cfb97ceee72eff53d63da079e3249fb62d6bcd556e6f27d495dfd9
+test_truth_tracking_kalman[generic-False-0.0]__trackstates_kf.root: 9f77962b92037cb760b1629a602b1dae61f45e659c45d9a87baa784f6190960e
+test_truth_tracking_kalman[generic-False-0.0]__tracksummary_kf.root: 562deecee4cfb97ceee72eff53d63da079e3249fb62d6bcd556e6f27d495dfd9
+test_truth_tracking_kalman[generic-False-1000.0]__trackstates_kf.root: 56a1bd989b9c1316b9098c65fa75df9e6683e62e35ae68d8f72d27220be0fd7d
+test_truth_tracking_kalman[generic-False-1000.0]__tracksummary_kf.root: 2d85be3a5dff01a1076e80f8c225aca32f65b30dc9c3551b610ac2f12d006a39
+test_truth_tracking_kalman[generic-True-0.0]__trackstates_kf.root: 9f77962b92037cb760b1629a602b1dae61f45e659c45d9a87baa784f6190960e
+test_truth_tracking_kalman[generic-True-0.0]__tracksummary_kf.root: 562deecee4cfb97ceee72eff53d63da079e3249fb62d6bcd556e6f27d495dfd9
+test_truth_tracking_kalman[generic-True-1000.0]__trackstates_kf.root: 56a1bd989b9c1316b9098c65fa75df9e6683e62e35ae68d8f72d27220be0fd7d
+test_truth_tracking_kalman[generic-True-1000.0]__tracksummary_kf.root: 2d85be3a5dff01a1076e80f8c225aca32f65b30dc9c3551b610ac2f12d006a39
+test_truth_tracking_kalman[odd-False-0.0]__trackstates_kf.root: 7e144571b19aaf00002aef4f5bec5d488b96fb9ed8e1b2904c3756b31be83513
+test_truth_tracking_kalman[odd-False-0.0]__tracksummary_kf.root: d5085882e45a0b699194dff9f40a36e9291227bf65f9aaaf9087f9242ef5ae22
+test_truth_tracking_kalman[odd-False-1000.0]__trackstates_kf.root: efdf37f56fa3ef85265cda61853f4c0f989e3d4f4745b5e351c9bcca78cd93cc
+test_truth_tracking_kalman[odd-False-1000.0]__tracksummary_kf.root: b84fabd6c1b71c360019cd719400746ccff1e565a983ca23d0621790b8843e44
+test_truth_tracking_kalman[odd-True-0.0]__trackstates_kf.root: 7e144571b19aaf00002aef4f5bec5d488b96fb9ed8e1b2904c3756b31be83513
+test_truth_tracking_kalman[odd-True-0.0]__tracksummary_kf.root: d5085882e45a0b699194dff9f40a36e9291227bf65f9aaaf9087f9242ef5ae22
+test_truth_tracking_kalman[odd-True-1000.0]__trackstates_kf.root: efdf37f56fa3ef85265cda61853f4c0f989e3d4f4745b5e351c9bcca78cd93cc
+test_truth_tracking_kalman[odd-True-1000.0]__tracksummary_kf.root: b84fabd6c1b71c360019cd719400746ccff1e565a983ca23d0621790b8843e44
diff --git a/Examples/Python/tests/test_algorithms.py b/Examples/Python/tests/test_algorithms.py
index ede2610f604..4cca7199291 100644
--- a/Examples/Python/tests/test_algorithms.py
+++ b/Examples/Python/tests/test_algorithms.py
@@ -11,7 +11,6 @@
     EventGenerator,
     FatrasSimulation,
     MaterialMapping,
-    TruthSeedSelector,
     TruthTrackFinder,
     ParticleSelector,
     TruthVertexFinder,
@@ -42,7 +41,6 @@
         EventGenerator,
         FatrasSimulation,
         MaterialMapping,
-        TruthSeedSelector,
         TruthTrackFinder,
         ParticleSelector,
         TruthVertexFinder,
diff --git a/Examples/Python/tests/test_covfie.py b/Examples/Python/tests/test_covfie.py
new file mode 100644
index 00000000000..3c1d7ca0d3d
--- /dev/null
+++ b/Examples/Python/tests/test_covfie.py
@@ -0,0 +1,63 @@
+import pathlib, acts, acts.examples
+import pytest
+
+from helpers import covfieEnabled
+
+
+@pytest.mark.skipif(not covfieEnabled, reason="Covfie plugin not available")
+def test_constant_field_conversion():
+    from acts import covfie
+
+    v = acts.Vector3(1, 2, 3)
+    af = acts.ConstantBField(v)
+    cf = covfie.makeCovfieField(af)
+    view = covfie.toView(cf)
+    points = [(0, 0, 1), (1, 1, 1), (1, 0, 2)]
+    for x, y, z in points:
+        assert view.at(x, y, z) == [1, 2, 3]
+
+
+@pytest.mark.skipif(not covfieEnabled, reason="Covfie plugin not available")
+def test_root_field_conversion():
+    from acts import covfie
+
+    current_file_path = pathlib.Path(__file__).resolve().parent
+    p = (
+        current_file_path.parent.parent.parent
+        / "thirdparty"
+        / "OpenDataDetector"
+        / "data"
+        / "odd-bfield.root"
+    )
+
+    af = acts.examples.MagneticFieldMapXyz(str(p))
+    bc = acts.MagneticFieldContext()
+    fc = af.makeCache(bc)
+
+    cf = covfie.makeCovfieField(af)
+    view = covfie.toView(cf)
+    points = [
+        (9300.0, 4700.0, 11200.0),
+        (9999.0, 9999.0, 14300.0),
+        (-2900.0, -4700.0, 5200.0),
+        (-2900.0, -4800.0, 9100.0),
+        (-2900.0, -5200.0, -8800.0),
+        (-4400.0, 4800.0, -12700.0),
+        (-6600.0, 1900.0, 7700.0),
+        (-9700.0, -900.0, 12700.0),
+        (-9999.0, -9999.0, -13000.0),
+        (9999.0, 0, 14900.0),
+    ]
+
+    error_margin_half_width = 0.0001
+    for x, y, z in points:
+        val = af.getField(acts.Vector3(x, y, z), fc)
+        Bx1, By1, Bz1 = val[0], val[1], val[2]
+
+        Bx2, By2, Bz2 = tuple(view.at(x, y, z))
+
+        assert (
+            abs(Bx1 - Bx2) < error_margin_half_width
+            and abs(By1 - By2) < error_margin_half_width
+            and abs(Bz1 - Bz2) < error_margin_half_width
+        )
diff --git a/Examples/Python/tests/test_detectors.py b/Examples/Python/tests/test_detectors.py
index e99406c69d6..c4d2c6ea9ed 100644
--- a/Examples/Python/tests/test_detectors.py
+++ b/Examples/Python/tests/test_detectors.py
@@ -1,4 +1,5 @@
 import pytest
+from pathlib import Path
 
 from helpers import dd4hepEnabled
 
@@ -157,3 +158,34 @@ def eq(self, other):
 
         v = Volume(**{key: (4, None)})
         assert getattr(v, key) == Interval(4, None)
+
+
+def test_coordinate_converter(trk_geo):
+    digiCfg = acts.examples.DigitizationConfig(
+        acts.examples.readDigiConfigFromJson(
+            str(
+                Path(__file__).parent.parent.parent.parent
+                / "Examples/Algorithms/Digitization/share/default-smearing-config-generic.json"
+            )
+        ),
+        surfaceByIdentifier=trk_geo.geoIdSurfaceMap(),
+    )
+    converter = acts.examples.DigitizationCoordinatesConverter(digiCfg)
+
+    def test_surface(surface):
+        gctx = acts.GeometryContext()
+        geo_id = surface.geometryId().value()
+        geo_center = surface.center(gctx)
+        x, y, z = geo_center[0], geo_center[1], geo_center[2]
+
+        # test if surface center can be reproduced
+        assert converter.globalToLocal(geo_id, x, y, z) == (0, 0)
+        assert converter.localToGlobal(geo_id, 0, 0) == (x, y, z)
+
+        # test if we can get back to the same local coordinates
+        global_shifted = converter.localToGlobal(geo_id, 5, 5)
+        local_shifted = converter.globalToLocal(geo_id, *global_shifted)
+        assert abs(local_shifted[0] - 5) / 5 < 1e-6
+        assert abs(local_shifted[1] - 5) / 5 < 1e-6
+
+    trk_geo.visitSurfaces(test_surface)
diff --git a/Examples/Python/tests/test_examples.py b/Examples/Python/tests/test_examples.py
index 1772f7c0dba..2261e58cea4 100644
--- a/Examples/Python/tests/test_examples.py
+++ b/Examples/Python/tests/test_examples.py
@@ -18,6 +18,7 @@
     pythia8Enabled,
     exatrkxEnabled,
     onnxEnabled,
+    hashingSeedingEnabled,
     AssertCollectionExistsAlg,
     failure_threshold,
 )
@@ -48,7 +49,13 @@ def assert_csv_output(csv_path, stem):
     __tracebackhide__ = True
     # print(list(csv_path.iterdir()))
     assert len([f for f in csv_path.iterdir() if f.name.endswith(stem + ".csv")]) > 0
-    assert all([f.stat().st_size > 100 for f in csv_path.iterdir()])
+    assert all(
+        [
+            f.stat().st_size > 100
+            for f in csv_path.iterdir()
+            if f.name.endswith(stem + ".csv")
+        ]
+    )
 
 
 def assert_entries(root_file, tree_name, exp=None, non_zero=False):
@@ -80,14 +87,14 @@ def test_pythia8(tmp_path, seq, assert_root_hash):
 
     (tmp_path / "csv").mkdir()
 
-    assert not (tmp_path / "pythia8_particles.root").exists()
+    assert not (tmp_path / "particles.root").exists()
     assert len(list((tmp_path / "csv").iterdir())) == 0
 
     events = seq.config.events
 
     runPythia8(str(tmp_path), outputRoot=True, outputCsv=True, s=seq).run()
 
-    fp = tmp_path / "pythia8_particles.root"
+    fp = tmp_path / "particles.root"
     assert fp.exists()
     assert fp.stat().st_size > 2**10 * 50
     assert_entries(fp, "particles", events)
@@ -123,8 +130,7 @@ def test_fatras(trk_geo, tmp_path, field, assert_root_hash):
     seq = Sequencer(events=nevents)
     runFatras(trk_geo, field, str(tmp_path), s=seq).run()
 
-    assert_csv_output(csv, "particles_final")
-    assert_csv_output(csv, "particles_initial")
+    assert_csv_output(csv, "particles_simulated")
     assert_csv_output(csv, "hits")
     for f, tn in root_files:
         rfp = tmp_path / f
@@ -179,8 +185,7 @@ def test_geant4(tmp_path, assert_root_hash):
         print(e.output.decode("utf-8"))
         raise
 
-    assert_csv_output(csv, "particles_final")
-    assert_csv_output(csv, "particles_initial")
+    assert_csv_output(csv, "particles_simulated")
     assert_csv_output(csv, "hits")
     for f in root_files:
         rfp = tmp_path / f
@@ -237,8 +242,68 @@ def test_seeding(tmp_path, trk_geo, field, assert_root_hash):
             assert_root_hash(fn, fp)
 
     assert_csv_output(csv, "particles")
-    assert_csv_output(csv, "particles_final")
-    assert_csv_output(csv, "particles_initial")
+    assert_csv_output(csv, "particles_simulated")
+
+
+@pytest.mark.slow
+@pytest.mark.skipif(not hashingSeedingEnabled, reason="HashingSeeding not set up")
+def test_hashing_seeding(tmp_path, trk_geo, field, assert_root_hash):
+    from hashing_seeding import runHashingSeeding, Config
+
+    field = acts.ConstantBField(acts.Vector3(0, 0, 2 * acts.UnitConstants.T))
+
+    seq = Sequencer(events=10, numThreads=1)
+
+    root_files = [
+        (
+            "estimatedparams.root",
+            "estimatedparams",
+        ),
+        (
+            "performance_seeding.root",
+            None,
+        ),
+    ]
+
+    for fn, _ in root_files:
+        fp = tmp_path / fn
+        assert not fp.exists(), f"{fp} exists"
+
+    config = Config(
+        mu=50,
+    )
+
+    _, _, digiConfig, geoSelectionConfigFile = config.getDetectorInfo()
+
+    runHashingSeeding(
+        10,
+        trk_geo,
+        field,
+        outputDir=str(tmp_path),
+        saveFiles=True,
+        npileup=config.mu,
+        seedingAlgorithm=config.seedingAlgorithm,
+        maxSeedsPerSpM=config.maxSeedsPerSpM,
+        digiConfig=digiConfig,
+        geoSelectionConfigFile=geoSelectionConfigFile,
+        config=config,
+        s=seq,
+    ).run()
+
+    del seq
+
+    for fn, tn in root_files:
+        fp = tmp_path / fn
+        assert fp.exists(), f"{fp} does not exist"
+        assert fp.stat().st_size > 100, f"{fp} is too small: {fp.stat().st_size} bytes"
+
+        if tn is not None:
+            assert_has_entries(fp, tn)
+            assert_root_hash(fn, fp)
+
+    assert_csv_output(tmp_path, "particles_simulated")
+    assert_csv_output(tmp_path, "buckets")
+    assert_csv_output(tmp_path, "seed")
 
 
 def test_seeding_orthogonal(tmp_path, trk_geo, field, assert_root_hash):
@@ -294,8 +359,7 @@ def test_seeding_orthogonal(tmp_path, trk_geo, field, assert_root_hash):
             assert_root_hash(fn, fp)
 
     assert_csv_output(csv, "particles")
-    assert_csv_output(csv, "particles_final")
-    assert_csv_output(csv, "particles_initial")
+    assert_csv_output(csv, "particles_simulated")
 
 
 def test_itk_seeding(tmp_path, trk_geo, field, assert_root_hash):
@@ -338,6 +402,7 @@ def test_itk_seeding(tmp_path, trk_geo, field, assert_root_hash):
         EtaConfig,
         MomentumConfig,
         ParticleConfig,
+        ParticleSelectorConfig,
         addFatras,
         addDigitization,
     )
@@ -359,6 +424,12 @@ def test_itk_seeding(tmp_path, trk_geo, field, assert_root_hash):
         outputDirCsv=tmp_path / "csv",
         outputDirRoot=str(tmp_path),
         rnd=rnd,
+        postSelectParticles=ParticleSelectorConfig(
+            pt=(0.9 * u.GeV, None),
+            eta=(-4, 4),
+            measurements=(9, None),
+            removeNeutral=True,
+        ),
     )
 
     srcdir = Path(__file__).resolve().parent.parent.parent.parent
@@ -373,7 +444,6 @@ def test_itk_seeding(tmp_path, trk_geo, field, assert_root_hash):
 
     from acts.examples.reconstruction import (
         addSeeding,
-        TruthSeedRanges,
     )
     from acts.examples.itk import itkSeedingAlgConfig, InputSpacePointsType
 
@@ -381,12 +451,10 @@ def test_itk_seeding(tmp_path, trk_geo, field, assert_root_hash):
         seq,
         trk_geo,
         field,
-        TruthSeedRanges(pt=(1.0 * u.GeV, None), eta=(-4, 4), nHits=(9, None)),
         *itkSeedingAlgConfig(InputSpacePointsType.PixelSpacePoints),
         acts.logging.VERBOSE,
         geoSelectionConfigFile=srcdir
         / "Examples/Algorithms/TrackFinding/share/geoSelection-genericDetector.json",
-        inputParticles="particles_final",  # use this to reproduce the original root_file_hashes.txt - remove to fix
         outputDirRoot=str(tmp_path),
     )
 
@@ -402,8 +470,7 @@ def test_itk_seeding(tmp_path, trk_geo, field, assert_root_hash):
             assert_root_hash(fn, fp)
 
     assert_csv_output(csv, "particles")
-    assert_csv_output(csv, "particles_final")
-    assert_csv_output(csv, "particles_initial")
+    assert_csv_output(csv, "particles_simulated")
 
 
 @pytest.mark.slow
@@ -630,6 +697,7 @@ def test_refitting(tmp_path, detector_config, assert_root_hash):
         runRefittingGsf(
             trackingGeometry=trackingGeometry,
             field=field,
+            digiConfigFile=detector_config.digiConfigFile,
             outputDir=tmp_path,
             s=seq,
         ).run()
@@ -931,6 +999,40 @@ def test_digitization_example(trk_geo, tmp_path, assert_root_hash, digi_config_f
     assert_root_hash(root_file.name, root_file)
 
 
+@pytest.mark.parametrize(
+    "digi_config_file",
+    [
+        DIGI_SHARE_DIR / "default-smearing-config-generic.json",
+        DIGI_SHARE_DIR / "default-geometric-config-generic.json",
+        pytest.param(
+            (
+                getOpenDataDetectorDirectory()
+                / "config"
+                / "odd-digi-smearing-config.json"
+            ),
+            marks=[
+                pytest.mark.odd,
+            ],
+        ),
+        pytest.param(
+            (
+                getOpenDataDetectorDirectory()
+                / "config"
+                / "odd-digi-geometric-config.json"
+            ),
+            marks=[
+                pytest.mark.odd,
+            ],
+        ),
+    ],
+    ids=["smeared", "geometric", "odd-smeared", "odd-geometric"],
+)
+def test_digitization_example_input_parsing(digi_config_file):
+    from acts.examples import readDigiConfigFromJson
+
+    acts.examples.readDigiConfigFromJson(str(digi_config_file))
+
+
 @pytest.mark.parametrize(
     "digi_config_file",
     [
@@ -1037,7 +1139,7 @@ def test_ckf_tracks_example(
 
     root_files = [
         (
-            "performance_ckf.root",
+            "performance_finding_ckf.root",
             None,
         ),
         (
@@ -1132,7 +1234,8 @@ def test_full_chain_odd_example_pythia_geant4(tmp_path):
     # This test literally only ensures that the full chain example can run without erroring out
 
     # just to make sure it can build the odd
-    detector, trackingGeometry, decorators = getOpenDataDetector()
+    with getOpenDataDetector() as (detector, trackingGeometry, decorators):
+        pass
 
     script = (
         Path(__file__).parent.parent.parent.parent
@@ -1180,12 +1283,13 @@ def test_full_chain_odd_example_pythia_geant4(tmp_path):
 def test_ML_Ambiguity_Solver(tmp_path, assert_root_hash):
     # This test literally only ensures that the full chain example can run without erroring out
 
-    root_file = "performance_ambiML.root"
+    root_file = "performance_finding_ambiML.root"
     output_dir = "odd_output"
     assert not (tmp_path / root_file).exists()
 
     # just to make sure it can build the odd
-    detector, trackingGeometry, decorators = getOpenDataDetector()
+    with getOpenDataDetector() as (detector, trackingGeometry, decorators):
+        pass
 
     script = (
         Path(__file__).parent.parent.parent.parent
diff --git a/Examples/Python/tests/test_magnetic_field.py b/Examples/Python/tests/test_magnetic_field.py
index 3c1aae5c537..a51ebd55ab6 100644
--- a/Examples/Python/tests/test_magnetic_field.py
+++ b/Examples/Python/tests/test_magnetic_field.py
@@ -1,4 +1,5 @@
 import pytest
+import random
 
 import acts
 import acts.examples
@@ -7,16 +8,52 @@
 
 
 def test_null_bfield():
-    assert acts.NullBField()
+    nb = acts.NullBField()
+    assert nb
+
+    ct = acts.MagneticFieldContext()
+    assert ct
+
+    fc = nb.makeCache(ct)
+    assert fc
+
+    for i in range(100):
+        x = random.uniform(-10000.0, 10000.0)
+        y = random.uniform(-10000.0, 10000.0)
+        z = random.uniform(-10000.0, 10000.0)
+
+        rv = nb.getField(acts.Vector3(x, y, z), fc)
+
+        assert rv[0] == pytest.approx(0.0)
+        assert rv[1] == pytest.approx(0.0)
+        assert rv[2] == pytest.approx(0.0)
 
 
 def test_constant_bfield():
     with pytest.raises(TypeError):
         acts.ConstantBField()
+
     v = acts.Vector3(1, 2, 3)
     cb = acts.ConstantBField(v)
     assert cb
 
+    ct = acts.MagneticFieldContext()
+    assert ct
+
+    fc = cb.makeCache(ct)
+    assert fc
+
+    for i in range(100):
+        x = random.uniform(-10000.0, 10000.0)
+        y = random.uniform(-10000.0, 10000.0)
+        z = random.uniform(-10000.0, 10000.0)
+
+        rv = cb.getField(acts.Vector3(x, y, z), fc)
+
+        assert rv[0] == pytest.approx(1.0)
+        assert rv[1] == pytest.approx(2.0)
+        assert rv[2] == pytest.approx(3.0)
+
 
 def test_solenoid(conf_const):
     solenoid = conf_const(
diff --git a/Examples/Python/tests/test_navigation.py b/Examples/Python/tests/test_navigation.py
new file mode 100644
index 00000000000..56c908f7911
--- /dev/null
+++ b/Examples/Python/tests/test_navigation.py
@@ -0,0 +1,48 @@
+import pytest
+
+import acts
+
+import acts.examples
+
+
+def test_navigation_policy_factory():
+
+    policy = (
+        acts.NavigationPolicyFactory.make()
+        .add(acts.TryAllNavigationPolicy)
+        .add(
+            acts.SurfaceArrayNavigationPolicy,
+            acts.SurfaceArrayNavigationPolicy.Config(
+                layerType=acts.SurfaceArrayNavigationPolicy.LayerType.Disc,
+                bins=(10, 10),
+            ),
+        )
+    )
+
+    policy._buildTest()
+
+    policy = acts.NavigationPolicyFactory.make().add(acts.TryAllNavigationPolicy)
+
+    policy._buildTest()
+
+
+def test_navigation_policy_factory_build_empty():
+    policy = acts.NavigationPolicyFactory.make()
+
+    with pytest.raises(RuntimeError):
+        policy._buildTest()
+
+
+def test_navigation_policy_factory_add_multiple():
+    with pytest.raises(ValueError):
+        (
+            acts.NavigationPolicyFactory.make()
+            .add(acts.TryAllNavigationPolicy)
+            .add(acts.TryAllNavigationPolicy)
+        )
+
+
+def test_try_all_arguments():
+    acts.NavigationPolicyFactory.make().add(
+        acts.TryAllNavigationPolicy, acts.TryAllNavigationPolicy.Config(sensitives=True)
+    )
diff --git a/Examples/Python/tests/test_reader.py b/Examples/Python/tests/test_reader.py
index f4e803776d5..104a4e0f98f 100644
--- a/Examples/Python/tests/test_reader.py
+++ b/Examples/Python/tests/test_reader.py
@@ -206,7 +206,6 @@ def test_csv_meas_reader(tmp_path, fatras, trk_geo, conf_const):
             level=acts.logging.WARNING,
             outputMeasurements="measurements",
             outputMeasurementSimHitsMap="simhitsmap",
-            outputSourceLinks="sourcelinks",
             outputMeasurementParticlesMap="meas_ptcl_map",
             inputSimHits=simAlg.config.outputSimHits,
             inputDir=str(out),
@@ -215,7 +214,7 @@ def test_csv_meas_reader(tmp_path, fatras, trk_geo, conf_const):
 
     algs = [
         AssertCollectionExistsAlg(k, f"check_alg_{k}", acts.logging.WARNING)
-        for k in ("measurements", "simhitsmap", "sourcelinks", "meas_ptcl_map")
+        for k in ("measurements", "simhitsmap", "meas_ptcl_map")
     ]
     for alg in algs:
         s.addAlgorithm(alg)
@@ -291,8 +290,11 @@ def test_edm4hep_simhit_particle_reader(tmp_path):
     tmp_file = str(tmp_path / "output_edm4hep.root")
     odd_xml_file = str(getOpenDataDetectorDirectory() / "xml" / "OpenDataDetector.xml")
 
-    with multiprocessing.get_context("spawn").Pool() as pool:
-        pool.apply(generate_input_test_edm4hep_simhit_reader, (odd_xml_file, tmp_file))
+    p = multiprocessing.Process(
+        target=generate_input_test_edm4hep_simhit_reader, args=(odd_xml_file, tmp_file)
+    )
+    p.start()
+    p.join()
 
     assert os.path.exists(tmp_file)
 
@@ -312,8 +314,7 @@ def test_edm4hep_simhit_particle_reader(tmp_path):
                     "LongStripEndcapReadout",
                 ],
                 outputParticlesGenerator="particles_input",
-                outputParticlesInitial="particles_initial",
-                outputParticlesFinal="particles_final",
+                outputParticlesSimulation="particles_simulated",
                 outputSimHits="simhits",
                 dd4hepDetector=detector,
                 trackingGeometry=trackingGeometry,
@@ -363,14 +364,13 @@ def test_edm4hep_measurement_reader(tmp_path, fatras, conf_const):
             level=acts.logging.WARNING,
             outputMeasurements="measurements",
             outputMeasurementSimHitsMap="simhitsmap",
-            outputSourceLinks="sourcelinks",
             inputPath=str(out),
         )
     )
 
     algs = [
         AssertCollectionExistsAlg(k, f"check_alg_{k}", acts.logging.WARNING)
-        for k in ("measurements", "simhitsmap", "sourcelinks")
+        for k in ("measurements", "simhitsmap")
     ]
     for alg in algs:
         s.addAlgorithm(alg)
diff --git a/Examples/Python/tests/test_writer.py b/Examples/Python/tests/test_writer.py
index a3098c743c9..95cd67decd1 100644
--- a/Examples/Python/tests/test_writer.py
+++ b/Examples/Python/tests/test_writer.py
@@ -21,7 +21,7 @@
 from acts import UnitConstants as u
 from acts.examples import (
     ObjPropagationStepsWriter,
-    TrackFinderPerformanceWriter,
+    TrackFinderNTupleWriter,
     SeedingPerformanceWriter,
     RootPropagationStepsWriter,
     RootParticleWriter,
@@ -31,7 +31,7 @@
     RootSimHitWriter,
     RootTrackStatesWriter,
     RootTrackSummaryWriter,
-    VertexPerformanceWriter,
+    VertexNTupleWriter,
     RootMeasurementWriter,
     CsvParticleWriter,
     CsvSimHitWriter,
@@ -250,7 +250,7 @@ def test_csv_simhits_writer(tmp_path, fatras, conf_const):
     [
         RootPropagationStepsWriter,
         RootParticleWriter,
-        TrackFinderPerformanceWriter,
+        TrackFinderNTupleWriter,
         SeedingPerformanceWriter,
         RootTrackParameterWriter,
         RootMaterialTrackWriter,
@@ -259,7 +259,7 @@ def test_csv_simhits_writer(tmp_path, fatras, conf_const):
         RootSimHitWriter,
         RootTrackStatesWriter,
         RootTrackSummaryWriter,
-        VertexPerformanceWriter,
+        VertexNTupleWriter,
         SeedingPerformanceWriter,
     ],
 )
diff --git a/Examples/Scripts/MaterialMapping/Mat_map.C b/Examples/Scripts/MaterialMapping/Mat_map.C
index 200aa99af2b..60c70fa2339 100644
--- a/Examples/Scripts/MaterialMapping/Mat_map.C
+++ b/Examples/Scripts/MaterialMapping/Mat_map.C
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2020 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include <TROOT.h>
 
@@ -57,7 +57,7 @@ void Draw_ratio(TCanvas* c, TProfile* h1, TProfile* h2, TLegend* leg, std::strin
   h5->SetStats(0);      // No statistics on lower plot
   h5->Divide(h1);
 
-  double maxi = min( max( fabs(h5->GetMinimum()-0.1*h5->GetMinimum()),h5->GetMaximum()+0.1*h5->GetMaximum() ), 10. );
+  double maxi = min( max( std::abs(h5->GetMinimum()-0.1*h5->GetMinimum()),h5->GetMaximum()+0.1*h5->GetMaximum() ), 10. );
 
   h5->SetMinimum( 0.5 );  // Define Y ..
   h5->SetMaximum( 1.1 ); // .. range
@@ -145,7 +145,7 @@ void Mat_map(std::string Val = "", std::string geantino = "", std::string name =
 
     // 2D map for Validation input
     TCanvas *VM = new TCanvas("VM","Validation Map") ;
-    Val_file->Draw("mat_y:mat_z","fabs(mat_x)<1");
+    Val_file->Draw("mat_y:mat_z","std::abs(mat_x)<1");
 
     eta_0->Draw("Same");
     eta_1p->Draw("Same");
@@ -206,7 +206,7 @@ void Mat_map(std::string Val = "", std::string geantino = "", std::string name =
 
     // 2D map for Geantino input
     TCanvas *GM = new TCanvas("GM","Geantino Map") ;
-    geantino_file->Draw("mat_y:mat_z","fabs(mat_x)<1");
+    geantino_file->Draw("mat_y:mat_z","std::abs(mat_x)<1");
 
     eta_0->Draw("Same");
     eta_1p->Draw("Same");
diff --git a/Examples/Scripts/MaterialMapping/Mat_map_detector_plot.C b/Examples/Scripts/MaterialMapping/Mat_map_detector_plot.C
index deeb7c275a3..9441c176736 100644
--- a/Examples/Scripts/MaterialMapping/Mat_map_detector_plot.C
+++ b/Examples/Scripts/MaterialMapping/Mat_map_detector_plot.C
@@ -1,13 +1,15 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2020 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include <TROOT.h>
 
+#include "Acts/Utilities/Helpers.hpp"
+
 #include "materialPlotHelper.cpp"
 
 #include <fstream>
@@ -153,7 +155,7 @@ void Fill(std::vector<TH2F*>& detector_hist, const std::string& input_file, std:
       }
 
       // Check if the volume/surface is part of the selected ones
-      if(std::find(detectors.begin(), detectors.end(), ID.volume()) != detectors.end()) {
+      if(rangeContainsValue(detectors, ID.volume())) {
         matX0 += mat_step_length->at(j) / mat_X0->at(j);
         matL0 += mat_step_length->at(j) / mat_L0->at(j);
       }
diff --git a/Examples/Scripts/MaterialMapping/Mat_map_detector_plot_ratio.C b/Examples/Scripts/MaterialMapping/Mat_map_detector_plot_ratio.C
index dfbb12effa9..fafe59e0c49 100644
--- a/Examples/Scripts/MaterialMapping/Mat_map_detector_plot_ratio.C
+++ b/Examples/Scripts/MaterialMapping/Mat_map_detector_plot_ratio.C
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2020 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include "Mat_map_detector_plot.C"
 
diff --git a/Examples/Scripts/MaterialMapping/Mat_map_surface_plot.C b/Examples/Scripts/MaterialMapping/Mat_map_surface_plot.C
index 584664ec1e7..a5482d30846 100644
--- a/Examples/Scripts/MaterialMapping/Mat_map_surface_plot.C
+++ b/Examples/Scripts/MaterialMapping/Mat_map_surface_plot.C
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2020 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include <TROOT.h>
 
diff --git a/Examples/Scripts/MaterialMapping/Mat_map_surface_plot_1D.C b/Examples/Scripts/MaterialMapping/Mat_map_surface_plot_1D.C
index d69d271a605..6068f624693 100644
--- a/Examples/Scripts/MaterialMapping/Mat_map_surface_plot_1D.C
+++ b/Examples/Scripts/MaterialMapping/Mat_map_surface_plot_1D.C
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2020 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include <TROOT.h>
 
diff --git a/Examples/Scripts/MaterialMapping/Mat_map_surface_plot_dist.C b/Examples/Scripts/MaterialMapping/Mat_map_surface_plot_dist.C
index 5b822199aca..020b9cd717d 100644
--- a/Examples/Scripts/MaterialMapping/Mat_map_surface_plot_dist.C
+++ b/Examples/Scripts/MaterialMapping/Mat_map_surface_plot_dist.C
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2020 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include <TROOT.h>
 
diff --git a/Examples/Scripts/MaterialMapping/Mat_map_surface_plot_ratio.C b/Examples/Scripts/MaterialMapping/Mat_map_surface_plot_ratio.C
index 311dd234369..9fd02c9b747 100644
--- a/Examples/Scripts/MaterialMapping/Mat_map_surface_plot_ratio.C
+++ b/Examples/Scripts/MaterialMapping/Mat_map_surface_plot_ratio.C
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2020 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include "Mat_map_surface_plot.C"
 
diff --git a/Examples/Scripts/MaterialMapping/MaterialComposition.cpp b/Examples/Scripts/MaterialMapping/MaterialComposition.cpp
index bc9f7936f67..348a4912f29 100644
--- a/Examples/Scripts/MaterialMapping/MaterialComposition.cpp
+++ b/Examples/Scripts/MaterialMapping/MaterialComposition.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2021 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include "ActsExamples/Utilities/Options.hpp"
 
@@ -73,7 +73,7 @@ int main(int argc, char** argv) {
     store(command_line_parser(argc, argv).options(description).run(), vm);
     notify(vm);
 
-    if (vm.count("help") != 0u) {
+    if (vm.contains("help")) {
       std::cout << description;
     }
 
@@ -89,7 +89,7 @@ int main(int argc, char** argv) {
     // Subdetector configurations
     std::vector<Region> dRegion = {};
 
-    if (vm.count("config") > 0) {
+    if (vm.contains("config")) {
       std::filesystem::path config = vm["config"].as<std::string>();
       std::cout << "Reading region configuration from JSON: " << config
                 << std::endl;
diff --git a/Examples/Scripts/MaterialMapping/configureMap.py b/Examples/Scripts/MaterialMapping/configureMap.py
index 770343f27fc..26cbfc551fe 100644
--- a/Examples/Scripts/MaterialMapping/configureMap.py
+++ b/Examples/Scripts/MaterialMapping/configureMap.py
@@ -1,10 +1,10 @@
-# This file is part of the Acts project.
+# This file is part of the ACTS project.
 #
-# Copyright (C) 2020-2021 CERN for the benefit of the Acts project
+# Copyright (C) 2016 CERN for the benefit of the ACTS project
 #
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+# file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 import json
 import sys
diff --git a/Examples/Scripts/MaterialMapping/materialComposition.C b/Examples/Scripts/MaterialMapping/materialComposition.C
index ecd3863f19d..91293812abf 100644
--- a/Examples/Scripts/MaterialMapping/materialComposition.C
+++ b/Examples/Scripts/MaterialMapping/materialComposition.C
@@ -1,14 +1,15 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2021 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include <cmath>
 #include <iostream>
 #include <map>
+#include <numbers>
 #include <string>
 #include <tuple>
 
@@ -56,9 +57,9 @@ struct MaterialHistograms {
                   : name + std::string("_l0_vs_phi_A") + std::to_string(iA);
 
     x0_vs_phi =
-        new TProfile(x0NamePhi.c_str(), "X_{0} vs. #phi", bins, -M_PI, M_PI);
+        new TProfile(x0NamePhi.c_str(), "X_{0} vs. #phi", bins, -std::numbers::pi, std::numbers::pi);
     l0_vs_phi =
-        new TProfile(l0NamePhi.c_str(), "L_{0} vs. #phi", bins, -M_PI, M_PI);
+        new TProfile(l0NamePhi.c_str(), "L_{0} vs. #phi", bins, -std::numbers::pi, std::numbers::pi);
   }
 
   /// This fills the event into the histograms
diff --git a/Examples/Scripts/MaterialMapping/materialPlotHelper.cpp b/Examples/Scripts/MaterialMapping/materialPlotHelper.cpp
index 0558219cbbf..38b3baeae12 100644
--- a/Examples/Scripts/MaterialMapping/materialPlotHelper.cpp
+++ b/Examples/Scripts/MaterialMapping/materialPlotHelper.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2020 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include "materialPlotHelper.hpp"
 
@@ -36,7 +36,7 @@ std::ostream& Acts::operator<<(std::ostream& os, Acts::GeometryIdentifier id) {
 /// Initialise the information on each surface.
 
 void Initialise_info(sinfo& surface_info,
-                     const std::map<std::string, std::string>& surface_name,
+                     const std::map<std::string, std::string>& surfaceName,
                      const std::uint64_t& id, const int& type, const float& pos,
                      const float& range_min, const float& range_max) {
   Acts::GeometryIdentifier ID(id);
@@ -67,10 +67,11 @@ void Initialise_info(sinfo& surface_info,
                         Ids[3] + "_s" + Ids[4];
   surface_info.type = type;
 
-  if (surface_name.find(surface_id) != surface_name.end()) {
-    surface_info.name = surface_name.at(surface_id);
-  } else
+  if (surfaceName.contains(surface_id)) {
+    surface_info.name = surfaceName.at(surface_id);
+  } else {
     surface_info.name = "";
+  }
 
   surface_info.id = surface_id;
   surface_info.pos = pos;
diff --git a/Examples/Scripts/MaterialMapping/materialPlotHelper.hpp b/Examples/Scripts/MaterialMapping/materialPlotHelper.hpp
index b8dde85a01f..db3419db605 100644
--- a/Examples/Scripts/MaterialMapping/materialPlotHelper.hpp
+++ b/Examples/Scripts/MaterialMapping/materialPlotHelper.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2016-2019 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
diff --git a/Examples/Scripts/MaterialMapping/writeMapConfig.py b/Examples/Scripts/MaterialMapping/writeMapConfig.py
index ec06b8f189f..0f7f525ad5a 100644
--- a/Examples/Scripts/MaterialMapping/writeMapConfig.py
+++ b/Examples/Scripts/MaterialMapping/writeMapConfig.py
@@ -1,10 +1,10 @@
-# This file is part of the Acts project.
+# This file is part of the ACTS project.
 #
-# Copyright (C) 2020-2021 CERN for the benefit of the Acts project
+# Copyright (C) 2016 CERN for the benefit of the ACTS project
 #
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+# file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 import json
 import sys
diff --git a/Examples/Scripts/Optimization/ckf.py b/Examples/Scripts/Optimization/ckf.py
index bf927850ecc..ba18291735c 100755
--- a/Examples/Scripts/Optimization/ckf.py
+++ b/Examples/Scripts/Optimization/ckf.py
@@ -116,13 +116,13 @@ def runCKFTracks(
         EtaConfig,
         PhiConfig,
         ParticleConfig,
+        ParticleSelectorConfig,
         addFatras,
         addDigitization,
     )
 
     from acts.examples.reconstruction import (
         addSeeding,
-        TruthSeedRanges,
         ParticleSmearingSigmas,
         SeedFinderConfigArg,
         SeedFinderOptionsArg,
@@ -169,6 +169,11 @@ def runCKFTracks(
         trackingGeometry,
         field,
         rnd=rnd,
+        postSelectParticles=ParticleSelectorConfig(
+            pt=(0.5 * u.GeV, None),
+            measurements=(9, None),
+            removeNeutral=True,
+        ),
     )
 
     addDigitization(
@@ -183,7 +188,6 @@ def runCKFTracks(
         s,
         trackingGeometry,
         field,
-        TruthSeedRanges(pt=(500.0 * u.MeV, None), nHits=(9, None)),
         ParticleSmearingSigmas(  # only used by SeedingAlgorithm.TruthSmeared
             # zero eveything so the CKF has a chance to find the measurements
             d0=0,
@@ -259,7 +263,7 @@ def runCKFTracks(
 
     field = acts.ConstantBField(acts.Vector3(0, 0, 2 * u.T))
 
-    inputParticlePath = Path(Inputdir) / "pythia8_particles.root"
+    inputParticlePath = Path(Inputdir) / "particles.root"
     if not inputParticlePath.exists():
         inputParticlePath = None
 
diff --git a/Examples/Scripts/Python/ckf_tracks.py b/Examples/Scripts/Python/ckf_tracks.py
index b5b7d21d28c..97f56d17ff0 100755
--- a/Examples/Scripts/Python/ckf_tracks.py
+++ b/Examples/Scripts/Python/ckf_tracks.py
@@ -27,13 +27,13 @@ def runCKFTracks(
         EtaConfig,
         PhiConfig,
         ParticleConfig,
+        ParticleSelectorConfig,
         addFatras,
         addDigitization,
     )
 
     from acts.examples.reconstruction import (
         addSeeding,
-        TruthSeedRanges,
         ParticleSmearingSigmas,
         SeedFinderConfigArg,
         SeedFinderOptionsArg,
@@ -80,6 +80,11 @@ def runCKFTracks(
         trackingGeometry,
         field,
         rnd=rnd,
+        postSelectParticles=ParticleSelectorConfig(
+            pt=(0.5 * u.GeV, None),
+            measurements=(9, None),
+            removeNeutral=True,
+        ),
     )
 
     addDigitization(
@@ -94,7 +99,6 @@ def runCKFTracks(
         s,
         trackingGeometry,
         field,
-        TruthSeedRanges(pt=(500.0 * u.MeV, None), nHits=(9, None)),
         ParticleSmearingSigmas(  # only used by SeedingAlgorithm.TruthSmeared
             # zero eveything so the CKF has a chance to find the measurements
             d0=0,
@@ -158,13 +162,15 @@ def runCKFTracks(
             maxOutliers=2,
         ),
         CkfConfig(
-            chi2CutOff=15,
+            chi2CutOffMeasurement=15.0,
+            chi2CutOffOutlier=25.0,
             numMeasurementsCutOff=10,
             seedDeduplication=True if not truthSmearedSeeded else False,
             stayOnSeed=True if not truthSmearedSeeded else False,
         ),
         outputDirRoot=outputDir,
         outputDirCsv=outputDir / "csv" if outputCsv else None,
+        writeTrackStates=True,
     )
 
     return s
diff --git a/Examples/Scripts/Python/detector_creation.py b/Examples/Scripts/Python/detector_creation.py
index 6939ae9cb20..071520b85fc 100644
--- a/Examples/Scripts/Python/detector_creation.py
+++ b/Examples/Scripts/Python/detector_creation.py
@@ -49,13 +49,13 @@
 
     # OBJ style output
     surfaces = []
+    viewConfig = acts.ViewConfig()
+    viewConfig.nSegments = 100
     for vol in detector.volumePtrs():
         for surf in vol.surfacePtrs():
             if surf.geometryId().sensitive() > 0:
                 surfaces.append(surf)
-    acts.examples.writeSurfacesObj(
-        surfaces, geoContext, [0, 120, 120], "odd-surfaces.obj"
-    )
+    acts.examples.writeSurfacesObj(surfaces, geoContext, viewConfig, "odd-surfaces.obj")
 
     # SVG style output
     surfaceStyle = acts.svg.Style()
@@ -69,28 +69,28 @@
     volumeOptions = acts.svg.DetectorVolumeOptions()
     volumeOptions.surfaceOptions = surfaceOptions
 
-    for ivol in range(detector.numberVolumes()):
-        acts.svg.viewDetector(
-            geoContext,
-            detector,
-            "odd-xy",
-            [[ivol, volumeOptions]],
-            [["xy", ["sensitives"], viewRange]],
-            "vol_" + str(ivol),
-        )
-
-    xyRange = acts.Extent([[acts.Binning.z, [-50, 50]]])
-    zrRange = acts.Extent([[acts.Binning.phi, [-0.1, 0.1]]])
-
-    acts.svg.viewDetector(
+    # Transverse view
+    xyRange = acts.Extent([[acts.BinningValue.binZ, [-50, 50]]])
+    xyView = acts.svg.drawDetector(
         geoContext,
         detector,
         "odd",
         [[ivol, volumeOptions] for ivol in range(detector.numberVolumes())],
-        [["xy", ["sensitives"], xyRange], ["zr", ["materials"], zrRange]],
-        "detector",
+        [["xy", ["sensitives"], xyRange]],
     )
+    xyFile = acts.svg.file()
+    xyFile.addObjects(xyView)
+    xyFile.write("odd_xy.svg")
 
-    acts.examples.writeDetectorToJsonDetray(geoContext, detector, "odd-detray")
-
-    # det_detector = acts.examples.DetrayConverter(geoContext, detector,"odd-detray")
+    # Longitudinal view
+    zrRange = acts.Extent([[acts.BinningValue.binPhi, [-0.1, 0.1]]])
+    zrView = acts.svg.drawDetector(
+        geoContext,
+        detector,
+        "odd",
+        [[ivol, volumeOptions] for ivol in range(detector.numberVolumes())],
+        [["zr", ["sensitives", "portals"], zrRange]],
+    )
+    zrFile = acts.svg.file()
+    zrFile.addObjects(zrView)
+    zrFile.write("odd_zr.svg")
diff --git a/Examples/Scripts/Python/full_chain_itk.py b/Examples/Scripts/Python/full_chain_itk.py
index 6231127096c..b5c17278a1e 100755
--- a/Examples/Scripts/Python/full_chain_itk.py
+++ b/Examples/Scripts/Python/full_chain_itk.py
@@ -5,6 +5,7 @@
     MomentumConfig,
     EtaConfig,
     ParticleConfig,
+    ParticleSelectorConfig,
     addPythia8,
     addFatras,
     ParticleSelectorConfig,
@@ -13,7 +14,6 @@
 from acts.examples.reconstruction import (
     addSeeding,
     SeedingAlgorithm,
-    TruthSeedRanges,
     addCKFTracks,
     CkfConfig,
     TrackSelectorConfig,
@@ -67,11 +67,16 @@
             absZ=(0.0 * u.mm, 1.0 * u.m),
             eta=(-4.0, 4.0),
             pt=(150 * u.MeV, None),
-            removeNeutral=True,
         )
         if ttbar_pu200
         else ParticleSelectorConfig()
     ),
+    postSelectParticles=ParticleSelectorConfig(
+        pt=(1.0 * u.GeV, None),
+        eta=(-4.0, 4.0),
+        measurements=(9, None),
+        removeNeutral=True,
+    ),
     outputDirRoot=outputDir,
 )
 
@@ -88,11 +93,6 @@
     s,
     trackingGeometry,
     field,
-    (
-        TruthSeedRanges(pt=(1.0 * u.GeV, None), eta=(-4.0, 4.0), nHits=(9, None))
-        if ttbar_pu200
-        else TruthSeedRanges()
-    ),
     seedingAlgorithm=SeedingAlgorithm.Default,
     *acts.examples.itk.itkSeedingAlgConfig(
         acts.examples.itk.InputSpacePointsType.PixelSpacePoints
@@ -126,8 +126,8 @@
         seedDeduplication=True,
         stayOnSeed=True,
         # ITk volumes from Noemi's plot
-        pixelVolumes={8, 9, 10, 13, 14, 15, 16, 18, 19, 20},
-        stripVolumes={22, 23, 24},
+        pixelVolumes=[8, 9, 10, 13, 14, 15, 16, 18, 19, 20],
+        stripVolumes=[22, 23, 24],
         maxPixelHoles=1,
         maxStripHoles=2,
     ),
diff --git a/Examples/Scripts/Python/full_chain_itk_Gbts.py b/Examples/Scripts/Python/full_chain_itk_Gbts.py
index 7a45b7e5a71..ac9cc8ae8fc 100755
--- a/Examples/Scripts/Python/full_chain_itk_Gbts.py
+++ b/Examples/Scripts/Python/full_chain_itk_Gbts.py
@@ -5,6 +5,7 @@
     MomentumConfig,
     EtaConfig,
     ParticleConfig,
+    ParticleSelectorConfig,
     addPythia8,
     addFatras,
     ParticleSelectorConfig,
@@ -13,7 +14,6 @@
 from acts.examples.reconstruction import (
     addSeeding,
     SeedingAlgorithm,
-    TruthSeedRanges,
     addCKFTracks,
     TrackSelectorConfig,
 )
@@ -62,11 +62,16 @@
             absZ=(0.0 * u.mm, 1.0 * u.m),
             eta=(-4.0, 4.0),
             pt=(150 * u.MeV, None),
-            removeNeutral=True,
         )
         if ttbar_pu200
         else ParticleSelectorConfig()
     ),
+    postSelectParticles=ParticleSelectorConfig(
+        pt=(1.0 * u.GeV, None),
+        eta=(-4.0, 4.0),
+        measurements=(9, None),
+        removeNeutral=True,
+    ),
     outputDirRoot=outputDir,
 )
 
@@ -84,11 +89,6 @@
     s,
     trackingGeometry,
     field,
-    (
-        TruthSeedRanges(pt=(1.0 * u.GeV, None), eta=(-4.0, 4.0), nHits=(9, None))
-        if ttbar_pu200
-        else TruthSeedRanges()
-    ),
     seedingAlgorithm=SeedingAlgorithm.Gbts,
     *acts.examples.itk.itkSeedingAlgConfig(
         acts.examples.itk.InputSpacePointsType.PixelSpacePoints
diff --git a/Examples/Scripts/Python/full_chain_odd.py b/Examples/Scripts/Python/full_chain_odd.py
index 0c6b5fd1f38..8b86402b820 100755
--- a/Examples/Scripts/Python/full_chain_odd.py
+++ b/Examples/Scripts/Python/full_chain_odd.py
@@ -3,6 +3,7 @@
 import os
 import argparse
 import pathlib
+import math
 
 import acts
 import acts.examples
@@ -12,6 +13,7 @@
     EtaConfig,
     PhiConfig,
     ParticleConfig,
+    ParticleSelectorConfig,
     addPythia8,
     addFatras,
     addGeant4,
@@ -21,7 +23,6 @@
 )
 from acts.examples.reconstruction import (
     addSeeding,
-    TruthSeedRanges,
     CkfConfig,
     addCKFTracks,
     TrackSelectorConfig,
@@ -188,8 +189,7 @@
             "LongStripEndcapReadout",
         ],
         outputParticlesGenerator="particles_input",
-        outputParticlesInitial="particles_initial",
-        outputParticlesFinal="particles_final",
+        outputParticlesSimulation="particles_simulated",
         outputSimHits="simhits",
         graphvizOutput="graphviz",
         dd4hepDetector=detector,
@@ -268,12 +268,17 @@
                 absZ=(0.0, 1.0 * u.m),
                 eta=(-3.0, 3.0),
                 pt=(150 * u.MeV, None),
+            ),
+            postSelectParticles=ParticleSelectorConfig(
+                pt=(1.0 * u.GeV, None),
+                eta=(-3.0, 3.0),
+                measurements=(9, None),
                 removeNeutral=True,
             ),
             outputDirRoot=outputDir if args.output_root else None,
             outputDirCsv=outputDir if args.output_csv else None,
             rnd=rnd,
-            killVolume=trackingGeometry.worldVolume,
+            killVolume=trackingGeometry.highestTrackingVolume,
             killAfterTime=25 * u.ns,
         )
     else:
@@ -287,11 +292,16 @@
                     absZ=(0.0, 1.0 * u.m),
                     eta=(-3.0, 3.0),
                     pt=(150 * u.MeV, None),
-                    removeNeutral=True,
                 )
                 if args.ttbar
                 else ParticleSelectorConfig()
             ),
+            postSelectParticles=ParticleSelectorConfig(
+                pt=(1.0 * u.GeV, None),
+                eta=(-3.0, 3.0),
+                measurements=(9, None),
+                removeNeutral=True,
+            ),
             enableInteractions=True,
             outputDirRoot=outputDir if args.output_root else None,
             outputDirCsv=outputDir if args.output_csv else None,
@@ -313,11 +323,6 @@
         s,
         trackingGeometry,
         field,
-        (
-            TruthSeedRanges(pt=(1.0 * u.GeV, None), eta=(-3.0, 3.0), nHits=(9, None))
-            if args.ttbar
-            else TruthSeedRanges()
-        ),
         initialSigmas=[
             1 * u.mm,
             1 * u.mm,
@@ -358,14 +363,32 @@
             maxOutliers=2,
         ),
         CkfConfig(
-            chi2CutOff=15,
+            chi2CutOffMeasurement=15.0,
+            chi2CutOffOutlier=25.0,
             numMeasurementsCutOff=10,
             seedDeduplication=True,
             stayOnSeed=True,
-            pixelVolumes={16, 17, 18},
-            stripVolumes={23, 24, 25},
+            pixelVolumes=[16, 17, 18],
+            stripVolumes=[23, 24, 25],
             maxPixelHoles=1,
             maxStripHoles=2,
+            constrainToVolumes=[
+                2,  # beam pipe
+                32,
+                4,  # beam pip gap
+                16,
+                17,
+                18,  # pixel
+                20,  # PST
+                23,
+                24,
+                25,  # short strip
+                26,
+                8,  # long strip gap
+                28,
+                29,
+                30,  # long strip
+            ],
         ),
         outputDirRoot=outputDir if args.output_root else None,
         outputDirCsv=outputDir if args.output_csv else None,
@@ -394,8 +417,8 @@
                 maxSharedTracksPerMeasurement=2,
                 pTMax=1400,
                 pTMin=0.5,
-                phiMax=3.14,
-                phiMin=-3.14,
+                phiMax=math.pi,
+                phiMin=-math.pi,
                 etaMax=4,
                 etaMin=-4,
                 useAmbiguityFunction=False,
diff --git a/Examples/Scripts/Python/full_chain_odd_LRT.py b/Examples/Scripts/Python/full_chain_odd_LRT.py
new file mode 100644
index 00000000000..cfa03b5336c
--- /dev/null
+++ b/Examples/Scripts/Python/full_chain_odd_LRT.py
@@ -0,0 +1,420 @@
+#!/usr/bin/env python3
+
+import os
+import argparse
+import pathlib
+
+import acts
+import acts.examples
+from acts.examples.simulation import (
+    addParticleGun,
+    MomentumConfig,
+    EtaConfig,
+    PhiConfig,
+    ParticleConfig,
+    addPythia8,
+    addFatras,
+    addGeant4,
+    ParticleSelectorConfig,
+    addDigitization,
+    addParticleSelection,
+)
+from acts.examples.reconstruction import (
+    addSeeding,
+    CkfConfig,
+    addCKFTracks,
+    TrackSelectorConfig,
+    addAmbiguityResolution,
+    AmbiguityResolutionConfig,
+    addAmbiguityResolutionML,
+    AmbiguityResolutionMLConfig,
+    addScoreBasedAmbiguityResolution,
+    ScoreBasedAmbiguityResolutionConfig,
+    addVertexFitting,
+    VertexFinder,
+    addSeedFilterML,
+    SeedFilterMLDBScanConfig,
+)
+from acts.examples.odd import getOpenDataDetector, getOpenDataDetectorDirectory
+
+u = acts.UnitConstants
+
+
+parser = argparse.ArgumentParser(description="Full chain with the OpenDataDetector")
+parser.add_argument(
+    "--output",
+    "-o",
+    help="Output directory",
+    type=pathlib.Path,
+    default=pathlib.Path.cwd() / "odd_output",
+)
+parser.add_argument("--events", "-n", help="Number of events", type=int, default=100)
+parser.add_argument("--skip", "-s", help="Number of events", type=int, default=0)
+parser.add_argument("--edm4hep", help="Use edm4hep inputs", type=pathlib.Path)
+parser.add_argument(
+    "--geant4", help="Use Geant4 instead of fatras", action="store_true"
+)
+parser.add_argument(
+    "--ttbar",
+    help="Use Pythia8 (ttbar, pile-up 200) instead of particle gun",
+    action="store_true",
+)
+parser.add_argument(
+    "--ttbar-pu",
+    help="Number of pile-up events for ttbar",
+    type=int,
+    default=200,
+)
+parser.add_argument(
+    "--gun-particles",
+    help="Multiplicity (no. of particles) of the particle gun",
+    type=int,
+    default=4,
+)
+parser.add_argument(
+    "--gun-multiplicity",
+    help="Multiplicity (no. of vertices) of the particle gun",
+    type=int,
+    default=200,
+)
+parser.add_argument(
+    "--gun-eta-range",
+    nargs=2,
+    help="Eta range of the particle gun",
+    type=float,
+    default=[-3.0, 3.0],
+)
+parser.add_argument(
+    "--gun-pt-range",
+    nargs=2,
+    help="Pt range of the particle gun (GeV)",
+    type=float,
+    default=[1.0 * u.GeV, 10.0 * u.GeV],
+)
+parser.add_argument(
+    "--digi-config", help="Digitization configuration file", type=pathlib.Path
+)
+parser.add_argument(
+    "--material-config", help="Material map configuration file", type=pathlib.Path
+)
+parser.add_argument(
+    "--ambi-solver",
+    help="Set which ambiguity solver to use, default is the classical one",
+    type=str,
+    choices=["greedy", "scoring", "ML"],
+    default="greedy",
+)
+parser.add_argument(
+    "--ambi-config",
+    help="Set the configuration file for the Score Based ambiguity resolution",
+    type=pathlib.Path,
+    default=pathlib.Path.cwd() / "ambi_config.json",
+)
+
+parser.add_argument(
+    "--MLSeedFilter",
+    help="Use the Ml seed filter to select seed after the seeding step",
+    action="store_true",
+)
+parser.add_argument(
+    "--reco",
+    help="Switch reco on/off",
+    default=True,
+    action=argparse.BooleanOptionalAction,
+)
+parser.add_argument(
+    "--output-root",
+    help="Switch root output on/off",
+    default=True,
+    action=argparse.BooleanOptionalAction,
+)
+parser.add_argument(
+    "--output-csv",
+    help="Switch csv output on/off",
+    default=True,
+    action=argparse.BooleanOptionalAction,
+)
+
+args = parser.parse_args()
+
+outputDir = args.output
+ambi_ML = args.ambi_solver == "ML"
+ambi_scoring = args.ambi_solver == "scoring"
+ambi_config = args.ambi_config
+seedFilter_ML = args.MLSeedFilter
+geoDir = getOpenDataDetectorDirectory()
+# acts.examples.dump_args_calls(locals())  # show python binding calls
+
+oddMaterialMap = (
+    args.material_config
+    if args.material_config
+    else geoDir / "data/odd-material-maps.root"
+)
+
+oddDigiConfig = (
+    args.digi_config
+    if args.digi_config
+    else geoDir / "config/odd-digi-smearing-config.json"
+)
+
+oddSeedingSel = geoDir / "config/odd-seeding-config.json"
+oddMaterialDeco = acts.IMaterialDecorator.fromFile(oddMaterialMap)
+
+detector, trackingGeometry, decorators = getOpenDataDetector(
+    odd_dir=geoDir, mdecorator=oddMaterialDeco
+)
+field = acts.ConstantBField(acts.Vector3(0.0, 0.0, 2.0 * u.T))
+rnd = acts.examples.RandomNumbers(seed=42)
+
+s = acts.examples.Sequencer(
+    events=args.events,
+    skip=args.skip,
+    numThreads=1 if args.geant4 else -1,
+    outputDir=str(outputDir),
+)
+
+if args.edm4hep:
+    import acts.examples.edm4hep
+
+    edm4hepReader = acts.examples.edm4hep.EDM4hepReader(
+        inputPath=str(args.edm4hep),
+        inputSimHits=[
+            "PixelBarrelReadout",
+            "PixelEndcapReadout",
+            "ShortStripBarrelReadout",
+            "ShortStripEndcapReadout",
+            "LongStripBarrelReadout",
+            "LongStripEndcapReadout",
+        ],
+        outputParticlesGenerator="particles_input",
+        outputParticlesSimulation="particles_simulated",
+        outputSimHits="simhits",
+        graphvizOutput="graphviz",
+        dd4hepDetector=detector,
+        trackingGeometry=trackingGeometry,
+        sortSimHitsInTime=True,
+        level=acts.logging.INFO,
+    )
+    s.addReader(edm4hepReader)
+    s.addWhiteboardAlias("particles", edm4hepReader.config.outputParticlesGenerator)
+
+    addParticleSelection(
+        s,
+        config=ParticleSelectorConfig(
+            rho=(0.0, 24 * u.mm),
+            absZ=(0.0, 1.0 * u.m),
+            eta=(-3.0, 3.0),
+            pt=(150 * u.MeV, None),
+            removeNeutral=True,
+        ),
+        inputParticles="particles",
+        outputParticles="particles_selected",
+    )
+else:
+    if not args.ttbar:
+        addParticleGun(
+            s,
+            MomentumConfig(
+                args.gun_pt_range[0] * u.GeV,
+                args.gun_pt_range[1] * u.GeV,
+                transverse=True,
+            ),
+            EtaConfig(args.gun_eta_range[0], args.gun_eta_range[1]),
+            PhiConfig(0.0, 360.0 * u.degree),
+            ParticleConfig(
+                args.gun_particles, acts.PdgParticle.eMuon, randomizeCharge=True
+            ),
+            outputDirRoot=pathlib.Path("/home/aicha/Atlas/NewVertices"),
+            vtxGen=acts.examples.GaussianDisplacedVertexPositionGenerator(
+                rMean=2,
+                rStdDev=0.0125 * u.mm,
+                zMean=2,
+                zStdDev=55.5 * u.mm,
+                tMean=0,
+                tStdDev=1.0 * u.ns,
+            ),
+            multiplicity=args.gun_multiplicity,
+            rnd=rnd,
+        )
+    else:
+        addPythia8(
+            s,
+            hardProcess=["Top:qqbar2ttbar=on"],
+            npileup=args.ttbar_pu,
+            vtxGen=acts.examples.GaussianDisplacedVertexPositionGenerator(
+                mean=acts.Vector4(0, 0, 0, 0),
+                stddev=acts.Vector4(
+                    0.0125 * u.mm, 0.0125 * u.mm, 55.5 * u.mm, 5.0 * u.ns
+                ),
+            ),
+            rnd=rnd,
+            outputDirRoot=outputDir if args.output_root else None,
+            outputDirCsv=outputDir if args.output_csv else None,
+        )
+
+    if args.geant4:
+        if s.config.numThreads != 1:
+            raise ValueError("Geant 4 simulation does not support multi-threading")
+
+        # Pythia can sometime simulate particles outside the world volume, a cut on the Z of the track help mitigate this effect
+        # Older version of G4 might not work, this as has been tested on version `geant4-11-00-patch-03`
+        # For more detail see issue #1578
+        addGeant4(
+            s,
+            detector,
+            trackingGeometry,
+            field,
+            preSelectParticles=ParticleSelectorConfig(
+                rho=(0.0, 24 * u.mm),
+                absZ=(0.0, 1.0 * u.m),
+                eta=(-3.0, 3.0),
+                pt=(150 * u.MeV, None),
+            ),
+            postSelectParticles=ParticleSelectorConfig(
+                pt=(1.0 * u.GeV, None),
+                eta=(-3.0, 3.0),
+                measurements=(9, None),
+                removeNeutral=True,
+            ),
+            outputDirRoot=outputDir if args.output_root else None,
+            outputDirCsv=outputDir if args.output_csv else None,
+            rnd=rnd,
+            killVolume=trackingGeometry.highestTrackingVolume,
+            killAfterTime=25 * u.ns,
+        )
+    else:
+        addFatras(
+            s,
+            trackingGeometry,
+            field,
+            preSelectParticles=(
+                ParticleSelectorConfig(
+                    rho=(0.0, 24 * u.mm),
+                    absZ=(0.0, 1.0 * u.m),
+                    eta=(-3.0, 3.0),
+                    pt=(150 * u.MeV, None),
+                )
+                if args.ttbar
+                else ParticleSelectorConfig()
+            ),
+            postSelectParticles=ParticleSelectorConfig(
+                pt=(1.0 * u.GeV, None),
+                eta=(-3.0, 3.0),
+                measurements=(9, None),
+                removeNeutral=True,
+            ),
+            enableInteractions=True,
+            outputDirRoot=outputDir if args.output_root else None,
+            outputDirCsv=outputDir if args.output_csv else None,
+            rnd=rnd,
+        )
+
+addDigitization(
+    s,
+    trackingGeometry,
+    field,
+    digiConfigFile=oddDigiConfig,
+    outputDirRoot=outputDir if args.output_root else None,
+    outputDirCsv=outputDir if args.output_csv else None,
+    rnd=rnd,
+)
+
+if args.reco:
+    addSeeding(
+        s,
+        trackingGeometry,
+        field,
+        geoSelectionConfigFile=oddSeedingSel,
+        outputDirRoot=outputDir if args.output_root else None,
+        outputDirCsv=outputDir if args.output_csv else None,
+    )
+
+    if seedFilter_ML:
+        addSeedFilterML(
+            s,
+            SeedFilterMLDBScanConfig(
+                epsilonDBScan=0.03, minPointsDBScan=2, minSeedScore=0.1
+            ),
+            onnxModelFile=os.path.dirname(__file__)
+            + "/MLAmbiguityResolution/seedDuplicateClassifier.onnx",
+            outputDirRoot=outputDir if args.output_root else None,
+            outputDirCsv=outputDir if args.output_csv else None,
+        )
+
+    addCKFTracks(
+        s,
+        trackingGeometry,
+        field,
+        TrackSelectorConfig(
+            pt=(1.0 * u.GeV if args.ttbar else 0.0, None),
+            absEta=(None, 3.0),
+            loc0=(-4.0 * u.mm, 4.0 * u.mm),
+            nMeasurementsMin=7,
+            maxHoles=2,
+            maxOutliers=2,
+        ),
+        CkfConfig(
+            seedDeduplication=True,
+            stayOnSeed=True,
+            pixelVolumes={16, 17, 18},
+            stripVolumes={23, 24, 25},
+            maxPixelHoles=1,
+            maxStripHoles=2,
+        ),
+        outputDirRoot=outputDir if args.output_root else None,
+        outputDirCsv=outputDir if args.output_csv else None,
+        writeCovMat=True,
+    )
+
+    if ambi_ML:
+        addAmbiguityResolutionML(
+            s,
+            AmbiguityResolutionMLConfig(
+                maximumSharedHits=3, maximumIterations=1000000, nMeasurementsMin=7
+            ),
+            outputDirRoot=outputDir if args.output_root else None,
+            outputDirCsv=outputDir if args.output_csv else None,
+            onnxModelFile=os.path.dirname(__file__)
+            + "/MLAmbiguityResolution/duplicateClassifier.onnx",
+        )
+
+    elif ambi_scoring:
+        addScoreBasedAmbiguityResolution(
+            s,
+            ScoreBasedAmbiguityResolutionConfig(
+                minScore=0,
+                minScoreSharedTracks=1,
+                maxShared=2,
+                maxSharedTracksPerMeasurement=2,
+                pTMax=1400,
+                pTMin=0.5,
+                phiMax=3.14,
+                phiMin=-3.14,
+                etaMax=4,
+                etaMin=-4,
+                useAmbiguityFunction=False,
+            ),
+            outputDirRoot=outputDir if args.output_root else None,
+            outputDirCsv=outputDir if args.output_csv else None,
+            ambiVolumeFile=ambi_config,
+            writeCovMat=True,
+        )
+    else:
+        addAmbiguityResolution(
+            s,
+            AmbiguityResolutionConfig(
+                maximumSharedHits=3, maximumIterations=1000000, nMeasurementsMin=7
+            ),
+            outputDirRoot=outputDir if args.output_root else None,
+            outputDirCsv=outputDir if args.output_csv else None,
+            writeCovMat=True,
+        )
+
+    addVertexFitting(
+        s,
+        field,
+        vertexFinder=VertexFinder.Iterative,
+        outputDirRoot=outputDir if args.output_root else None,
+    )
+
+s.run()
diff --git a/Examples/Scripts/Python/geant4.py b/Examples/Scripts/Python/geant4.py
index eb636c43bdd..42cb5db95bb 100755
--- a/Examples/Scripts/Python/geant4.py
+++ b/Examples/Scripts/Python/geant4.py
@@ -8,12 +8,6 @@
 from acts.examples.simulation import addParticleGun, addGeant4, EtaConfig
 from acts.examples.odd import getOpenDataDetector, getOpenDataDetectorDirectory
 
-from acts.examples.dd4hep import (
-    DD4hepDetector,
-    DD4hepDetectorOptions,
-    DD4hepGeometryService,
-)
-
 u = acts.UnitConstants
 
 
@@ -22,6 +16,8 @@ def runGeant4(
     trackingGeometry,
     field,
     outputDir,
+    materialMappings=["Silicon"],
+    volumeMappings=[],
     s: acts.examples.Sequencer = None,
 ):
     s = s or acts.examples.Sequencer(events=100, numThreads=1)
@@ -41,6 +37,8 @@ def runGeant4(
         outputDirCsv=outputDir / "csv",
         outputDirRoot=outputDir,
         rnd=rnd,
+        materialMappings=materialMappings,
+        volumeMappings=volumeMappings,
     )
     return s
 
@@ -59,6 +57,12 @@ def runGeant4(
     field = acts.ConstantBField(acts.Vector3(0, 0, 2 * u.T))
 
     if args.experimental:
+        from acts.examples.dd4hep import (
+            DD4hepDetector,
+            DD4hepDetectorOptions,
+            DD4hepGeometryService,
+        )
+
         print(">>> Running experimental geometry <<<")
         odd_xml = getOpenDataDetectorDirectory() / "xml" / "OpenDataDetector.xml"
 
diff --git a/Examples/Scripts/Python/geomodel.py b/Examples/Scripts/Python/geomodel.py
index 82fc851b727..d92836949f5 100644
--- a/Examples/Scripts/Python/geomodel.py
+++ b/Examples/Scripts/Python/geomodel.py
@@ -16,10 +16,6 @@ def main():
 
     p.add_argument("-i", "--input", type=str, default="", help="Input SQL file")
 
-    p.add_argument(
-        "-o", "--output", type=str, default="GeoModel", help="Output file(s) base name"
-    )
-
     p.add_argument(
         "-q",
         "--queries",
@@ -29,6 +25,24 @@ def main():
         help="List of Queries for Published full phys volumes",
     )
 
+    p.add_argument(
+        "-n",
+        "--name-list",
+        type=str,
+        nargs="+",
+        default=[],
+        help="List of Name List for the Surface Factory",
+    )
+
+    p.add_argument(
+        "-ml",
+        "--material-list",
+        type=str,
+        nargs="+",
+        default=[],
+        help="List of Material List for the Surface Factory",
+    )
+
     p.add_argument(
         "--table-name",
         type=str,
@@ -57,29 +71,15 @@ def main():
     )
 
     p.add_argument(
-        "--output-svg",
-        help="Write the surfaces to SVG files",
-        action="store_true",
-        default=False,
-    )
-
-    p.add_argument(
-        "--output-internals-svg",
-        help="Write the internal navigation to SVG files",
+        "--convert-subvols",
+        help="Convert the children of the top level full phys vol",
         action="store_true",
         default=False,
     )
 
     p.add_argument(
-        "--output-obj",
-        help="Write the surfaces to OBJ files",
-        action="store_true",
-        default=False,
-    )
-
-    p.add_argument(
-        "--output-json",
-        help="Write the surfaces to OBJ files",
+        "--enable-blueprint",
+        help="Enable the usage of the blueprint",
         action="store_true",
         default=False,
     )
@@ -97,18 +97,16 @@ def main():
     # Read the geometry model from the database
     gmTree = acts.geomodel.readFromDb(args.input)
 
-    gmFactoryConfig = gm.GeoModelDetectorSurfaceFactory.Config()
-    gmFactoryConfig.shapeConverters = [
-        gm.GeoBoxConverter(),
-        gm.GeoTrdConverter(),
-        gm.GeoIntersectionAnnulusConverter(),
-    ]
-    gmFactory = gm.GeoModelDetectorSurfaceFactory(gmFactoryConfig, logLevel)
+    gmFactoryConfig = gm.GeoModelDetectorObjectFactory.Config()
+    gmFactoryConfig.materialList = args.material_list
+    gmFactoryConfig.nameList = args.name_list
+    gmFactoryConfig.convertSubVolumes = args.convert_subvols
+    gmFactory = gm.GeoModelDetectorObjectFactory(gmFactoryConfig, logLevel)
     # The options
-    gmFactoryOptions = gm.GeoModelDetectorSurfaceFactory.Options()
+    gmFactoryOptions = gm.GeoModelDetectorObjectFactory.Options()
     gmFactoryOptions.queries = args.queries
     # The Cache & construct call
-    gmFactoryCache = gm.GeoModelDetectorSurfaceFactory.Cache()
+    gmFactoryCache = gm.GeoModelDetectorObjectFactory.Cache()
     gmFactory.construct(gmFactoryCache, gContext, gmTree, gmFactoryOptions)
 
     # All surfaces from GeoModel
@@ -149,56 +147,6 @@ def main():
     gmDetectorBuilder = DetectorBuilder(gmDetectorConfig, args.top_node, logLevel)
     detector = gmDetectorBuilder.construct(gContext)
 
-    # Output the detector to SVG
-    if args.output_svg:
-        surfaceStyle = acts.svg.Style()
-        surfaceStyle.fillColor = [5, 150, 245]
-        surfaceStyle.fillOpacity = 0.5
-
-        surfaceOptions = acts.svg.SurfaceOptions()
-        surfaceOptions.style = surfaceStyle
-
-        viewRange = acts.Extent([])
-        volumeOptions = acts.svg.DetectorVolumeOptions()
-        volumeOptions.surfaceOptions = surfaceOptions
-
-        xyRange = acts.Extent([[acts.Binning.z, [-50, 50]]])
-        zrRange = acts.Extent([[acts.Binning.phi, [-0.8, 0.8]]])
-
-        acts.svg.viewDetector(
-            gContext,
-            detector,
-            args.top_node,
-            [[ivol, volumeOptions] for ivol in range(detector.numberVolumes())],
-            [
-                ["xy", ["sensitives", "portals"], xyRange],
-                ["zr", ["sensitives", "portals", "materials"], zrRange],
-            ],
-            args.output + "_detector",
-        )
-
-        # Output the internal navigation to SVG
-        if args.output_internals_svg:
-            for vol in detector.volumes():
-                acts.svg.viewInternalNavigation(
-                    gContext, vol, [66, 111, 245, 245, 203, 66, 0.8], "/;:"
-                )
-
-    # Output the surface to an OBJ file
-    if args.output_obj:
-        segments = 720
-        ssurfaces = [ss[1] for ss in gmFactoryCache.sensitiveSurfaces]
-        acts.examples.writeSurfacesObj(
-            ssurfaces,
-            gContext,
-            [75, 220, 100],
-            segments,
-            args.output + "_sensitives.obj",
-        )
-    # Output to a JSON file
-    if args.output_json:
-        acts.examples.writeDetectorToJsonDetray(gContext, detector, args.output)
-
     return
 
 
diff --git a/Examples/Scripts/Python/geomodel_vol.py b/Examples/Scripts/Python/geomodel_vol.py
new file mode 100644
index 00000000000..95d3c171658
--- /dev/null
+++ b/Examples/Scripts/Python/geomodel_vol.py
@@ -0,0 +1,174 @@
+import acts
+import argparse
+from acts import (
+    logging,
+    GeometryContext,
+    CylindricalContainerBuilder,
+    DetectorBuilder,
+    GeometryIdGenerator,
+)
+from acts import geomodel as gm
+from acts import examples
+
+
+def main():
+    p = argparse.ArgumentParser()
+
+    p.add_argument("-i", "--input", type=str, default="", help="Input SQL file")
+
+    p.add_argument(
+        "-o", "--output", type=str, default="GeoModel", help="Output file(s) base name"
+    )
+
+    p.add_argument(
+        "-q",
+        "--queries",
+        type=str,
+        nargs="+",
+        default="GeoModelXML",
+        help="List of Queries for Published full phys volumes",
+    )
+
+    p.add_argument(
+        "-n",
+        "--name-list",
+        type=str,
+        nargs="+",
+        default=[],
+        help="List of Name List for the Surface Factory",
+    )
+
+    p.add_argument(
+        "-ml",
+        "--material-list",
+        type=str,
+        nargs="+",
+        default=[],
+        help="List of Material List for the Surface Factory",
+    )
+
+    p.add_argument(
+        "--table-name",
+        type=str,
+        default="ActsBlueprint",
+        help="Name of the blueprint table",
+    )
+
+    p.add_argument(
+        "-t",
+        "--top-node",
+        type=str,
+        default="",
+        help="Name of the top node in the blueprint tree",
+    )
+
+    p.add_argument(
+        "-b",
+        "--top-node-bounds",
+        type=str,
+        default="",
+        help="Table entry string overriding the top node bounds",
+    )
+
+    p.add_argument(
+        "-m", "--map", type=str, default="", help="Input file for the material map"
+    )
+
+    p.add_argument(
+        "--convert-subvols",
+        help="Convert the children of the top level full phys vol",
+        action="store_true",
+        default=False,
+    )
+
+    p.add_argument(
+        "--convert-boundingboxes",
+        help="Convert the fpvs to bounding boxes",
+        type=str,
+        nargs="+",
+        default=[],
+    )
+
+    p.add_argument(
+        "--output-svg",
+        help="Write the surfaces to SVG files",
+        action="store_true",
+        default=False,
+    )
+
+    p.add_argument(
+        "--output-internals-svg",
+        help="Write the internal navigation to SVG files",
+        action="store_true",
+        default=False,
+    )
+
+    p.add_argument(
+        "--output-obj",
+        help="Write the surfaces to OBJ files",
+        action="store_true",
+        default=False,
+    )
+
+    p.add_argument(
+        "--output-json",
+        help="Write the surfaces to OBJ files",
+        action="store_true",
+        default=False,
+    )
+
+    p.add_argument(
+        "--enable-blueprint",
+        help="Enable the usage of the blueprint",
+        action="store_true",
+        default=False,
+    )
+
+    args = p.parse_args()
+
+    gContext = acts.GeometryContext()
+    logLevel = logging.INFO
+
+    materialDecorator = None
+    if args.map != "":
+        print("Loading a material decorator from file:", args.map)
+        materialDecorator = acts.IMaterialDecorator.fromFile(args.map)
+
+    # Read the geometry model from the database
+    gmTree = acts.geomodel.readFromDb(args.input)
+    gmFactoryConfig = gm.GeoModelDetectorObjectFactory.Config()
+    gmFactoryConfig.materialList = args.material_list
+    gmFactoryConfig.nameList = args.name_list
+    gmFactoryConfig.convertBox = args.convert_boundingboxes
+    gmFactoryConfig.convertSubVolumes = args.convert_subvols
+    gmFactory = gm.GeoModelDetectorObjectFactory(gmFactoryConfig, logLevel)
+    # The options
+    gmFactoryOptions = gm.GeoModelDetectorObjectFactory.Options()
+    gmFactoryOptions.queries = args.queries
+    # The Cache & construct call
+    gmFactoryCache = gm.GeoModelDetectorObjectFactory.Cache()
+    gmFactory.construct(gmFactoryCache, gContext, gmTree, gmFactoryOptions)
+
+    # All surfaces from GeoModel
+    # Output the surface to an OBJ file
+    if args.output_obj:
+        segments = 720
+        gmBoxes = gmFactoryCache.boundingBoxes
+        gmBoxSurfaces = []
+        for gmBox in gmBoxes:
+            gmBoxSurfaces.extend(gmBox.surfaces())
+        gmSurfaces = [ss[1] for ss in gmFactoryCache.sensitiveSurfaces]
+        unboundSurfaces = [item for item in gmSurfaces if item not in gmBoxSurfaces]
+
+        acts.examples.writeVolumesSurfacesObj(
+            unboundSurfaces,
+            gmBoxes,
+            gContext,
+            [75, 220, 100],
+            segments,
+            args.output + "_vols.obj",
+        )
+
+
+if "__main__" == __name__:
+    main()
diff --git a/Examples/Scripts/Python/hashing_seeding.py b/Examples/Scripts/Python/hashing_seeding.py
new file mode 100755
index 00000000000..770c34e5185
--- /dev/null
+++ b/Examples/Scripts/Python/hashing_seeding.py
@@ -0,0 +1,409 @@
+#!/usr/bin/env python3
+
+import argparse
+import pathlib
+
+import acts
+import acts.examples
+from acts.examples.simulation import (
+    addPythia8,
+    addFatras,
+    ParticleSelectorConfig,
+    addDigitization,
+)
+
+from acts.examples.reconstruction import (
+    addSeeding,
+    addCKFTracks,
+    TrackSelectorConfig,
+    SeedingAlgorithm,
+)
+
+from pathlib import Path
+
+from typing import Optional
+from enum import Enum
+
+DetectorName = Enum("DetectorName", "ODD generic")
+
+HashingMetric = Enum("HashingMetric", "dphi dR")
+
+
+class Config:
+    def __init__(
+        self,
+        mu: int = None,
+        bucketSize: int = 100,
+        maxSeedsPerSpM: int = 1000,
+        detector: DetectorName = DetectorName.generic,
+        seedingAlgorithm: SeedingAlgorithm = SeedingAlgorithm.Hashing,
+        metric: str = HashingMetric.dphi,
+        annoySeed: int = 123456789,
+        zBins: int = 100_000,
+        phiBins: int = 0,
+    ):
+        self.mu = mu
+        self.bucketSize = bucketSize
+        self.maxSeedsPerSpM = maxSeedsPerSpM
+        self.detector = detector
+        self.seedingAlgorithm = (
+            seedingAlgorithm
+            if type(seedingAlgorithm) == SeedingAlgorithm
+            else SeedingAlgorithm[seedingAlgorithm]
+        )
+        self.metric = metric if type(metric) == HashingMetric else HashingMetric[metric]
+        self.annoySeed = annoySeed
+        self.zBins = zBins
+        self.phiBins = phiBins
+
+        if seedingAlgorithm == SeedingAlgorithm.Default:
+            self.bucketSize = 0
+            self.metric = HashingMetric.dphi
+            self.annoySeed = 123456789
+            self.zBins = 0
+            self.phiBins = 0
+
+    def __str__(self):
+        return (
+            f"mu={self.mu}, bucketSize={self.bucketSize}, maxSeedsPerSpM={self.maxSeedsPerSpM}, "
+            f"detector={self.detector}, seedingAlgorithm={self.seedingAlgorithm}, metric={self.metric}, "
+            f"annoySeed={self.annoySeed}, zBins={self.zBins}, phiBins={self.phiBins}"
+        )
+
+    def __repr__(self):
+        return self.__str__()
+
+    def save(self, path: pathlib.Path):
+        with open(path, "w") as f:
+            f.write(str(self))
+
+    @property
+    def doHashing(self):
+        return self.bucketSize > 0
+
+    @property
+    def directory(self):
+        outDir = f"detector_{extractEnumName(self.detector)}"
+        outDir += "_output"
+        doHashing = self.bucketSize > 0
+        if doHashing:
+            outDir += "_hashing"
+
+        outDir += f"_mu_{self.mu}"
+        if doHashing:
+            outDir += f"_bucket_{self.bucketSize}"
+
+        outDir += f"_maxSeedsPerSpM_{self.maxSeedsPerSpM}"
+
+        outDir += f"_seedFinderConfig_{'TrackML' if self.detector == DetectorName.generic else 'ODD'}"
+
+        outDir += f"_seedingAlgorithm_{extractEnumName(self.seedingAlgorithm)}Seeding"
+        if doHashing:
+            if self.metric != "angular":
+                outDir += f"_metric_{extractEnumName(self.metric)}"
+            outDir += f"_annoySeed_{self.annoySeed}"
+            if self.zBins != 0:
+                outDir += f"_zBins_{self.zBins}"
+            if self.phiBins != 0:
+                outDir += f"_phiBins_{self.phiBins}"
+
+        return outDir
+
+    def getDetectorInfo(self):
+        actsExamplesDir = getActsExamplesDirectory()
+
+        if self.detector == DetectorName.ODD:
+            from acts.examples.odd import (
+                getOpenDataDetector,
+                getOpenDataDetectorDirectory,
+            )
+
+            geoDir = getOpenDataDetectorDirectory()
+
+            oddMaterialMap = geoDir / "data/odd-material-maps.root"
+            oddDigiConfig = geoDir / "config/odd-digi-smearing-config.json"
+            oddSeedingSel = geoDir / "config/odd-seeding-config.json"
+            oddMaterialDeco = acts.IMaterialDecorator.fromFile(oddMaterialMap)
+
+            detector, trackingGeometry, decorators = getOpenDataDetector(
+                odd_dir=geoDir, mdecorator=oddMaterialDeco
+            )
+
+            digiConfig = oddDigiConfig
+
+            geoSelectionConfigFile = oddSeedingSel
+
+        elif self.detector == DetectorName.generic:
+            print("Create detector and tracking geometry")
+
+            detector, trackingGeometry, a = acts.examples.GenericDetector.create()
+            digiConfig = (
+                actsExamplesDir
+                / "Algorithms/Digitization/share/default-smearing-config-generic.json"
+            )
+            geoSelectionConfigFile = (
+                actsExamplesDir
+                / "Algorithms/TrackFinding/share/geoSelection-genericDetector.json"
+            )
+        else:
+            exit("Detector not supported")
+
+        return detector, trackingGeometry, digiConfig, geoSelectionConfigFile
+
+
+def extractEnumName(enumvar):
+    return str(enumvar).split(".")[-1]
+
+
+def getActsExamplesDirectory():
+    return Path(__file__).parent.parent.parent
+
+
+def runHashingSeeding(
+    nevents: int,
+    trackingGeometry: acts.TrackingGeometry,
+    field: acts.MagneticFieldProvider,
+    outputDir: pathlib.Path,
+    saveFiles: bool,
+    npileup: int,
+    seedingAlgorithm: SeedingAlgorithm,
+    maxSeedsPerSpM: int,
+    digiConfig: pathlib.Path,
+    geoSelectionConfigFile: pathlib.Path,
+    eta=4,
+    rnd: acts.examples.RandomNumbers = acts.examples.RandomNumbers(seed=42),
+    config: Config = None,
+    s=None,
+):
+    from acts.examples.reconstruction import (
+        SeedFinderConfigArg,
+        SeedFinderOptionsArg,
+        HashingTrainingConfigArg,
+        HashingAlgorithmConfigArg,
+    )
+
+    u = acts.UnitConstants
+
+    outputDir = Path(outputDir)
+
+    s = s or acts.examples.Sequencer(
+        events=nevents,
+        numThreads=1,
+        outputDir=str(outputDir),
+        trackFpes=False,
+    )
+
+    addPythia8(
+        s,
+        hardProcess=["Top:qqbar2ttbar=on"],
+        npileup=npileup,
+        vtxGen=acts.examples.GaussianVertexGenerator(
+            stddev=acts.Vector4(0, 0, 50 * u.mm, 0),
+            mean=acts.Vector4(0, 0, 0, 0),
+        ),
+        rnd=rnd,
+    )
+
+    addFatras(
+        s,
+        trackingGeometry,
+        field,
+        preSelectParticles=ParticleSelectorConfig(
+            eta=(-eta, eta),
+            pt=(150 * u.MeV, None),
+        ),
+        postSelectParticles=ParticleSelectorConfig(
+            pt=(1.0 * u.GeV, None),
+            eta=(-eta, eta),
+            measurements=(9, None),
+            removeNeutral=True,
+        ),
+        enableInteractions=True,
+        # outputDirRoot=outputDir,  # RootParticle ERROR when setting the outputDirRoot
+        outputDirCsv=outputDir if saveFiles else None,
+        rnd=rnd,
+    )
+
+    addDigitization(
+        s,
+        trackingGeometry,
+        field,
+        digiConfigFile=digiConfig,
+        outputDirRoot=outputDir,
+        outputDirCsv=outputDir if saveFiles else None,
+        rnd=rnd,
+    )
+
+    import numpy as np
+
+    cotThetaMax = 1 / (np.tan(2 * np.arctan(np.exp(-eta))))  # =1/tan(2×atan(e^(-eta)))
+    seedFinderConfigArg = SeedFinderConfigArg(
+        r=(None, 200 * u.mm),  # rMin=default, 33mm
+        deltaR=(1 * u.mm, 60 * u.mm),
+        collisionRegion=(-250 * u.mm, 250 * u.mm),
+        z=(-2000 * u.mm, 2000 * u.mm),
+        maxSeedsPerSpM=maxSeedsPerSpM,
+        sigmaScattering=5,
+        radLengthPerSeed=0.1,
+        minPt=500 * u.MeV,
+        impactMax=3 * u.mm,
+        cotThetaMax=cotThetaMax,
+    )
+
+    seedFinderOptionsArg: SeedFinderOptionsArg = SeedFinderOptionsArg(bFieldInZ=2 * u.T)
+    hashingTrainingConfigArg: HashingTrainingConfigArg = HashingTrainingConfigArg(
+        annoySeed=config.annoySeed, f=2 if config.metric == HashingMetric.dR else 1
+    )
+    hashingAlgorithmConfigArg: HashingAlgorithmConfigArg = HashingAlgorithmConfigArg(
+        bucketSize=config.bucketSize,
+        zBins=config.zBins,
+        phiBins=config.phiBins,
+    )
+    initialSigmas: Optional[list] = [
+        1 * u.mm,
+        1 * u.mm,
+        1 * u.degree,
+        1 * u.degree,
+        0.1 / u.GeV,
+        1 * u.ns,
+    ]
+
+    initialVarInflation: Optional[list] = [1.0] * 6
+
+    addSeeding(
+        s,
+        trackingGeometry,
+        field,
+        seedFinderConfigArg,
+        seedFinderOptionsArg,
+        hashingTrainingConfigArg,
+        hashingAlgorithmConfigArg,
+        seedingAlgorithm=seedingAlgorithm,
+        geoSelectionConfigFile=geoSelectionConfigFile,
+        initialSigmas=initialSigmas,
+        initialVarInflation=initialVarInflation,
+        outputDirRoot=outputDir,
+        outputDirCsv=outputDir if saveFiles else None,
+    )
+
+    return s
+
+
+if __name__ == "__main__":
+    eta = 4
+    # eta = 2.5
+
+    parser = argparse.ArgumentParser(
+        description="Example script to run seed finding with hashing"
+    )
+    parser.add_argument("--mu", type=int, default=50)
+    parser.add_argument("--bucketSize", type=int, default=100)
+    parser.add_argument(
+        "--nevents",
+        type=int,
+        default=20,
+    )
+    parser.add_argument("--maxSeedsPerSpM", type=int, default=1000)
+    parser.add_argument("--seedingAlgorithm", type=str, default="Hashing")
+    parser.add_argument("--saveFiles", type=bool, default=True)
+    parser.add_argument("--annoySeed", type=int, default=123456789)
+    parser.add_argument("--zBins", type=int, default=100000)
+    parser.add_argument("--phiBins", type=int, default=0)
+    parser.add_argument("--metric", type=str, default="dphi")
+    args = parser.parse_args()
+
+    print(args)
+
+    mu = args.mu
+    bucketSize = args.bucketSize
+    nevents = args.nevents
+    saveFiles = args.saveFiles
+    annoySeed = args.annoySeed
+    zBins = args.zBins
+    phiBins = args.phiBins
+    maxSeedsPerSpM = args.maxSeedsPerSpM
+
+    metric = HashingMetric[args.metric]
+
+    seedingAlgorithm = SeedingAlgorithm[args.seedingAlgorithm]
+
+    detector = DetectorName.generic
+
+    u = acts.UnitConstants
+
+    config = Config(
+        mu=mu,
+        bucketSize=bucketSize,
+        maxSeedsPerSpM=maxSeedsPerSpM,
+        detector=detector,
+        seedingAlgorithm=seedingAlgorithm,
+        metric=metric,
+        annoySeed=annoySeed,
+        zBins=zBins,
+        phiBins=phiBins,
+    )
+
+    doHashing = config.doHashing
+    bucketSize = config.bucketSize
+    npileup = config.mu
+    maxSeedsPerSpM = config.maxSeedsPerSpM
+
+    outputDir = pathlib.Path.cwd() / config.directory
+
+    if not outputDir.exists():
+        outputDir.mkdir(parents=True)
+
+    config.save(outputDir / "config_file.txt")
+
+    field = acts.ConstantBField(acts.Vector3(0.0, 0.0, 2.0 * u.T))
+    rnd = acts.examples.RandomNumbers(seed=42)
+
+    _, trackingGeometry, digiConfig, geoSelectionConfigFile = config.getDetectorInfo()
+
+    s = runHashingSeeding(
+        nevents,
+        trackingGeometry,
+        field,
+        outputDir,
+        saveFiles,
+        npileup,
+        seedingAlgorithm,
+        maxSeedsPerSpM,
+        digiConfig,
+        geoSelectionConfigFile,
+        rnd=rnd,
+        eta=eta,
+        config=config,
+    )
+
+    logLevel = acts.logging.VERBOSE
+    rootSpacepointsWriter = acts.examples.RootSpacepointWriter(
+        level=logLevel,
+        inputSpacepoints="spacepoints",
+        filePath=str(outputDir / "spacepoints.root"),
+    )
+    s.addWriter(rootSpacepointsWriter)
+
+    rootSeedsWriter = acts.examples.RootSeedWriter(
+        level=logLevel,
+        inputSeeds="seeds",
+        filePath=str(outputDir / "seeds.root"),
+    )
+    s.addWriter(rootSeedsWriter)
+
+    # TrackFinding ERROR no intersection found; TrackExtrapolationError:2
+    addCKFTracks(
+        s,
+        trackingGeometry,
+        field,
+        TrackSelectorConfig(
+            pt=(1.0 * u.GeV, None),
+            absEta=(None, eta),
+            nMeasurementsMin=6,
+        ),
+        outputDirRoot=outputDir,
+        writeTrajectories=False,
+        twoWay=False,
+    )
+
+    s.run()
diff --git a/Examples/Scripts/Python/material_mapping_core.py b/Examples/Scripts/Python/material_mapping_core.py
index 9a9801b50af..0bd9a7415de 100644
--- a/Examples/Scripts/Python/material_mapping_core.py
+++ b/Examples/Scripts/Python/material_mapping_core.py
@@ -156,6 +156,29 @@ def runMaterialMapping(surfaces, inputFile, outputFile, outputMap, loglevel):
         help="Construct experimental geometry from GeoModel",
     )
 
+    p.add_argument(
+        "--geomodel-name-list",
+        type=str,
+        nargs="+",
+        default=[],
+        help="List of Name List for the Surface Factory",
+    )
+
+    p.add_argument(
+        "--geomodel-material-list",
+        type=str,
+        nargs="+",
+        default=[],
+        help="List of Material List for the Surface Factory",
+    )
+
+    p.add_argument(
+        "--geomodel-convert-subvols",
+        help="Convert the children of the top level full phys vol",
+        action="store_true",
+        default=False,
+    )
+
     p.add_argument(
         "--geomodel-top-node",
         type=str,
@@ -189,19 +212,16 @@ def runMaterialMapping(surfaces, inputFile, outputFile, outputMap, loglevel):
             # Read the geometry model from the database
             gmTree = acts.geomodel.readFromDb(args.geomodel_input)
 
-            gmFactoryConfig = gm.GeoModelDetectorSurfaceFactory.Config()
-            gmFactoryConfig.shapeConverters = [
-                gm.GeoBoxConverter(),
-                gm.GeoTrdConverter(),
-                gm.GeoIntersectionAnnulusConverter(),
-            ]
-
-            gmFactory = gm.GeoModelDetectorSurfaceFactory(gmFactoryConfig, logLevel)
+            gmFactoryConfig = gm.GeoModelDetectorObjectFactory.Config()
+            gmFactoryConfig.materialList = args.geomodel_material_list
+            gmFactoryConfig.nameList = args.geomodel_name_list
+            gmFactoryConfig.convertSubVolumes = args.geomodel_convert_subvols
+            gmFactory = gm.GeoModelDetectorObjectFactory(gmFactoryConfig, logLevel)
             # The options
-            gmFactoryOptions = gm.GeoModelDetectorSurfaceFactory.Options()
+            gmFactoryOptions = gm.GeoModelDetectorObjectFactory.Options()
             gmFactoryOptions.queries = args.geomodel_queries
             # The Cache & construct call
-            gmFactoryCache = gm.GeoModelDetectorSurfaceFactory.Cache()
+            gmFactoryCache = gm.GeoModelDetectorObjectFactory.Cache()
             gmFactory.construct(gmFactoryCache, gContext, gmTree, gmFactoryOptions)
 
             # All surfaces from GeoModel
@@ -210,7 +230,10 @@ def runMaterialMapping(surfaces, inputFile, outputFile, outputMap, loglevel):
             # Construct the building hierarchy
             gmBlueprintConfig = gm.GeoModelBlueprintCreater.Config()
             gmBlueprintConfig.detectorSurfaces = gmSurfaces
-            gmBlueprintConfig.kdtBinning = [acts.Binning.z, acts.Binning.r]
+            gmBlueprintConfig.kdtBinning = [
+                acts.BinningValue.binZ,
+                acts.BinningValue.binR,
+            ]
 
             gmBlueprintOptions = gm.GeoModelBlueprintCreater.Options()
             gmBlueprintOptions.table = args.geomodel_table_name
diff --git a/Examples/Scripts/Python/material_recording.py b/Examples/Scripts/Python/material_recording.py
index ee8910e8ef4..9de5914d45a 100755
--- a/Examples/Scripts/Python/material_recording.py
+++ b/Examples/Scripts/Python/material_recording.py
@@ -18,6 +18,12 @@
 import acts.examples.geant4.dd4hep
 from acts.examples.odd import getOpenDataDetector
 
+try:
+    import acts.examples.geant4.geomodel
+except ImportError:
+    # geomodel is optional for this script
+    pass
+
 u = acts.UnitConstants
 
 _material_recording_executed = False
@@ -114,8 +120,6 @@ def main():
             acts.examples.geant4.GdmlDetectorConstructionFactory(args.input)
         )
     elif args.input.endswith(".sqlite") or args.input.endswith(".db"):
-        import acts.examples.geant4.geomodel
-
         geoModelTree = acts.geomodel.readFromDb(args.input)
         detectorConstructionFactory = (
             acts.examples.geant4.geomodel.GeoModelDetectorConstructionFactory(
diff --git a/Examples/Scripts/Python/material_validation_core.py b/Examples/Scripts/Python/material_validation_core.py
index e696f704a5f..7e2ae129dcf 100644
--- a/Examples/Scripts/Python/material_validation_core.py
+++ b/Examples/Scripts/Python/material_validation_core.py
@@ -92,6 +92,29 @@ def runMaterialValidation(s, ntracks, surfaces, outputFile, seed, loglevel):
         help="Construct experimental geometry from GeoModel",
     )
 
+    p.add_argument(
+        "--geomodel-name-list",
+        type=str,
+        nargs="+",
+        default=[],
+        help="List of Name List for the Surface Factory",
+    )
+
+    p.add_argument(
+        "--geomodel-material-list",
+        type=str,
+        nargs="+",
+        default=[],
+        help="List of Material List for the Surface Factory",
+    )
+
+    p.add_argument(
+        "--geomodel-convert-subvols",
+        help="Convert the children of the top level full phys vol",
+        action="store_true",
+        default=False,
+    )
+
     p.add_argument(
         "--geomodel-top-node",
         type=str,
@@ -129,19 +152,16 @@ def runMaterialValidation(s, ntracks, surfaces, outputFile, seed, loglevel):
             # Read the geometry model from the database
             gmTree = acts.geomodel.readFromDb(args.geomodel_input)
 
-            gmFactoryConfig = gm.GeoModelDetectorSurfaceFactory.Config()
-            gmFactoryConfig.shapeConverters = [
-                gm.GeoBoxConverter(),
-                gm.GeoTrdConverter(),
-                gm.GeoIntersectionAnnulusConverter(),
-            ]
-
-            gmFactory = gm.GeoModelDetectorSurfaceFactory(gmFactoryConfig, logLevel)
+            gmFactoryConfig = gm.GeoModelDetectorObjectFactory.Config()
+            gmFactoryConfig.materialList = args.geomodel_material_list
+            gmFactoryConfig.nameList = args.geomodel_name_list
+            gmFactoryConfig.convertSubVolumes = args.geomodel_convert_subvols
+            gmFactory = gm.GeoModelDetectorObjectFactory(gmFactoryConfig, logLevel)
             # The options
-            gmFactoryOptions = gm.GeoModelDetectorSurfaceFactory.Options()
+            gmFactoryOptions = gm.GeoModelDetectorObjectFactory.Options()
             gmFactoryOptions.queries = args.geomodel_queries
             # The Cache & construct call
-            gmFactoryCache = gm.GeoModelDetectorSurfaceFactory.Cache()
+            gmFactoryCache = gm.GeoModelDetectorObjectFactory.Cache()
             gmFactory.construct(gmFactoryCache, gContext, gmTree, gmFactoryOptions)
 
             # All surfaces from GeoModel
@@ -150,7 +170,10 @@ def runMaterialValidation(s, ntracks, surfaces, outputFile, seed, loglevel):
             # Construct the building hierarchy
             gmBlueprintConfig = gm.GeoModelBlueprintCreater.Config()
             gmBlueprintConfig.detectorSurfaces = gmSurfaces
-            gmBlueprintConfig.kdtBinning = [acts.Binning.z, acts.Binning.r]
+            gmBlueprintConfig.kdtBinning = [
+                acts.BinningValue.binZ,
+                acts.BinningValue.binR,
+            ]
 
             gmBlueprintOptions = gm.GeoModelBlueprintCreater.Options()
             gmBlueprintOptions.table = args.geomodel_table_name
diff --git a/Examples/Scripts/Python/seeding.py b/Examples/Scripts/Python/seeding.py
index 4c87ba9b82b..3beb6071aae 100755
--- a/Examples/Scripts/Python/seeding.py
+++ b/Examples/Scripts/Python/seeding.py
@@ -57,6 +57,7 @@ def runSeeding(
         EtaConfig,
         PhiConfig,
         ParticleConfig,
+        ParticleSelectorConfig,
         addFatras,
         addDigitization,
     )
@@ -86,6 +87,12 @@ def runSeeding(
         outputDirRoot=outputDir,
         rnd=rnd,
         preSelectParticles=None,
+        postSelectParticles=ParticleSelectorConfig(
+            pt=(1.0 * u.GeV, None),
+            eta=(-2.5, 2.5),
+            measurements=(9, None),
+            removeNeutral=True,
+        ),
     )
 
     srcdir = Path(__file__).resolve().parent.parent.parent.parent
@@ -97,9 +104,9 @@ def runSeeding(
         / "Examples/Algorithms/Digitization/share/default-smearing-config-generic.json",
         rnd=rnd,
     )
+
     from acts.examples.reconstruction import (
         addSeeding,
-        TruthSeedRanges,
         SeedFinderConfigArg,
         SeedFinderOptionsArg,
     )
@@ -108,7 +115,6 @@ def runSeeding(
         s,
         trackingGeometry,
         field,
-        TruthSeedRanges(pt=(1.0 * u.GeV, None), eta=(-2.5, 2.5), nHits=(9, None)),
         SeedFinderConfigArg(
             r=(None, 200 * u.mm),  # rMin=default, 33mm
             deltaR=(1 * u.mm, 60 * u.mm),
@@ -127,7 +133,6 @@ def runSeeding(
         seedingAlgorithm=seedingAlgorithm,
         geoSelectionConfigFile=srcdir
         / "Examples/Algorithms/TrackFinding/share/geoSelection-genericDetector.json",
-        inputParticles="particles_final",  # use this to reproduce the original root_file_hashes.txt - remove to fix
         outputDirRoot=outputDir,
     )
     return s
diff --git a/Examples/Scripts/Python/truth_tracking_gsf.py b/Examples/Scripts/Python/truth_tracking_gsf.py
index 82c99bb38aa..ae8aca06d6c 100755
--- a/Examples/Scripts/Python/truth_tracking_gsf.py
+++ b/Examples/Scripts/Python/truth_tracking_gsf.py
@@ -24,13 +24,13 @@ def runTruthTrackingGsf(
         EtaConfig,
         PhiConfig,
         MomentumConfig,
+        ParticleSelectorConfig,
         addFatras,
         addDigitization,
     )
     from acts.examples.reconstruction import (
         addSeeding,
         SeedingAlgorithm,
-        TruthSeedRanges,
         addTruthTrackingGsf,
     )
 
@@ -77,6 +77,12 @@ def runTruthTrackingGsf(
         field,
         rnd=rnd,
         enableInteractions=True,
+        postSelectParticles=ParticleSelectorConfig(
+            pt=(0.9 * u.GeV, None),
+            measurements=(7, None),
+            removeNeutral=True,
+            removeSecondaries=True,
+        ),
     )
 
     addDigitization(
@@ -95,9 +101,6 @@ def runTruthTrackingGsf(
         inputParticles="particles_input",
         seedingAlgorithm=SeedingAlgorithm.TruthSmeared,
         particleHypothesis=acts.ParticleHypothesis.electron,
-        truthSeedRanges=TruthSeedRanges(
-            nHits=(7, None),
-        ),
     )
 
     addTruthTrackingGsf(
@@ -122,7 +125,7 @@ def runTruthTrackingGsf(
         acts.examples.RootTrackStatesWriter(
             level=acts.logging.INFO,
             inputTracks="tracks",
-            inputParticles="truth_seeds_selected",
+            inputParticles="particles_selected",
             inputTrackParticleMatching="track_particle_matching",
             inputSimHits="simhits",
             inputMeasurementSimHitsMap="measurement_simhits_map",
@@ -134,7 +137,7 @@ def runTruthTrackingGsf(
         acts.examples.RootTrackSummaryWriter(
             level=acts.logging.INFO,
             inputTracks="tracks",
-            inputParticles="truth_seeds_selected",
+            inputParticles="particles_selected",
             inputTrackParticleMatching="track_particle_matching",
             filePath=str(outputDir / "tracksummary_gsf.root"),
             writeGsfSpecific=True,
@@ -145,7 +148,7 @@ def runTruthTrackingGsf(
         acts.examples.TrackFitterPerformanceWriter(
             level=acts.logging.INFO,
             inputTracks="tracks",
-            inputParticles="truth_seeds_selected",
+            inputParticles="particles_selected",
             inputTrackParticleMatching="track_particle_matching",
             filePath=str(outputDir / "performance_gsf.root"),
         )
diff --git a/Examples/Scripts/Python/truth_tracking_gsf_refitting.py b/Examples/Scripts/Python/truth_tracking_gsf_refitting.py
index 138540db2af..686f4af06c2 100755
--- a/Examples/Scripts/Python/truth_tracking_gsf_refitting.py
+++ b/Examples/Scripts/Python/truth_tracking_gsf_refitting.py
@@ -11,25 +11,27 @@
 
 
 def runRefittingGsf(
-    trackingGeometry,
-    field,
-    outputDir,
+    trackingGeometry: acts.TrackingGeometry,
+    field: acts.MagneticFieldProvider,
+    digiConfigFile: Path,
+    outputDir: Path,
     s: acts.examples.Sequencer = None,
 ):
-    srcdir = Path(__file__).resolve().parent.parent.parent.parent
-
     s = runTruthTrackingKalman(
         trackingGeometry,
         field,
-        digiConfigFile=srcdir
-        / "Examples/Algorithms/Digitization/share/default-smearing-config-generic.json",
-        # "thirdparty/OpenDataDetector/config/odd-digi-smearing-config.json",
+        digiConfigFile=digiConfigFile,
         outputDir=outputDir,
         s=s,
     )
 
+    # NOTE we specify clampToRange as True to silence warnings in the test about
+    # queries to the loss distribution outside the specified range, since no dedicated
+    # approximation for the ODD is done yet.
+    bha = acts.examples.AtlasBetheHeitlerApprox.makeDefault(clampToRange=True)
+
     gsfOptions = {
-        "betheHeitlerApprox": acts.examples.AtlasBetheHeitlerApprox.makeDefault(),
+        "betheHeitlerApprox": bha,
         "maxComponents": 12,
         "componentMergeMethod": acts.examples.ComponentMergeMethod.maxWeight,
         "mixtureReductionAlgorithm": acts.examples.MixtureReductionAlgorithm.KLDistance,
@@ -41,7 +43,7 @@ def runRefittingGsf(
         acts.examples.RefittingAlgorithm(
             acts.logging.INFO,
             inputTracks="kf_tracks",
-            outputTracks="gsf_tracks",
+            outputTracks="gsf_refit_tracks",
             fit=acts.examples.makeGsfFitterFunction(
                 trackingGeometry, field, **gsfOptions
             ),
@@ -51,8 +53,8 @@ def runRefittingGsf(
     s.addAlgorithm(
         acts.examples.TrackTruthMatcher(
             level=acts.logging.INFO,
-            inputTracks="gsf_tracks",
-            inputParticles="truth_seeds_selected",
+            inputTracks="gsf_refit_tracks",
+            inputParticles="particles_selected",
             inputMeasurementParticlesMap="measurement_particles_map",
             outputTrackParticleMatching="refit_track_particle_matching",
             outputParticleTrackMatching="refit_particle_track_matching",
@@ -62,8 +64,8 @@ def runRefittingGsf(
     s.addWriter(
         acts.examples.RootTrackStatesWriter(
             level=acts.logging.INFO,
-            inputTracks="gsf_tracks",
-            inputParticles="truth_seeds_selected",
+            inputTracks="gsf_refit_tracks",
+            inputParticles="particles_selected",
             inputTrackParticleMatching="refit_track_particle_matching",
             inputSimHits="simhits",
             inputMeasurementSimHitsMap="measurement_simhits_map",
@@ -75,7 +77,7 @@ def runRefittingGsf(
         acts.examples.RootTrackSummaryWriter(
             level=acts.logging.INFO,
             inputTracks="tracks",
-            inputParticles="truth_seeds_selected",
+            inputParticles="particles_selected",
             inputTrackParticleMatching="refit_track_particle_matching",
             filePath=str(outputDir / "tracksummary_gsf_refit.root"),
         )
@@ -85,9 +87,9 @@ def runRefittingGsf(
         acts.examples.TrackFitterPerformanceWriter(
             level=acts.logging.INFO,
             inputTracks="tracks",
-            inputParticles="truth_seeds_selected",
+            inputParticles="particles_selected",
             inputTrackParticleMatching="track_particle_matching",
-            filePath=str(outputDir / "performance_refitter.root"),
+            filePath=str(outputDir / "performance_gsf_refit.root"),
         )
     )
 
@@ -95,10 +97,28 @@ def runRefittingGsf(
 
 
 if __name__ == "__main__":
-    outputDir = Path.cwd()
+    srcdir = Path(__file__).resolve().parent.parent.parent.parent
+
+    # ODD
+    from acts.examples.odd import getOpenDataDetector
+
+    detector, trackingGeometry, decorators = getOpenDataDetector()
+    digiConfigFile = (
+        srcdir / "thirdparty/OpenDataDetector/config/odd-digi-smearing-config.json"
+    )
+
+    ## GenericDetector
+    # detector, trackingGeometry, _ = acts.examples.GenericDetector.create()
+    # digiConfigFile = (
+    #     srcdir
+    #     / "Examples/Algorithms/Digitization/share/default-smearing-config-generic.json"
+    # )
 
-    # detector, trackingGeometry, decorators = getOpenDataDetector()
-    detector, trackingGeometry, decorators = acts.examples.GenericDetector.create()
     field = acts.ConstantBField(acts.Vector3(0, 0, 2 * u.T))
 
-    runRefittingGsf(trackingGeometry, field, outputDir).run()
+    runRefittingGsf(
+        trackingGeometry=trackingGeometry,
+        field=field,
+        digiConfigFile=digiConfigFile,
+        outputDir=Path.cwd(),
+    ).run()
diff --git a/Examples/Scripts/Python/truth_tracking_gx2f.py b/Examples/Scripts/Python/truth_tracking_gx2f.py
index e20795b7010..8503dc982f4 100644
--- a/Examples/Scripts/Python/truth_tracking_gx2f.py
+++ b/Examples/Scripts/Python/truth_tracking_gx2f.py
@@ -23,13 +23,13 @@ def runTruthTrackingGx2f(
         EtaConfig,
         PhiConfig,
         MomentumConfig,
+        ParticleSelectorConfig,
         addFatras,
         addDigitization,
     )
     from acts.examples.reconstruction import (
         addSeeding,
         SeedingAlgorithm,
-        TruthSeedRanges,
         addGx2fTracks,
     )
 
@@ -74,6 +74,12 @@ def runTruthTrackingGx2f(
         field,
         rnd=rnd,
         enableInteractions=True,
+        postSelectParticles=ParticleSelectorConfig(
+            pt=(0.9 * u.GeV, None),
+            measurements=(7, None),
+            removeNeutral=True,
+            removeSecondaries=True,
+        ),
     )
 
     addDigitization(
@@ -92,9 +98,6 @@ def runTruthTrackingGx2f(
         inputParticles="particles_input",
         seedingAlgorithm=SeedingAlgorithm.TruthSmeared,
         particleHypothesis=acts.ParticleHypothesis.muon,
-        truthSeedRanges=TruthSeedRanges(
-            nHits=(7, None),
-        ),
     )
 
     addGx2fTracks(
@@ -103,6 +106,7 @@ def runTruthTrackingGx2f(
         field,
         nUpdateMax=17,
         relChi2changeCutOff=1e-7,
+        multipleScattering=True,
     )
 
     s.addAlgorithm(
@@ -121,7 +125,7 @@ def runTruthTrackingGx2f(
         acts.examples.RootTrackStatesWriter(
             level=acts.logging.INFO,
             inputTracks="tracks",
-            inputParticles="truth_seeds_selected",
+            inputParticles="particles_selected",
             inputTrackParticleMatching="track_particle_matching",
             inputSimHits="simhits",
             inputMeasurementSimHitsMap="measurement_simhits_map",
@@ -133,7 +137,7 @@ def runTruthTrackingGx2f(
         acts.examples.RootTrackSummaryWriter(
             level=acts.logging.INFO,
             inputTracks="tracks",
-            inputParticles="truth_seeds_selected",
+            inputParticles="particles_selected",
             inputTrackParticleMatching="track_particle_matching",
             filePath=str(outputDir / "tracksummary_gx2f.root"),
             writeGx2fSpecific=True,
@@ -144,7 +148,7 @@ def runTruthTrackingGx2f(
         acts.examples.TrackFitterPerformanceWriter(
             level=acts.logging.INFO,
             inputTracks="tracks",
-            inputParticles="truth_seeds_selected",
+            inputParticles="particles_selected",
             inputTrackParticleMatching="track_particle_matching",
             filePath=str(outputDir / "performance_gx2f.root"),
         )
diff --git a/Examples/Scripts/Python/truth_tracking_kalman.py b/Examples/Scripts/Python/truth_tracking_kalman.py
index 83d189c6bd6..91c18f1dd28 100755
--- a/Examples/Scripts/Python/truth_tracking_kalman.py
+++ b/Examples/Scripts/Python/truth_tracking_kalman.py
@@ -15,6 +15,7 @@ def runTruthTrackingKalman(
     digiConfigFile: Path,
     outputDir: Path,
     inputParticlePath: Optional[Path] = None,
+    inputHitsPath: Optional[Path] = None,
     decorators=[],
     directNavigation=False,
     reverseFilteringMomThreshold=0 * u.GeV,
@@ -26,13 +27,13 @@ def runTruthTrackingKalman(
         EtaConfig,
         PhiConfig,
         MomentumConfig,
+        ParticleSelectorConfig,
         addFatras,
         addDigitization,
     )
     from acts.examples.reconstruction import (
         addSeeding,
         SeedingAlgorithm,
-        TruthSeedRanges,
         addKalmanTracks,
     )
 
@@ -46,6 +47,8 @@ def runTruthTrackingKalman(
     rnd = acts.examples.RandomNumbers(seed=42)
     outputDir = Path(outputDir)
 
+    logger = acts.logging.getLogger("Truth tracking example")
+
     if inputParticlePath is None:
         addParticleGun(
             s,
@@ -61,9 +64,7 @@ def runTruthTrackingKalman(
             rnd=rnd,
         )
     else:
-        acts.logging.getLogger("Truth tracking example").info(
-            "Reading particles from %s", inputParticlePath.resolve()
-        )
+        logger.info("Reading particles from %s", inputParticlePath.resolve())
         assert inputParticlePath.exists()
         s.addReader(
             acts.examples.RootParticleReader(
@@ -72,14 +73,32 @@ def runTruthTrackingKalman(
                 outputParticles="particles_input",
             )
         )
+        s.addWhiteboardAlias("particles", "particles_input")
 
-    addFatras(
-        s,
-        trackingGeometry,
-        field,
-        rnd=rnd,
-        enableInteractions=True,
-    )
+    if inputHitsPath is None:
+        addFatras(
+            s,
+            trackingGeometry,
+            field,
+            rnd=rnd,
+            enableInteractions=True,
+            postSelectParticles=ParticleSelectorConfig(
+                pt=(0.9 * u.GeV, None),
+                measurements=(7, None),
+                removeNeutral=True,
+                removeSecondaries=True,
+            ),
+        )
+    else:
+        logger.info("Reading hits from %s", inputHitsPath.resolve())
+        assert inputHitsPath.exists()
+        s.addReader(
+            acts.examples.RootSimHitReader(
+                level=acts.logging.INFO,
+                filePath=str(inputHitsPath.resolve()),
+                outputSimHits="simhits",
+            )
+        )
 
     addDigitization(
         s,
@@ -97,9 +116,6 @@ def runTruthTrackingKalman(
         inputParticles="particles_input",
         seedingAlgorithm=SeedingAlgorithm.TruthSmeared,
         particleHypothesis=acts.ParticleHypothesis.muon,
-        truthSeedRanges=TruthSeedRanges(
-            nHits=(7, None),
-        ),
     )
 
     addKalmanTracks(
@@ -126,7 +142,7 @@ def runTruthTrackingKalman(
         acts.examples.RootTrackStatesWriter(
             level=acts.logging.INFO,
             inputTracks="tracks",
-            inputParticles="truth_seeds_selected",
+            inputParticles="particles_selected",
             inputTrackParticleMatching="track_particle_matching",
             inputSimHits="simhits",
             inputMeasurementSimHitsMap="measurement_simhits_map",
@@ -138,7 +154,7 @@ def runTruthTrackingKalman(
         acts.examples.RootTrackSummaryWriter(
             level=acts.logging.INFO,
             inputTracks="tracks",
-            inputParticles="truth_seeds_selected",
+            inputParticles="particles_selected",
             inputTrackParticleMatching="track_particle_matching",
             filePath=str(outputDir / "tracksummary_kf.root"),
         )
@@ -148,7 +164,7 @@ def runTruthTrackingKalman(
         acts.examples.TrackFitterPerformanceWriter(
             level=acts.logging.INFO,
             inputTracks="tracks",
-            inputParticles="truth_seeds_selected",
+            inputParticles="particles_selected",
             inputTrackParticleMatching="track_particle_matching",
             filePath=str(outputDir / "performance_kf.root"),
         )
diff --git a/Examples/Scripts/Python/truth_tracking_kalman_refitting.py b/Examples/Scripts/Python/truth_tracking_kalman_refitting.py
new file mode 100755
index 00000000000..46578423f33
--- /dev/null
+++ b/Examples/Scripts/Python/truth_tracking_kalman_refitting.py
@@ -0,0 +1,122 @@
+#!/usr/bin/env python3
+
+from pathlib import Path
+
+import acts
+import acts.examples
+
+from truth_tracking_kalman import runTruthTrackingKalman
+
+u = acts.UnitConstants
+
+
+def runRefittingKf(
+    trackingGeometry: acts.TrackingGeometry,
+    field: acts.MagneticFieldProvider,
+    digiConfigFile: Path,
+    outputDir: Path,
+    multipleScattering: bool = True,
+    energyLoss: bool = True,
+    reverseFilteringMomThreshold=0 * u.GeV,
+    s: acts.examples.Sequencer = None,
+):
+    s = runTruthTrackingKalman(
+        trackingGeometry,
+        field,
+        digiConfigFile=digiConfigFile,
+        outputDir=outputDir,
+        s=s,
+    )
+
+    kalmanOptions = {
+        "multipleScattering": multipleScattering,
+        "energyLoss": energyLoss,
+        "reverseFilteringMomThreshold": reverseFilteringMomThreshold,
+        "freeToBoundCorrection": acts.examples.FreeToBoundCorrection(False),
+        "level": acts.logging.INFO,
+    }
+
+    s.addAlgorithm(
+        acts.examples.RefittingAlgorithm(
+            level=acts.logging.INFO,
+            inputTracks="kf_tracks",
+            outputTracks="kf_refit_tracks",
+            fit=acts.examples.makeKalmanFitterFunction(
+                trackingGeometry, field, **kalmanOptions
+            ),
+        )
+    )
+
+    s.addAlgorithm(
+        acts.examples.TrackTruthMatcher(
+            level=acts.logging.INFO,
+            inputTracks="kf_refit_tracks",
+            inputParticles="particles_selected",
+            inputMeasurementParticlesMap="measurement_particles_map",
+            outputTrackParticleMatching="refit_track_particle_matching",
+            outputParticleTrackMatching="refit_particle_track_matching",
+        )
+    )
+
+    s.addWriter(
+        acts.examples.RootTrackStatesWriter(
+            level=acts.logging.INFO,
+            inputTracks="kf_refit_tracks",
+            inputParticles="particles_selected",
+            inputTrackParticleMatching="refit_track_particle_matching",
+            inputSimHits="simhits",
+            inputMeasurementSimHitsMap="measurement_simhits_map",
+            filePath=str(outputDir / "trackstates_kf_refit.root"),
+        )
+    )
+
+    s.addWriter(
+        acts.examples.RootTrackSummaryWriter(
+            level=acts.logging.INFO,
+            inputTracks="tracks",
+            inputParticles="particles_selected",
+            inputTrackParticleMatching="refit_track_particle_matching",
+            filePath=str(outputDir / "tracksummary_kf_refit.root"),
+        )
+    )
+
+    s.addWriter(
+        acts.examples.TrackFitterPerformanceWriter(
+            level=acts.logging.INFO,
+            inputTracks="tracks",
+            inputParticles="particles_selected",
+            inputTrackParticleMatching="track_particle_matching",
+            filePath=str(outputDir / "performance_kf_refit.root"),
+        )
+    )
+
+    return s
+
+
+if __name__ == "__main__":
+    srcdir = Path(__file__).resolve().parent.parent.parent.parent
+    outputDir = Path.cwd()
+
+    # ODD
+    from acts.examples.odd import getOpenDataDetector
+
+    detector, trackingGeometry, decorators = getOpenDataDetector()
+    digiConfigFile = (
+        srcdir / "thirdparty/OpenDataDetector/config/odd-digi-smearing-config.json"
+    )
+
+    ## GenericDetector
+    # detector, trackingGeometry, _ = acts.examples.GenericDetector.create()
+    # digiConfigFile = (
+    #     srcdir
+    #     / "Examples/Algorithms/Digitization/share/default-smearing-config-generic.json"
+    # )
+
+    field = acts.ConstantBField(acts.Vector3(0, 0, 2 * u.T))
+
+    runRefittingKf(
+        trackingGeometry=trackingGeometry,
+        field=field,
+        digiConfigFile=digiConfigFile,
+        outputDir=Path.cwd(),
+    ).run()
diff --git a/Examples/Scripts/TrackingPerformance/CommonUtils.h b/Examples/Scripts/TrackingPerformance/CommonUtils.h
index 016765910fb..20fbf60f9af 100644
--- a/Examples/Scripts/TrackingPerformance/CommonUtils.h
+++ b/Examples/Scripts/TrackingPerformance/CommonUtils.h
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2019-2021 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
diff --git a/Examples/Scripts/TrackingPerformance/ResidualsAndPulls.cpp b/Examples/Scripts/TrackingPerformance/ResidualsAndPulls.cpp
index f0875b1a77f..b686c02a6a3 100644
--- a/Examples/Scripts/TrackingPerformance/ResidualsAndPulls.cpp
+++ b/Examples/Scripts/TrackingPerformance/ResidualsAndPulls.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2021 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include <exception>
 #include <iostream>
@@ -46,7 +46,7 @@ int main(int argc, char** argv) {
     variables_map vm;
     store(command_line_parser(argc, argv).options(description).run(), vm);
 
-    if (vm.count("help") != 0u) {
+    if (vm.contains("help")) {
       std::cout << description;
       return 1;
     }
diff --git a/Examples/Scripts/TrackingPerformance/TrackSummary.cpp b/Examples/Scripts/TrackingPerformance/TrackSummary.cpp
index 06d547bd357..deba72311d5 100644
--- a/Examples/Scripts/TrackingPerformance/TrackSummary.cpp
+++ b/Examples/Scripts/TrackingPerformance/TrackSummary.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2021 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include "ActsExamples/Utilities/Options.hpp"
 
@@ -15,6 +15,7 @@
 #include <exception>
 #include <iostream>
 #include <limits>
+#include <numbers>
 #include <optional>
 #include <sstream>
 #include <string>
@@ -79,7 +80,8 @@ int main(int argc, char** argv) {
     ao("phi-bins", value<unsigned int>()->default_value(10),
        "Number of bins in phi.");
     ao("phi-range",
-       value<Interval>()->value_name("MIN:MAX")->default_value({-M_PI, M_PI}),
+       value<Interval>()->value_name("MIN:MAX")->default_value(
+           {-std::numbers::pi, std::numbers::pi}),
        "Range for the phi bins.");
     ao("pt-borders", value<VariableReals>()->required(),
        "Transverse momentum borders.");
@@ -109,7 +111,7 @@ int main(int argc, char** argv) {
     variables_map vm;
     store(command_line_parser(argc, argv).options(description).run(), vm);
 
-    if (vm.count("help") != 0u) {
+    if (vm.contains("help")) {
       std::cout << description;
       return 1;
     }
@@ -141,8 +143,8 @@ int main(int argc, char** argv) {
     unsigned int nPhiBins = vm["phi-bins"].as<unsigned int>();
     auto phiInterval = vm["phi-range"].as<Interval>();
     std::array<float, 2> phiRange = {
-        static_cast<float>(phiInterval.lower.value_or(-M_PI)),
-        static_cast<float>(phiInterval.upper.value_or(M_PI))};
+        static_cast<float>(phiInterval.lower.value_or(-std::numbers::pi)),
+        static_cast<float>(phiInterval.upper.value_or(std::numbers::pi))};
 
     auto ptBorders = vm["pt-borders"].as<VariableReals>().values;
     if (ptBorders.empty()) {
diff --git a/Examples/Scripts/TrackingPerformance/TreeReader.h b/Examples/Scripts/TrackingPerformance/TreeReader.h
index bb03ca493c2..4ab47746dc0 100644
--- a/Examples/Scripts/TrackingPerformance/TreeReader.h
+++ b/Examples/Scripts/TrackingPerformance/TreeReader.h
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2021 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
@@ -36,7 +36,7 @@ struct ParticleInfo {
 ///
 struct TreeReader {
   // The constructor
-  TreeReader(TTree* tree_) : tree(tree_) {}
+  explicit TreeReader(TTree* tree_) : tree(tree_) {}
 
   // Get entry
   void getEntry(unsigned int i) const {
@@ -400,7 +400,7 @@ struct TrackSummaryReader : public TreeReader {
 };
 
 /// Struct used for reading particles written out by the
-/// TrackFinderPerformanceWriter
+/// TrackFinderNTupleWriter
 ///
 struct ParticleReader : public TreeReader {
   // Delete the default constructor
diff --git a/Examples/Scripts/TrackingPerformance/boundParamResolution.C b/Examples/Scripts/TrackingPerformance/boundParamResolution.C
index 80baebd47f9..11c53943fb8 100644
--- a/Examples/Scripts/TrackingPerformance/boundParamResolution.C
+++ b/Examples/Scripts/TrackingPerformance/boundParamResolution.C
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2019-2022 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include <array>
 #include <iostream>
@@ -141,7 +141,7 @@ int boundParamResolution(const std::string& inFile, const std::string& treeName,
   for (int volID = 1; volID <= volBins; ++volID) {
     for (int layID = 1; layID <= layBins; ++layID) {
       if (h2_volID_layID->GetBinContent(volID, layID) != 0.) {
-        if (volLayIds.find(volID) == volLayIds.end()) {
+        if (!volLayIds.contains(volID)) {
           // First occurrence of this layer, add -1 for volume plots
           volLayIds[volID] = {-1, layID};
         } else {
diff --git a/Examples/Scripts/TrackingPerformance/defineReconstructionPerformance.C b/Examples/Scripts/TrackingPerformance/defineReconstructionPerformance.C
index 04715e27fe7..1eda61ac6bd 100644
--- a/Examples/Scripts/TrackingPerformance/defineReconstructionPerformance.C
+++ b/Examples/Scripts/TrackingPerformance/defineReconstructionPerformance.C
@@ -1,13 +1,14 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2021 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include <array>
 #include <iostream>
+#include <algorithm>
 #include <string>
 #include <tuple>
 #include <vector>
@@ -189,19 +190,9 @@ void defineReconstructionPerformance(
       for (auto& [id, matchedTracks] : matchedParticles) {
         // Sort all tracks matched to this particle according to majority prob
         // and track quality
-        std::sort(matchedTracks.begin(), matchedTracks.end(),
-                  [](const RecoTrackInfo& lhs, const RecoTrackInfo& rhs) {
-                    if (lhs.nMajorityHits > rhs.nMajorityHits) {
-                      return true;
-                    }
-                    if (lhs.nMajorityHits < rhs.nMajorityHits) {
-                      return false;
-                    }
-                    if (lhs.nMeasurements > rhs.nMeasurements) {
-                      return true;
-                    }
-                    return false;
-                  });
+        std::ranges::sort(matchedTracks, std::greater{}, [](const auto& m) {
+            return std::make_tuple(m.nMajorityHits, m.nMeasurements);
+          });
         // Fill the duplication rate plots
         for (std::size_t k = 0; k < matchedTracks.size(); ++k) {
           auto eta = matchedTracks[k].eta;
diff --git a/Examples/Scripts/TrackingPerformance/reconstructionPerformance.C b/Examples/Scripts/TrackingPerformance/reconstructionPerformance.C
index 46451a26710..7dbf43e9283 100644
--- a/Examples/Scripts/TrackingPerformance/reconstructionPerformance.C
+++ b/Examples/Scripts/TrackingPerformance/reconstructionPerformance.C
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2019-2021 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include <array>
 #include <string>
diff --git a/Examples/Scripts/TrackingPerformance/trackSummaryAnalysis.C b/Examples/Scripts/TrackingPerformance/trackSummaryAnalysis.C
index 2fd404aa8f1..317c7d4c11e 100644
--- a/Examples/Scripts/TrackingPerformance/trackSummaryAnalysis.C
+++ b/Examples/Scripts/TrackingPerformance/trackSummaryAnalysis.C
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2019-2021 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include <bitset>
 #include <fstream>
@@ -12,6 +12,7 @@
 #include <limits>
 #include <map>
 #include <string>
+#include <numbers>
 #include <vector>
 
 #include <TCanvas.h>
@@ -56,7 +57,7 @@ int trackSummaryAnalysis(
     const std::string& outConfig = "", unsigned long nEntries = 0,
     unsigned int nPeakEntries = 0, float pullRange = 6.,
     unsigned int nHistBins = 61, unsigned int nPhiBins = 10,
-    const std::array<float, 2>& phiRange = {-M_PI, M_PI},
+    const std::array<float, 2>& phiRange = {-std::numbers::pi_v<float>, std::numbers::pi_v<float>},
     unsigned int nEtaBins = 10, const std::array<float, 2>& etaRange = {-3, 3},
     const std::vector<double>& ptBorders =
         {0., std::numeric_limits<double>::infinity()},
diff --git a/Examples/Scripts/compareAssignedRealPos.C b/Examples/Scripts/compareAssignedRealPos.C
index 96b2c2fd36d..4a700dfee8c 100644
--- a/Examples/Scripts/compareAssignedRealPos.C
+++ b/Examples/Scripts/compareAssignedRealPos.C
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2017 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 /*
  * compareAssignedRealPos.C
diff --git a/Examples/Scripts/compareDistributions.C b/Examples/Scripts/compareDistributions.C
index 3ab9c8cff62..25bcff962bb 100644
--- a/Examples/Scripts/compareDistributions.C
+++ b/Examples/Scripts/compareDistributions.C
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2017 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include "TFile.h"
 #include "TH1F.h"
diff --git a/Examples/Scripts/compareHistograms.C b/Examples/Scripts/compareHistograms.C
index 4603cd7664b..a8e2d9c9880 100644
--- a/Examples/Scripts/compareHistograms.C
+++ b/Examples/Scripts/compareHistograms.C
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2017 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include "TFile.h"
 #include "TH1F.h"
diff --git a/Examples/Scripts/compareHitHistograms.C b/Examples/Scripts/compareHitHistograms.C
index 2687366471c..53a5c50baf6 100644
--- a/Examples/Scripts/compareHitHistograms.C
+++ b/Examples/Scripts/compareHitHistograms.C
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2017 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 /*
  * compareHitHistograms.C
diff --git a/Examples/Scripts/compareRootFiles.C b/Examples/Scripts/compareRootFiles.C
index 2c5a4a99586..d279a717102 100644
--- a/Examples/Scripts/compareRootFiles.C
+++ b/Examples/Scripts/compareRootFiles.C
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2017 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 // This ROOT script compares two ROOT files in an order-insensitive way. Its
 // intended use is to compare the output of a single-threaded and multi-threaded
diff --git a/Examples/Scripts/compareRootFiles.hpp b/Examples/Scripts/compareRootFiles.hpp
index d22853fec92..464230373be 100644
--- a/Examples/Scripts/compareRootFiles.hpp
+++ b/Examples/Scripts/compareRootFiles.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2017 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
diff --git a/Examples/Scripts/errorOfHistograms.C b/Examples/Scripts/errorOfHistograms.C
index fa907faa18b..2b5584f8e87 100644
--- a/Examples/Scripts/errorOfHistograms.C
+++ b/Examples/Scripts/errorOfHistograms.C
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2017 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 /*
  * errorOfHistograms.C
diff --git a/Examples/Scripts/fullMaterial.C b/Examples/Scripts/fullMaterial.C
index 6e14752d901..85ee1092eb5 100644
--- a/Examples/Scripts/fullMaterial.C
+++ b/Examples/Scripts/fullMaterial.C
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2017 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 /*
  * fullMaterial.cxx
@@ -13,6 +13,8 @@
  *      Author: jhrdinka
  */
 
+#include "Acts/Utilities/AngleHelpers.hpp"
+
 #include "TFile.h"
 #include "TH1F.h"
 #include "TH2F.h"
@@ -111,7 +113,7 @@ fullMaterial(std::string inFile,
   for (auto& mrecord : mrecords) {
     std::vector<Acts::MaterialStep> steps = mrecord.materialSteps();
     float                           theta = mrecord.theta();
-    float                           eta   = -log(tan(theta * 0.5));
+    float                           eta   = Acts::AngleHelpers::etaFromTheta(theta);
     float                           phi   = VectorHelpers::phi(mrecord);
 
     float thickness = 0.;
diff --git a/Examples/Scripts/layerMaterial.C b/Examples/Scripts/layerMaterial.C
index 240e9f9e41c..6c618b22398 100644
--- a/Examples/Scripts/layerMaterial.C
+++ b/Examples/Scripts/layerMaterial.C
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2017 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 //
 //  layerMaterial.C
diff --git a/Examples/Scripts/momentumDistributions.C b/Examples/Scripts/momentumDistributions.C
index cd19fb51980..211477e9b0e 100644
--- a/Examples/Scripts/momentumDistributions.C
+++ b/Examples/Scripts/momentumDistributions.C
@@ -1,10 +1,14 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2017 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
+
+#include "Acts/Utilities/AngleHelpers.hpp"
+
+#include <numbers>
 
 #include "TFile.h"
 #include "TH1F.h"
@@ -21,7 +25,7 @@
 void momentumDistributions(std::string inFile, std::string treeName,
                            std::string outFile, int nBins, float r, float zMin,
                            float zMax, float etaMin, float etaMax,
-                           float thetaMin = 0., float thetaMax = M_PI) {
+                           float thetaMin = 0., float thetaMax = std::numbers::pi_v<float>) {
   std::cout << "Opening file: " << inFile << std::endl;
   TFile inputFile(inFile.c_str());
   std::cout << "Reading tree: " << treeName << std::endl;
@@ -106,7 +110,7 @@ void momentumDistributions(std::string inFile, std::string treeName,
 
     for (int j = 0; j < x->size(); j++) {
       float hitTheta = std::atan2(std::hypot(x->at(j), y->at(j)), z->at(j));
-      hitsEta->Fill(-log(tan(hitTheta * 0.5)));
+      hitsEta->Fill(Acts::AngleHelpers::etaFromTheta(hitTheta));
       hitsTheta->Fill(hitTheta);
       hitsZ->Fill(z->at(j));
     }
diff --git a/Examples/Scripts/printBField.C b/Examples/Scripts/printBField.C
index 27181311e32..d88a3609dae 100644
--- a/Examples/Scripts/printBField.C
+++ b/Examples/Scripts/printBField.C
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2017 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include <TTreeReader.h>
 #include <TTreeReaderValue.h>
diff --git a/Examples/Scripts/printHits.C b/Examples/Scripts/printHits.C
index f35bc0f3715..bd3fa21f4d7 100644
--- a/Examples/Scripts/printHits.C
+++ b/Examples/Scripts/printHits.C
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2017 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include <TTreeReader.h>
 #include <TTreeReaderValue.h>
diff --git a/Examples/Scripts/run_full_chain.sh b/Examples/Scripts/run_full_chain.sh
deleted file mode 100755
index f7af8e77355..00000000000
--- a/Examples/Scripts/run_full_chain.sh
+++ /dev/null
@@ -1,29 +0,0 @@
-#!/bin/sh
-
-bindir=$1
-outdir=${2:-output}
-events=${EVENTS:-32}
-
-# ensure output directories exist
-# should be handled by the tools directly
-# mkdir -p ${outdir}/gen ${outdir}/sim ${outdir}/rec
-
-# generate events with some muons
-# ${bindir}/ActsGenParticleGun \
-#   --events=${events} \
-#   --output-dir=${outdir}/gen --output-csv=1 --output-root=1 \
-#   --pg-nparticles=10 \
-#   --pg-pdg=13
-
-# simulate some events
-${bindir}/ActsSimFatrasGeneric \
-  --events=${events} \
-  --output-dir=${outdir}/sim --output-csv=1 --output-root=1 \
-  --evg-input-type=gun \
-  --pg-nparticles=10 \
-  --pg-pdg=13
-
-# reconstruct simulated events
-${bindir}/ActsRecTruthTracks \
-  --input-dir=${outdir}/sim \
-  --output-dir=${outdir}/rec --output-csv=1 --output-root=1
diff --git a/Fatras/Geant4/include/ActsFatras/Geant4/DummyDetectorConstruction.hpp b/Fatras/Geant4/include/ActsFatras/Geant4/DummyDetectorConstruction.hpp
index e42c1030388..ca671ef6188 100644
--- a/Fatras/Geant4/include/ActsFatras/Geant4/DummyDetectorConstruction.hpp
+++ b/Fatras/Geant4/include/ActsFatras/Geant4/DummyDetectorConstruction.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2021 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
diff --git a/Fatras/Geant4/include/ActsFatras/Geant4/Geant4Decay.hpp b/Fatras/Geant4/include/ActsFatras/Geant4/Geant4Decay.hpp
index 60b8c7fd3ca..177e3ac6221 100644
--- a/Fatras/Geant4/include/ActsFatras/Geant4/Geant4Decay.hpp
+++ b/Fatras/Geant4/include/ActsFatras/Geant4/Geant4Decay.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2021 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
diff --git a/Fatras/Geant4/include/ActsFatras/Geant4/PDGtoG4Converter.hpp b/Fatras/Geant4/include/ActsFatras/Geant4/PDGtoG4Converter.hpp
index efdc36c7cb1..67766de3bf5 100644
--- a/Fatras/Geant4/include/ActsFatras/Geant4/PDGtoG4Converter.hpp
+++ b/Fatras/Geant4/include/ActsFatras/Geant4/PDGtoG4Converter.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2021 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
diff --git a/Fatras/Geant4/src/DummyDetectorConstruction.cpp b/Fatras/Geant4/src/DummyDetectorConstruction.cpp
index 583913f66e7..80d180b37cc 100644
--- a/Fatras/Geant4/src/DummyDetectorConstruction.cpp
+++ b/Fatras/Geant4/src/DummyDetectorConstruction.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2021 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include "ActsFatras/Geant4/DummyDetectorConstruction.hpp"
 
diff --git a/Fatras/Geant4/src/Geant4Decay.cpp b/Fatras/Geant4/src/Geant4Decay.cpp
index f8532aafd2d..41b5a3656b1 100644
--- a/Fatras/Geant4/src/Geant4Decay.cpp
+++ b/Fatras/Geant4/src/Geant4Decay.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2021 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include "ActsFatras/Geant4/Geant4Decay.hpp"
 
diff --git a/Fatras/Geant4/src/PDGtoG4Converter.cpp b/Fatras/Geant4/src/PDGtoG4Converter.cpp
index 25ff64377ac..320f0fcc550 100644
--- a/Fatras/Geant4/src/PDGtoG4Converter.cpp
+++ b/Fatras/Geant4/src/PDGtoG4Converter.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2021 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include "ActsFatras/Geant4/PDGtoG4Converter.hpp"
 
diff --git a/Fatras/include/ActsFatras/Digitization/ChannelMerger.hpp b/Fatras/include/ActsFatras/Digitization/ChannelMerger.hpp
index f09f142cb32..67e0b79ef9f 100644
--- a/Fatras/include/ActsFatras/Digitization/ChannelMerger.hpp
+++ b/Fatras/include/ActsFatras/Digitization/ChannelMerger.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2020 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
diff --git a/Fatras/include/ActsFatras/Digitization/Channelizer.hpp b/Fatras/include/ActsFatras/Digitization/Channelizer.hpp
index 08b59bdf4f8..4f190365fe9 100644
--- a/Fatras/include/ActsFatras/Digitization/Channelizer.hpp
+++ b/Fatras/include/ActsFatras/Digitization/Channelizer.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2020 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
diff --git a/Fatras/include/ActsFatras/Digitization/DigitizationData.hpp b/Fatras/include/ActsFatras/Digitization/DigitizationData.hpp
index 52ca3ff5ae1..314cbcc5eb1 100644
--- a/Fatras/include/ActsFatras/Digitization/DigitizationData.hpp
+++ b/Fatras/include/ActsFatras/Digitization/DigitizationData.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2020 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
diff --git a/Fatras/include/ActsFatras/Digitization/DigitizationError.hpp b/Fatras/include/ActsFatras/Digitization/DigitizationError.hpp
index 77d4ebb1be4..d07097afd2d 100644
--- a/Fatras/include/ActsFatras/Digitization/DigitizationError.hpp
+++ b/Fatras/include/ActsFatras/Digitization/DigitizationError.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2020 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
diff --git a/Fatras/include/ActsFatras/Digitization/PlanarSurfaceDrift.hpp b/Fatras/include/ActsFatras/Digitization/PlanarSurfaceDrift.hpp
index 02c3da08446..1f5ac70d771 100644
--- a/Fatras/include/ActsFatras/Digitization/PlanarSurfaceDrift.hpp
+++ b/Fatras/include/ActsFatras/Digitization/PlanarSurfaceDrift.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2021 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
diff --git a/Fatras/include/ActsFatras/Digitization/PlanarSurfaceMask.hpp b/Fatras/include/ActsFatras/Digitization/PlanarSurfaceMask.hpp
index 1202c51a568..9aa2efbfc90 100644
--- a/Fatras/include/ActsFatras/Digitization/PlanarSurfaceMask.hpp
+++ b/Fatras/include/ActsFatras/Digitization/PlanarSurfaceMask.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2020 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
@@ -30,7 +30,7 @@ struct PlanarSurfaceMask {
   using Segment2D = std::array<Acts::Vector2, 2>;
 
   /// Apply the mask on the segment
-  /// - If the semgent is full inside the surface, return unchanged
+  /// - If the segment is fully inside the surface, return unchanged
   /// - Otherwise mask/clip the segment to fit into the bounds
   ///
   /// @note Only PlaneSurface/DiscSurface are supported
@@ -64,7 +64,7 @@ struct PlanarSurfaceMask {
   ///
   /// @param rBounds The radial disc for the masking
   /// @param segment The track segment (on surface)
-  /// @param polarSegment The track segmetn (on surface, in polar)
+  /// @param polarSegment The track segment (on surface, in polar)
   /// @param firstInside The indicator if the first is inside
   ///
   /// @return a result wrapping a segment
diff --git a/Fatras/include/ActsFatras/Digitization/Segmentizer.hpp b/Fatras/include/ActsFatras/Digitization/Segmentizer.hpp
index e6e8ac6327d..9824ff21295 100644
--- a/Fatras/include/ActsFatras/Digitization/Segmentizer.hpp
+++ b/Fatras/include/ActsFatras/Digitization/Segmentizer.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2020 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
@@ -74,7 +74,7 @@ struct Segmentizer {
     /// Constructor with arguments
     ///
     /// @param bin_ The bin corresponding to this step
-    /// @param path2D_ The start/end 2D position of the segement
+    /// @param path2D_ The start/end 2D position of the segment
     /// @param activation_ The segment activation (clean: length) for this bin
     ChannelSegment(Bin2D bin_, Segment2D path2D_, double activation_)
         : bin(bin_), path2D(std::move(path2D_)), activation(activation_) {}
diff --git a/Fatras/include/ActsFatras/Digitization/UncorrelatedHitSmearer.hpp b/Fatras/include/ActsFatras/Digitization/UncorrelatedHitSmearer.hpp
index 0600006b5f2..4420c8a6200 100644
--- a/Fatras/include/ActsFatras/Digitization/UncorrelatedHitSmearer.hpp
+++ b/Fatras/include/ActsFatras/Digitization/UncorrelatedHitSmearer.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2020 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
diff --git a/Fatras/include/ActsFatras/EventData/Barcode.hpp b/Fatras/include/ActsFatras/EventData/Barcode.hpp
index 9b0719f55bc..7054d4efbf7 100644
--- a/Fatras/include/ActsFatras/EventData/Barcode.hpp
+++ b/Fatras/include/ActsFatras/EventData/Barcode.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2018-2020 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
diff --git a/Fatras/include/ActsFatras/EventData/Hit.hpp b/Fatras/include/ActsFatras/EventData/Hit.hpp
index 6a3e8bb4a90..d5eb25662f8 100644
--- a/Fatras/include/ActsFatras/EventData/Hit.hpp
+++ b/Fatras/include/ActsFatras/EventData/Hit.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2020 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
diff --git a/Fatras/include/ActsFatras/EventData/Particle.hpp b/Fatras/include/ActsFatras/EventData/Particle.hpp
index 2687f0361c7..5b6eb2f7a61 100644
--- a/Fatras/include/ActsFatras/EventData/Particle.hpp
+++ b/Fatras/include/ActsFatras/EventData/Particle.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2018-2024 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
@@ -153,33 +153,33 @@ class Particle {
   }
 
   /// Particle identifier within an event.
-  constexpr Barcode particleId() const { return m_particleId; }
+  Barcode particleId() const { return m_particleId; }
   /// Which type of process generated this particle.
-  constexpr ProcessType process() const { return m_process; }
+  ProcessType process() const { return m_process; }
   /// PDG particle number that identifies the type.
-  constexpr Acts::PdgParticle pdg() const { return m_pdg; }
+  Acts::PdgParticle pdg() const { return m_pdg; }
   /// Absolute PDG particle number that identifies the type.
-  constexpr Acts::PdgParticle absolutePdg() const {
+  Acts::PdgParticle absolutePdg() const {
     return Acts::makeAbsolutePdgParticle(pdg());
   }
   /// Particle charge.
-  constexpr Scalar charge() const { return m_charge; }
+  Scalar charge() const { return m_charge; }
   /// Particle absolute charge.
-  constexpr Scalar absoluteCharge() const { return std::abs(m_charge); }
+  Scalar absoluteCharge() const { return std::abs(m_charge); }
   /// Particle mass.
-  constexpr Scalar mass() const { return m_mass; }
+  Scalar mass() const { return m_mass; }
 
   /// Particle hypothesis.
-  constexpr Acts::ParticleHypothesis hypothesis() const {
+  Acts::ParticleHypothesis hypothesis() const {
     return Acts::ParticleHypothesis(absolutePdg(), mass(), absoluteCharge());
   }
   /// Particl qOverP.
-  constexpr Scalar qOverP() const {
+  Scalar qOverP() const {
     return hypothesis().qOverP(absoluteMomentum(), charge());
   }
 
   /// Space-time position four-vector.
-  constexpr const Vector4 &fourPosition() const { return m_position4; }
+  const Vector4 &fourPosition() const { return m_position4; }
   /// Three-position, i.e. spatial coordinates without the time.
   auto position() const { return m_position4.segment<3>(Acts::ePos0); }
   /// Time coordinate.
@@ -205,16 +205,17 @@ class Particle {
     return m_absMomentum * m_direction.segment<2>(Acts::eMom0).norm();
   }
   /// Absolute momentum.
-  constexpr Scalar absoluteMomentum() const { return m_absMomentum; }
+  Scalar absoluteMomentum() const { return m_absMomentum; }
   /// Absolute momentum.
   Vector3 momentum() const { return absoluteMomentum() * direction(); }
   /// Total energy, i.e. norm of the four-momentum.
   Scalar energy() const { return std::hypot(m_mass, m_absMomentum); }
 
   /// Check if the particle is alive, i.e. is not at rest.
-  constexpr bool isAlive() const { return Scalar{0} < m_absMomentum; }
+  bool isAlive() const { return Scalar{0} < m_absMomentum; }
 
-  constexpr bool isSecondary() const {
+  /// Check if this is a secondary particle.
+  bool isSecondary() const {
     return particleId().vertexSecondary() != 0 ||
            particleId().generation() != 0 || particleId().subParticle() != 0;
   }
@@ -224,26 +225,26 @@ class Particle {
   /// Set the proper time in the particle rest frame.
   ///
   /// @param properTime passed proper time in the rest frame
-  constexpr Particle &setProperTime(Scalar properTime) {
+  Particle &setProperTime(Scalar properTime) {
     m_properTime = properTime;
     return *this;
   }
   /// Proper time in the particle rest frame.
-  constexpr Scalar properTime() const { return m_properTime; }
+  Scalar properTime() const { return m_properTime; }
 
   /// Set the accumulated material measured in radiation/interaction lengths.
   ///
   /// @param pathInX0 accumulated material measured in radiation lengths
   /// @param pathInL0 accumulated material measured in interaction lengths
-  constexpr Particle &setMaterialPassed(Scalar pathInX0, Scalar pathInL0) {
+  Particle &setMaterialPassed(Scalar pathInX0, Scalar pathInL0) {
     m_pathInX0 = pathInX0;
     m_pathInL0 = pathInL0;
     return *this;
   }
   /// Accumulated path within material measured in radiation lengths.
-  constexpr Scalar pathInX0() const { return m_pathInX0; }
+  Scalar pathInX0() const { return m_pathInX0; }
   /// Accumulated path within material measured in interaction lengths.
-  constexpr Scalar pathInL0() const { return m_pathInL0; }
+  Scalar pathInL0() const { return m_pathInL0; }
 
   /// Set the reference surface.
   ///
@@ -285,24 +286,24 @@ class Particle {
   /// Set the number of hits.
   ///
   /// @param nHits number of hits
-  constexpr Particle &setNumberOfHits(std::uint32_t nHits) {
+  Particle &setNumberOfHits(std::uint32_t nHits) {
     m_numberOfHits = nHits;
     return *this;
   }
 
   /// Number of hits.
-  constexpr std::uint32_t numberOfHits() const { return m_numberOfHits; }
+  std::uint32_t numberOfHits() const { return m_numberOfHits; }
 
   /// Set the outcome of particle.
   ///
   /// @param outcome outcome code
-  constexpr Particle &setOutcome(ParticleOutcome outcome) {
+  Particle &setOutcome(ParticleOutcome outcome) {
     m_outcome = outcome;
     return *this;
   }
 
   /// Particle outcome.
-  constexpr ParticleOutcome outcome() const { return m_outcome; }
+  ParticleOutcome outcome() const { return m_outcome; }
 
  private:
   // identity, i.e. things that do not change over the particle lifetime.
diff --git a/Fatras/include/ActsFatras/EventData/ParticleOutcome.hpp b/Fatras/include/ActsFatras/EventData/ParticleOutcome.hpp
index ad15e5c73e7..22f2092ef1b 100644
--- a/Fatras/include/ActsFatras/EventData/ParticleOutcome.hpp
+++ b/Fatras/include/ActsFatras/EventData/ParticleOutcome.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2024 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
diff --git a/Fatras/include/ActsFatras/EventData/ProcessType.hpp b/Fatras/include/ActsFatras/EventData/ProcessType.hpp
index 62a6cc85ae4..b0d30b443cc 100644
--- a/Fatras/include/ActsFatras/EventData/ProcessType.hpp
+++ b/Fatras/include/ActsFatras/EventData/ProcessType.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2020 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
diff --git a/Fatras/include/ActsFatras/Kernel/ContinuousProcess.hpp b/Fatras/include/ActsFatras/Kernel/ContinuousProcess.hpp
index aff810e608c..5a23ac0f256 100644
--- a/Fatras/include/ActsFatras/Kernel/ContinuousProcess.hpp
+++ b/Fatras/include/ActsFatras/Kernel/ContinuousProcess.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2018-2020 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
@@ -37,7 +37,7 @@ namespace ActsFatras {
 /// filter the generated child particles.
 ///
 /// @note The output and child particle selectors are identical unless the
-///       child particle selector is explicitely specified.
+///       child particle selector is explicitly specified.
 template <typename physics_t, typename input_particle_selector_t,
           typename output_particle_selector_t,
           typename child_particle_selector_t = output_particle_selector_t>
diff --git a/Fatras/include/ActsFatras/Kernel/InteractionList.hpp b/Fatras/include/ActsFatras/Kernel/InteractionList.hpp
index c148446c6cb..eb6816c490a 100644
--- a/Fatras/include/ActsFatras/Kernel/InteractionList.hpp
+++ b/Fatras/include/ActsFatras/Kernel/InteractionList.hpp
@@ -1,15 +1,14 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2018-2021 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
 #include "Acts/Material/MaterialSlab.hpp"
-#include "Acts/Utilities/TypeTraits.hpp"
 #include "ActsFatras/EventData/Particle.hpp"
 
 #include <bitset>
@@ -81,34 +80,31 @@ using TupleFilter = typename TupleFilterImpl<predicate_t, tuple_t,
 ///
 /// Only checks for the existence of the templated `generatePathLimits` method
 template <typename process_t>
-class IsPointLikeProcess {
-  struct MockUniformRandomBitGenerator {
-    using result_type = unsigned int;
-
-    static constexpr result_type min() { return 0u; }
-    static constexpr result_type max() { return 1u << 15u; }
-    constexpr result_type operator()() { return 0u; }
-  };
-
-  METHOD_TRAIT(generatePathLimits_method_t, generatePathLimits);
+concept PointLikeProcessConcept = requires(
+    const process_t& p, std::uniform_int_distribution<unsigned int>& rng,
+    const Particle& prt) {
+  {
+    p.generatePathLimits(rng, prt)
+  } -> std::same_as<std::pair<Particle::Scalar, Particle::Scalar>>;
+};
 
-  using scalar_pair_t = std::pair<Particle::Scalar, Particle::Scalar>;
+template <typename process_t>
+concept ContinuousProcessConcept = !PointLikeProcessConcept<process_t>;
 
- public:
-  static constexpr bool value = Acts::Concepts::has_method<
-      const process_t, scalar_pair_t, generatePathLimits_method_t,
-      MockUniformRandomBitGenerator&, const Particle&>;
+template <typename process_t>
+struct PointLikeProcessTrait {
+  static constexpr bool value = PointLikeProcessConcept<process_t>;
 };
 
 template <typename process_t>
-struct IsContinuousProcess {
-  static constexpr bool value = !IsPointLikeProcess<process_t>::value;
+struct ContinuousProcessTrait {
+  static constexpr bool value = ContinuousProcessConcept<process_t>;
 };
 
 template <typename processes_t>
-using ContinuousIndices = TupleFilter<IsContinuousProcess, processes_t>;
+using ContinuousIndices = TupleFilter<ContinuousProcessTrait, processes_t>;
 template <typename processes_t>
-using PointLikeIndices = TupleFilter<IsPointLikeProcess, processes_t>;
+using PointLikeIndices = TupleFilter<PointLikeProcessTrait, processes_t>;
 
 }  // namespace detail
 
@@ -119,7 +115,7 @@ using PointLikeIndices = TupleFilter<IsPointLikeProcess, processes_t>;
 ///
 /// Continuous processes scale with the passed material. They tpyically
 /// describe effective results of a large number of small interactions such as
-/// multiple scattering or ionisation. Continous process types **must** provide
+/// multiple scattering or ionisation. Continuous process types **must** provide
 /// a call operator with the following signature:
 ///
 ///     template <typename generator_t>
@@ -167,7 +163,7 @@ using PointLikeIndices = TupleFilter<IsPointLikeProcess, processes_t>;
 ///   destruction is typically of more interest to the user and this simplifies
 ///   validation.
 ///
-/// The physics processes are extendable by the user to accomodate their
+/// The physics processes are extendable by the user to accommodate their
 /// specific requirements. While the set of available physics processes must be
 /// configured at compile-time, within that set, processes can again be
 /// selectively disabled at run-time. By default all processes are applied.
@@ -221,7 +217,7 @@ class InteractionList {
   /// @param[in]     slab      is the passed material
   /// @param[in,out] particle  is the particle being updated
   /// @param[out]    generated is the container of generated particles
-  /// @return Break condition, i.e. whether a process stoped the propagation
+  /// @return Break condition, i.e. whether a process stopped the propagation
   template <typename generator_t>
   bool runContinuous(generator_t& rng, const Acts::MaterialSlab& slab,
                      Particle& particle,
diff --git a/Fatras/include/ActsFatras/Kernel/Simulation.hpp b/Fatras/include/ActsFatras/Kernel/Simulation.hpp
index 13528e40792..b6975c34172 100644
--- a/Fatras/include/ActsFatras/Kernel/Simulation.hpp
+++ b/Fatras/include/ActsFatras/Kernel/Simulation.hpp
@@ -1,25 +1,18 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2018-2021 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
-#include "Acts/EventData/Charge.hpp"
-#include "Acts/EventData/GenericCurvilinearTrackParameters.hpp"
-#include "Acts/EventData/TrackParameters.hpp"
 #include "Acts/Geometry/GeometryContext.hpp"
 #include "Acts/MagneticField/MagneticFieldContext.hpp"
-#include "Acts/Propagator/AbortList.hpp"
-#include "Acts/Propagator/ActionList.hpp"
-#include "Acts/Propagator/Propagator.hpp"
-#include "Acts/Propagator/StandardAborters.hpp"
+#include "Acts/Propagator/ActorList.hpp"
 #include "Acts/Utilities/Logger.hpp"
 #include "Acts/Utilities/Result.hpp"
-#include "ActsFatras/EventData/Hit.hpp"
 #include "ActsFatras/EventData/Particle.hpp"
 #include "ActsFatras/Kernel/SimulationResult.hpp"
 #include "ActsFatras/Kernel/detail/SimulationActor.hpp"
@@ -79,19 +72,17 @@ struct SingleParticleSimulation {
     // propagator-related additional types
     using Actor = detail::SimulationActor<generator_t, decay_t, interactions_t,
                                           hit_surface_selector_t>;
-    using Aborter = typename Actor::ParticleNotAlive;
     using Result = typename Actor::result_type;
-    using Actions = Acts::ActionList<Actor>;
-    using Abort = Acts::AbortList<Aborter, Acts::EndOfWorldReached>;
+    using ActorList = Acts::ActorList<Actor>;
     using PropagatorOptions =
-        typename propagator_t::template Options<Actions, Abort>;
+        typename propagator_t::template Options<ActorList>;
 
     // Construct per-call options.
     PropagatorOptions options(geoCtx, magCtx);
     options.stepping.maxStepSize = maxStepSize;
     options.pathLimit = pathLimit;
     // setup the interactor as part of the propagator options
-    auto &actor = options.actionList.template get<Actor>();
+    auto &actor = options.actorList.template get<Actor>();
     actor.generator = &generator;
     actor.decay = decay;
     actor.interactions = interactions;
@@ -248,6 +239,9 @@ struct Simulation {
           continue;
         }
 
+        assert(result->particle.particleId() == initialParticle.particleId() &&
+               "Particle id must not change during simulation");
+
         copyOutputs(result.value(), simulatedParticlesInitial,
                     simulatedParticlesFinal, hits);
         // since physics processes are independent, there can be particle id
@@ -259,7 +253,11 @@ struct Simulation {
       }
     }
 
-    // the overall function call succeeded, i.e. no fatal errors occured.
+    assert(
+        (simulatedParticlesInitial.size() == simulatedParticlesFinal.size()) &&
+        "Inconsistent final sizes of the simulated particle containers");
+
+    // the overall function call succeeded, i.e. no fatal errors occurred.
     // yet, there might have been some particle for which the propagation
     // failed. thus, the successful result contains a list of failed particles.
     // sounds a bit weird, but that is the way it is.
@@ -287,12 +285,13 @@ struct Simulation {
     // initial particle state was already pushed to the container before
     // store final particle state at the end of the simulation
     particlesFinal.push_back(result.particle);
+    std::copy(result.hits.begin(), result.hits.end(), std::back_inserter(hits));
+
     // move generated secondaries that should be simulated to the output
     std::copy_if(
         result.generatedParticles.begin(), result.generatedParticles.end(),
         std::back_inserter(particlesInitial),
         [this](const Particle &particle) { return selectParticle(particle); });
-    std::copy(result.hits.begin(), result.hits.end(), std::back_inserter(hits));
   }
 
   /// Renumber particle ids in the tail of the container.
diff --git a/Fatras/include/ActsFatras/Kernel/SimulationResult.hpp b/Fatras/include/ActsFatras/Kernel/SimulationResult.hpp
index 9ffbc04278d..2750e01b616 100644
--- a/Fatras/include/ActsFatras/Kernel/SimulationResult.hpp
+++ b/Fatras/include/ActsFatras/Kernel/SimulationResult.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2020-2021 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
diff --git a/Fatras/include/ActsFatras/Kernel/detail/SimulationActor.hpp b/Fatras/include/ActsFatras/Kernel/detail/SimulationActor.hpp
index ee8a5e3ba7a..acbaaaa713d 100644
--- a/Fatras/include/ActsFatras/Kernel/detail/SimulationActor.hpp
+++ b/Fatras/include/ActsFatras/Kernel/detail/SimulationActor.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2018-2021 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
@@ -41,24 +41,6 @@ template <typename generator_t, typename decay_t, typename interactions_t,
 struct SimulationActor {
   using result_type = SimulationResult;
 
-  /// Abort if the particle was killed during a previous interaction.
-  struct ParticleNotAlive {
-    // This references the SimulationActor to automatically access its result
-    // type.
-    using action_type = SimulationActor;
-
-    template <typename propagator_state_t, typename stepper_t,
-              typename navigator_t>
-    constexpr bool operator()(propagator_state_t & /*state*/,
-                              const stepper_t & /*stepper*/,
-                              const navigator_t & /*navigator*/,
-                              const result_type &result,
-                              const Acts::Logger & /*logger*/) const {
-      // must return true if the propagation should abort
-      return !result.isAlive;
-    }
-  };
-
   /// Random number generator used for the simulation.
   generator_t *generator = nullptr;
   /// Decay module.
@@ -84,25 +66,29 @@ struct SimulationActor {
   /// @param logger a logger instance
   template <typename propagator_state_t, typename stepper_t,
             typename navigator_t>
-  void operator()(propagator_state_t &state, stepper_t &stepper,
-                  navigator_t &navigator, result_type &result,
-                  const Acts::Logger &logger) const {
-    assert(generator && "The generator pointer must be valid");
+  void act(propagator_state_t &state, stepper_t &stepper,
+           navigator_t &navigator, result_type &result,
+           const Acts::Logger &logger) const {
+    assert(generator != nullptr && "The generator pointer must be valid");
 
-    // actors are called once more after the propagation terminated
-    if (!result.isAlive) {
+    if (state.stage == Acts::PropagatorStage::prePropagation) {
+      // first step is special: there is no previous state and we need to arm
+      // the decay simulation for all future steps.
+      result.particle =
+          makeParticle(initialParticle, state, stepper, navigator);
+      result.properTimeLimit =
+          decay.generateProperTimeLimit(*generator, initialParticle);
       return;
     }
 
-    if (Acts::EndOfWorldReached{}(state, stepper, navigator, logger)) {
-      result.isAlive = false;
+    // actors are called once more after the propagation terminated
+    if (!result.isAlive) {
       return;
     }
 
-    // check if we are still on the start surface and skip if so
-    if ((navigator.startSurface(state.navigation) != nullptr) &&
-        (navigator.startSurface(state.navigation) ==
-         navigator.currentSurface(state.navigation))) {
+    if (Acts::EndOfWorldReached{}.checkAbort(state, stepper, navigator,
+                                             logger)) {
+      result.isAlive = false;
       return;
     }
 
@@ -110,17 +96,7 @@ struct SimulationActor {
     // needs the particle state from the previous step for reference. that means
     // this must happen for every step (not just on surface) and before
     // everything, e.g. any interactions that could modify the state.
-    if (std::isnan(result.properTimeLimit)) {
-      // first step is special: there is no previous state and we need to arm
-      // the decay simulation for all future steps.
-      result.particle =
-          makeParticle(initialParticle, state, stepper, navigator);
-      result.properTimeLimit =
-          decay.generateProperTimeLimit(*generator, initialParticle);
-    } else {
-      result.particle =
-          makeParticle(result.particle, state, stepper, navigator);
-    }
+    result.particle = makeParticle(result.particle, state, stepper, navigator);
 
     // decay check. needs to happen at every step, not just on surfaces.
     if (std::isfinite(result.properTimeLimit) &&
@@ -183,7 +159,7 @@ struct SimulationActor {
         Acts::MaterialSlab slab =
             surface.surfaceMaterial()->materialSlab(local);
         // again: interact only if there is valid material to interact with
-        if (slab) {
+        if (slab.isValid()) {
           // adapt material for non-zero incidence
           auto normal = surface.normal(state.geoContext, before.position(),
                                        before.direction());
@@ -220,6 +196,15 @@ struct SimulationActor {
                    after.qOverP(), after.time());
   }
 
+  template <typename propagator_state_t, typename stepper_t,
+            typename navigator_t>
+  bool checkAbort(propagator_state_t & /*state*/, const stepper_t & /*stepper*/,
+                  const navigator_t & /*navigator*/, const result_type &result,
+                  const Acts::Logger & /*logger*/) const {
+    // must return true if the propagation should abort
+    return !result.isAlive;
+  }
+
   /// Construct the current particle state from the propagation state.
   template <typename propagator_state_t, typename stepper_t,
             typename navigator_t>
@@ -262,8 +247,8 @@ struct SimulationActor {
 
   /// Run the interaction simulation for the given material.
   ///
-  /// Simulate all continous processes and at most one point-like process within
-  /// the material.
+  /// Simulate all continuous processes and at most one point-like process
+  /// within the material.
   void interact(const Acts::MaterialSlab &slab, result_type &result) const {
     // run the continuous processes over a fraction of the material. returns
     // true on break condition (same as the underlying physics lists).
@@ -283,7 +268,7 @@ struct SimulationActor {
       // the SimulationActor is in charge of keeping track of the material.
       // since the accumulated material is stored in the particle it could (but
       // should not) be modified by a physics process. to avoid issues, the
-      // material is updated only after process simulation has occured. this
+      // material is updated only after process simulation has occurred. this
       // intentionally overwrites any material updates made by the process.
       result.particle.setMaterialPassed(x0, l0);
       return retval;
@@ -306,7 +291,7 @@ struct SimulationActor {
     //
     // fraction < 0:
     //   this is an error case where the point-like interaction should have
-    //   occured before reaching the material. not sure how this could happen,
+    //   occurred before reaching the material. not sure how this could happen,
     //   but in such a case the point-like interaction happens immediately.
     // 1 < fraction:
     //   the next point-like interaction does not occur within the current
diff --git a/Fatras/include/ActsFatras/Kernel/detail/SimulationError.hpp b/Fatras/include/ActsFatras/Kernel/detail/SimulationError.hpp
index 56b3c6bc515..9769441c65f 100644
--- a/Fatras/include/ActsFatras/Kernel/detail/SimulationError.hpp
+++ b/Fatras/include/ActsFatras/Kernel/detail/SimulationError.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2020-2021 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
diff --git a/Fatras/include/ActsFatras/Physics/Decay/NoDecay.hpp b/Fatras/include/ActsFatras/Physics/Decay/NoDecay.hpp
index 929d7b6f7ef..17aefd7341b 100644
--- a/Fatras/include/ActsFatras/Physics/Decay/NoDecay.hpp
+++ b/Fatras/include/ActsFatras/Physics/Decay/NoDecay.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2020-2021 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
diff --git a/Fatras/include/ActsFatras/Physics/ElectroMagnetic/BetheBloch.hpp b/Fatras/include/ActsFatras/Physics/ElectroMagnetic/BetheBloch.hpp
index 8316c09f762..72a8ff951da 100644
--- a/Fatras/include/ActsFatras/Physics/ElectroMagnetic/BetheBloch.hpp
+++ b/Fatras/include/ActsFatras/Physics/ElectroMagnetic/BetheBloch.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2018-2020 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
diff --git a/Fatras/include/ActsFatras/Physics/ElectroMagnetic/BetheHeitler.hpp b/Fatras/include/ActsFatras/Physics/ElectroMagnetic/BetheHeitler.hpp
index 7a336210c55..d0529837b7f 100644
--- a/Fatras/include/ActsFatras/Physics/ElectroMagnetic/BetheHeitler.hpp
+++ b/Fatras/include/ActsFatras/Physics/ElectroMagnetic/BetheHeitler.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2018-2021 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
@@ -14,6 +14,7 @@
 
 #include <array>
 #include <cmath>
+#include <numbers>
 #include <random>
 
 namespace ActsFatras {
@@ -58,8 +59,8 @@ struct BetheHeitler {
                                      const Acts::MaterialSlab &slab,
                                      Particle &particle) const {
     // Take a random gamma-distributed value - depending on t/X0
-    std::gamma_distribution<double> gDist(slab.thicknessInX0() / std::log(2.0),
-                                          1.0);
+    std::gamma_distribution<double> gDist(
+        slab.thicknessInX0() / std::numbers::ln2, 1.);
 
     const auto u = gDist(generator);
     const auto z = std::exp(-u);  // MARK: fpeMask(FLTUND, 1, #2346)
diff --git a/Fatras/include/ActsFatras/Physics/ElectroMagnetic/PhotonConversion.hpp b/Fatras/include/ActsFatras/Physics/ElectroMagnetic/PhotonConversion.hpp
index 6a01b08e19e..d54b17e7407 100644
--- a/Fatras/include/ActsFatras/Physics/ElectroMagnetic/PhotonConversion.hpp
+++ b/Fatras/include/ActsFatras/Physics/ElectroMagnetic/PhotonConversion.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2021 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
@@ -22,6 +22,7 @@
 #include <array>
 #include <cmath>
 #include <limits>
+#include <numbers>
 #include <random>
 #include <utility>
 #include <vector>
@@ -59,7 +60,7 @@ class PhotonConversion {
   /// @param [in, out] particle The interacting photon
   /// @param [out] generated List of generated particles
   ///
-  /// @return True if the conversion occured, else false
+  /// @return True if the conversion occurred, else false
   template <typename generator_t>
   bool run(generator_t& generator, Particle& particle,
            std::vector<Particle>& generated) const;
@@ -241,8 +242,8 @@ Particle::Vector3 PhotonConversion::generateChildDirection(
                : u * 1. / 3.;  // 9./(9.+27) = 0.25
 
   // draw the random orientation angle
-  const auto psi =
-      std::uniform_real_distribution<double>(-M_PI, M_PI)(generator);
+  const auto psi = std::uniform_real_distribution<double>(
+      -std::numbers::pi, std::numbers::pi)(generator);
 
   Acts::Vector3 direction = particle.direction();
   // construct the combined rotation to the scattered direction
diff --git a/Fatras/include/ActsFatras/Physics/ElectroMagnetic/Scattering.hpp b/Fatras/include/ActsFatras/Physics/ElectroMagnetic/Scattering.hpp
index db07ad29edb..054aacded9f 100644
--- a/Fatras/include/ActsFatras/Physics/ElectroMagnetic/Scattering.hpp
+++ b/Fatras/include/ActsFatras/Physics/ElectroMagnetic/Scattering.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2018-2021 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
@@ -17,6 +17,7 @@
 #include "ActsFatras/Physics/ElectroMagnetic/detail/Highland.hpp"
 
 #include <array>
+#include <numbers>
 #include <random>
 
 namespace ActsFatras {
@@ -52,8 +53,8 @@ struct GenericScattering {
     // drawn from the specific scattering model distribution.
 
     // draw the random orientation angle
-    const auto psi =
-        std::uniform_real_distribution<double>(-M_PI, M_PI)(generator);
+    const auto psi = std::uniform_real_distribution<double>(
+        -std::numbers::pi, std::numbers::pi)(generator);
     // draw the scattering angle
     const auto theta = angle(generator, slab, particle);
 
diff --git a/Fatras/include/ActsFatras/Physics/ElectroMagnetic/detail/GaussianMixture.hpp b/Fatras/include/ActsFatras/Physics/ElectroMagnetic/detail/GaussianMixture.hpp
index 70274e11c40..54c2afce19f 100644
--- a/Fatras/include/ActsFatras/Physics/ElectroMagnetic/detail/GaussianMixture.hpp
+++ b/Fatras/include/ActsFatras/Physics/ElectroMagnetic/detail/GaussianMixture.hpp
@@ -1,15 +1,16 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2018-2021 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
 #include "Acts/Material/Interactions.hpp"
 
+#include <numbers>
 #include <random>
 
 namespace ActsFatras::detail {
@@ -84,7 +85,7 @@ struct GaussianMixture {
       sigma2 *= (1. - (1. - epsilon) * sigma1square) / epsilon;
     }
     // return back to the
-    return M_SQRT2 * std::sqrt(sigma2) * gaussDist(generator);
+    return std::numbers::sqrt2 * std::sqrt(sigma2) * gaussDist(generator);
   }
 };
 
diff --git a/Fatras/include/ActsFatras/Physics/ElectroMagnetic/detail/GeneralMixture.hpp b/Fatras/include/ActsFatras/Physics/ElectroMagnetic/detail/GeneralMixture.hpp
index 200e84bc1f7..621aae2180a 100644
--- a/Fatras/include/ActsFatras/Physics/ElectroMagnetic/detail/GeneralMixture.hpp
+++ b/Fatras/include/ActsFatras/Physics/ElectroMagnetic/detail/GeneralMixture.hpp
@@ -1,16 +1,17 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2018-2021 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
 #include "Acts/Definitions/PdgParticle.hpp"
 #include "Acts/Material/Interactions.hpp"
 
+#include <numbers>
 #include <random>
 
 namespace ActsFatras::detail {
@@ -87,7 +88,7 @@ struct GeneralMixture {
       theta = std::normal_distribution<double>(0.0, theta0)(generator);
     }
     // scale from planar to 3d angle
-    return M_SQRT2 * theta;
+    return std::numbers::sqrt2 * theta;
   }
 
   // helper methods for getting parameters and simulating
diff --git a/Fatras/include/ActsFatras/Physics/ElectroMagnetic/detail/Highland.hpp b/Fatras/include/ActsFatras/Physics/ElectroMagnetic/detail/Highland.hpp
index 5ac710ed727..cee57f0248b 100644
--- a/Fatras/include/ActsFatras/Physics/ElectroMagnetic/detail/Highland.hpp
+++ b/Fatras/include/ActsFatras/Physics/ElectroMagnetic/detail/Highland.hpp
@@ -1,15 +1,16 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2018-2021 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
 #include "Acts/Material/Interactions.hpp"
 
+#include <numbers>
 #include <random>
 
 namespace ActsFatras::detail {
@@ -35,7 +36,8 @@ struct Highland {
         slab, particle.absolutePdg(), particle.mass(), particle.qOverP(),
         particle.absoluteCharge());
     // draw from the normal distribution representing the 3d angle distribution
-    return std::normal_distribution<double>(0.0, M_SQRT2 * theta0)(generator);
+    return std::normal_distribution<double>(
+        0., std::numbers::sqrt2 * theta0)(generator);
   }
 };
 
diff --git a/Fatras/include/ActsFatras/Physics/NuclearInteraction/NuclearInteraction.hpp b/Fatras/include/ActsFatras/Physics/NuclearInteraction/NuclearInteraction.hpp
index a408b1ff97f..89072e78536 100644
--- a/Fatras/include/ActsFatras/Physics/NuclearInteraction/NuclearInteraction.hpp
+++ b/Fatras/include/ActsFatras/Physics/NuclearInteraction/NuclearInteraction.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2020-2021 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
@@ -23,6 +23,7 @@
 #include <cmath>
 #include <iterator>
 #include <limits>
+#include <numbers>
 #include <optional>
 #include <random>
 #include <utility>
@@ -41,7 +42,7 @@ struct NuclearInteraction {
   /// The storage of the parameterisation
   detail::MultiParticleNuclearInteractionParametrisation
       multiParticleParameterisation;
-  /// The number of trials to match momenta and inveriant masses
+  /// The number of trials to match momenta and invariant masses
   //~ unsigned int nMatchingTrials = std::numeric_limits<unsigned int>::max();
   unsigned int nMatchingTrials = 100;
   unsigned int nMatchingTrialsTotal = 1000;
@@ -56,7 +57,7 @@ struct NuclearInteraction {
   template <typename generator_t>
   std::pair<Scalar, Scalar> generatePathLimits(generator_t& generator,
                                                const Particle& particle) const {
-    // Fast exit: No paramtrization provided
+    // Fast exit: No parameterisation provided
     if (multiParticleParameterisation.empty()) {
       return std::make_pair(std::numeric_limits<Scalar>::infinity(),
                             std::numeric_limits<Scalar>::infinity());
@@ -416,7 +417,7 @@ Acts::ActsDynamicVector NuclearInteraction::sampleInvariantMasses(
   for (unsigned int i = 0; i < size; i++) {
     float variance = parametrisation.eigenvaluesInvariantMass[i];
     std::normal_distribution<Acts::ActsScalar> dist{
-        parametrisation.meanInvariantMass[i], sqrtf(variance)};
+        parametrisation.meanInvariantMass[i], std::sqrt(variance)};
     parameters[i] = dist(generator);
   }
   // Transform to multivariate normal distribution
@@ -446,7 +447,7 @@ Acts::ActsDynamicVector NuclearInteraction::sampleMomenta(
   for (unsigned int i = 0; i < size; i++) {
     float variance = parametrisation.eigenvaluesMomentum[i];
     std::normal_distribution<Acts::ActsScalar> dist{
-        parametrisation.meanMomentum[i], sqrtf(variance)};
+        parametrisation.meanMomentum[i], std::sqrt(variance)};
     parameters[i] = dist(generator);
   }
 
@@ -517,9 +518,9 @@ std::vector<Particle> NuclearInteraction::convertParametersToParticles(
     const float p1p2 = 2. * momentum * parametrizedMomentum;
     const float costheta = 1. - invariantMass * invariantMass / p1p2;
 
-    const auto phiTheta =
-        globalAngle(phi, theta, uniformDistribution(generator) * 2. * M_PI,
-                    std::acos(costheta));
+    const auto phiTheta = globalAngle(
+        phi, theta, uniformDistribution(generator) * 2. * std::numbers::pi,
+        std::acos(costheta));
     const auto direction =
         Acts::makeDirectionFromPhiTheta(phiTheta.first, phiTheta.second);
 
diff --git a/Fatras/include/ActsFatras/Physics/NuclearInteraction/NuclearInteractionParameters.hpp b/Fatras/include/ActsFatras/Physics/NuclearInteraction/NuclearInteractionParameters.hpp
index 981cab16741..617acd5ba94 100644
--- a/Fatras/include/ActsFatras/Physics/NuclearInteraction/NuclearInteractionParameters.hpp
+++ b/Fatras/include/ActsFatras/Physics/NuclearInteraction/NuclearInteractionParameters.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2021 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
diff --git a/Fatras/include/ActsFatras/Physics/StandardInteractions.hpp b/Fatras/include/ActsFatras/Physics/StandardInteractions.hpp
index 4d7708bf6f5..4bb655224b5 100644
--- a/Fatras/include/ActsFatras/Physics/StandardInteractions.hpp
+++ b/Fatras/include/ActsFatras/Physics/StandardInteractions.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2020-2021 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
diff --git a/Fatras/include/ActsFatras/Selectors/KinematicCasts.hpp b/Fatras/include/ActsFatras/Selectors/KinematicCasts.hpp
index 56305f3ca2e..f3fa45b124c 100644
--- a/Fatras/include/ActsFatras/Selectors/KinematicCasts.hpp
+++ b/Fatras/include/ActsFatras/Selectors/KinematicCasts.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2018-2020 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
diff --git a/Fatras/include/ActsFatras/Selectors/ParticleSelectors.hpp b/Fatras/include/ActsFatras/Selectors/ParticleSelectors.hpp
index 25deaa431bc..4deb110969e 100644
--- a/Fatras/include/ActsFatras/Selectors/ParticleSelectors.hpp
+++ b/Fatras/include/ActsFatras/Selectors/ParticleSelectors.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2018-2021 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
diff --git a/Fatras/include/ActsFatras/Selectors/SelectorHelpers.hpp b/Fatras/include/ActsFatras/Selectors/SelectorHelpers.hpp
index c5d6816b8cc..b9ff1e5a00f 100644
--- a/Fatras/include/ActsFatras/Selectors/SelectorHelpers.hpp
+++ b/Fatras/include/ActsFatras/Selectors/SelectorHelpers.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2018-2020 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
@@ -53,12 +53,12 @@ struct Range {
   }
 };
 
-/// Select objects that fullfil all selectors.
+/// Select objects that fulfill all selectors.
 template <typename... selectors_t>
 using CombineAnd =
     detail::CombineSelectors<true, std::logical_and<bool>, selectors_t...>;
 
-/// Select objects that fullfil at least one selector.
+/// Select objects that fulfill at least one selector.
 template <typename... selectors_t>
 using CombineOr =
     detail::CombineSelectors<false, std::logical_or<bool>, selectors_t...>;
diff --git a/Fatras/include/ActsFatras/Selectors/SurfaceSelectors.hpp b/Fatras/include/ActsFatras/Selectors/SurfaceSelectors.hpp
index 9755d472c0c..1c138f80892 100644
--- a/Fatras/include/ActsFatras/Selectors/SurfaceSelectors.hpp
+++ b/Fatras/include/ActsFatras/Selectors/SurfaceSelectors.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2020 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
diff --git a/Fatras/include/ActsFatras/Selectors/detail/combine_selectors.hpp b/Fatras/include/ActsFatras/Selectors/detail/combine_selectors.hpp
index 23a95492c62..0ce31ba7989 100644
--- a/Fatras/include/ActsFatras/Selectors/detail/combine_selectors.hpp
+++ b/Fatras/include/ActsFatras/Selectors/detail/combine_selectors.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2020 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
diff --git a/Fatras/include/ActsFatras/Utilities/LandauDistribution.hpp b/Fatras/include/ActsFatras/Utilities/LandauDistribution.hpp
index 1baa37e1625..2b29bd89066 100644
--- a/Fatras/include/ActsFatras/Utilities/LandauDistribution.hpp
+++ b/Fatras/include/ActsFatras/Utilities/LandauDistribution.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2018-2020 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
@@ -33,7 +33,7 @@ class LandauDistribution {
     /// Construct from parameters.
     param_type(double location_, double scale_)
         : location(location_), scale(scale_) {}
-    // Explicitlely defaulted construction and assignment
+    // Explicitly defaulted construction and assignment
     param_type() = default;
     param_type(const param_type &) = default;
     param_type(param_type &&) = default;
@@ -44,9 +44,6 @@ class LandauDistribution {
     friend bool operator==(const param_type &lhs, const param_type &rhs) {
       return (lhs.location == rhs.location) && (lhs.scale == rhs.scale);
     }
-    friend bool operator!=(const param_type &lhs, const param_type &rhs) {
-      return !(lhs == rhs);
-    }
   };
   /// The type of the generated values.
   using result_type = double;
@@ -54,7 +51,7 @@ class LandauDistribution {
   /// Construct directly from the distribution parameters.
   LandauDistribution(double location, double scale) : m_cfg(location, scale) {}
   /// Construct from a parameter object.
-  LandauDistribution(const param_type &cfg) : m_cfg(cfg) {}
+  explicit LandauDistribution(const param_type &cfg) : m_cfg(cfg) {}
   // Explicitlely defaulted construction and assignment
   LandauDistribution() = default;
   LandauDistribution(const LandauDistribution &) = default;
@@ -91,10 +88,6 @@ class LandauDistribution {
                          const LandauDistribution &rhs) {
     return lhs.m_cfg == rhs.m_cfg;
   }
-  friend bool operator!=(const LandauDistribution &lhs,
-                         const LandauDistribution &rhs) {
-    return !(lhs == rhs);
-  }
 
  private:
   param_type m_cfg;
diff --git a/Fatras/scripts/generate_particle_data_table.py b/Fatras/scripts/generate_particle_data_table.py
index c05123b3bb0..ebbbab2720b 100755
--- a/Fatras/scripts/generate_particle_data_table.py
+++ b/Fatras/scripts/generate_particle_data_table.py
@@ -25,13 +25,13 @@ def main(output_file):
 
 
 CODE_HEADER = """\
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2024 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 // The entries within this file have been automatically created using the
 // particle data files from the 2019 edition of the Review of Particle Physics
diff --git a/Fatras/src/Digitization/DigitizationError.cpp b/Fatras/src/Digitization/DigitizationError.cpp
index 07a149bbca9..34978ff3d57 100644
--- a/Fatras/src/Digitization/DigitizationError.cpp
+++ b/Fatras/src/Digitization/DigitizationError.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2020 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include "ActsFatras/Digitization/DigitizationError.hpp"
 
@@ -26,7 +26,7 @@ class DigitizationErrorCategory : public std::error_category {
       case DigitizationError::SmearingOutOfRange:
         return "Smeared out of surface bounds.";
       case DigitizationError::SmearingError:
-        return "Smearing error occured.";
+        return "Smearing error occurred.";
       case DigitizationError::UndefinedSurface:
         return "Surface undefined for this operation.";
       case DigitizationError::MaskingError:
diff --git a/Fatras/src/Digitization/PlanarSurfaceDrift.cpp b/Fatras/src/Digitization/PlanarSurfaceDrift.cpp
index 9d62e2dd7f3..006444f3fee 100644
--- a/Fatras/src/Digitization/PlanarSurfaceDrift.cpp
+++ b/Fatras/src/Digitization/PlanarSurfaceDrift.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2021 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include "ActsFatras/Digitization/PlanarSurfaceDrift.hpp"
 
@@ -25,7 +25,7 @@ ActsFatras::PlanarSurfaceDrift::toReadout(const Acts::GeometryContext& gctx,
   Acts::Vector3 seg3Local = invTransform.linear() * dir;
   // Scale unit direction to the actual segment in the (depletion/drift) zone
   seg3Local *= thickness / std::cos(Acts::VectorHelpers::theta(seg3Local));
-  // Calulate local entry/exit before drift
+  // Calculate local entry/exit before drift
   Acts::Vector2 entry = pos2Local - 0.5 * seg3Local.segment<2>(0);
   Acts::Vector2 exit = pos2Local + 0.5 * seg3Local.segment<2>(0);
   // Actually apply a drift
diff --git a/Fatras/src/Digitization/PlanarSurfaceMask.cpp b/Fatras/src/Digitization/PlanarSurfaceMask.cpp
index f660082bfad..1b73ff409e6 100644
--- a/Fatras/src/Digitization/PlanarSurfaceMask.cpp
+++ b/Fatras/src/Digitization/PlanarSurfaceMask.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2020 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include "ActsFatras/Digitization/PlanarSurfaceMask.hpp"
 
@@ -25,6 +25,7 @@
 #include <cmath>
 #include <cstddef>
 #include <memory>
+#include <numbers>
 
 namespace {
 
@@ -58,8 +59,7 @@ void checkIntersection(std::vector<Acts::Intersection2D>& intersections,
 Acts::Result<ActsFatras::PlanarSurfaceMask::Segment2D> maskAndReturn(
     std::vector<Acts::Intersection2D>& intersections,
     const ActsFatras::PlanarSurfaceMask::Segment2D& segment, bool firstInside) {
-  std::sort(intersections.begin(), intersections.end(),
-            Acts::Intersection2D::pathLengthOrder);
+  std::ranges::sort(intersections, Acts::Intersection2D::pathLengthOrder);
   if (intersections.size() >= 2) {
     return ActsFatras::PlanarSurfaceMask::Segment2D{
         intersections[0].position(), intersections[1].position()};
@@ -218,7 +218,7 @@ ActsFatras::PlanarSurfaceMask::radialMask(const Acts::RadialBounds& rBounds,
   };
 
   // Intersect phi lines
-  if ((M_PI - hPhi) > Acts::s_epsilon) {
+  if ((std::numbers::pi - hPhi) > Acts::s_epsilon) {
     if (sPhi < phii[0] || ePhi < phii[0]) {
       intersectPhiLine(phii[0]);
     }
diff --git a/Fatras/src/Digitization/Segmentizer.cpp b/Fatras/src/Digitization/Segmentizer.cpp
index 9c2bb72c972..27dfb903efc 100644
--- a/Fatras/src/Digitization/Segmentizer.cpp
+++ b/Fatras/src/Digitization/Segmentizer.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2020 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include "ActsFatras/Digitization/Segmentizer.hpp"
 
@@ -140,7 +140,7 @@ ActsFatras::Segmentizer::segments(const Acts::GeometryContext& geoCtx,
   // Register the last step if successful
   if (!cSteps.empty()) {
     cSteps.push_back(ChannelStep({0, 0}, end, start));
-    std::sort(cSteps.begin(), cSteps.end());
+    std::ranges::sort(cSteps, std::less<ChannelStep>{});
   }
 
   std::vector<ChannelSegment> cSegments;
diff --git a/Fatras/src/EventData/Particle.cpp b/Fatras/src/EventData/Particle.cpp
index c19f9b88433..17cf41d8efe 100644
--- a/Fatras/src/EventData/Particle.cpp
+++ b/Fatras/src/EventData/Particle.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2020 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include "ActsFatras/EventData/Particle.hpp"
 
diff --git a/Fatras/src/EventData/ParticleOutcome.cpp b/Fatras/src/EventData/ParticleOutcome.cpp
index 4c5fa59ad1d..83ebdc4a62a 100644
--- a/Fatras/src/EventData/ParticleOutcome.cpp
+++ b/Fatras/src/EventData/ParticleOutcome.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2024 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include "ActsFatras/EventData/ParticleOutcome.hpp"
 
diff --git a/Fatras/src/EventData/ProcessType.cpp b/Fatras/src/EventData/ProcessType.cpp
index 7f1bc026c87..1e93465241e 100644
--- a/Fatras/src/EventData/ProcessType.cpp
+++ b/Fatras/src/EventData/ProcessType.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2020 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include "ActsFatras/EventData/ProcessType.hpp"
 
diff --git a/Fatras/src/Kernel/SimulationError.cpp b/Fatras/src/Kernel/SimulationError.cpp
index 7c86bcc7890..9f08cd8946c 100644
--- a/Fatras/src/Kernel/SimulationError.cpp
+++ b/Fatras/src/Kernel/SimulationError.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2020-2021 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include "ActsFatras/Kernel/detail/SimulationError.hpp"
 
diff --git a/Fatras/src/Physics/BetheHeitler.cpp b/Fatras/src/Physics/BetheHeitler.cpp
index 9ef32c94e3f..af8cbd2711f 100644
--- a/Fatras/src/Physics/BetheHeitler.cpp
+++ b/Fatras/src/Physics/BetheHeitler.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2021 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include "ActsFatras/Physics/ElectroMagnetic/BetheHeitler.hpp"
 
@@ -16,6 +16,7 @@
 
 #include <algorithm>
 #include <cmath>
+#include <numbers>
 #include <utility>
 
 ActsFatras::Particle ActsFatras::BetheHeitler::bremPhoton(
@@ -30,7 +31,7 @@ ActsFatras::Particle ActsFatras::BetheHeitler::bremPhoton(
   // later
   //      the azimutal angle
 
-  Scalar psi = 2. * M_PI * rndPsi;
+  Scalar psi = 2. * std::numbers::pi * rndPsi;
 
   // the start of the equation
   Scalar theta = 0.;
diff --git a/Fatras/src/Physics/NuclearInteraction/NuclearInteraction.cpp b/Fatras/src/Physics/NuclearInteraction/NuclearInteraction.cpp
index de9446a046e..1515fc3c626 100644
--- a/Fatras/src/Physics/NuclearInteraction/NuclearInteraction.cpp
+++ b/Fatras/src/Physics/NuclearInteraction/NuclearInteraction.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2021 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include "ActsFatras/Physics/NuclearInteraction/NuclearInteraction.hpp"
 
diff --git a/Fatras/src/Physics/PhotonConversion.cpp b/Fatras/src/Physics/PhotonConversion.cpp
index f4cac0e5e9d..73bb83ad413 100644
--- a/Fatras/src/Physics/PhotonConversion.cpp
+++ b/Fatras/src/Physics/PhotonConversion.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2021 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include "ActsFatras/Physics/ElectroMagnetic/PhotonConversion.hpp"
 
diff --git a/Fatras/src/Physics/StandardInteractions.cpp b/Fatras/src/Physics/StandardInteractions.cpp
index 886e7bc5396..b2c7fbfec71 100644
--- a/Fatras/src/Physics/StandardInteractions.cpp
+++ b/Fatras/src/Physics/StandardInteractions.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2020-2021 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include "ActsFatras/Physics/StandardInteractions.hpp"
 
diff --git a/Fatras/src/Utilities/LandauDistribution.cpp b/Fatras/src/Utilities/LandauDistribution.cpp
index d22c53082bf..fa85d7e593a 100644
--- a/Fatras/src/Utilities/LandauDistribution.cpp
+++ b/Fatras/src/Utilities/LandauDistribution.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2018 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include "ActsFatras/Utilities/LandauDistribution.hpp"
 
diff --git a/LICENSE b/LICENSE
index a612ad9813b..d0a1fa1482e 100644
--- a/LICENSE
+++ b/LICENSE
@@ -357,7 +357,7 @@ Exhibit A - Source Code Form License Notice
 
   This Source Code Form is subject to the terms of the Mozilla Public
   License, v. 2.0. If a copy of the MPL was not distributed with this
-  file, You can obtain one at http://mozilla.org/MPL/2.0/.
+  file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 If it is not possible or desirable to put the notice in a particular
 file, then You may include the notice in a location (such as a LICENSE
diff --git a/Plugins/ActSVG/include/Acts/Plugins/ActSVG/DetectorSvgConverter.hpp b/Plugins/ActSVG/include/Acts/Plugins/ActSVG/DetectorSvgConverter.hpp
index c7c681ed6ce..3be5b384602 100644
--- a/Plugins/ActSVG/include/Acts/Plugins/ActSVG/DetectorSvgConverter.hpp
+++ b/Plugins/ActSVG/include/Acts/Plugins/ActSVG/DetectorSvgConverter.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2023 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
diff --git a/Plugins/ActSVG/include/Acts/Plugins/ActSVG/DetectorVolumeSvgConverter.hpp b/Plugins/ActSVG/include/Acts/Plugins/ActSVG/DetectorVolumeSvgConverter.hpp
index f79a15d3776..f27db472439 100644
--- a/Plugins/ActSVG/include/Acts/Plugins/ActSVG/DetectorVolumeSvgConverter.hpp
+++ b/Plugins/ActSVG/include/Acts/Plugins/ActSVG/DetectorVolumeSvgConverter.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2023 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
@@ -41,6 +41,8 @@ struct Options {
   PortalConverter::Options portalOptions;
   /// The Surface converter options
   SurfaceConverter::Options surfaceOptions;
+  /// The Grid converter options
+  IndexedSurfacesConverter::Options indexedSurfacesOptions;
 };
 
 /// Write/create the detector volume
diff --git a/Plugins/ActSVG/include/Acts/Plugins/ActSVG/EventDataSvgConverter.hpp b/Plugins/ActSVG/include/Acts/Plugins/ActSVG/EventDataSvgConverter.hpp
index e162db5dce4..c05539d6dd4 100644
--- a/Plugins/ActSVG/include/Acts/Plugins/ActSVG/EventDataSvgConverter.hpp
+++ b/Plugins/ActSVG/include/Acts/Plugins/ActSVG/EventDataSvgConverter.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2022 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
@@ -13,11 +13,7 @@
 #include "Acts/Utilities/Logger.hpp"
 #include <actsvg/core.hpp>
 
-namespace Acts {
-
-namespace Svg {
-
-namespace EventDataConverter {
+namespace Acts::Svg::EventDataConverter {
 
 /// Write/create a 3D point in XY view
 ///
@@ -62,8 +58,4 @@ actsvg::svg::object point(const Vector3& pos, ActsScalar size,
   return circle;
 }
 
-}  // namespace EventDataConverter
-
-}  // namespace Svg
-
-}  // namespace Acts
+}  // namespace Acts::Svg::EventDataConverter
diff --git a/Plugins/ActSVG/include/Acts/Plugins/ActSVG/GridSvgConverter.hpp b/Plugins/ActSVG/include/Acts/Plugins/ActSVG/GridSvgConverter.hpp
index 96076d50377..909fc44a356 100644
--- a/Plugins/ActSVG/include/Acts/Plugins/ActSVG/GridSvgConverter.hpp
+++ b/Plugins/ActSVG/include/Acts/Plugins/ActSVG/GridSvgConverter.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2023 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
diff --git a/Plugins/ActSVG/include/Acts/Plugins/ActSVG/IndexedSurfacesSvgConverter.hpp b/Plugins/ActSVG/include/Acts/Plugins/ActSVG/IndexedSurfacesSvgConverter.hpp
index 1f788a11b5e..788ac36aca5 100644
--- a/Plugins/ActSVG/include/Acts/Plugins/ActSVG/IndexedSurfacesSvgConverter.hpp
+++ b/Plugins/ActSVG/include/Acts/Plugins/ActSVG/IndexedSurfacesSvgConverter.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2023 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
@@ -27,9 +27,7 @@
 #include <tuple>
 #include <vector>
 
-namespace Acts {
-
-namespace Svg {
+namespace Acts::Svg {
 
 using ProtoSurface = actsvg::proto::surface<std::vector<Vector3>>;
 using ProtoGrid = actsvg::proto::grid;
@@ -172,7 +170,7 @@ ProtoIndexedSurfaceGrid convertImpl(const GeometryContext& gctx,
       }
     }
   }
-  return std::tie(pSurfaces, pGrid, highlightIndices);
+  return {pSurfaces, pGrid, highlightIndices};
 }
 
 /// @brief Convert the single delegate if it is of the type of the reference
@@ -304,7 +302,7 @@ static inline actsvg::svg::object xy(const ProtoIndexedSurfaceGrid& pIndexGrid,
     for (const auto [is, sis] : enumerate(pIndices[ig])) {
       const auto& ps = pSurfaces[sis];
       std::string oInfo = std::string("- object: ") + std::to_string(sis);
-      if (ps._aux_info.find("center") != ps._aux_info.end()) {
+      if (ps._aux_info.contains("center")) {
         for (const auto& ci : ps._aux_info.at("center")) {
           oInfo += ci;
         }
@@ -340,5 +338,4 @@ static inline actsvg::svg::object zphi(
 }
 
 }  // namespace View
-}  // namespace Svg
-}  // namespace Acts
+}  // namespace Acts::Svg
diff --git a/Plugins/ActSVG/include/Acts/Plugins/ActSVG/LayerSvgConverter.hpp b/Plugins/ActSVG/include/Acts/Plugins/ActSVG/LayerSvgConverter.hpp
index 8c62796ef6b..079f5ae7aec 100644
--- a/Plugins/ActSVG/include/Acts/Plugins/ActSVG/LayerSvgConverter.hpp
+++ b/Plugins/ActSVG/include/Acts/Plugins/ActSVG/LayerSvgConverter.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2022 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
@@ -14,6 +14,8 @@
 #include <actsvg/core.hpp>
 #include <actsvg/meta.hpp>
 
+#include <numbers>
+
 namespace Acts {
 
 class Layer;
@@ -26,7 +28,9 @@ static std::array<ActsScalar, 2> noLimitZ = {
     std::numeric_limits<Acts::ActsScalar>::lowest(),
     std::numeric_limits<Acts::ActsScalar>::max()};
 
-static std::array<ActsScalar, 2> noLimitPhi = {-M_PI, M_PI};
+static std::array<ActsScalar, 2> noLimitPhi = {
+    -std::numbers::pi_v<Acts::ActsScalar>,
+    std::numbers::pi_v<Acts::ActsScalar>};
 
 namespace LayerConverter {
 
diff --git a/Plugins/ActSVG/include/Acts/Plugins/ActSVG/PortalSvgConverter.hpp b/Plugins/ActSVG/include/Acts/Plugins/ActSVG/PortalSvgConverter.hpp
index dc83f0c54bc..658e29667ba 100644
--- a/Plugins/ActSVG/include/Acts/Plugins/ActSVG/PortalSvgConverter.hpp
+++ b/Plugins/ActSVG/include/Acts/Plugins/ActSVG/PortalSvgConverter.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2023 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
diff --git a/Plugins/ActSVG/include/Acts/Plugins/ActSVG/SurfaceArraySvgConverter.hpp b/Plugins/ActSVG/include/Acts/Plugins/ActSVG/SurfaceArraySvgConverter.hpp
index 181cd3c5b96..1335a197599 100644
--- a/Plugins/ActSVG/include/Acts/Plugins/ActSVG/SurfaceArraySvgConverter.hpp
+++ b/Plugins/ActSVG/include/Acts/Plugins/ActSVG/SurfaceArraySvgConverter.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2022 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
diff --git a/Plugins/ActSVG/include/Acts/Plugins/ActSVG/SurfaceSvgConverter.hpp b/Plugins/ActSVG/include/Acts/Plugins/ActSVG/SurfaceSvgConverter.hpp
index 7349a0086ab..54043a65de1 100644
--- a/Plugins/ActSVG/include/Acts/Plugins/ActSVG/SurfaceSvgConverter.hpp
+++ b/Plugins/ActSVG/include/Acts/Plugins/ActSVG/SurfaceSvgConverter.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2022 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
@@ -55,7 +55,7 @@ namespace View {
 static inline actsvg::svg::object xy(const ProtoSurface& pSurface,
                                      const std::string& identification) {
   actsvg::views::x_y xyView;
-  return actsvg::display::surface(identification, pSurface, xyView, true);
+  return actsvg::display::surface(identification, pSurface, xyView);
 }
 
 /// Convert into an acts::svg::object with an z-r view
@@ -67,7 +67,7 @@ static inline actsvg::svg::object xy(const ProtoSurface& pSurface,
 static inline actsvg::svg::object zr(const ProtoSurface& pSurface,
                                      const std::string& identification) {
   actsvg::views::z_r zrView;
-  return actsvg::display::surface(identification, pSurface, zrView, true);
+  return actsvg::display::surface(identification, pSurface, zrView);
 }
 
 /// Convert into an acts::svg::object with an z-phi view
@@ -79,7 +79,7 @@ static inline actsvg::svg::object zr(const ProtoSurface& pSurface,
 static inline actsvg::svg::object zphi(const ProtoSurface& pSurface,
                                        const std::string& identification) {
   actsvg::views::z_phi zphiView;
-  return actsvg::display::surface(identification, pSurface, zphiView, true);
+  return actsvg::display::surface(identification, pSurface, zphiView);
 }
 
 /// Convert into an acts::svg::object with an z-rphi view
@@ -94,7 +94,7 @@ static inline actsvg::svg::object zrphi(const ProtoSurface& pSurface,
                                         const std::string& identification) {
   actsvg::views::z_rphi zrphiView;
   zrphiView._fixed_r = pSurface._radii[0u];
-  return actsvg::display::surface(identification, pSurface, zrphiView, true);
+  return actsvg::display::surface(identification, pSurface, zrphiView);
 }
 
 }  // namespace View
diff --git a/Plugins/ActSVG/include/Acts/Plugins/ActSVG/SvgUtils.hpp b/Plugins/ActSVG/include/Acts/Plugins/ActSVG/SvgUtils.hpp
index 8a4b5cb89a0..d2326694b5d 100644
--- a/Plugins/ActSVG/include/Acts/Plugins/ActSVG/SvgUtils.hpp
+++ b/Plugins/ActSVG/include/Acts/Plugins/ActSVG/SvgUtils.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2022 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
@@ -17,9 +17,9 @@
 #include <tuple>
 #include <vector>
 
-namespace Acts {
-namespace Svg {
+namespace Acts::Svg {
 
+/// @brief Style struct
 struct Style {
   // Fill parameters
   std::array<int, 3> fillColor = {255, 255, 255};
@@ -38,8 +38,10 @@ struct Style {
   std::vector<int> strokeDasharray = {};
 
   unsigned int fontSize = 14u;
+  std::array<int, 3> fontColor = {0};
 
-  unsigned int nSegments = 72u;
+  /// Number of segments to approximate a quarter of a circle
+  unsigned int quarterSegments = 72u;
 
   /// Conversion to fill and stroke object from the base library
   /// @return a tuple of actsvg digestable objects
@@ -57,7 +59,20 @@ struct Style {
     str._hl_width = highlightStrokeWidth;
     str._dasharray = strokeDasharray;
 
-    return std::tie(fll, str);
+    return {fll, str};
+  }
+
+  /// Conversion to fill, stroke and font
+  /// @return a tuple of actsvg digestable objects
+  std::tuple<actsvg::style::fill, actsvg::style::stroke, actsvg::style::font>
+  fillStrokeFont() const {
+    auto [fll, str] = fillAndStroke();
+
+    actsvg::style::font fnt;
+    fnt._size = fontSize;
+    fnt._fc._rgb = fontColor;
+
+    return std::tie(fll, str, fnt);
   }
 };
 
@@ -132,31 +147,27 @@ inline static actsvg::svg::object axesXY(ActsScalar xMin, ActsScalar xMax,
 /// @param xPos the minimum x value
 /// @param yPos the maximum x value
 /// @param title the title of the info box
+/// @param titleStyle the title of the info box
 /// @param info the text of the info box
-/// @param infoBoxStyle the style of the info box
+/// @param infoStyle the style of the info box (body)
 /// @param object the connected object
 ///
 /// @return an svg object
-inline static actsvg::svg::object infoBox(ActsScalar xPos, ActsScalar yPos,
-                                          const std::string& title,
-                                          const std::vector<std::string>& info,
-                                          const Style& infoBoxStyle,
-                                          const actsvg::svg::object& object) {
-  auto [fill, stroke] = infoBoxStyle.fillAndStroke();
-
-  actsvg::style::font titleFont;
-  titleFont._fc = actsvg::style::color{{255, 255, 255}};
-  titleFont._size = infoBoxStyle.fontSize;
-
-  actsvg::style::fill infoFill = fill;
-  infoFill._fc._opacity = 0.4;
-  actsvg::style::font infoFont;
-  infoFont._size = infoBoxStyle.fontSize;
+inline static actsvg::svg::object infoBox(
+    ActsScalar xPos, ActsScalar yPos, const std::string& title,
+    const Style& titleStyle, const std::vector<std::string>& info,
+    const Style& infoStyle, actsvg::svg::object& object,
+    const std::vector<std::string>& highlights = {"mouseover", "mouseout"}) {
+  auto [titleFill, titleStroke, titleFont] = titleStyle.fillStrokeFont();
+  auto [infoFill, infoStroke, infoFont] = infoStyle.fillStrokeFont();
+
+  actsvg::style::stroke stroke;
 
   return actsvg::draw::connected_info_box(
       object._id + "_infoBox",
       {static_cast<actsvg::scalar>(xPos), static_cast<actsvg::scalar>(yPos)},
-      title, fill, titleFont, info, infoFill, infoFont, stroke, object);
+      title, titleFill, titleFont, info, infoFill, infoFont, stroke, object,
+      highlights);
 }
 
 /// Helper method to write to file
@@ -178,5 +189,4 @@ inline static void toFile(const std::vector<actsvg::svg::object>& objects,
   fout.close();
 }
 
-}  // namespace Svg
-}  // namespace Acts
+}  // namespace Acts::Svg
diff --git a/Plugins/ActSVG/include/Acts/Plugins/ActSVG/TrackingGeometrySvgConverter.hpp b/Plugins/ActSVG/include/Acts/Plugins/ActSVG/TrackingGeometrySvgConverter.hpp
index 3b934bef4e9..2baa9728c9d 100644
--- a/Plugins/ActSVG/include/Acts/Plugins/ActSVG/TrackingGeometrySvgConverter.hpp
+++ b/Plugins/ActSVG/include/Acts/Plugins/ActSVG/TrackingGeometrySvgConverter.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2022 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
diff --git a/Plugins/ActSVG/src/DetectorSvgConverter.cpp b/Plugins/ActSVG/src/DetectorSvgConverter.cpp
index c9ff7dff516..6607a9ddb08 100644
--- a/Plugins/ActSVG/src/DetectorSvgConverter.cpp
+++ b/Plugins/ActSVG/src/DetectorSvgConverter.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2023 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include "Acts/Plugins/ActSVG/DetectorSvgConverter.hpp"
 
diff --git a/Plugins/ActSVG/src/DetectorVolumeSvgConverter.cpp b/Plugins/ActSVG/src/DetectorVolumeSvgConverter.cpp
index db949a2c256..93527488538 100644
--- a/Plugins/ActSVG/src/DetectorVolumeSvgConverter.cpp
+++ b/Plugins/ActSVG/src/DetectorVolumeSvgConverter.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2023 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include "Acts/Plugins/ActSVG/DetectorVolumeSvgConverter.hpp"
 
@@ -68,7 +68,8 @@ Acts::Svg::DetectorVolumeConverter::convert(
   // Make dedicated surface grid sheets
   const auto& internalNavigationDelegate = dVolume.internalNavigation();
 
-  IndexedSurfacesConverter::Options isOptions;
+  IndexedSurfacesConverter::Options isOptions =
+      volumeOptions.indexedSurfacesOptions;
   // Use or transfer the surface style
   if (isOptions.surfaceStyles.empty()) {
     std::pair<Acts::GeometryIdentifier, Acts::Svg::Style> style{
diff --git a/Plugins/ActSVG/src/EventDataSvgConverter.cpp b/Plugins/ActSVG/src/EventDataSvgConverter.cpp
index 6c98bf958c1..cf6de982922 100644
--- a/Plugins/ActSVG/src/EventDataSvgConverter.cpp
+++ b/Plugins/ActSVG/src/EventDataSvgConverter.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2022 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include "Acts/Plugins/ActSVG/EventDataSvgConverter.hpp"
 
diff --git a/Plugins/ActSVG/src/LayerSvgConverter.cpp b/Plugins/ActSVG/src/LayerSvgConverter.cpp
index 11cabd0e0e7..3f018bf562f 100644
--- a/Plugins/ActSVG/src/LayerSvgConverter.cpp
+++ b/Plugins/ActSVG/src/LayerSvgConverter.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2022 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include "Acts/Plugins/ActSVG/LayerSvgConverter.hpp"
 
diff --git a/Plugins/ActSVG/src/PortalSvgConverter.cpp b/Plugins/ActSVG/src/PortalSvgConverter.cpp
index 47ca4a12c1a..67cc7975bfe 100644
--- a/Plugins/ActSVG/src/PortalSvgConverter.cpp
+++ b/Plugins/ActSVG/src/PortalSvgConverter.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2023 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include "Acts/Plugins/ActSVG/PortalSvgConverter.hpp"
 
diff --git a/Plugins/ActSVG/src/SurfaceArraySvgConverter.cpp b/Plugins/ActSVG/src/SurfaceArraySvgConverter.cpp
index 990cfdc75bb..7cb9ec40897 100644
--- a/Plugins/ActSVG/src/SurfaceArraySvgConverter.cpp
+++ b/Plugins/ActSVG/src/SurfaceArraySvgConverter.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2022 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include "Acts/Plugins/ActSVG/SurfaceArraySvgConverter.hpp"
 
@@ -13,6 +13,9 @@
 #include "Acts/Surfaces/SurfaceArray.hpp"
 #include "Acts/Surfaces/SurfaceBounds.hpp"
 
+#include <algorithm>
+#include <numbers>
+
 std::tuple<std::vector<Acts::Svg::ProtoSurfaces>, Acts::Svg::ProtoGrid,
            std::vector<Acts::Svg::ProtoAssociations> >
 Acts::Svg::SurfaceArrayConverter::convert(
@@ -93,11 +96,9 @@ Acts::Svg::SurfaceArrayConverter::convert(
     auto sameBounds = [&](const SurfaceBounds* test) {
       return ((*test) == sBounds);
     };
-    // Check if you have this template object already
-    auto tBounds =
-        std::find_if(templateBounds.begin(), templateBounds.end(), sameBounds);
-    // New reference bounds and new reference object
-    if (tBounds == templateBounds.end()) {
+    // Check if you have this template object already before creating new
+    // reference bounds and new reference object
+    if (std::ranges::none_of(templateBounds, sameBounds)) {
       // Let's get the right style
       SurfaceConverter::Options sOptions;
       sOptions.templateSurface = true;
@@ -107,7 +108,7 @@ Acts::Svg::SurfaceArrayConverter::convert(
         sOptions.style = *sfStyle;
       }
 
-      // Create a referese surface and reference object from it
+      // Create a reference surface and reference object from it
       auto referenceSurface = SurfaceConverter::convert(gctx, *sf, sOptions);
       auto referenceObject =
           View::xy(referenceSurface,
@@ -148,8 +149,7 @@ Acts::Svg::SurfaceArrayConverter::convert(
         return ((*test) == sBounds);
       };
       // Check if you have this template object already
-      auto tBounds = std::find_if(templateBounds.begin(), templateBounds.end(),
-                                  sameBounds);
+      auto tBounds = std::ranges::find_if(templateBounds, sameBounds);
       // New reference bounds and new reference object
       if (tBounds != templateBounds.end()) {
         std::size_t tObject = std::distance(templateBounds.begin(), tBounds);
@@ -165,7 +165,8 @@ Acts::Svg::SurfaceArrayConverter::convert(
       Vector3 localZ = sTransform.rotation().col(2);
       // Find out orientation w.r.t. global transform
       ActsScalar projZ = localZ.dot(Vector3(0., 0., 1.));
-      ActsScalar alpha = std::atan2(localA[1], localA[0]) / M_PI * 180.;
+      ActsScalar alpha =
+          std::atan2(localA[1], localA[0]) / std::numbers::pi * 180.;
       if (projZ < 0.) {
         alpha += 180.;
       }
@@ -196,7 +197,7 @@ Acts::Svg::SurfaceArrayConverter::convert(
       auto bSurfaces = surfaceArray.neighbors(bCenter);
       std::vector<std::size_t> binnAssoc;
       for (const auto& bs : bSurfaces) {
-        auto candidate = std::find(surfaces.begin(), surfaces.end(), bs);
+        auto candidate = std::ranges::find(surfaces, bs);
         if (candidate != surfaces.end()) {
           binnAssoc.push_back(std::distance(surfaces.begin(), candidate));
         }
@@ -207,5 +208,5 @@ Acts::Svg::SurfaceArrayConverter::convert(
   // Return the surfaces and the grid
   std::vector<ProtoSurfaces> pSurfaceBatches = {pSurfaces};
   std::vector<ProtoAssociations> pAssociationBatchs = {pAssociations};
-  return std::tie(pSurfaceBatches, pGrid, pAssociationBatchs);
+  return {pSurfaceBatches, pGrid, pAssociationBatchs};
 }
diff --git a/Plugins/ActSVG/src/SurfaceSvgConverter.cpp b/Plugins/ActSVG/src/SurfaceSvgConverter.cpp
index ea827a7bbf3..8cc7a78d2df 100644
--- a/Plugins/ActSVG/src/SurfaceSvgConverter.cpp
+++ b/Plugins/ActSVG/src/SurfaceSvgConverter.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2022 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include "Acts/Plugins/ActSVG/SurfaceSvgConverter.hpp"
 
@@ -21,7 +21,7 @@ Acts::Svg::ProtoSurface Acts::Svg::SurfaceConverter::convert(
   if (!cOptions.templateSurface) {
     // Polyhedron surface for vertices needed anyway
     Polyhedron surfaceHedron =
-        surface.polyhedronRepresentation(gctx, cOptions.style.nSegments);
+        surface.polyhedronRepresentation(gctx, cOptions.style.quarterSegments);
     auto vertices3D = surfaceHedron.vertices;
     pSurface._vertices = vertices3D;
   } else {
@@ -30,7 +30,7 @@ Acts::Svg::ProtoSurface Acts::Svg::SurfaceConverter::convert(
     auto planarBounds =
         dynamic_cast<const Acts::PlanarBounds*>(&(surface.bounds()));
     if (planarBounds != nullptr) {
-      auto vertices2D = planarBounds->vertices(cOptions.style.nSegments);
+      auto vertices2D = planarBounds->vertices(cOptions.style.quarterSegments);
       pSurface._vertices.reserve(vertices2D.size());
       for (const auto& v2 : vertices2D) {
         pSurface._vertices.push_back({v2[0], v2[1], 0.});
@@ -40,7 +40,8 @@ Acts::Svg::ProtoSurface Acts::Svg::SurfaceConverter::convert(
       auto annulusBounds =
           dynamic_cast<const Acts::AnnulusBounds*>(&(surface.bounds()));
       if (annulusBounds != nullptr) {
-        auto vertices2D = annulusBounds->vertices(cOptions.style.nSegments);
+        auto vertices2D =
+            annulusBounds->vertices(cOptions.style.quarterSegments);
         pSurface._vertices.reserve(vertices2D.size());
         for (const auto& v2 : vertices2D) {
           pSurface._vertices.push_back({v2[0], v2[1], 0.});
@@ -129,18 +130,9 @@ Acts::Svg::ProtoSurface Acts::Svg::SurfaceConverter::convert(
   geoId._id = std::to_string(surface.geometryId().value());
   pSurface._decorations["geo_id"] = geoId;
 
-  // Attach the style
-  pSurface._fill._fc = {
-      cOptions.style.fillColor,
-      static_cast<actsvg::scalar>(cOptions.style.fillOpacity)};
-
-  // Fill style
-  pSurface._fill._fc._hl_rgb = cOptions.style.highlightColor;
-  pSurface._fill._fc._highlight = cOptions.style.highlights;
-
-  // Stroke style
-  pSurface._stroke._sc = actsvg::style::color{cOptions.style.strokeColor};
-  pSurface._stroke._width = cOptions.style.strokeWidth;
+  auto [surfaceFill, surfaceStroke] = cOptions.style.fillAndStroke();
+  pSurface._fill = surfaceFill;
+  pSurface._stroke = surfaceStroke;
 
   return pSurface;
 }
diff --git a/Plugins/ActSVG/src/TrackingGeometrySvgConverter.cpp b/Plugins/ActSVG/src/TrackingGeometrySvgConverter.cpp
index 83429d36bc1..5f82f0127b0 100644
--- a/Plugins/ActSVG/src/TrackingGeometrySvgConverter.cpp
+++ b/Plugins/ActSVG/src/TrackingGeometrySvgConverter.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2022 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include "Acts/Plugins/ActSVG/TrackingGeometrySvgConverter.hpp"
 
diff --git a/Plugins/CMakeLists.txt b/Plugins/CMakeLists.txt
index b0d006a61c1..f766f8d1293 100644
--- a/Plugins/CMakeLists.txt
+++ b/Plugins/CMakeLists.txt
@@ -11,6 +11,8 @@ add_component_if(Legacy PluginLegacy ACTS_BUILD_PLUGIN_LEGACY)
 add_component_if(Onnx PluginOnnx ACTS_BUILD_PLUGIN_ONNX)
 add_component_if(ExaTrkX PluginExaTrkX ACTS_BUILD_PLUGIN_EXATRKX)
 add_component_if(Detray PluginDetray ACTS_BUILD_PLUGIN_TRACCC)
+add_component_if(Covfie PluginCovfie ACTS_BUILD_PLUGIN_TRACCC)
+add_component_if(Hashing PluginHashing ACTS_BUILD_PLUGIN_HASHING)
 
 # dependent plugins. depend either on a independent plugins or on one another
 add_component_if(TGeo PluginTGeo ACTS_BUILD_PLUGIN_TGEO)
diff --git a/Plugins/Covfie/CMakeLists.txt b/Plugins/Covfie/CMakeLists.txt
new file mode 100644
index 00000000000..0245904b035
--- /dev/null
+++ b/Plugins/Covfie/CMakeLists.txt
@@ -0,0 +1,16 @@
+add_library(ActsPluginCovfie SHARED src/FieldConversion.cpp)
+
+target_include_directories(
+    ActsPluginCovfie
+    PUBLIC
+        $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
+        $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>
+)
+target_link_libraries(ActsPluginCovfie PUBLIC ActsCore covfie::core)
+
+install(
+    TARGETS ActsPluginCovfie
+    EXPORT ActsPluginCovfieTargets
+    LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
+)
+install(DIRECTORY include/Acts DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
diff --git a/Plugins/Covfie/include/Acts/Plugins/Covfie/FieldConversion.hpp b/Plugins/Covfie/include/Acts/Plugins/Covfie/FieldConversion.hpp
new file mode 100644
index 00000000000..9edfc0a6066
--- /dev/null
+++ b/Plugins/Covfie/include/Acts/Plugins/Covfie/FieldConversion.hpp
@@ -0,0 +1,64 @@
+// This file is part of the ACTS project.
+//
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
+//
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
+
+#pragma once
+
+#include <covfie/core/algebra/affine.hpp>
+#include <covfie/core/backend/primitive/array.hpp>
+#include <covfie/core/backend/primitive/constant.hpp>
+#include <covfie/core/backend/transformer/affine.hpp>
+#include <covfie/core/backend/transformer/clamp.hpp>
+#include <covfie/core/backend/transformer/linear.hpp>
+#include <covfie/core/backend/transformer/strided.hpp>
+#include <covfie/core/field.hpp>
+#include <covfie/core/field_view.hpp>
+#include <covfie/core/parameter_pack.hpp>
+
+// acts includes
+#include "Acts/MagneticField/BFieldMapUtils.hpp"
+#include "Acts/MagneticField/ConstantBField.hpp"
+#include "Acts/MagneticField/MagneticFieldProvider.hpp"
+
+namespace Acts::CovfiePlugin {
+
+using BuilderBackend =
+    covfie::backend::strided<covfie::vector::size3,
+                             covfie::backend::array<covfie::vector::float3>>;
+
+using InterpolatedField = covfie::field<covfie::backend::clamp<
+    covfie::backend::affine<covfie::backend::linear<BuilderBackend>>>>;
+
+using ConstantField = covfie::field<
+    covfie::backend::constant<covfie::vector::float3, covfie::vector::float3>>;
+
+/// @brief Creates a covfie field from an interpolated magnetic field.
+/// @param magneticField The acts interpolated magnetic field.
+/// @return An affine linear strided covfie field.
+InterpolatedField covfieField(
+    const Acts::InterpolatedMagneticField& magneticField);
+
+/// @brief Creates a covfie field from a constant B field.
+/// @param magneticField The acts constant magnetic field.
+/// @return A constant covfie field.
+ConstantField covfieField(const Acts::ConstantBField& magneticField);
+
+/// @brief Creates a covfie field from a magnetic field provider by sampling it.
+/// The field must be defined within min (inclusive) and max (inclusive).
+/// @param magneticField The acts magnetic field provider.
+/// @param cache The acts cache.
+/// @param nPoints 3D array of containing the number of bins for each axis.
+/// @param min (min_x, min_y, min_z)
+/// @param max (max_x, max_y, max_z)
+/// @return An affine linear strided covfie field.
+InterpolatedField covfieField(const Acts::MagneticFieldProvider& magneticField,
+                              Acts::MagneticFieldProvider::Cache& cache,
+                              const std::array<std::size_t, 3>& nPoints,
+                              const Acts::Vector3& min,
+                              const Acts::Vector3& max);
+
+}  // namespace Acts::CovfiePlugin
diff --git a/Plugins/Covfie/src/FieldConversion.cpp b/Plugins/Covfie/src/FieldConversion.cpp
new file mode 100644
index 00000000000..7aee611b0fa
--- /dev/null
+++ b/Plugins/Covfie/src/FieldConversion.cpp
@@ -0,0 +1,197 @@
+// This file is part of the ACTS project.
+//
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
+//
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
+
+#include "Acts/Plugins/Covfie/FieldConversion.hpp"
+
+#include "Acts/Utilities/Axis.hpp"
+#include "Acts/Utilities/AxisFwd.hpp"
+#include "Acts/Utilities/Grid.hpp"
+
+#include <cmath>
+#include <stdexcept>
+#include <type_traits>
+
+namespace Acts::CovfiePlugin {
+
+/// @brief Creates a strided covfie field that stores the values of the
+/// magnetic field in the volume given by min and max using a fixed sample
+/// spacing (determined by nPoints).
+///
+/// @param magneticField The acts magnetic field.
+/// @param cache The acts cache.
+/// @param nPoints 3D array of containing the number of bins for each axis.
+/// @param min (min_x, min_y, min_z)
+/// @param max (max_x, max_y, max_z)
+/// @return A strided covfie field.
+template <typename magnetic_field_t>
+auto newBuilder(const magnetic_field_t& magneticField,
+                typename magnetic_field_t::Cache& cache,
+                const std::array<std::size_t, 3>& nPoints,
+                const Acts::Vector3& min, const Acts::Vector3& max) {
+  using Field = covfie::field<BuilderBackend>;
+
+  // Hack to avoid the fact that the domain of ACTS magnetic fields is defined
+  // as a half-open interval. Has the potential to introduce very minor
+  // floating point errors, but no easy way to fix this right now.
+  // TODO: Fix the aforementioned problem.
+  std::vector<double> maxima = {
+      std::nexttoward(max[0], -std::numeric_limits<double>::infinity()),
+      std::nexttoward(max[1], -std::numeric_limits<double>::infinity()),
+      std::nexttoward(max[1], -std::numeric_limits<double>::infinity()),
+  };
+
+  Field field(covfie::make_parameter_pack(
+      Field::backend_t::configuration_t{nPoints[0], nPoints[1], nPoints[2]}));
+
+  Field::view_t view(field);
+
+  std::array<double, 3> sampleSpacing = {
+      (max.x() - min.x()) / (nPoints[0] - 1),
+      (max.y() - min.y()) / (nPoints[1] - 1),
+      (max.z() - min.z()) / (nPoints[2] - 1)};
+
+  for (std::size_t x = 0; x < nPoints[0]; x++) {
+    for (std::size_t y = 0; y < nPoints[1]; y++) {
+      for (std::size_t z = 0; z < nPoints[2]; z++) {
+        Acts::Vector3 position{
+            std::min(x * sampleSpacing[0] + min[0], maxima[0]),
+            std::min(y * sampleSpacing[1] + min[1], maxima[1]),
+            std::min(z * sampleSpacing[2] + min[2], maxima[2])};
+
+        Field::view_t::output_t& p = view.at(x, y, z);
+        Result<Vector3> result = magneticField.getField(position, cache);
+
+        if (!result.ok()) {
+          throw std::runtime_error("Field lookup failed!");
+        }
+
+        Acts::Vector3 rv = *result;
+        p[0] = static_cast<float>(rv[0]);
+        p[1] = static_cast<float>(rv[1]);
+        p[2] = static_cast<float>(rv[2]);
+      }
+    }
+  }
+
+  return field;
+}
+
+/// @brief Generate the affine covfie configuration (scaling and rotation)
+/// given the size of the field (min and max)
+///
+/// @param nPoints 3D array of containing the number of bins for each axis.
+/// @param min (min_x, min_y, min_z)
+/// @param max (max_x, max_y, max_z)
+/// @return The affine field configuration.
+template <typename backend_t>
+typename backend_t::configuration_t affineConfiguration(
+    const std::array<std::size_t, 3>& nPoints, const Acts::Vector3& min,
+    const Acts::Vector3& max) {
+  auto scaling = covfie::algebra::affine<3>::scaling(
+      static_cast<float>((nPoints[0] - 1) / (max[0] - min[0])),
+      static_cast<float>((nPoints[1] - 1) / (max[1] - min[1])),
+      static_cast<float>((nPoints[2] - 1) / (max[2] - min[2])));
+
+  auto translation = covfie::algebra::affine<3>::translation(
+      static_cast<float>(-min[0]), static_cast<float>(-min[1]),
+      static_cast<float>(-min[2]));
+
+  return {scaling * translation};
+}
+
+/// @brief Uses std::nextafter to generates a clamp backend
+/// configuration where arguments min and max hold floating point values.
+/// @param min (min_x, min_y, min_z)
+/// @param max (max_x, max_y, max_z)
+/// @return The clamp field configuration.
+template <typename backend_t>
+typename backend_t::configuration_t clampConfigurationFloat(
+    const Acts::Vector3& min, const Acts::Vector3& max) {
+  return {{std::nextafter(static_cast<float>(min[0]),
+                          std::numeric_limits<float>::infinity()),
+           std::nextafter(static_cast<float>(min[1]),
+                          std::numeric_limits<float>::infinity()),
+           std::nextafter(static_cast<float>(min[2]),
+                          std::numeric_limits<float>::infinity())},
+          {std::nextafter(static_cast<float>(max[0]),
+                          -std::numeric_limits<float>::infinity()),
+           std::nextafter(static_cast<float>(max[1]),
+                          -std::numeric_limits<float>::infinity()),
+           std::nextafter(static_cast<float>(max[2]),
+                          -std::numeric_limits<float>::infinity())}};
+}
+
+/// @brief Creates a covfie field from a generic magnetic field.
+/// @param magneticField The generic magnetic field.
+/// @param cache The cache.
+/// @param nPoints 3D array of containing the number of bins for each axis.
+/// @param min (min_x, min_y, min_z)
+/// @param max (max_x, max_y, max_z)
+/// @return A clamp affine linear strided covfie field.
+template <typename magnetic_field_t>
+InterpolatedField covfieFieldLinear(const magnetic_field_t& magneticField,
+                                    typename magnetic_field_t::Cache& cache,
+                                    const std::array<std::size_t, 3>& nPoints,
+                                    const Acts::Vector3& min,
+                                    const Acts::Vector3& max) {
+  auto builder = newBuilder(magneticField, cache, nPoints, min, max);
+  InterpolatedField field(covfie::make_parameter_pack(
+      clampConfigurationFloat<InterpolatedField::backend_t>(min, max),
+      affineConfiguration<InterpolatedField::backend_t::backend_t>(nPoints, min,
+                                                                   max),
+      InterpolatedField::backend_t::backend_t::backend_t::configuration_t{},
+      builder.backend()));
+
+  return field;
+}
+
+/// @brief Creates a covfie field from a magnetic field provider by sampling it.
+/// @param magneticField The acts magnetic field provider.
+/// @param cache The acts cache.
+/// @param nPoints 3D array of containing the number of bins for each axis.
+/// @param min (min_x, min_y, min_z)
+/// @param max (max_x, max_y, max_z)
+/// @return A clamp affine linear strided covfie field.
+InterpolatedField covfieField(const Acts::MagneticFieldProvider& magneticField,
+                              Acts::MagneticFieldProvider::Cache& cache,
+                              const std::array<std::size_t, 3>& nPoints,
+                              const Acts::Vector3& min,
+                              const Acts::Vector3& max) {
+  return covfieFieldLinear(magneticField, cache, nPoints, min, max);
+}
+
+/// @brief Creates a covfie field from an interpolated magnetic field.
+/// @param magneticField The acts interpolated magnetic field.
+/// @return A clamp affine linear strided covfie field.
+InterpolatedField covfieField(
+    const Acts::InterpolatedMagneticField& magneticField) {
+  Acts::MagneticFieldContext ctx;
+  auto cache = magneticField.makeCache(ctx);
+  const std::vector<double>& old_min = magneticField.getMin();
+  const std::vector<double>& old_max = magneticField.getMax();
+  const std::vector<std::size_t>& old_nbins = magneticField.getNBins();
+  Acts::Vector3 min{old_min.at(0), old_min.at(1), old_min.at(2)};
+  Acts::Vector3 max{old_max.at(0), old_max.at(1), old_max.at(2)};
+  std::array<std::size_t, 3> nPoints{old_nbins.at(0), old_nbins.at(1),
+                                     old_nbins.at(2)};
+  return covfieFieldLinear(magneticField, cache, nPoints, min, max);
+}
+
+/// @brief Creates a covfie field from a constant B field.
+/// @param magneticField The acts constant magnetic field.
+/// @return A constant covfie field.
+ConstantField covfieField(const Acts::ConstantBField& magneticField) {
+  auto B = magneticField.getField();
+  ConstantField field(
+      covfie::make_parameter_pack(ConstantField::backend_t::configuration_t{
+          static_cast<float>(B[0]), static_cast<float>(B[1]),
+          static_cast<float>(B[2])}));
+  return field;
+}
+
+}  // namespace Acts::CovfiePlugin
diff --git a/Plugins/Cuda/include/Acts/Plugins/Cuda/Cuda.hpp b/Plugins/Cuda/include/Acts/Plugins/Cuda/Cuda.hpp
index c2f8a21ef05..c2f126b9aac 100644
--- a/Plugins/Cuda/include/Acts/Plugins/Cuda/Cuda.hpp
+++ b/Plugins/Cuda/include/Acts/Plugins/Cuda/Cuda.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2020 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
diff --git a/Plugins/Cuda/include/Acts/Plugins/Cuda/Seeding/Kernels.cuh b/Plugins/Cuda/include/Acts/Plugins/Cuda/Seeding/Kernels.cuh
index 375c19f5377..6ad2eefa538 100644
--- a/Plugins/Cuda/include/Acts/Plugins/Cuda/Seeding/Kernels.cuh
+++ b/Plugins/Cuda/include/Acts/Plugins/Cuda/Seeding/Kernels.cuh
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2020 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
diff --git a/Plugins/Cuda/include/Acts/Plugins/Cuda/Seeding/SeedFinder.hpp b/Plugins/Cuda/include/Acts/Plugins/Cuda/Seeding/SeedFinder.hpp
index 40718c1891b..2928a05ffac 100644
--- a/Plugins/Cuda/include/Acts/Plugins/Cuda/Seeding/SeedFinder.hpp
+++ b/Plugins/Cuda/include/Acts/Plugins/Cuda/Seeding/SeedFinder.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2024 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
diff --git a/Plugins/Cuda/include/Acts/Plugins/Cuda/Seeding/SeedFinder.ipp b/Plugins/Cuda/include/Acts/Plugins/Cuda/Seeding/SeedFinder.ipp
index 6049dd3876b..662c2b2ad27 100644
--- a/Plugins/Cuda/include/Acts/Plugins/Cuda/Seeding/SeedFinder.ipp
+++ b/Plugins/Cuda/include/Acts/Plugins/Cuda/Seeding/SeedFinder.ipp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2024 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include "Acts/Seeding/CandidatesForMiddleSp.hpp"
 
@@ -306,9 +306,9 @@ SeedFinder<external_spacepoint_t, Acts::Cuda>::createSeedsForGroup(
                                 false);
       }
 
-      std::sort(candidates.begin(), candidates.end(),
-                CandidatesForMiddleSp<const InternalSpacePoint<
-                    external_spacepoint_t>>::descendingByQuality);
+      std::ranges::sort(candidates,
+                        CandidatesForMiddleSp<const InternalSpacePoint<
+                            external_spacepoint_t>>::descendingByQuality);
       std::size_t numQualitySeeds = 0;  // not used but needs to be fixed
       m_config.seedFilter->filterSeeds_1SpFixed(spacePointData, candidates,
                                                 numQualitySeeds,
diff --git a/Plugins/Cuda/include/Acts/Plugins/Cuda/Seeding2/Details/CountDublets.hpp b/Plugins/Cuda/include/Acts/Plugins/Cuda/Seeding2/Details/CountDublets.hpp
index bf4ba8ab6ad..b53bbe5064b 100644
--- a/Plugins/Cuda/include/Acts/Plugins/Cuda/Seeding2/Details/CountDublets.hpp
+++ b/Plugins/Cuda/include/Acts/Plugins/Cuda/Seeding2/Details/CountDublets.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2020 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
diff --git a/Plugins/Cuda/include/Acts/Plugins/Cuda/Seeding2/Details/FindDublets.hpp b/Plugins/Cuda/include/Acts/Plugins/Cuda/Seeding2/Details/FindDublets.hpp
index 3bb9b2b7011..0f58ac721dc 100644
--- a/Plugins/Cuda/include/Acts/Plugins/Cuda/Seeding2/Details/FindDublets.hpp
+++ b/Plugins/Cuda/include/Acts/Plugins/Cuda/Seeding2/Details/FindDublets.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2020 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
diff --git a/Plugins/Cuda/include/Acts/Plugins/Cuda/Seeding2/Details/FindTriplets.hpp b/Plugins/Cuda/include/Acts/Plugins/Cuda/Seeding2/Details/FindTriplets.hpp
index 3fca7899946..7dbd798ae5e 100644
--- a/Plugins/Cuda/include/Acts/Plugins/Cuda/Seeding2/Details/FindTriplets.hpp
+++ b/Plugins/Cuda/include/Acts/Plugins/Cuda/Seeding2/Details/FindTriplets.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2020 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
diff --git a/Plugins/Cuda/include/Acts/Plugins/Cuda/Seeding2/Details/Types.hpp b/Plugins/Cuda/include/Acts/Plugins/Cuda/Seeding2/Details/Types.hpp
index 1e7ff758a3b..d7fb0b5524c 100644
--- a/Plugins/Cuda/include/Acts/Plugins/Cuda/Seeding2/Details/Types.hpp
+++ b/Plugins/Cuda/include/Acts/Plugins/Cuda/Seeding2/Details/Types.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2020 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
diff --git a/Plugins/Cuda/include/Acts/Plugins/Cuda/Seeding2/SeedFinder.hpp b/Plugins/Cuda/include/Acts/Plugins/Cuda/Seeding2/SeedFinder.hpp
index f66c9655ec6..a2522eaf340 100644
--- a/Plugins/Cuda/include/Acts/Plugins/Cuda/Seeding2/SeedFinder.hpp
+++ b/Plugins/Cuda/include/Acts/Plugins/Cuda/Seeding2/SeedFinder.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2024 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
diff --git a/Plugins/Cuda/include/Acts/Plugins/Cuda/Seeding2/SeedFinder.ipp b/Plugins/Cuda/include/Acts/Plugins/Cuda/Seeding2/SeedFinder.ipp
index deee520fab0..736209619a4 100644
--- a/Plugins/Cuda/include/Acts/Plugins/Cuda/Seeding2/SeedFinder.ipp
+++ b/Plugins/Cuda/include/Acts/Plugins/Cuda/Seeding2/SeedFinder.ipp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2024 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
@@ -23,11 +23,11 @@
 #include "Acts/Seeding/InternalSpacePoint.hpp"
 
 // System include(s).
+#include <algorithm>
 #include <cstring>
 #include <vector>
 
-namespace Acts {
-namespace Cuda {
+namespace Acts::Cuda {
 
 template <typename external_spacepoint_t>
 SeedFinder<external_spacepoint_t>::SeedFinder(
@@ -226,8 +226,8 @@ SeedFinder<external_spacepoint_t>::createSeedsForGroup(
       candidates.emplace_back(bottomSP, middleSP, topSP, triplet.weight, 0,
                               false);
     }
-    std::sort(
-        candidates.begin(), candidates.end(),
+    std::ranges::sort(
+        candidates,
         CandidatesForMiddleSp<const InternalSpacePoint<external_spacepoint_t>>::
             descendingByQuality);
     std::size_t numQualitySeeds = 0;  // not used but needs to be fixed
@@ -249,5 +249,4 @@ void SeedFinder<external_spacepoint_t>::setLogger(
   return m_logger.swap(newLogger);
 }
 
-}  // namespace Cuda
-}  // namespace Acts
+}  // namespace Acts::Cuda
diff --git a/Plugins/Cuda/include/Acts/Plugins/Cuda/Seeding2/TripletFilterConfig.hpp b/Plugins/Cuda/include/Acts/Plugins/Cuda/Seeding2/TripletFilterConfig.hpp
index 60f1527e7e9..864658782fa 100644
--- a/Plugins/Cuda/include/Acts/Plugins/Cuda/Seeding2/TripletFilterConfig.hpp
+++ b/Plugins/Cuda/include/Acts/Plugins/Cuda/Seeding2/TripletFilterConfig.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2020 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
diff --git a/Plugins/Cuda/include/Acts/Plugins/Cuda/Utilities/Arrays.hpp b/Plugins/Cuda/include/Acts/Plugins/Cuda/Utilities/Arrays.hpp
index c08e480a185..be9d3b38c9f 100644
--- a/Plugins/Cuda/include/Acts/Plugins/Cuda/Utilities/Arrays.hpp
+++ b/Plugins/Cuda/include/Acts/Plugins/Cuda/Utilities/Arrays.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2020 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
diff --git a/Plugins/Cuda/include/Acts/Plugins/Cuda/Utilities/CpuMatrix.hpp b/Plugins/Cuda/include/Acts/Plugins/Cuda/Utilities/CpuMatrix.hpp
index 51e450108aa..87a57923f8a 100644
--- a/Plugins/Cuda/include/Acts/Plugins/Cuda/Utilities/CpuMatrix.hpp
+++ b/Plugins/Cuda/include/Acts/Plugins/Cuda/Utilities/CpuMatrix.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2020 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
diff --git a/Plugins/Cuda/include/Acts/Plugins/Cuda/Utilities/CpuScalar.hpp b/Plugins/Cuda/include/Acts/Plugins/Cuda/Utilities/CpuScalar.hpp
index 57f9009c8a6..749624177dc 100644
--- a/Plugins/Cuda/include/Acts/Plugins/Cuda/Utilities/CpuScalar.hpp
+++ b/Plugins/Cuda/include/Acts/Plugins/Cuda/Utilities/CpuScalar.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2020 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
diff --git a/Plugins/Cuda/include/Acts/Plugins/Cuda/Utilities/CpuVector.hpp b/Plugins/Cuda/include/Acts/Plugins/Cuda/Utilities/CpuVector.hpp
index 547b16d4bba..0c8d9cab266 100644
--- a/Plugins/Cuda/include/Acts/Plugins/Cuda/Utilities/CpuVector.hpp
+++ b/Plugins/Cuda/include/Acts/Plugins/Cuda/Utilities/CpuVector.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2020 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
diff --git a/Plugins/Cuda/include/Acts/Plugins/Cuda/Utilities/CudaMatrix.cu b/Plugins/Cuda/include/Acts/Plugins/Cuda/Utilities/CudaMatrix.cu
index ee3737e4598..eba95a456a5 100644
--- a/Plugins/Cuda/include/Acts/Plugins/Cuda/Utilities/CudaMatrix.cu
+++ b/Plugins/Cuda/include/Acts/Plugins/Cuda/Utilities/CudaMatrix.cu
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2020 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
diff --git a/Plugins/Cuda/include/Acts/Plugins/Cuda/Utilities/CudaScalar.cu b/Plugins/Cuda/include/Acts/Plugins/Cuda/Utilities/CudaScalar.cu
index 7d3f8437a4b..889f483e1ed 100644
--- a/Plugins/Cuda/include/Acts/Plugins/Cuda/Utilities/CudaScalar.cu
+++ b/Plugins/Cuda/include/Acts/Plugins/Cuda/Utilities/CudaScalar.cu
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2020 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
diff --git a/Plugins/Cuda/include/Acts/Plugins/Cuda/Utilities/CudaUtils.cu b/Plugins/Cuda/include/Acts/Plugins/Cuda/Utilities/CudaUtils.cu
index bb4f70f3375..d24c6232f95 100644
--- a/Plugins/Cuda/include/Acts/Plugins/Cuda/Utilities/CudaUtils.cu
+++ b/Plugins/Cuda/include/Acts/Plugins/Cuda/Utilities/CudaUtils.cu
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2020 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
diff --git a/Plugins/Cuda/include/Acts/Plugins/Cuda/Utilities/CudaVector.cu b/Plugins/Cuda/include/Acts/Plugins/Cuda/Utilities/CudaVector.cu
index 256dd2d24f2..5856b4da3ac 100644
--- a/Plugins/Cuda/include/Acts/Plugins/Cuda/Utilities/CudaVector.cu
+++ b/Plugins/Cuda/include/Acts/Plugins/Cuda/Utilities/CudaVector.cu
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2020 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
diff --git a/Plugins/Cuda/include/Acts/Plugins/Cuda/Utilities/Info.hpp b/Plugins/Cuda/include/Acts/Plugins/Cuda/Utilities/Info.hpp
index 989aea2e2df..0a4c14ef705 100644
--- a/Plugins/Cuda/include/Acts/Plugins/Cuda/Utilities/Info.hpp
+++ b/Plugins/Cuda/include/Acts/Plugins/Cuda/Utilities/Info.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2020 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
diff --git a/Plugins/Cuda/include/Acts/Plugins/Cuda/Utilities/MemoryManager.hpp b/Plugins/Cuda/include/Acts/Plugins/Cuda/Utilities/MemoryManager.hpp
index 6225cf4f7a3..b54d6418e3f 100644
--- a/Plugins/Cuda/include/Acts/Plugins/Cuda/Utilities/MemoryManager.hpp
+++ b/Plugins/Cuda/include/Acts/Plugins/Cuda/Utilities/MemoryManager.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2020 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
diff --git a/Plugins/Cuda/include/Acts/Plugins/Cuda/Utilities/StreamWrapper.hpp b/Plugins/Cuda/include/Acts/Plugins/Cuda/Utilities/StreamWrapper.hpp
index 39d8c646143..739807e86a1 100644
--- a/Plugins/Cuda/include/Acts/Plugins/Cuda/Utilities/StreamWrapper.hpp
+++ b/Plugins/Cuda/include/Acts/Plugins/Cuda/Utilities/StreamWrapper.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2020 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
diff --git a/Plugins/Cuda/include/Acts/Plugins/Cuda/Utilities/UsmMatrix.cu b/Plugins/Cuda/include/Acts/Plugins/Cuda/Utilities/UsmMatrix.cu
index 94dfb99fa4e..135df2abaf0 100644
--- a/Plugins/Cuda/include/Acts/Plugins/Cuda/Utilities/UsmMatrix.cu
+++ b/Plugins/Cuda/include/Acts/Plugins/Cuda/Utilities/UsmMatrix.cu
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2020 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
diff --git a/Plugins/Cuda/include/Acts/Plugins/Cuda/Utilities/UsmScalar.cu b/Plugins/Cuda/include/Acts/Plugins/Cuda/Utilities/UsmScalar.cu
index 79185fca0ec..418908deac0 100644
--- a/Plugins/Cuda/include/Acts/Plugins/Cuda/Utilities/UsmScalar.cu
+++ b/Plugins/Cuda/include/Acts/Plugins/Cuda/Utilities/UsmScalar.cu
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2020 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
diff --git a/Plugins/Cuda/src/Seeding/Kernels.cu b/Plugins/Cuda/src/Seeding/Kernels.cu
index f255d8b70ab..4bed66a0906 100644
--- a/Plugins/Cuda/src/Seeding/Kernels.cu
+++ b/Plugins/Cuda/src/Seeding/Kernels.cu
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2020 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include "Acts/Plugins/Cuda/Cuda.hpp"
 #include "Acts/Plugins/Cuda/Seeding/Kernels.cuh"
diff --git a/Plugins/Cuda/src/Seeding2/CountDublets.cu b/Plugins/Cuda/src/Seeding2/CountDublets.cu
index 2d63aa09982..38f036671a7 100644
--- a/Plugins/Cuda/src/Seeding2/CountDublets.cu
+++ b/Plugins/Cuda/src/Seeding2/CountDublets.cu
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2020 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 // CUDA plugin include(s).
 #include "Acts/Plugins/Cuda/Seeding2/Details/CountDublets.hpp"
diff --git a/Plugins/Cuda/src/Seeding2/FindDublets.cu b/Plugins/Cuda/src/Seeding2/FindDublets.cu
index cec93c50f00..d2b98455c91 100644
--- a/Plugins/Cuda/src/Seeding2/FindDublets.cu
+++ b/Plugins/Cuda/src/Seeding2/FindDublets.cu
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2020 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 // CUDA plugin include(s).
 #include "Acts/Plugins/Cuda/Seeding2/Details/FindDublets.hpp"
diff --git a/Plugins/Cuda/src/Seeding2/FindTriplets.cu b/Plugins/Cuda/src/Seeding2/FindTriplets.cu
index fa20df5faa6..e1f712161f6 100644
--- a/Plugins/Cuda/src/Seeding2/FindTriplets.cu
+++ b/Plugins/Cuda/src/Seeding2/FindTriplets.cu
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2020 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 // CUDA plugin include(s).
 #include "Acts/Plugins/Cuda/Seeding2/Details/FindTriplets.hpp"
diff --git a/Plugins/Cuda/src/Utilities/Arrays.cu b/Plugins/Cuda/src/Utilities/Arrays.cu
index 4418c44ae4b..57dea52911c 100644
--- a/Plugins/Cuda/src/Utilities/Arrays.cu
+++ b/Plugins/Cuda/src/Utilities/Arrays.cu
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2020 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 // CUDA plugin include(s).
 #include "Acts/Plugins/Cuda/Seeding2/Details/Types.hpp"
diff --git a/Plugins/Cuda/src/Utilities/ErrorCheck.cu b/Plugins/Cuda/src/Utilities/ErrorCheck.cu
index cded125e6af..d197e1b1071 100644
--- a/Plugins/Cuda/src/Utilities/ErrorCheck.cu
+++ b/Plugins/Cuda/src/Utilities/ErrorCheck.cu
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2020 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 // CUDA include(s).
 #include <cuda_runtime.h>
diff --git a/Plugins/Cuda/src/Utilities/ErrorCheck.cuh b/Plugins/Cuda/src/Utilities/ErrorCheck.cuh
index 035fb61c739..40ed81516d6 100644
--- a/Plugins/Cuda/src/Utilities/ErrorCheck.cuh
+++ b/Plugins/Cuda/src/Utilities/ErrorCheck.cuh
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2020 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
diff --git a/Plugins/Cuda/src/Utilities/Info.cu b/Plugins/Cuda/src/Utilities/Info.cu
index 3ca375b6f47..5cd4fc116cd 100644
--- a/Plugins/Cuda/src/Utilities/Info.cu
+++ b/Plugins/Cuda/src/Utilities/Info.cu
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2020 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 // CUDA plugin include(s).
 #include "Acts/Plugins/Cuda/Utilities/Info.hpp"
diff --git a/Plugins/Cuda/src/Utilities/MatrixMacros.hpp b/Plugins/Cuda/src/Utilities/MatrixMacros.hpp
index bf724191228..4df65c19a79 100644
--- a/Plugins/Cuda/src/Utilities/MatrixMacros.hpp
+++ b/Plugins/Cuda/src/Utilities/MatrixMacros.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2020 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
diff --git a/Plugins/Cuda/src/Utilities/MemoryManager.cu b/Plugins/Cuda/src/Utilities/MemoryManager.cu
index ae623be672d..551ebf4c26c 100644
--- a/Plugins/Cuda/src/Utilities/MemoryManager.cu
+++ b/Plugins/Cuda/src/Utilities/MemoryManager.cu
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2020 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 // CUDA plugin include(s).
 #include "Acts/Plugins/Cuda/Utilities/MemoryManager.hpp"
diff --git a/Plugins/Cuda/src/Utilities/StreamHandlers.cuh b/Plugins/Cuda/src/Utilities/StreamHandlers.cuh
index e1191ef45a5..67bc0788e43 100644
--- a/Plugins/Cuda/src/Utilities/StreamHandlers.cuh
+++ b/Plugins/Cuda/src/Utilities/StreamHandlers.cuh
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2020 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
diff --git a/Plugins/Cuda/src/Utilities/StreamWrapper.cu b/Plugins/Cuda/src/Utilities/StreamWrapper.cu
index 720a7282de8..ed732c39c85 100644
--- a/Plugins/Cuda/src/Utilities/StreamWrapper.cu
+++ b/Plugins/Cuda/src/Utilities/StreamWrapper.cu
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2020 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 // CUDA plugin include(s).
 #include "Acts/Plugins/Cuda/Utilities/StreamWrapper.hpp"
diff --git a/Plugins/DD4hep/include/Acts/Plugins/DD4hep/ConvertDD4hepDetector.hpp b/Plugins/DD4hep/include/Acts/Plugins/DD4hep/ConvertDD4hepDetector.hpp
index 083d229c7cf..295f01fec5d 100644
--- a/Plugins/DD4hep/include/Acts/Plugins/DD4hep/ConvertDD4hepDetector.hpp
+++ b/Plugins/DD4hep/include/Acts/Plugins/DD4hep/ConvertDD4hepDetector.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2017-2018 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
diff --git a/Plugins/DD4hep/include/Acts/Plugins/DD4hep/DD4hepBinningHelpers.hpp b/Plugins/DD4hep/include/Acts/Plugins/DD4hep/DD4hepBinningHelpers.hpp
index aa5ddabef2a..6577905bbba 100644
--- a/Plugins/DD4hep/include/Acts/Plugins/DD4hep/DD4hepBinningHelpers.hpp
+++ b/Plugins/DD4hep/include/Acts/Plugins/DD4hep/DD4hepBinningHelpers.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2023 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
diff --git a/Plugins/DD4hep/include/Acts/Plugins/DD4hep/DD4hepBlueprintFactory.hpp b/Plugins/DD4hep/include/Acts/Plugins/DD4hep/DD4hepBlueprintFactory.hpp
index 0f89983507c..b2dfa9243f9 100644
--- a/Plugins/DD4hep/include/Acts/Plugins/DD4hep/DD4hepBlueprintFactory.hpp
+++ b/Plugins/DD4hep/include/Acts/Plugins/DD4hep/DD4hepBlueprintFactory.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2023 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
diff --git a/Plugins/DD4hep/include/Acts/Plugins/DD4hep/DD4hepConversionHelpers.hpp b/Plugins/DD4hep/include/Acts/Plugins/DD4hep/DD4hepConversionHelpers.hpp
index 4d2e0a0b6ac..9924522d4e7 100644
--- a/Plugins/DD4hep/include/Acts/Plugins/DD4hep/DD4hepConversionHelpers.hpp
+++ b/Plugins/DD4hep/include/Acts/Plugins/DD4hep/DD4hepConversionHelpers.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2017-2018 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
diff --git a/Plugins/DD4hep/include/Acts/Plugins/DD4hep/DD4hepDetectorElement.hpp b/Plugins/DD4hep/include/Acts/Plugins/DD4hep/DD4hepDetectorElement.hpp
index 360d82358c4..0dd6788c315 100644
--- a/Plugins/DD4hep/include/Acts/Plugins/DD4hep/DD4hepDetectorElement.hpp
+++ b/Plugins/DD4hep/include/Acts/Plugins/DD4hep/DD4hepDetectorElement.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2017-2018 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
diff --git a/Plugins/DD4hep/include/Acts/Plugins/DD4hep/DD4hepDetectorStructure.hpp b/Plugins/DD4hep/include/Acts/Plugins/DD4hep/DD4hepDetectorStructure.hpp
index a63b8a5067f..eb69176aa19 100644
--- a/Plugins/DD4hep/include/Acts/Plugins/DD4hep/DD4hepDetectorStructure.hpp
+++ b/Plugins/DD4hep/include/Acts/Plugins/DD4hep/DD4hepDetectorStructure.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2023 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
@@ -55,9 +55,9 @@ class DD4hepDetectorStructure {
   /// @param logger is the screen output logger
   ///
   /// @note this needs to be provided
-  DD4hepDetectorStructure(std::unique_ptr<const Logger> logger =
-                              getDefaultLogger("DD4hepLayerStructure",
-                                               Acts::Logging::INFO));
+  explicit DD4hepDetectorStructure(std::unique_ptr<const Logger> logger =
+                                       getDefaultLogger("DD4hepLayerStructure",
+                                                        Acts::Logging::INFO));
 
   DD4hepDetectorStructure() = delete;
 
diff --git a/Plugins/DD4hep/include/Acts/Plugins/DD4hep/DD4hepDetectorSurfaceFactory.hpp b/Plugins/DD4hep/include/Acts/Plugins/DD4hep/DD4hepDetectorSurfaceFactory.hpp
index 4c660dd6d5e..b120358d537 100644
--- a/Plugins/DD4hep/include/Acts/Plugins/DD4hep/DD4hepDetectorSurfaceFactory.hpp
+++ b/Plugins/DD4hep/include/Acts/Plugins/DD4hep/DD4hepDetectorSurfaceFactory.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2023 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
@@ -71,8 +71,8 @@ class DD4hepDetectorSurfaceFactory {
     std::optional<Extent> pExtent = std::nullopt;
     /// Optionally provide an Extent constraints to measure the layers
     std::vector<BinningValue> extentConstraints = {};
-    /// The approximination for extent measuring
-    std::size_t nExtentSegments = 1u;
+    /// The approximination of a circle quarter for extent measuring
+    std::size_t nExtentQSegments = 1u;
   };
 
   /// Nested options struct to steer the conversion
@@ -90,7 +90,7 @@ class DD4hepDetectorSurfaceFactory {
   /// The DD4hep detector element factory
   ///
   /// @param mlogger a screen output logger
-  DD4hepDetectorSurfaceFactory(
+  explicit DD4hepDetectorSurfaceFactory(
       std::unique_ptr<const Logger> mlogger = getDefaultLogger(
           "DD4hepDetectorSurfaceFactory", Acts::Logging::INFO));
 
diff --git a/Plugins/DD4hep/include/Acts/Plugins/DD4hep/DD4hepFieldAdapter.hpp b/Plugins/DD4hep/include/Acts/Plugins/DD4hep/DD4hepFieldAdapter.hpp
index 22bb9ba490f..6f7b8077348 100644
--- a/Plugins/DD4hep/include/Acts/Plugins/DD4hep/DD4hepFieldAdapter.hpp
+++ b/Plugins/DD4hep/include/Acts/Plugins/DD4hep/DD4hepFieldAdapter.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2023 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
@@ -22,7 +22,7 @@ class DD4hepFieldAdapter : public Acts::MagneticFieldProvider {
   struct Cache {};
 
  public:
-  DD4hepFieldAdapter(dd4hep::OverlayedField field);
+  explicit DD4hepFieldAdapter(dd4hep::OverlayedField field);
 
   MagneticFieldProvider::Cache makeCache(
       const Acts::MagneticFieldContext& mctx) const override;
diff --git a/Plugins/DD4hep/include/Acts/Plugins/DD4hep/DD4hepIdentifierMapper.hpp b/Plugins/DD4hep/include/Acts/Plugins/DD4hep/DD4hepIdentifierMapper.hpp
index 4463db89c79..029df67304b 100644
--- a/Plugins/DD4hep/include/Acts/Plugins/DD4hep/DD4hepIdentifierMapper.hpp
+++ b/Plugins/DD4hep/include/Acts/Plugins/DD4hep/DD4hepIdentifierMapper.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2023 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
diff --git a/Plugins/DD4hep/include/Acts/Plugins/DD4hep/DD4hepLayerBuilder.hpp b/Plugins/DD4hep/include/Acts/Plugins/DD4hep/DD4hepLayerBuilder.hpp
index bed054f90e7..5fba8474a77 100644
--- a/Plugins/DD4hep/include/Acts/Plugins/DD4hep/DD4hepLayerBuilder.hpp
+++ b/Plugins/DD4hep/include/Acts/Plugins/DD4hep/DD4hepLayerBuilder.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2017-2018 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
diff --git a/Plugins/DD4hep/include/Acts/Plugins/DD4hep/DD4hepLayerStructure.hpp b/Plugins/DD4hep/include/Acts/Plugins/DD4hep/DD4hepLayerStructure.hpp
index 441386857b2..a44e4341feb 100644
--- a/Plugins/DD4hep/include/Acts/Plugins/DD4hep/DD4hepLayerStructure.hpp
+++ b/Plugins/DD4hep/include/Acts/Plugins/DD4hep/DD4hepLayerStructure.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2023 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
@@ -65,8 +65,8 @@ class DD4hepLayerStructure {
     std::optional<Extent> extent = std::nullopt;
     /// The extent constraints - optionally
     std::vector<BinningValue> extentConstraints = {};
-    /// Approximation for the polyhedron binning nSegments
-    unsigned int nSegments = 1u;
+    /// Approximation for the polyhedron binning
+    unsigned int quarterSegments = 1u;
     /// Patch the binning with the extent if possible
     bool patchBinningWithExtent = true;
     /// Conversion options
diff --git a/Plugins/DD4hep/include/Acts/Plugins/DD4hep/DD4hepMaterialHelpers.hpp b/Plugins/DD4hep/include/Acts/Plugins/DD4hep/DD4hepMaterialHelpers.hpp
index 552b37f5584..0749a9599b3 100644
--- a/Plugins/DD4hep/include/Acts/Plugins/DD4hep/DD4hepMaterialHelpers.hpp
+++ b/Plugins/DD4hep/include/Acts/Plugins/DD4hep/DD4hepMaterialHelpers.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2019 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
diff --git a/Plugins/DD4hep/include/Acts/Plugins/DD4hep/DD4hepVolumeBuilder.hpp b/Plugins/DD4hep/include/Acts/Plugins/DD4hep/DD4hepVolumeBuilder.hpp
index ba97eed110b..c57515b4bc4 100644
--- a/Plugins/DD4hep/include/Acts/Plugins/DD4hep/DD4hepVolumeBuilder.hpp
+++ b/Plugins/DD4hep/include/Acts/Plugins/DD4hep/DD4hepVolumeBuilder.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2018 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 #include "Acts/Definitions/Algebra.hpp"
diff --git a/Plugins/DD4hep/src/ConvertDD4hepDetector.cpp b/Plugins/DD4hep/src/ConvertDD4hepDetector.cpp
index ed783e8f8ef..848de200db0 100644
--- a/Plugins/DD4hep/src/ConvertDD4hepDetector.cpp
+++ b/Plugins/DD4hep/src/ConvertDD4hepDetector.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2017-2018 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include "Acts/Plugins/DD4hep/ConvertDD4hepDetector.hpp"
 
@@ -429,7 +429,8 @@ std::shared_ptr<const CylinderVolumeBuilder> volumeBuilder_dd4hep(
     plbConfig.layerIdentification = subDetector.name();
     plbConfig.centralLayerRadii = std::vector<double>(1, 0.5 * (rMax + rMin));
     plbConfig.centralLayerHalflengthZ = std::vector<double>(1, halfZ);
-    plbConfig.centralLayerThickness = std::vector<double>(1, fabs(rMax - rMin));
+    plbConfig.centralLayerThickness =
+        std::vector<double>(1, std::abs(rMax - rMin));
     plbConfig.centralLayerMaterial = {plMaterial};
     auto pcLayerBuilder = std::make_shared<const Acts::PassiveLayerBuilder>(
         plbConfig, logger.clone(std::string("D2A_PL:") + subDetector.name()));
diff --git a/Plugins/DD4hep/src/DD4hepBinningHelpers.cpp b/Plugins/DD4hep/src/DD4hepBinningHelpers.cpp
index 2b37ebc040f..d96ef4ec228 100644
--- a/Plugins/DD4hep/src/DD4hepBinningHelpers.cpp
+++ b/Plugins/DD4hep/src/DD4hepBinningHelpers.cpp
@@ -1,13 +1,15 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2023 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include "Acts/Plugins/DD4hep/DD4hepBinningHelpers.hpp"
 
+#include <numbers>
+
 std::vector<Acts::Experimental::ProtoBinning>
 Acts::DD4hepBinningHelpers::convertBinning(
     const dd4hep::DetElement &dd4hepElement, const std::string &bname) {
@@ -36,14 +38,19 @@ Acts::DD4hepBinningHelpers::convertBinning(
               Experimental::ProtoBinning(bVal, bType, nBins, nExpansion));
         } else {
           // Equidistant binning
-          ActsScalar minDefault = bVal == BinningValue::binPhi ? -M_PI : 0.;
-          ActsScalar maxDefault = bVal == BinningValue::binPhi ? M_PI : 0.;
+          ActsScalar minDefault = bVal == BinningValue::binPhi
+                                      ? -std::numbers::pi_v<ActsScalar>
+                                      : 0.;
+          ActsScalar maxDefault = bVal == BinningValue::binPhi
+                                      ? std::numbers::pi_v<ActsScalar>
+                                      : 0.;
           auto min = getParamOr<ActsScalar>(bname + "_" + ab + "_min",
                                             dd4hepElement, minDefault);
           auto max = getParamOr<ActsScalar>(bname + "_" + ab + "_max",
                                             dd4hepElement, maxDefault);
           // Check for closed phi binning
-          if (bVal == BinningValue::binPhi && (max - min) > 1.9 * M_PI) {
+          if (bVal == BinningValue::binPhi &&
+              (max - min) > 1.9 * std::numbers::pi) {
             bType = Acts::AxisBoundaryType::Closed;
           }
           protoBinnings.push_back(Experimental::ProtoBinning(
@@ -58,7 +65,7 @@ Acts::DD4hepBinningHelpers::convertBinning(
         }
         // Check for closed phi binning
         if (bVal == BinningValue::binPhi &&
-            (edges.back() - edges.front()) > 1.9 * M_PI) {
+            (edges.back() - edges.front()) > 1.9 * std::numbers::pi) {
           bType = Acts::AxisBoundaryType::Closed;
         }
         protoBinnings.push_back(
diff --git a/Plugins/DD4hep/src/DD4hepBlueprintFactory.cpp b/Plugins/DD4hep/src/DD4hepBlueprintFactory.cpp
index 351b5312af3..4a214d3ba32 100644
--- a/Plugins/DD4hep/src/DD4hepBlueprintFactory.cpp
+++ b/Plugins/DD4hep/src/DD4hepBlueprintFactory.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2023 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include "Acts/Plugins/DD4hep/DD4hepBlueprintFactory.hpp"
 
diff --git a/Plugins/DD4hep/src/DD4hepDetectorElement.cpp b/Plugins/DD4hep/src/DD4hepDetectorElement.cpp
index 78a6abc14ff..e145e80d412 100644
--- a/Plugins/DD4hep/src/DD4hepDetectorElement.cpp
+++ b/Plugins/DD4hep/src/DD4hepDetectorElement.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2017-2018 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include "Acts/Plugins/DD4hep/DD4hepDetectorElement.hpp"
 
diff --git a/Plugins/DD4hep/src/DD4hepDetectorStructure.cpp b/Plugins/DD4hep/src/DD4hepDetectorStructure.cpp
index c1d46bf628b..00a5017fca9 100644
--- a/Plugins/DD4hep/src/DD4hepDetectorStructure.cpp
+++ b/Plugins/DD4hep/src/DD4hepDetectorStructure.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2023 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include "Acts/Plugins/DD4hep/DD4hepDetectorStructure.hpp"
 
@@ -75,7 +75,7 @@ Acts::Experimental::DD4hepDetectorStructure::construct(
       detail::BlueprintDrawer::dotStream(bpf, *dd4hepBlueprint);
       bpf.close();
       // Return without building
-      return std::tie(detector, detectorStore);
+      return {detector, detectorStore};
     }
 
     // Create a Cylindrical detector builder from this blueprint
@@ -100,5 +100,5 @@ Acts::Experimental::DD4hepDetectorStructure::construct(
         "DD4hepDetectorStructure: Only cylindrical detectors are (currently) "
         "supported.");
   }
-  return std::tie(detector, detectorStore);
+  return {detector, detectorStore};
 }
diff --git a/Plugins/DD4hep/src/DD4hepDetectorSurfaceFactory.cpp b/Plugins/DD4hep/src/DD4hepDetectorSurfaceFactory.cpp
index 99d55278b21..d628ff76379 100644
--- a/Plugins/DD4hep/src/DD4hepDetectorSurfaceFactory.cpp
+++ b/Plugins/DD4hep/src/DD4hepDetectorSurfaceFactory.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2023 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include "Acts/Plugins/DD4hep/DD4hepDetectorSurfaceFactory.hpp"
 
@@ -108,7 +108,7 @@ Acts::DD4hepDetectorSurfaceFactory::constructSensitiveComponents(
   // Measure if configured to do so
   if (cache.sExtent.has_value()) {
     auto sExtent =
-        sSurface->polyhedronRepresentation(gctx, cache.nExtentSegments)
+        sSurface->polyhedronRepresentation(gctx, cache.nExtentQSegments)
             .extent();
     cache.sExtent.value().extend(sExtent, cache.extentConstraints);
   }
@@ -137,7 +137,7 @@ Acts::DD4hepDetectorSurfaceFactory::constructPassiveComponents(
   // Measure if configured to do so
   if (cache.pExtent.has_value()) {
     auto sExtent =
-        pSurface->polyhedronRepresentation(gctx, cache.nExtentSegments)
+        pSurface->polyhedronRepresentation(gctx, cache.nExtentQSegments)
             .extent();
     cache.pExtent.value().extend(sExtent, cache.extentConstraints);
   }
diff --git a/Plugins/DD4hep/src/DD4hepFieldAdapter.cpp b/Plugins/DD4hep/src/DD4hepFieldAdapter.cpp
index e2ae69eb617..ad8ce3c2bda 100644
--- a/Plugins/DD4hep/src/DD4hepFieldAdapter.cpp
+++ b/Plugins/DD4hep/src/DD4hepFieldAdapter.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2023 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include "Acts/Plugins/DD4hep/DD4hepFieldAdapter.hpp"
 
diff --git a/Plugins/DD4hep/src/DD4hepLayerBuilder.cpp b/Plugins/DD4hep/src/DD4hepLayerBuilder.cpp
index 4d604fbeb42..c7cffaaf5aa 100644
--- a/Plugins/DD4hep/src/DD4hepLayerBuilder.cpp
+++ b/Plugins/DD4hep/src/DD4hepLayerBuilder.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2017-2019 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include "Acts/Plugins/DD4hep/DD4hepLayerBuilder.hpp"
 
@@ -102,7 +102,7 @@ const Acts::LayerVector Acts::DD4hepLayerBuilder::endcapLayers(
                        std::back_inserter(rvalues), [&](const auto& surface) {
                          return VectorHelpers::perp(surface->center(gctx));
                        });
-        std::sort(rvalues.begin(), rvalues.end());
+        std::ranges::sort(rvalues);
         std::vector<std::string> locs;
         std::transform(rvalues.begin(),
                        std::unique(rvalues.begin(), rvalues.end()),
@@ -208,8 +208,8 @@ const Acts::LayerVector Acts::DD4hepLayerBuilder::endcapLayers(
         // create the share disc bounds
         auto dBounds = std::make_shared<const RadialBounds>(
             pl.min(Acts::BinningValue::binR), pl.max(Acts::BinningValue::binR));
-        double thickness = std::fabs(pl.max(Acts::BinningValue::binZ) -
-                                     pl.min(Acts::BinningValue::binZ));
+        double thickness = std::abs(pl.max(Acts::BinningValue::binZ) -
+                                    pl.min(Acts::BinningValue::binZ));
         // Create the layer containing the sensitive surface
         endcapLayer = DiscLayer::create(transform, dBounds, std::move(sArray),
                                         thickness, nullptr, Acts::active);
@@ -275,7 +275,7 @@ const Acts::LayerVector Acts::DD4hepLayerBuilder::centralLayers(
                        std::back_inserter(zvalues), [&](const auto& surface) {
                          return surface->center(gctx)[eZ];
                        });
-        std::sort(zvalues.begin(), zvalues.end());
+        std::ranges::sort(zvalues);
         std::vector<std::string> locs;
         std::transform(zvalues.begin(),
                        std::unique(zvalues.begin(), zvalues.end()),
@@ -357,8 +357,8 @@ const Acts::LayerVector Acts::DD4hepLayerBuilder::centralLayers(
         double layerR = (pl.min(Acts::BinningValue::binR) +
                          pl.max(Acts::BinningValue::binR)) *
                         0.5;
-        double thickness = std::fabs(pl.max(Acts::BinningValue::binR) -
-                                     pl.min(Acts::BinningValue::binR));
+        double thickness = std::abs(pl.max(Acts::BinningValue::binR) -
+                                    pl.min(Acts::BinningValue::binR));
         auto cBounds = std::make_shared<CylinderBounds>(layerR, halfZ);
         // Create the layer containing the sensitive surface
         centralLayer =
diff --git a/Plugins/DD4hep/src/DD4hepLayerStructure.cpp b/Plugins/DD4hep/src/DD4hepLayerStructure.cpp
index f2b45ab2e46..10a4e6eb9f0 100644
--- a/Plugins/DD4hep/src/DD4hepLayerStructure.cpp
+++ b/Plugins/DD4hep/src/DD4hepLayerStructure.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2023 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include "Acts/Plugins/DD4hep/DD4hepLayerStructure.hpp"
 
@@ -26,7 +26,7 @@ Acts::Experimental::DD4hepLayerStructure::builder(
     DD4hepDetectorElement::Store& dd4hepStore, const GeometryContext& gctx,
     const dd4hep::DetElement& dd4hepElement, const Options& options) const {
   // Check for misconfiguration with double naming
-  if (dd4hepStore.find(options.name) != dd4hepStore.end()) {
+  if (dd4hepStore.contains(options.name)) {
     std::string reMessage = "DD4hepLayerStructure: structure with name '";
     reMessage += options.name;
     reMessage += "' already registered in DetectorElementStore";
@@ -38,7 +38,7 @@ Acts::Experimental::DD4hepLayerStructure::builder(
   fCache.sExtent = options.extent;
   fCache.pExtent = options.extent;
   fCache.extentConstraints = options.extentConstraints;
-  fCache.nExtentSegments = options.nSegments;
+  fCache.nExtentQSegments = options.quarterSegments;
   m_surfaceFactory->construct(fCache, gctx, dd4hepElement,
                               options.conversionOptions);
 
diff --git a/Plugins/DD4hep/src/DD4hepMaterialHelpers.cpp b/Plugins/DD4hep/src/DD4hepMaterialHelpers.cpp
index 02fb1fa4947..c3d6b346c72 100644
--- a/Plugins/DD4hep/src/DD4hepMaterialHelpers.cpp
+++ b/Plugins/DD4hep/src/DD4hepMaterialHelpers.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2019 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include "Acts/Plugins/DD4hep/DD4hepMaterialHelpers.hpp"
 
@@ -19,6 +19,7 @@
 #include <cmath>
 #include <cstddef>
 #include <iterator>
+#include <numbers>
 #include <ostream>
 
 #include <boost/foreach.hpp>
@@ -40,8 +41,8 @@ std::shared_ptr<Acts::ProtoSurfaceMaterial> Acts::createProtoMaterial(
     double min = 0.;
     double max = 0.;
     if (bopt == Acts::closed) {
-      min = -M_PI;
-      max = M_PI;
+      min = -std::numbers::pi;
+      max = std::numbers::pi;
     }
     int bins = params.get<int>(valueTag + "_"s + bin.first);
     ACTS_VERBOSE("  - material binning for " << bin.first << " on " << valueTag
diff --git a/Plugins/DD4hep/src/DD4hepVolumeBuilder.cpp b/Plugins/DD4hep/src/DD4hepVolumeBuilder.cpp
index 0913c3d31e1..cc3df6722d7 100644
--- a/Plugins/DD4hep/src/DD4hepVolumeBuilder.cpp
+++ b/Plugins/DD4hep/src/DD4hepVolumeBuilder.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2018 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include "Acts/Plugins/DD4hep/DD4hepVolumeBuilder.hpp"
 
diff --git a/Plugins/Detray/CMakeLists.txt b/Plugins/Detray/CMakeLists.txt
index 4dba2bf7c5d..608bcc866bd 100644
--- a/Plugins/Detray/CMakeLists.txt
+++ b/Plugins/Detray/CMakeLists.txt
@@ -1,4 +1,12 @@
-add_library(ActsPluginDetray SHARED src/DetrayConverter.cpp)
+add_library(
+    ActsPluginDetray
+    SHARED
+    src/DetrayConversionUtils.cpp
+    src/DetrayConverter.cpp
+    src/DetrayGeometryConverter.cpp
+    src/DetrayMaterialConverter.cpp
+    src/DetraySurfaceGridsConverter.cpp
+)
 
 add_dependencies(ActsPluginDetray detray::core covfie::core vecmem::core)
 
@@ -17,7 +25,8 @@ target_link_libraries(
         detray::core
         detray::core_array
         detray::io
-        detray::utils
+        detray::detectors
+        detray::test_utils
         vecmem::core
 )
 
diff --git a/Plugins/Detray/include/Acts/Plugins/Detray/DetrayConversionUtils.hpp b/Plugins/Detray/include/Acts/Plugins/Detray/DetrayConversionUtils.hpp
new file mode 100644
index 00000000000..2f827a08bea
--- /dev/null
+++ b/Plugins/Detray/include/Acts/Plugins/Detray/DetrayConversionUtils.hpp
@@ -0,0 +1,97 @@
+// This file is part of the ACTS project.
+//
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
+//
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
+
+#pragma once
+
+#include "Acts/Geometry/GeometryIdentifier.hpp"
+#include "Acts/Utilities/BinningData.hpp"
+#include "Acts/Utilities/BinningType.hpp"
+
+#include <map>
+
+#include <detray/core/detector.hpp>
+#include <detray/definitions/grid_axis.hpp>
+#include <detray/io/frontend/payloads.hpp>
+
+namespace Acts {
+
+namespace Experimental {
+class DetectorVolume;
+}
+
+using DetrayHostDetector = detray::detector<detray::default_metadata>;
+
+namespace DetrayConversionUtils {
+
+/// Detray conversion cache object
+///
+/// This object is used to synchronize link information between the
+/// different converters (geometry, material, surface grids)
+struct Cache {
+  /// Explicit constructor with detector volumes
+  ///
+  /// @param detectorVolumes the number of detector volumes
+  Cache(const std::vector<const Acts::Experimental::DetectorVolume*>& dVolumes)
+      : detectorVolumes(dVolumes) {}
+
+  /// The volumes of the detector for index lookup
+  std::vector<const Acts::Experimental::DetectorVolume*> detectorVolumes;
+  /// This is a map to pass on volume link information
+  std::map<GeometryIdentifier, unsigned long> volumeLinks;
+  /// This is a multimap to pass volume local surface link information
+  /// The portal splitting requires a multimap implementation here
+  ///
+  /// These are volume local, hence indexed per volumes
+  std::map<std::size_t, std::multimap<GeometryIdentifier, unsigned long>>
+      localSurfaceLinks;
+
+  /// Find the position of the volume to point to
+  ///
+  /// @param volume the volume to find
+  ///
+  /// @note throws exception if volume is not found
+  std::size_t volumeIndex(
+      const Acts::Experimental::DetectorVolume* volume) const {
+    auto candidate = std::ranges::find(detectorVolumes, volume);
+    if (candidate != detectorVolumes.end()) {
+      return std::distance(detectorVolumes.begin(), candidate);
+    }
+    throw std::invalid_argument("Volume not found in the cache");
+  }
+};
+
+/// Convert the binning option
+///
+/// @param bOption the binning option
+///
+/// @return a detray binning option
+detray::axis::bounds convertBinningOption(BinningOption bOption);
+
+/// Convert the binning value
+///
+/// @param bValue the binning value
+///
+/// @return a detray binning value
+detray::axis::label convertBinningValue(BinningValue bValue);
+
+/// Convert the binning type
+///
+/// @param bType the binning type
+///
+/// @return a detray binning type
+detray::axis::binning convertBinningType(BinningType bType);
+
+/// Convert the binning data to an axis
+///
+/// @param bData the binning data to be converted
+///
+/// @return a detray axis payload
+detray::io::axis_payload convertBinningData(const BinningData& bData);
+
+}  // namespace DetrayConversionUtils
+}  // namespace Acts
diff --git a/Plugins/Detray/include/Acts/Plugins/Detray/DetrayConverter.hpp b/Plugins/Detray/include/Acts/Plugins/Detray/DetrayConverter.hpp
index ff332d6d2a6..104c71e1893 100644
--- a/Plugins/Detray/include/Acts/Plugins/Detray/DetrayConverter.hpp
+++ b/Plugins/Detray/include/Acts/Plugins/Detray/DetrayConverter.hpp
@@ -1,144 +1,146 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2024 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
-#include "Acts/Definitions/Algebra.hpp"
 #include "Acts/Detector/Detector.hpp"
-#include "Acts/Geometry/GeometryContext.hpp"
-#include "Acts/Geometry/VolumeBounds.hpp"
+#include "Acts/Plugins/Detray/DetrayConversionUtils.hpp"
+#include "Acts/Plugins/Detray/DetrayGeometryConverter.hpp"
+#include "Acts/Plugins/Detray/DetrayMaterialConverter.hpp"
+#include "Acts/Plugins/Detray/DetraySurfaceGridsConverter.hpp"
+#include "Acts/Utilities/Logger.hpp"
 
-#include <vector>
+#include <memory>
 
-#include "detray/builders/detector_builder.hpp"
-#include "detray/core/detector.hpp"
-#include "detray/definitions/geometry.hpp"
-#include "detray/io/common/geometry_reader.hpp"
-#include "detray/io/frontend/detector_writer.hpp"
-#include "detray/io/frontend/payloads.hpp"
-#include "detray/utils/consistency_checker.hpp"
+#include <detray/io/common/geometry_reader.hpp>
+#include <detray/io/common/material_map_reader.hpp>
+#include <detray/io/common/surface_grid_reader.hpp>
+#include <detray/io/frontend/detector_writer_config.hpp>
+#include <detray/utils/consistency_checker.hpp>
 
 namespace Acts {
 
-class Surface;
-class SurfaceBounds;
-
-namespace Experimental {
-class DetectorVolume;
-class Portal;
-}  //  namespace Experimental
-
-namespace DetrayConverter {
-
-using DetrayDetector = detray::detector<detray::default_metadata>;
-
-/// Write the detector to json output
-///
-/// @param dDetector is the detray detector (converted)
-/// @param names a name map for the detector volumes
-/// @param writer_cfg the writer configuration
-void writeToJson(const DetrayDetector& dDetector,
-                 const typename DetrayDetector::name_map& names = {},
-                 detray::io::detector_writer_config writer_cfg = {});
-
-/// Conversion method for transform objects to detray::transform payloads
-///
-/// @param t the transform to be converted
-///
-/// @return the transform_payload(translation, rotation)
-detray::io::transform_payload convertTransform(const Transform3& t);
-
-/// Conversion method for surface bounds to detray::mask payloads
-///
-/// @param bounds the bounds object to be converted
-/// @param portal the flag for conversion into detray portal format
-///
-/// @return the mask_payload representing the bounds
-detray::io::mask_payload convertMask(const SurfaceBounds& bounds,
-                                     bool portal = false);
-
-/// Conversion method for surface objects to detray::surface payloads
-///
-/// @param gctx the geometry context
-/// @param surface the surface to be converted
-/// @param portal the flag for conversion into detray portal format
-///
-/// @return the surface_payload for portals and volumes by @param Surface acts object
-detray::io::surface_payload convertSurface(const GeometryContext& gctx,
-                                           const Surface& surface,
-                                           bool portal = false);
-/// Conversion method for Portal object to detray::portal payloads
-///
-/// @param gctx the geometry context
-/// @param portal the portal to be converted
-/// @param ip the portal index
-/// @param volume the volume to which the portal belongs
-/// @param orientedSurfaces the oriented surfaces of the portal
-/// @param detectorVolumes the detector volumes for the link lookup
-///
-/// @note due to portal splitting this can add up in N portals for one initial one
-///
-/// @brief convert the acts portal to detray surface payload and populate the payload
-std::vector<detray::io::surface_payload> convertPortal(
-    const GeometryContext& gctx, const Experimental::Portal& portal,
-    std::size_t ip, const Experimental::DetectorVolume& volume,
-    const std::vector<OrientedSurface>& orientedSurfaces,
-    const std::vector<const Experimental::DetectorVolume*>& detectorVolumes);
-
-/// Conversion method for volume objects to detray::volume payloads
-///
-/// @param gctx the geometry context
-/// @param volume the volume to be converted
-/// @param detectorVolumes the detector volumes for the link lookup
-///
-/// @return the volume_payload for portals and volumes by @param volume acts object
-detray::io::volume_payload convertVolume(
-    const GeometryContext& gctx, const Experimental::DetectorVolume& volume,
-    const std::vector<const Experimental::DetectorVolume*>& detectorVolumes);
-
-/// Conversion method for (common) header payload
-///
-/// @param detector is the detector to be converted
-///
-/// @return a geometry header payload
-detray::io::geo_header_payload convertHead(
-    const Acts::Experimental::Detector& detector);
-
-/// Convert an Acts::Experimental::Detector to a detray::detector object
-///
-/// @param gctx the geometry context
-/// @param detector the detector to be converted
-/// @param mr the memory resource to be used
-///
-/// @returns a detector of requested return type
-template <typename detector_t = DetrayDetector>
-std::tuple<detector_t, vecmem::memory_resource&> convertDetector(
-    const Acts::GeometryContext& gctx,
-    const Acts::Experimental::Detector& detector, vecmem::memory_resource& mr) {
-  detray::io::detector_payload detectorPayload;
-  for (const auto volume : detector.volumes()) {
-    detectorPayload.volumes.push_back(
-        convertVolume(gctx, *volume, detector.volumes()));
+class DetrayConverter {
+ public:
+  /// Detray conversion options
+  struct Options {
+    /// Option to switch on/off the material conversion
+    bool convertMaterial = true;
+    /// Option to switch on/off the surface grid conversin
+    bool convertSurfaceGrids = true;
+    /// Option to switch on/off the export to json
+    bool writeToJson = false;
+  };
+
+  /// Constructor with logger
+  explicit DetrayConverter(
+      std::unique_ptr<const Logger> logger = getDefaultLogger("DetrayConverter",
+                                                              Logging::INFO));
+
+  /// Convert an Acts::Experimental::Detector to a detray::detector object
+  ///
+  /// @param gctx the geometry context
+  /// @param detector the detector to be converted
+  /// @param mr the memory resource to be used
+  /// @param options the conversion options
+  ///
+  /// @returns a detector of requested return type
+  template <typename detector_t = DetrayHostDetector>
+  detector_t convert(const GeometryContext& gctx,
+                     const Experimental::Detector& detector,
+                     vecmem::memory_resource& mr, const Options& options) {
+    // The building cache object
+    DetrayConversionUtils::Cache cCache(detector.volumes());
+
+    typename detector_t::name_map names = {{0u, detector.name()}};
+
+    // build detector
+    detray::detector_builder<typename detector_t::metadata> detectorBuilder{};
+    // (1) geometry
+    detray::io::detector_payload detectorPayload =
+        DetrayGeometryConverter::convertDetector(cCache, gctx, detector,
+                                                 logger());
+    detray::io::geometry_reader::convert<detector_t>(detectorBuilder, names,
+                                                     detectorPayload);
+
+    // (2a) homogeneous material
+    if constexpr (detray::detail::has_homogeneous_material_v<detector_t>) {
+      if (options.convertMaterial) {
+        detray::io::detector_homogeneous_material_payload materialSlabsPayload =
+            DetrayMaterialConverter::convertHomogeneousSurfaceMaterial(
+                cCache, detector, logger());
+        detray::io::homogeneous_material_reader::convert<detector_t>(
+            detectorBuilder, names, std::move(materialSlabsPayload));
+      }
+    }
+
+    // (2b) material grids
+    if constexpr (detray::detail::has_material_grids_v<detector_t>) {
+      if (options.convertMaterial) {
+        detray::io::detector_grids_payload<detray::io::material_slab_payload,
+                                           detray::io::material_id>
+            materialGridsPayload =
+                DetrayMaterialConverter::convertGridSurfaceMaterial(
+                    cCache, detector, logger());
+        detray::io::material_map_reader<std::integral_constant<
+            std::size_t, 2>>::convert<detector_t>(detectorBuilder, names,
+                                                  std::move(
+                                                      materialGridsPayload));
+      }
+    }
+
+    // (3) surface grids
+    if (options.convertSurfaceGrids) {
+      detray::io::detector_grids_payload<std::size_t, detray::io::accel_id>
+          surfaceGridsPayload =
+              DetraySurfaceGridsConverter::convertSurfaceGrids(detector);
+
+      // Capacity 0 (dynamic bin size) and dimension 2 (2D grids)
+      detray::io::surface_grid_reader<typename detector_t::surface_type,
+                                      std::integral_constant<std::size_t, 0>,
+                                      std::integral_constant<std::size_t, 2>>::
+          template convert<detector_t>(detectorBuilder, names,
+                                       std::move(surfaceGridsPayload));
+    }
+
+    detector_t detrayDetector(detectorBuilder.build(mr));
+
+    // Checks and print
+    detray::detail::check_consistency(detrayDetector);
+
+    // If configured, write the detector to json
+    if (options.writeToJson) {
+      // Create a writer configuration and write it out
+      detray::io::detector_writer_config writerConfig{};
+      writerConfig.m_write_material = options.convertMaterial;
+      writerConfig.m_write_grids = options.convertSurfaceGrids;
+      writeToJson(detrayDetector, names, writerConfig);
+    }
+
+    return detrayDetector;
   }
-  typename detector_t::name_map names = {{0u, detector.name()}};
 
-  // build detector
-  detray::detector_builder<detray::default_metadata> detectorBuilder{};
-  detray::io::geometry_reader::convert<detector_t>(detectorBuilder, names,
-                                                   detectorPayload);
-  detector_t detrayDetector(detectorBuilder.build(mr));
+  /// Write the detector to json output
+  ///
+  /// @param dDetector is the detray detector (converted)
+  /// @param names a name map for the detector volumes
+  /// @param writer_cfg the writer configuration
+  static void writeToJson(
+      const DetrayHostDetector& dDetector,
+      const typename DetrayHostDetector::name_map& names = {},
+      detray::io::detector_writer_config writer_cfg = {});
 
-  // checks and print
-  detray::detail::check_consistency(detrayDetector);
-  converterPrint(detrayDetector, names);
+ private:
+  /// The logger instance
+  std::unique_ptr<const Logger> m_logger = nullptr;
 
-  return {std::move(detrayDetector), mr};
-}
+  // Return the logging instance
+  const Acts::Logger& logger() const { return *m_logger; }
+};
 
-}  // namespace DetrayConverter
 }  // namespace Acts
diff --git a/Plugins/Detray/include/Acts/Plugins/Detray/DetrayGeometryConverter.hpp b/Plugins/Detray/include/Acts/Plugins/Detray/DetrayGeometryConverter.hpp
new file mode 100644
index 00000000000..b6ea1373125
--- /dev/null
+++ b/Plugins/Detray/include/Acts/Plugins/Detray/DetrayGeometryConverter.hpp
@@ -0,0 +1,109 @@
+// This file is part of the ACTS project.
+//
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
+//
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
+
+#pragma once
+
+#include "Acts/Definitions/Algebra.hpp"
+#include "Acts/Detector/Detector.hpp"
+#include "Acts/Geometry/GeometryContext.hpp"
+#include "Acts/Geometry/VolumeBounds.hpp"
+#include "Acts/Plugins/Detray/DetrayConversionUtils.hpp"
+#include "Acts/Utilities/Logger.hpp"
+
+#include <vector>
+
+#include <detray/builders/detector_builder.hpp>
+#include <detray/definitions/geometry.hpp>
+#include <detray/io/frontend/detector_writer.hpp>
+#include <detray/io/frontend/payloads.hpp>
+
+namespace Acts {
+
+class Surface;
+class SurfaceBounds;
+
+namespace Experimental {
+class DetectorVolume;
+class Detector;
+class Portal;
+}  //  namespace Experimental
+
+namespace DetrayGeometryConverter {
+
+/// Conversion method for transform objects to detray::transform payloads
+///
+/// @param t the transform to be converted
+///
+/// @return the transform_payload(translation, rotation)
+detray::io::transform_payload convertTransform(const Transform3& t);
+
+/// Conversion method for surface bounds to detray::mask payloads
+///
+/// @param bounds the bounds object to be converted
+/// @param portal the flag for conversion into detray portal format
+///
+/// @return the mask_payload representing the bounds
+detray::io::mask_payload convertMask(const SurfaceBounds& bounds,
+                                     bool portal = false);
+
+/// Conversion method for surface objects to detray::surface payloads
+///
+/// @param gctx the geometry context
+/// @param surface the surface to be converted
+/// @param portal the flag for conversion into detray portal format
+///
+/// @return the surface_payload for portals and volumes by @param Surface acts object
+detray::io::surface_payload convertSurface(const GeometryContext& gctx,
+                                           const Surface& surface,
+                                           bool portal = false);
+
+/// Conversion method for Portal object to detray::portal payloads
+///
+/// @param cCache [in, out] object
+/// @param gctx the geometry context
+/// @param portal the portal to be converted
+/// @param ip the portal index
+/// @param volume the volume to which the portal belongs
+/// @param orientedSurfaces the oriented surfaces of the portal
+///
+/// @note due to portal splitting this can add up in N portals for one initial one
+///
+/// @brief convert the acts portal to detray surface payload and populate the payload
+std::vector<detray::io::surface_payload> convertPortal(
+    DetrayConversionUtils::Cache& cCache, const GeometryContext& gctx,
+    const Experimental::Portal& portal, std::size_t ip,
+    const Experimental::DetectorVolume& volume,
+    const std::vector<OrientedSurface>& orientedSurfaces);
+
+/// Conversion method for volume objects to detray::volume payloads
+///
+/// @param cCache [in, out] object
+/// @param gctx the geometry context
+/// @param volume the volume to be converted
+/// @param detectorVolumes the detector volumes for the link lookup
+/// @param logger the logger object for screen output
+///
+/// @return the volume_payload for portals and volumes by @param volume acts object
+detray::io::volume_payload convertVolume(
+    DetrayConversionUtils::Cache& cCache, const GeometryContext& gctx,
+    const Experimental::DetectorVolume& volume, const Acts::Logger& logger);
+
+/// Conversion method for detector objects to detray::detector payload
+///
+/// @param cCache [in, out] object
+/// @param gctx the geometry context
+/// @param detector the detector to be converted
+/// @param logger the logger object for screen output
+///
+/// @return the detector_payload for portals and volumes by @param detector acts object
+detray::io::detector_payload convertDetector(
+    DetrayConversionUtils::Cache& cCache, const GeometryContext& gctx,
+    const Experimental::Detector& detector, const Acts::Logger& logger);
+
+}  // namespace DetrayGeometryConverter
+}  // namespace Acts
diff --git a/Plugins/Detray/include/Acts/Plugins/Detray/DetrayMaterialConverter.hpp b/Plugins/Detray/include/Acts/Plugins/Detray/DetrayMaterialConverter.hpp
new file mode 100644
index 00000000000..70a2c8cec73
--- /dev/null
+++ b/Plugins/Detray/include/Acts/Plugins/Detray/DetrayMaterialConverter.hpp
@@ -0,0 +1,74 @@
+// This file is part of the ACTS project.
+//
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
+//
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
+
+#pragma once
+
+#include "Acts/Material/HomogeneousSurfaceMaterial.hpp"
+#include "Acts/Material/ISurfaceMaterial.hpp"
+#include "Acts/Material/MaterialSlab.hpp"
+#include "Acts/Plugins/Detray/DetrayConversionUtils.hpp"
+#include "Acts/Utilities/BinningData.hpp"
+#include "Acts/Utilities/Logger.hpp"
+
+#include <detray/io/frontend/payloads.hpp>
+
+namespace Acts {
+
+namespace Experimental {
+class Detector;
+}
+
+namespace DetrayMaterialConverter {
+
+/// Conversion method for material slab
+///
+/// @param materialSlab the material slab object
+///
+/// @return a material slab payload
+detray::io::material_slab_payload convertMaterialSlab(
+    const MaterialSlab& materialSlab);
+
+/// Conversion method for homogeneous material
+///
+/// @param cCache object to have the link association from the geometry building
+/// @param detector the detector object
+/// @param logger the logger object for screen output
+///
+/// @return the volume_payload for portals and volumes by @param volume acts object
+detray::io::detector_homogeneous_material_payload
+convertHomogeneousSurfaceMaterial(const DetrayConversionUtils::Cache& cCache,
+                                  const Experimental::Detector& detector,
+                                  const Logger& logger);
+
+/// Conversion method for grid based surface material
+///
+/// @param material the material (Binned/Grid)
+/// @param logger the logger object for screen output
+///
+/// @return a surface material
+detray::io::grid_payload<detray::io::material_slab_payload,
+                         detray::io::material_id>
+convertGridSurfaceMaterial(const ISurfaceMaterial& material,
+                           const Acts::Logger& logger);
+
+/// Conversion method for material grids
+///
+/// @param cCache object to have the link association from the geometry building
+/// @param detector the detector object
+/// @param logger the logger object for screen output
+///
+/// @return the volume_payload for portals and volumes by @param volume acts object
+detray::io::detector_grids_payload<detray::io::material_slab_payload,
+                                   detray::io::material_id>
+convertGridSurfaceMaterial(const DetrayConversionUtils::Cache& cCache,
+                           const Experimental::Detector& detector,
+                           const Logger& logger);
+
+}  // namespace DetrayMaterialConverter
+
+}  // namespace Acts
diff --git a/Plugins/Detray/include/Acts/Plugins/Detray/DetraySurfaceGridsConverter.hpp b/Plugins/Detray/include/Acts/Plugins/Detray/DetraySurfaceGridsConverter.hpp
new file mode 100644
index 00000000000..044922d5ad6
--- /dev/null
+++ b/Plugins/Detray/include/Acts/Plugins/Detray/DetraySurfaceGridsConverter.hpp
@@ -0,0 +1,90 @@
+// This file is part of the ACTS project.
+//
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
+//
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
+
+#pragma once
+
+#include "Acts/Navigation/InternalNavigation.hpp"
+#include "Acts/Utilities/BinningData.hpp"
+#include "Acts/Utilities/IAxis.hpp"
+#include "Acts/Utilities/Logger.hpp"
+#include "Acts/Utilities/TypeList.hpp"
+
+#include <detray/io/frontend/payloads.hpp>
+
+namespace Acts {
+
+class Surface;
+class SurfaceBounds;
+class IAxis;
+
+namespace Experimental {
+class Detector;
+}
+
+namespace DetraySurfaceGridsConverter {
+
+/// Conversion method for axis objects to detray::axis payloads
+///
+/// @param ia the axis to be converted
+///
+/// @return the axis_payload(bounds, binning, bins, edges)
+detray::io::axis_payload convertAxis(const IAxis& ia);
+
+/// Conversion method for grid objects to detray::grid payloads
+///
+/// @param grid the grid to be converted
+/// @param swapAxis the flag for swapping the axes
+///
+/// @return the grid_payload(axes, bins)
+template <typename grid_type>
+detray::io::grid_payload<std::size_t, detray::io::accel_id> convertGrid(
+    const grid_type& grid, bool swapAxis = false);
+
+/// Conversion method for index grid objects to detray::grid payloads
+///
+/// @param indexGrid the index grid to be converted
+///
+/// @return the grid_payload(axes, bins)
+template <typename index_grid>
+detray::io::grid_payload<std::size_t, detray::io::accel_id> convertImpl(
+    const index_grid& indexGrid);
+
+/// Conversion method for instance objects to detray::grid payloads
+///
+/// @param delegate the internal navigation delegate
+/// @param refInstance the reference instance
+///
+/// @return the grid_payload(axes, bins)
+template <typename instance_type>
+std::optional<detray::io::grid_payload<std::size_t, detray::io::accel_id>>
+convert(const Experimental::InternalNavigationDelegate& delegate,
+        [[maybe_unused]] const instance_type& refInstance);
+
+/// Conversion method for instance objects to detray::grid payloads
+///
+/// @param delegate the internal navigation delegate
+/// @param refInstance the reference instance
+///
+/// @return the grid_payload(axes, bins)
+template <typename... Args>
+std::vector<detray::io::grid_payload<std::size_t, detray::io::accel_id>>
+unrollConvert(const Acts::Experimental::InternalNavigationDelegate& delegate,
+              Acts::TypeList<Args...> /*unused*/);
+
+/// Conversion method for instance objects to detray::grid payloads
+///
+/// @param delegate the internal navigation delegate
+/// @param refInstance the reference instance
+///
+/// @return the grid_payload(axes, bins)
+detray::io::detector_grids_payload<std::size_t, detray::io::accel_id>
+convertSurfaceGrids(const Acts::Experimental::Detector& detector);
+
+}  // namespace DetraySurfaceGridsConverter
+
+}  // namespace Acts
diff --git a/Plugins/Detray/src/DetrayConversionUtils.cpp b/Plugins/Detray/src/DetrayConversionUtils.cpp
new file mode 100644
index 00000000000..b2a0f78138f
--- /dev/null
+++ b/Plugins/Detray/src/DetrayConversionUtils.cpp
@@ -0,0 +1,82 @@
+// This file is part of the ACTS project.
+//
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
+//
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
+
+#include "Acts/Plugins/Detray/DetrayConversionUtils.hpp"
+
+detray::axis::label Acts::DetrayConversionUtils::convertBinningValue(
+    BinningValue bValue) {
+  switch (bValue) {
+    case BinningValue::binX:
+      return detray::axis::label::e_x;
+    case BinningValue::binY:
+      return detray::axis::label::e_y;
+    case BinningValue::binZ:
+      return detray::axis::label::e_z;
+    case BinningValue::binR:
+      return detray::axis::label::e_r;
+    case BinningValue::binPhi:
+      return detray::axis::label::e_phi;
+    case BinningValue::binRPhi:
+      return detray::axis::label::e_rphi;
+    default:
+      throw std::invalid_argument(
+          "DetrayMaterialConverter: unknown binning value detected.");
+  }
+}
+
+detray::axis::bounds Acts::DetrayConversionUtils::convertBinningOption(
+    BinningOption bOption) {
+  // That's a bit of a mind bender, but the conversion is correct
+  // closed -> axis are closed, i.e. circular
+  // open -> axis are not closed, but the range is closed (no overflow bin) ->
+  // closed
+  switch (bOption) {
+    case BinningOption::closed:
+      return detray::axis::bounds::e_circular;
+    case BinningOption::open:
+      return detray::axis::bounds::e_closed;
+    default:
+      throw std::invalid_argument(
+          "DetrayMaterialConverter: unknown binning option detected.");
+  }
+}
+
+detray::axis::binning Acts::DetrayConversionUtils::convertBinningType(
+    BinningType bType) {
+  switch (bType) {
+    case BinningType::equidistant:
+      return detray::axis::binning::e_regular;
+    case BinningType::arbitrary:
+      return detray::axis::binning::e_irregular;
+    default:
+      throw std::invalid_argument(
+          "DetrayMaterialConverter: unknown binning type detected.");
+  }
+}
+
+detray::io::axis_payload Acts::DetrayConversionUtils::convertBinningData(
+    const BinningData& bData) {
+  detray::io::axis_payload axis;
+
+  axis.bins = bData.bins();
+  // Set the binning type
+  axis.binning = convertBinningType(bData.type);
+  // Set the binning option
+  axis.bounds = convertBinningOption(bData.option);
+  // Set the binning value
+  axis.label = convertBinningValue(bData.binvalue);
+  // Set the binning range
+  axis.edges = {};
+  if (bData.type == BinningType::equidistant) {
+    axis.edges = {bData.min, bData.max};
+  } else {
+    axis.edges.insert(axis.edges.end(), bData.boundaries().begin(),
+                      bData.boundaries().end());
+  }
+  return axis;
+}
diff --git a/Plugins/Detray/src/DetrayConverter.cpp b/Plugins/Detray/src/DetrayConverter.cpp
index 4f2ac983ad0..aa958af8fa1 100644
--- a/Plugins/Detray/src/DetrayConverter.cpp
+++ b/Plugins/Detray/src/DetrayConverter.cpp
@@ -1,316 +1,21 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2024 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include "Acts/Plugins/Detray/DetrayConverter.hpp"
 
-#include "Acts/Detector/Detector.hpp"
-#include "Acts/Detector/DetectorVolume.hpp"
-#include "Acts/Detector/Portal.hpp"
-#include "Acts/Navigation/PortalNavigation.hpp"
-#include "Acts/Plugins/Json/DetrayJsonHelper.hpp"
-#include "Acts/Surfaces/CylinderBounds.hpp"
-#include "Acts/Surfaces/CylinderSurface.hpp"
-#include "Acts/Surfaces/DiscSurface.hpp"
-#include "Acts/Surfaces/RadialBounds.hpp"
-#include "Acts/Surfaces/RegularSurface.hpp"
-#include "Acts/Surfaces/Surface.hpp"
-#include "Acts/Surfaces/SurfaceBounds.hpp"
+Acts::DetrayConverter::DetrayConverter(
+    std::unique_ptr<const Acts::Logger> logger)
+    : m_logger(std::move(logger)) {}
 
-#include "detray/io/frontend/detector_writer.hpp"
-
-using namespace detray;
-
-namespace {
-
-/// Find the position of the volume to point to
-///
-/// @param volume the volume to find
-/// @param the collection of volumes
-///
-/// @note return -1 if not found, to be interpreted by the caller
-int findVolume(
-    const Acts::Experimental::DetectorVolume* volume,
-    const std::vector<const Acts::Experimental::DetectorVolume*>& volumes) {
-  auto candidate = std::find(volumes.begin(), volumes.end(), volume);
-  if (candidate != volumes.end()) {
-    return std::distance(volumes.begin(), candidate);
-  }
-  return -1;
-}
-}  // namespace
-
-/// detray geometry writer function, debug purposes
 void Acts::DetrayConverter::writeToJson(
-    const DetrayDetector& dDetector,
-    const typename DetrayDetector::name_map& names,
+    const DetrayHostDetector& dDetector,
+    const typename DetrayHostDetector::name_map& names,
     detray::io::detector_writer_config writer_cfg) {
   writer_cfg.format(detray::io::format::json);
   detray::io::write_detector(dDetector, names, writer_cfg);
 }
-
-detray::io::transform_payload Acts::DetrayConverter::convertTransform(
-    const Transform3& t) {
-  detray::io::transform_payload tfPayload;
-  auto translation = t.translation();
-  tfPayload.tr = {translation.x(), translation.y(), translation.z()};
-
-  const auto rotation = t.rotation();
-  tfPayload.rot = {rotation(0, 0), rotation(0, 1), rotation(0, 2),
-                   rotation(1, 0), rotation(1, 1), rotation(1, 2),
-                   rotation(2, 0), rotation(2, 1), rotation(2, 2)};
-  return tfPayload;
-}
-
-detray::io::mask_payload Acts::DetrayConverter::convertMask(
-    const Acts::SurfaceBounds& bounds, bool portal) {
-  detray::io::mask_payload maskPayload;
-  auto [shape, boundaries] = DetrayJsonHelper::maskFromBounds(bounds, portal);
-  maskPayload.shape = static_cast<io::mask_payload::mask_shape>(shape);
-  maskPayload.boundaries = static_cast<std::vector<real_io>>(boundaries);
-  // default maskPayload.volume_link
-
-  return maskPayload;
-}
-
-detray::io::surface_payload Acts::DetrayConverter::convertSurface(
-    const Acts::GeometryContext& gctx, const Surface& surface, bool portal) {
-  detray::io::surface_payload surfacePayload;
-
-  surfacePayload.transform = convertTransform(surface.transform(gctx));
-  surfacePayload.source = surface.geometryId().value();
-  surfacePayload.barcode = std::nullopt;
-  surfacePayload.type = static_cast<detray::surface_id>(
-      portal ? surface_id::e_portal
-             : (surface.geometryId().sensitive() > 0
-                    ? detray::surface_id::e_sensitive
-                    : detray::surface_id::e_passive));
-  surfacePayload.mask = convertMask(surface.bounds());
-  return surfacePayload;
-}
-
-std::vector<detray::io::surface_payload> Acts::DetrayConverter::convertPortal(
-    const GeometryContext& gctx, const Experimental::Portal& portal,
-    std::size_t ip, const Experimental::DetectorVolume& volume,
-    const std::vector<Acts::OrientedSurface>& orientedSurfaces,
-    const std::vector<const Experimental::DetectorVolume*>& detectorVolumes) {
-  std::vector<detray::io::surface_payload> portals{};
-
-  const RegularSurface& surface = portal.surface();
-  const auto& volumeLinks = portal.portalNavigation();
-
-  // First assumption for outside link (along direction)
-  std::size_t outside = 1u;
-
-  // Find out if you need to take the outside or inside volume
-  // for planar surfaces that's easy
-  if (surface.type() != Acts::Surface::SurfaceType::Cylinder) {
-    // Get the two volume center
-    const auto volumeCenter = volume.transform(gctx).translation();
-    const auto surfaceCenter = surface.center(gctx);
-    const auto surfaceNormal = surface.normal(gctx, surfaceCenter);
-    // Get the direction from the volume to the surface, correct link
-    const auto volumeToSurface = surfaceCenter - volumeCenter;
-    if (volumeToSurface.dot(surfaceNormal) < 0.) {
-      outside = 0u;
-    }
-  } else {
-    // This is a cylinder portal, inner cover reverses the normal
-    if (ip == 3u) {
-      outside = 0u;
-    }
-  }
-
-  const auto& outsideLink = volumeLinks[outside];
-  // Grab the corresponding volume link
-  // If it is a single link, we are done
-  const auto* instance = outsideLink.instance();
-  // Single link cast
-  auto singleLink =
-      dynamic_cast<const Acts::Experimental::SingleDetectorVolumeNavigation*>(
-          instance);
-
-  auto [surfaceAdjusted, insidePointer] = orientedSurfaces[ip];
-
-  // Single link detected - just write it out, we use the oriented surface
-  // in order to make sure the size is adjusted
-  if (singleLink != nullptr) {
-    // Single link can be written out
-    std::size_t vLink = findVolume(singleLink->object(), detectorVolumes);
-    auto portalPayload = convertSurface(gctx, *surfaceAdjusted, true);
-    portalPayload.mask.volume_link.link = vLink;
-    portals.push_back(portalPayload);
-  } else {
-    // Multi link detected - 1D
-    auto multiLink1D =
-        dynamic_cast<const Experimental::BoundVolumesGrid1Navigation*>(
-            instance);
-    if (multiLink1D != nullptr) {
-      // Resolve the multi link 1D
-      auto boundaries =
-          multiLink1D->indexedUpdater.grid.axes()[0u]->getBinEdges();
-      const auto& cast = multiLink1D->indexedUpdater.casts[0u];
-      const auto& transform = multiLink1D->indexedUpdater.transform;
-      const auto& volumes = multiLink1D->indexedUpdater.extractor.dVolumes;
-
-      // Apply the correction from local to global boundaries
-      ActsScalar gCorr = VectorHelpers::cast(transform.translation(), cast);
-      std::for_each(boundaries.begin(), boundaries.end(),
-                    [&gCorr](ActsScalar& b) { b -= gCorr; });
-
-      // Get the volume indices
-      auto surfaceType = surfaceAdjusted->type();
-      std::vector<unsigned int> vIndices = {};
-      for (const auto& v : volumes) {
-        vIndices.push_back(findVolume(v, detectorVolumes));
-      }
-
-      // Pick the surface dimension - via poly
-      std::array<ActsScalar, 2u> clipRange = {0., 0.};
-      std::vector<ActsScalar> boundValues = surfaceAdjusted->bounds().values();
-      if (surfaceType == Surface::SurfaceType::Cylinder &&
-          cast == BinningValue::binZ) {
-        ActsScalar zPosition = surfaceAdjusted->center(gctx).z();
-        clipRange = {
-            zPosition - boundValues[CylinderBounds::BoundValues::eHalfLengthZ],
-            zPosition + boundValues[CylinderBounds::BoundValues::eHalfLengthZ]};
-      } else if (surfaceType == Surface::SurfaceType::Disc &&
-                 cast == BinningValue::binR) {
-        clipRange = {boundValues[RadialBounds::BoundValues::eMinR],
-                     boundValues[RadialBounds::BoundValues::eMaxR]};
-      } else {
-        throw std::runtime_error(
-            "PortalDetrayConverter: surface type not (yet) supported for "
-            "detray "
-            "conversion, only cylinder and disc are currently supported.");
-      }
-
-      // Need to clip the parameter space to the surface dimension
-      std::vector<unsigned int> clippedIndices = {};
-      std::vector<ActsScalar> clippedBoundaries = {};
-      clippedBoundaries.push_back(clipRange[0u]);
-      for (const auto [ib, b] : enumerate(boundaries)) {
-        if (ib > 0) {
-          unsigned int vI = vIndices[ib - 1u];
-          ActsScalar highEdge = boundaries[ib];
-          if (boundaries[ib - 1] >= clipRange[1u]) {
-            break;
-          }
-          if (highEdge <= clipRange[0u] ||
-              std::abs(highEdge - clipRange[0u]) < 1e-5) {
-            continue;
-          }
-          if (highEdge > clipRange[1u]) {
-            highEdge = clipRange[1u];
-          }
-          clippedIndices.push_back(vI);
-          clippedBoundaries.push_back(highEdge);
-        }
-      }
-      // Interpret the clipped information
-      //
-      // Clipped cylinder case
-      if (surfaceType == Surface::SurfaceType::Cylinder) {
-        for (auto [ib, b] : enumerate(clippedBoundaries)) {
-          if (ib > 0) {
-            // Create sub surfaces
-            std::array<ActsScalar, CylinderBounds::BoundValues::eSize>
-                subBoundValues = {};
-            for (auto [ibv, bv] : enumerate(boundValues)) {
-              subBoundValues[ibv] = bv;
-            }
-            subBoundValues[CylinderBounds::BoundValues::eHalfLengthZ] =
-                0.5 * (b - clippedBoundaries[ib - 1u]);
-            auto subBounds = std::make_shared<CylinderBounds>(subBoundValues);
-            auto subTransform = Transform3::Identity();
-            subTransform.pretranslate(Vector3(
-                0., 0.,
-                clippedBoundaries[ib - 1u] +
-                    subBoundValues[CylinderBounds::BoundValues::eHalfLengthZ]));
-            auto subSurface =
-                Surface::makeShared<CylinderSurface>(subTransform, subBounds);
-
-            auto portalPayload = convertSurface(gctx, *subSurface, true);
-            portalPayload.mask.volume_link.link = clippedIndices[ib - 1u];
-            portals.push_back(portalPayload);
-          }
-        }
-      } else {
-        for (auto [ib, b] : enumerate(clippedBoundaries)) {
-          if (ib > 0) {
-            // Create sub surfaces
-            std::array<ActsScalar, RadialBounds::BoundValues::eSize>
-                subBoundValues = {};
-            for (auto [ibv, bv] : enumerate(boundValues)) {
-              subBoundValues[ibv] = bv;
-            }
-            subBoundValues[RadialBounds::BoundValues::eMinR] =
-                clippedBoundaries[ib - 1u];
-            subBoundValues[RadialBounds::BoundValues::eMaxR] = b;
-            auto subBounds = std::make_shared<RadialBounds>(subBoundValues);
-            auto subSurface = Surface::makeShared<DiscSurface>(
-                portal.surface().transform(gctx), subBounds);
-
-            auto portalPayload = convertSurface(gctx, *subSurface, true);
-            portalPayload.mask.volume_link.link = clippedIndices[ib - 1u];
-            portals.push_back(portalPayload);
-          }
-        }
-      }
-
-    } else {
-      // End of world portal
-      // Write surface with invalid link
-      auto portalPayload = convertSurface(gctx, *surfaceAdjusted, true);
-      using NavigationLink =
-          typename DetrayDetector::surface_type::navigation_link;
-      portalPayload.mask.volume_link.link =
-          std::numeric_limits<NavigationLink>::max();
-
-      portals.push_back(portalPayload);
-    }
-  }
-
-  return portals;
-}
-
-detray::io::volume_payload Acts::DetrayConverter::convertVolume(
-    const Acts::GeometryContext& gctx,
-    const Acts::Experimental::DetectorVolume& volume,
-    const std::vector<const Experimental::DetectorVolume*>& detectorVolumes) {
-  detray::io::volume_payload volumePayload;
-  volumePayload.name = volume.name();
-  volumePayload.index.link = findVolume(&volume, detectorVolumes);
-  volumePayload.transform = convertTransform(volume.transform(gctx));
-
-  // iterate over surfaces and portals keeping the same surf_pd.index_in_coll
-  std::size_t sIndex = 0;
-  for (const auto surface : volume.surfaces()) {
-    io::surface_payload surfacePayload = convertSurface(gctx, *surface, false);
-
-    surfacePayload.index_in_coll = sIndex++;
-    surfacePayload.mask.volume_link.link =
-        volumePayload.index.link;  // link surface' mask to volume
-    volumePayload.surfaces.push_back(surfacePayload);
-  }
-
-  auto orientedSurfaces =
-      volume.volumeBounds().orientedSurfaces(volume.transform(gctx));
-
-  int portalCounter = 0;
-  for (const auto& [ip, p] : enumerate(volume.portals())) {
-    auto portals =
-        convertPortal(gctx, *p, ip, volume, orientedSurfaces, detectorVolumes);
-    std::for_each(portals.begin(), portals.end(), [&](auto& portalPayload) {
-      portalPayload.index_in_coll = sIndex++;
-      volumePayload.surfaces.push_back(portalPayload);
-      portalCounter++;
-    });
-  }
-
-  return volumePayload;
-}
diff --git a/Plugins/Detray/src/DetrayGeometryConverter.cpp b/Plugins/Detray/src/DetrayGeometryConverter.cpp
new file mode 100644
index 00000000000..23eb56a0f8c
--- /dev/null
+++ b/Plugins/Detray/src/DetrayGeometryConverter.cpp
@@ -0,0 +1,338 @@
+// This file is part of the ACTS project.
+//
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
+//
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
+
+#include "Acts/Plugins/Detray/DetrayGeometryConverter.hpp"
+
+#include "Acts/Detector/Detector.hpp"
+#include "Acts/Detector/DetectorVolume.hpp"
+#include "Acts/Detector/Portal.hpp"
+#include "Acts/Navigation/PortalNavigation.hpp"
+#include "Acts/Plugins/Json/DetrayJsonHelper.hpp"
+#include "Acts/Surfaces/CylinderBounds.hpp"
+#include "Acts/Surfaces/CylinderSurface.hpp"
+#include "Acts/Surfaces/DiscSurface.hpp"
+#include "Acts/Surfaces/RadialBounds.hpp"
+#include "Acts/Surfaces/RegularSurface.hpp"
+#include "Acts/Surfaces/Surface.hpp"
+#include "Acts/Surfaces/SurfaceBounds.hpp"
+
+#include <algorithm>
+
+#include <detray/io/frontend/detector_writer.hpp>
+
+using namespace detray;
+
+detray::io::transform_payload Acts::DetrayGeometryConverter::convertTransform(
+    const Transform3& t) {
+  detray::io::transform_payload tfPayload;
+  Vector3 translation = t.translation();
+  tfPayload.tr = {translation.x(), translation.y(), translation.z()};
+  RotationMatrix3 rotation = t.rotation().transpose();
+  tfPayload.rot = {rotation(0, 0), rotation(0, 1), rotation(0, 2),
+                   rotation(1, 0), rotation(1, 1), rotation(1, 2),
+                   rotation(2, 0), rotation(2, 1), rotation(2, 2)};
+  return tfPayload;
+}
+
+detray::io::mask_payload Acts::DetrayGeometryConverter::convertMask(
+    const Acts::SurfaceBounds& bounds, bool portal) {
+  detray::io::mask_payload maskPayload;
+  auto [shape, boundaries] = DetrayJsonHelper::maskFromBounds(bounds, portal);
+  maskPayload.shape = static_cast<io::mask_payload::mask_shape>(shape);
+  maskPayload.boundaries = static_cast<std::vector<real_io>>(boundaries);
+  // default maskPayload.volume_link
+
+  return maskPayload;
+}
+
+detray::io::surface_payload Acts::DetrayGeometryConverter::convertSurface(
+    const GeometryContext& gctx, const Surface& surface, bool portal) {
+  detray::io::surface_payload surfacePayload;
+
+  surfacePayload.transform = convertTransform(surface.transform(gctx));
+  surfacePayload.source = surface.geometryId().value();
+  surfacePayload.barcode = std::nullopt;
+  surfacePayload.type = static_cast<detray::surface_id>(
+      portal ? surface_id::e_portal
+             : (surface.geometryId().sensitive() > 0
+                    ? detray::surface_id::e_sensitive
+                    : detray::surface_id::e_passive));
+  surfacePayload.mask = convertMask(surface.bounds());
+  return surfacePayload;
+}
+
+std::vector<detray::io::surface_payload>
+Acts::DetrayGeometryConverter::convertPortal(
+    DetrayConversionUtils::Cache& cCache, const GeometryContext& gctx,
+    const Experimental::Portal& portal, std::size_t ip,
+    const Experimental::DetectorVolume& volume,
+    const std::vector<Acts::OrientedSurface>& orientedSurfaces) {
+  std::vector<detray::io::surface_payload> portals{};
+
+  const RegularSurface& surface = portal.surface();
+  const auto& volumeLinks = portal.portalNavigation();
+
+  // First assumption for outside link (along direction)
+  std::size_t outside = 1u;
+
+  // Find out if you need to take the outside or inside volume
+  // for planar surfaces that's easy
+  if (surface.type() != Acts::Surface::SurfaceType::Cylinder) {
+    // Get the two volume center
+    const auto volumeCenter = volume.transform(gctx).translation();
+    const auto surfaceCenter = surface.center(gctx);
+    const auto surfaceNormal = surface.normal(gctx, surfaceCenter);
+    // Get the direction from the volume to the surface, correct link
+    const auto volumeToSurface = surfaceCenter - volumeCenter;
+    if (volumeToSurface.dot(surfaceNormal) < 0.) {
+      outside = 0u;
+    }
+  } else {
+    // This is a cylinder portal, inner cover reverses the normal
+    if (ip == 3u) {
+      outside = 0u;
+    }
+  }
+
+  const auto& outsideLink = volumeLinks[outside];
+  // Grab the corresponding volume link
+  // If it is a single link, we are done
+  const auto* instance = outsideLink.instance();
+  // Single link cast
+  auto singleLink =
+      dynamic_cast<const Acts::Experimental::SingleDetectorVolumeNavigation*>(
+          instance);
+
+  auto [surfaceAdjusted, insidePointer] = orientedSurfaces[ip];
+  // Assign the geometry id to the surface
+  surfaceAdjusted->assignGeometryId(surface.geometryId());
+
+  // Single link detected - just write it out, we use the oriented surface
+  // in order to make sure the size is adjusted
+  if (singleLink != nullptr) {
+    // Single link can be written out
+    std::size_t vLink = cCache.volumeIndex(singleLink->object());
+    auto portalPayload = convertSurface(gctx, *surfaceAdjusted, true);
+    portalPayload.mask.volume_link.link = vLink;
+    portals.push_back(portalPayload);
+  } else {
+    // Multi link detected - 1D
+    auto multiLink1D =
+        dynamic_cast<const Experimental::BoundVolumesGrid1Navigation*>(
+            instance);
+    if (multiLink1D != nullptr) {
+      // Resolve the multi link 1D
+      auto boundaries =
+          multiLink1D->indexedUpdater.grid.axes()[0u]->getBinEdges();
+      const auto& cast = multiLink1D->indexedUpdater.casts[0u];
+      const auto& transform = multiLink1D->indexedUpdater.transform;
+      const auto& volumes = multiLink1D->indexedUpdater.extractor.dVolumes;
+
+      // Apply the correction from local to global boundaries
+      ActsScalar gCorr = VectorHelpers::cast(transform.translation(), cast);
+      std::for_each(boundaries.begin(), boundaries.end(),
+                    [&gCorr](ActsScalar& b) { b -= gCorr; });
+
+      // Get the volume indices
+      auto surfaceType = surfaceAdjusted->type();
+      std::vector<unsigned int> vIndices = {};
+      for (const auto& v : volumes) {
+        vIndices.push_back(cCache.volumeIndex(v));
+      }
+
+      // Pick the surface dimension
+      std::array<ActsScalar, 2u> clipRange = {0., 0.};
+      std::vector<ActsScalar> boundValues = surfaceAdjusted->bounds().values();
+      if (surfaceType == Surface::SurfaceType::Cylinder &&
+          cast == BinningValue::binZ) {
+        ActsScalar zPosition = surfaceAdjusted->center(gctx).z();
+        clipRange = {
+            zPosition - boundValues[CylinderBounds::BoundValues::eHalfLengthZ],
+            zPosition + boundValues[CylinderBounds::BoundValues::eHalfLengthZ]};
+      } else if (surfaceType == Surface::SurfaceType::Disc &&
+                 cast == BinningValue::binR) {
+        clipRange = {boundValues[RadialBounds::BoundValues::eMinR],
+                     boundValues[RadialBounds::BoundValues::eMaxR]};
+      } else {
+        throw std::runtime_error(
+            "PortalDetrayGeometryConverter: surface type not (yet) supported "
+            "for "
+            "detray "
+            "conversion, only cylinder and disc are currently supported.");
+      }
+
+      // Need to clip the parameter space to the surface dimension
+      std::vector<unsigned int> clippedIndices = {};
+      std::vector<ActsScalar> clippedBoundaries = {};
+      clippedBoundaries.push_back(clipRange[0u]);
+      for (const auto [ib, b] : enumerate(boundaries)) {
+        if (ib > 0) {
+          unsigned int vI = vIndices[ib - 1u];
+          ActsScalar highEdge = boundaries[ib];
+          if (boundaries[ib - 1] >= clipRange[1u]) {
+            break;
+          }
+          if (highEdge <= clipRange[0u] ||
+              std::abs(highEdge - clipRange[0u]) < 1e-5) {
+            continue;
+          }
+          if (highEdge > clipRange[1u]) {
+            highEdge = clipRange[1u];
+          }
+          clippedIndices.push_back(vI);
+          clippedBoundaries.push_back(highEdge);
+        }
+      }
+      // Interpret the clipped information
+      //
+      // Clipped cylinder case
+      if (surfaceType == Surface::SurfaceType::Cylinder) {
+        for (auto [ib, b] : enumerate(clippedBoundaries)) {
+          if (ib > 0) {
+            // Create sub surfaces
+            std::array<ActsScalar, CylinderBounds::BoundValues::eSize>
+                subBoundValues = {};
+            for (auto [ibv, bv] : enumerate(boundValues)) {
+              subBoundValues[ibv] = bv;
+            }
+            subBoundValues[CylinderBounds::BoundValues::eHalfLengthZ] =
+                0.5 * (b - clippedBoundaries[ib - 1u]);
+            auto subBounds = std::make_shared<CylinderBounds>(subBoundValues);
+            auto subTransform = Transform3::Identity();
+            subTransform.pretranslate(Vector3(
+                0., 0.,
+                clippedBoundaries[ib - 1u] +
+                    subBoundValues[CylinderBounds::BoundValues::eHalfLengthZ]));
+
+            auto subSurface =
+                Surface::makeShared<CylinderSurface>(subTransform, subBounds);
+            subSurface->assignGeometryId(surface.geometryId());
+
+            auto portalPayload = convertSurface(gctx, *subSurface, true);
+            portalPayload.mask.volume_link.link = clippedIndices[ib - 1u];
+            portals.push_back(portalPayload);
+          }
+        }
+      } else {
+        for (auto [ib, b] : enumerate(clippedBoundaries)) {
+          if (ib > 0) {
+            // Create sub surfaces
+            std::array<ActsScalar, RadialBounds::BoundValues::eSize>
+                subBoundValues = {};
+            for (auto [ibv, bv] : enumerate(boundValues)) {
+              subBoundValues[ibv] = bv;
+            }
+            subBoundValues[RadialBounds::BoundValues::eMinR] =
+                clippedBoundaries[ib - 1u];
+            subBoundValues[RadialBounds::BoundValues::eMaxR] = b;
+            auto subBounds = std::make_shared<RadialBounds>(subBoundValues);
+            auto subSurface = Surface::makeShared<DiscSurface>(
+                portal.surface().transform(gctx), subBounds);
+
+            subSurface->assignGeometryId(surface.geometryId());
+            auto portalPayload = convertSurface(gctx, *subSurface, true);
+            portalPayload.mask.volume_link.link = clippedIndices[ib - 1u];
+            portals.push_back(portalPayload);
+          }
+        }
+      }
+
+    } else {
+      // Write surface with invalid link
+      auto portalPayload = convertSurface(gctx, *surfaceAdjusted, true);
+      using NavigationLink =
+          typename DetrayHostDetector::surface_type::navigation_link;
+      portalPayload.mask.volume_link.link =
+          std::numeric_limits<NavigationLink>::max();
+
+      portals.push_back(portalPayload);
+    }
+  }
+  return portals;
+}
+
+detray::io::volume_payload Acts::DetrayGeometryConverter::convertVolume(
+    DetrayConversionUtils::Cache& cCache, const GeometryContext& gctx,
+    const Acts::Experimental::DetectorVolume& volume,
+    const Acts::Logger& logger) {
+  ACTS_DEBUG("DetrayGeometryConverter: converting volume "
+             << volume.name() << " with " << volume.surfaces().size()
+             << " surfaces and " << volume.portals().size() << " portals");
+
+  detray::io::volume_payload volumePayload;
+  std::size_t volumeIndex = cCache.volumeIndex(&volume);
+  volumePayload.name = volume.name();
+  volumePayload.index.link = volumeIndex;
+  volumePayload.transform = convertTransform(volume.transform(gctx));
+
+  // Remember the link
+  cCache.volumeLinks[volume.geometryId()] = volumePayload.index.link;
+
+  std::multimap<GeometryIdentifier, unsigned long> localSurfaceLinks;
+
+  // iterate over surfaces and portals keeping the same surf_pd.index_in_coll
+  std::size_t sIndex = 0;
+  for (const auto surface : volume.surfaces()) {
+    io::surface_payload surfacePayload = convertSurface(gctx, *surface, false);
+    // Set the index in the collection & remember it in the cache
+    surfacePayload.index_in_coll = sIndex++;
+    localSurfaceLinks.insert(
+        {surface->geometryId(), surfacePayload.index_in_coll.value()});
+    // Set mask to volume link
+    surfacePayload.mask.volume_link.link =
+        volumePayload.index.link;  // link surface' mask to volume
+    volumePayload.surfaces.push_back(surfacePayload);
+  }
+
+  auto orientedSurfaces =
+      volume.volumeBounds().orientedSurfaces(volume.transform(gctx));
+
+  // Iterate over portals
+  int portalCounter = 0;
+  for (const auto& [ip, p] : enumerate(volume.portals())) {
+    auto portals =
+        convertPortal(cCache, gctx, *p, ip, volume, orientedSurfaces);
+    ACTS_VERBOSE(" > portal " << ip << " split into " << portals.size()
+                              << " surfaces");
+    GeometryIdentifier geoID = p->surface().geometryId();
+    std::for_each(portals.begin(), portals.end(), [&](auto& portalPayload) {
+      // Set the index in the collection & remember it in the cache
+      portalPayload.index_in_coll = sIndex++;
+      localSurfaceLinks.insert({geoID, portalPayload.index_in_coll.value()});
+      // Add it to the surfaces
+      volumePayload.surfaces.push_back(portalPayload);
+      portalCounter++;
+    });
+  }
+  cCache.localSurfaceLinks[volumeIndex] = localSurfaceLinks;
+  ACTS_DEBUG(" > " << volume.portals().size()
+                   << " initial ACTS portals split into final " << portalCounter
+                   << " detray portals");
+  ACTS_VERBOSE(" > Local surface link cache has " << localSurfaceLinks.size()
+                                                  << " entries");
+
+  return volumePayload;
+}
+
+detray::io::detector_payload Acts::DetrayGeometryConverter::convertDetector(
+    DetrayConversionUtils::Cache& cCache, const GeometryContext& gctx,
+    const Acts::Experimental::Detector& detector, const Acts::Logger& logger) {
+  ACTS_DEBUG("DetrayGeometryConverter: converting detector"
+             << detector.name() << " with " << detector.volumes().size()
+             << " volumes.");
+
+  // The detector payload which will be handed back
+  detray::io::detector_payload detectorPayload;
+
+  for (const auto volume : detector.volumes()) {
+    detectorPayload.volumes.push_back(
+        convertVolume(cCache, gctx, *volume, logger));
+  }
+
+  return detectorPayload;
+}
diff --git a/Plugins/Detray/src/DetrayMaterialConverter.cpp b/Plugins/Detray/src/DetrayMaterialConverter.cpp
new file mode 100644
index 00000000000..f6b61236ec5
--- /dev/null
+++ b/Plugins/Detray/src/DetrayMaterialConverter.cpp
@@ -0,0 +1,311 @@
+// This file is part of the ACTS project.
+//
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
+//
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
+
+#include "Acts/Plugins/Detray/DetrayMaterialConverter.hpp"
+
+#include "Acts/Detector/Detector.hpp"
+#include "Acts/Material/BinnedSurfaceMaterial.hpp"
+#include "Acts/Material/HomogeneousSurfaceMaterial.hpp"
+#include "Acts/Material/ProtoSurfaceMaterial.hpp"
+#include "Acts/Plugins/Detray/DetrayConversionUtils.hpp"
+#include "Acts/Surfaces/Surface.hpp"
+#include "Acts/Utilities/BinUtility.hpp"
+#include "Acts/Utilities/BinningType.hpp"
+#include "Acts/Utilities/Helpers.hpp"
+
+#include <numbers>
+#include <stdexcept>
+
+namespace {
+
+struct MaterialSurfaceSelector {
+  std::vector<const Acts::Surface*> surfaces = {};
+
+  /// @param surface is the test surface
+  void operator()(const Acts::Surface* surface) {
+    if (surface->surfaceMaterial() != nullptr &&
+        !rangeContainsValue(surfaces, surface)) {
+      surfaces.push_back(surface);
+    }
+  }
+};
+
+}  // namespace
+
+detray::io::material_slab_payload
+Acts::DetrayMaterialConverter::convertMaterialSlab(
+    const MaterialSlab& materialSlab) {
+  detray::io::material_slab_payload slab;
+  // Fill the material parameters and the thickness
+  const auto& material = materialSlab.material();
+  slab.thickness = materialSlab.thickness();
+  slab.mat = detray::io::material_payload{
+      {material.X0(), material.L0(), material.Ar(), material.Z(),
+       material.massDensity(), material.molarDensity(), 0.}};
+  slab.type = detray::io::material_id::slab;
+  return slab;
+}
+
+detray::io::detector_homogeneous_material_payload
+Acts::DetrayMaterialConverter::convertHomogeneousSurfaceMaterial(
+    const DetrayConversionUtils::Cache& cCache,
+    const Experimental::Detector& detector, const Logger& logger) {
+  detray::io::detector_homogeneous_material_payload materialPayload;
+
+  for (const auto volume : detector.volumes()) {
+    auto volumeIndex = cCache.volumeLinks.find(volume->geometryId());
+    if (volumeIndex != cCache.volumeLinks.end()) {
+      // The volume material payload & its link
+      detray::io::material_volume_payload volumePayload;
+      detray::io::single_link_payload volumeLink;
+      volumeLink.link = volumeIndex->second;
+      volumePayload.volume_link = volumeLink;
+      // Now run through surfaces and portals to find the material
+      MaterialSurfaceSelector selector;
+      volume->visitSurfaces(selector);
+      ACTS_DEBUG("DetrayMaterialConverter: found "
+                 << selector.surfaces.size()
+                 << " surfaces/portals with material in volume "
+                 << volume->name());
+      for (const auto surface : selector.surfaces) {
+        const auto* surfaceMaterial = surface->surfaceMaterial();
+        auto homogeneousMaterial =
+            dynamic_cast<const HomogeneousSurfaceMaterial*>(surfaceMaterial);
+        if (homogeneousMaterial != nullptr) {
+          // Convert the material slab
+          auto materialSlab = homogeneousMaterial->materialSlab();
+          detray::io::material_slab_payload slabPayload =
+              convertMaterialSlab(materialSlab);
+          // Find the surfaces to assign
+          auto vIndex = cCache.volumeIndex(volume);
+          auto localSurfaceLinks = cCache.localSurfaceLinks.find(vIndex);
+          if (localSurfaceLinks != cCache.localSurfaceLinks.end()) {
+            // Find the surface link
+            auto surfaceIndices =
+                localSurfaceLinks->second.equal_range(surface->geometryId());
+            // Loop over the equal range and fill one grid each, this is needed
+            // as the initial portal could be split into multiple surfaces
+            for (auto itr = surfaceIndices.first; itr != surfaceIndices.second;
+                 ++itr) {
+              // Make an identified link copy for every matching surface
+              slabPayload.surface.link = itr->second;
+              volumePayload.mat_slabs.push_back(slabPayload);
+            }
+          } else {
+            ACTS_WARNING(
+                "DetrayMaterialConverter: no local surface links found");
+          }
+        }
+      }
+      materialPayload.volumes.push_back(volumePayload);
+    } else {
+      ACTS_WARNING("DetrayMaterialConverter: volume " << volume->name()
+                                                      << " not found in cache");
+    }
+  }
+
+  return materialPayload;
+}
+
+detray::io::grid_payload<detray::io::material_slab_payload,
+                         detray::io::material_id>
+Acts::DetrayMaterialConverter::convertGridSurfaceMaterial(
+    const ISurfaceMaterial& material, const Logger& logger) {
+  detray::io::grid_payload<detray::io::material_slab_payload,
+                           detray::io::material_id>
+      materialGrid;
+
+  // Check the material types
+  // (1) homogeneous -> skip
+  auto homogeneousMaterial =
+      dynamic_cast<const HomogeneousSurfaceMaterial*>(&material);
+  if (homogeneousMaterial != nullptr) {
+    ACTS_DEBUG(
+        "DetrayMaterialConverter: found homogeneous surface material, ignored "
+        "as this should be handled by the homogeneous material conversion.");
+    return materialGrid;
+  }
+  // (2) - binned material -> convert into grid structure
+  auto binnedMaterial = dynamic_cast<const BinnedSurfaceMaterial*>(&material);
+  if (binnedMaterial != nullptr) {
+    ACTS_VERBOSE("DetrayMaterialConverter: found binned surface material");
+
+    // BinUtility modifications
+    bool swapped = false;
+    // Get the bin utility (make a copy as we may modify it)
+    // Detray expects 2-dimensional grid, currently supported are
+    // x-y, r-phi, phi-z
+    BinUtility bUtility = binnedMaterial->binUtility();
+    // Turn the bin value into a 2D grid
+    if (bUtility.dimensions() == 1u) {
+      if (bUtility.binningData()[0u].binvalue == BinningValue::binX) {
+        // Turn to X-Y
+        bUtility += BinUtility(1u, std::numeric_limits<float>::lowest(),
+                               std::numeric_limits<float>::max(),
+                               BinningOption::closed, BinningValue::binY);
+      } else if (bUtility.binningData()[0u].binvalue == BinningValue::binY) {
+        // Turn to X-Y
+        BinUtility nbUtility(1u, std::numeric_limits<float>::lowest(),
+                             std::numeric_limits<float>::max(),
+                             BinningOption::closed, BinningValue::binX);
+        nbUtility += bUtility;
+        bUtility = std::move(nbUtility);
+        swapped = true;
+      } else if (bUtility.binningData()[0u].binvalue == BinningValue::binR) {
+        // Turn to R-Phi
+        bUtility += BinUtility(1u, -std::numbers::pi, std::numbers::pi, closed,
+                               BinningValue::binPhi);
+      } else if (bUtility.binningData()[0u].binvalue == BinningValue::binZ) {
+        // Turn to Phi-Z - swap needed
+        BinUtility nbUtility(1u, -std::numbers::pi, std::numbers::pi, closed,
+                             BinningValue::binPhi);
+        nbUtility += bUtility;
+        bUtility = std::move(nbUtility);
+        swapped = true;
+      } else {
+        std::invalid_argument("Unsupported binning for Detray");
+      }
+    } else if (bUtility.dimensions() == 2u &&
+               bUtility.binningData()[0u].binvalue == BinningValue::binZ &&
+               bUtility.binningData()[1u].binvalue == BinningValue::binPhi) {
+      BinUtility nbUtility(bUtility.binningData()[1u]);
+      nbUtility += bUtility.binningData()[0u];
+      bUtility = std::move(nbUtility);
+      swapped = true;
+    }
+
+    BinningValue bVal0 = bUtility.binningData()[0u].binvalue;
+    BinningValue bVal1 = bUtility.binningData()[1u].binvalue;
+
+    // Translate into grid index type
+    detray::io::material_id gridIndexType = detray::io::material_id::unknown;
+    if (bVal0 == BinningValue::binR && bVal1 == BinningValue::binPhi) {
+      gridIndexType = detray::io::material_id::ring2_map;
+    } else if (bVal0 == BinningValue::binPhi && bVal1 == BinningValue::binZ) {
+      gridIndexType = detray::io::material_id::concentric_cylinder2_map;
+    } else if (bVal0 == BinningValue::binX && bVal1 == BinningValue::binY) {
+      gridIndexType = detray::io::material_id::rectangle2_map;
+    } else {
+      std::runtime_error(
+          "DetrayMaterialConverter: Unsupported binning for Detray");
+    }
+
+    detray::io::typed_link_payload<detray::io::material_id> linkPayload{
+        gridIndexType, 0u};
+    materialGrid.grid_link = linkPayload;
+
+    // Now convert the (modified) bin utility
+    for (const auto& bData : bUtility.binningData()) {
+      auto axisPayload = DetrayConversionUtils::convertBinningData(bData);
+      materialGrid.axes.push_back(axisPayload);
+    }
+
+    // Convert the material slabs from the material matrix
+    auto materialMatrix = binnedMaterial->fullMaterial();
+    for (std::size_t ib1 = 0; ib1 < materialMatrix.size(); ++ib1) {
+      for (std::size_t ib0 = 0; ib0 < materialMatrix[0u].size(); ++ib0) {
+        // Translate into a local bin
+        std::size_t lb0 = swapped ? ib1 : ib0;
+        std::size_t lb1 = swapped ? ib0 : ib1;
+        detray::io::material_slab_payload slab =
+            convertMaterialSlab(materialMatrix[ib1][ib0]);
+        detray::io::grid_bin_payload<detray::io::material_slab_payload> slabBin{
+            {static_cast<unsigned int>(lb0), static_cast<unsigned int>(lb1)},
+            {slab}};
+        // Fill into the grid
+        materialGrid.bins.push_back(slabBin);
+      }
+    }
+    return materialGrid;
+  }
+
+  if (dynamic_cast<const Acts::ProtoSurfaceMaterial*>(&material) != nullptr ||
+      dynamic_cast<const Acts::ProtoGridSurfaceMaterial*>(&material) !=
+          nullptr) {
+    ACTS_WARNING(
+        "DetrayMaterialConverter: ProtoSurfaceMaterial and "
+        "ProtoGridSurfaceMaterial are not being translated, consider to switch "
+        "material conversion off.");
+    return materialGrid;
+  }
+
+  throw std::invalid_argument(
+      "DetrayMaterialConverter: unknown surface material type detected.");
+}
+
+detray::io::detector_grids_payload<detray::io::material_slab_payload,
+                                   detray::io::material_id>
+Acts::DetrayMaterialConverter::convertGridSurfaceMaterial(
+    const DetrayConversionUtils::Cache& cCache,
+    const Experimental::Detector& detector, const Logger& logger) {
+  // The material grid payload
+  detray::io::detector_grids_payload<detray::io::material_slab_payload,
+                                     detray::io::material_id>
+      materialGrids;
+
+  using DetrayMaterialGrid =
+      detray::io::grid_payload<detray::io::material_slab_payload,
+                               detray::io::material_id>;
+
+  // Loop over the volumes in order to assign the right volume links
+  for (const auto& volume : detector.volumes()) {
+    // Per volume surface selector
+    MaterialSurfaceSelector selector;
+    volume->visitSurfaces(selector);
+    ACTS_VERBOSE("DetrayMaterialConverter: found "
+                 << selector.surfaces.size()
+                 << " surfaces/portals with material in volume "
+                 << volume->name());
+    // Find the voluem index first
+    auto volumeIndex = cCache.volumeLinks.find(volume->geometryId());
+    if (volumeIndex != cCache.volumeLinks.end()) {
+      std::vector<DetrayMaterialGrid> volumeMaterialGrids = {};
+      // Now convert the surfaces
+      for (const auto& surface : selector.surfaces) {
+        // Find the surfaces to assign
+        auto vIndex = cCache.volumeIndex(volume);
+        auto localSurfaceLinks = cCache.localSurfaceLinks.find(vIndex);
+        if (localSurfaceLinks != cCache.localSurfaceLinks.end()) {
+          // Find the surface link
+          auto surfaceIndices =
+              localSurfaceLinks->second.equal_range(surface->geometryId());
+
+          ACTS_VERBOSE(
+              "DetrayMaterialConverter: assigning to "
+              << std::distance(surfaceIndices.first, surfaceIndices.second)
+              << " surfaces with material in volume " << volume->name());
+          DetrayMaterialGrid materialGrid =
+              convertGridSurfaceMaterial(*surface->surfaceMaterial(), logger);
+          // Ignore if an empty payload is returned
+          if (materialGrid.axes.empty() || materialGrid.bins.empty()) {
+            continue;
+          }
+
+          // Loop over the equal range and fill one grid each, this is needed
+          // as the initial portal could be split into multiple surfaces
+          for (auto itr = surfaceIndices.first; itr != surfaceIndices.second;
+               ++itr) {
+            // Fill the surface index
+            materialGrid.owner_link =
+                detray::io::single_link_payload{itr->second};
+            // Fill the grid
+            volumeMaterialGrids.push_back(materialGrid);
+          }
+        }
+      }
+      // Register the grids of this volume
+      materialGrids.grids.insert({volumeIndex->second, volumeMaterialGrids});
+    } else {
+      ACTS_WARNING(
+          "DetrayMaterialConverter: volume not found in cache, should not "
+          "happen.");
+    }
+  }
+  // Return the material grids payload
+  return materialGrids;
+}
diff --git a/Plugins/Detray/src/DetraySurfaceGridsConverter.cpp b/Plugins/Detray/src/DetraySurfaceGridsConverter.cpp
new file mode 100644
index 00000000000..f1572b77c08
--- /dev/null
+++ b/Plugins/Detray/src/DetraySurfaceGridsConverter.cpp
@@ -0,0 +1,201 @@
+// This file is part of the ACTS project.
+//
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
+//
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
+
+#include "Acts/Plugins/Detray/DetraySurfaceGridsConverter.hpp"
+
+#include "Acts/Detector/Detector.hpp"
+#include "Acts/Plugins/Detray/DetrayConversionUtils.hpp"
+#include "Acts/Plugins/Json/DetrayJsonHelper.hpp"
+#include "Acts/Surfaces/Surface.hpp"
+#include "Acts/Utilities/BinningType.hpp"
+#include "Acts/Utilities/GridAxisGenerators.hpp"
+
+#include <stdexcept>
+
+namespace Acts {
+
+/// DetraySurfaceGridsConverter converts surface grids from acts to detray
+/// format
+
+// convertAxis
+detray::io::axis_payload Acts::DetraySurfaceGridsConverter::convertAxis(
+    const Acts::IAxis& ia) {
+  detray::io::axis_payload axis_pd;
+  axis_pd.bounds = ia.getBoundaryType() == Acts::AxisBoundaryType::Bound
+                       ? detray::axis::bounds::e_closed
+                       : detray::axis::bounds::e_circular;
+  axis_pd.binning = ia.isEquidistant() ? detray::axis::binning::e_regular
+                                       : detray::axis::binning::e_irregular;
+  axis_pd.bins = ia.getNBins();
+  if (ia.isEquidistant()) {
+    axis_pd.edges = {ia.getBinEdges().front(), ia.getBinEdges().back()};
+  } else {
+    axis_pd.edges = ia.getBinEdges();
+  }
+
+  return axis_pd;
+}
+
+// convertGrid
+template <typename grid_type>
+detray::io::grid_payload<std::size_t, detray::io::accel_id>
+Acts::DetraySurfaceGridsConverter::convertGrid(const grid_type& grid,
+                                               bool swapAxis) {
+  // Get the grid axes & potentially swap them
+  detray::io::grid_payload<std::size_t, detray::io::accel_id> grid_pd;
+
+  auto axes = grid.axes();
+  if (swapAxis && grid_type::DIM == 2u) {
+    std::swap(axes[0u], axes[1u]);
+  }
+
+  // Fill the axes in the order they are
+  for (unsigned int ia = 0u; ia < grid_type::DIM; ++ia) {
+    detray::io::axis_payload axis_pd = convertAxis(*axes[ia]);
+    axis_pd.label = static_cast<detray::axis::label>(ia);
+    grid_pd.axes.push_back(axis_pd);  // push axis to axes
+  }
+
+  // 1D connections
+  if constexpr (grid_type::DIM == 1u) {
+    for (unsigned int ib0 = 1u; ib0 <= axes[0u]->getNBins(); ++ib0) {
+      // Lookup bin
+      typename grid_type::index_t lbin;
+      detray::io::grid_bin_payload<std::size_t> grid_bin_pd;
+
+      lbin[0u] = ib0;
+      grid_bin_pd.content = grid.atLocalBins(lbin);
+      // Corrected bin for detray
+      lbin[0u] = ib0 - 1u;
+      grid_bin_pd.loc_index =
+          std::vector<unsigned int>(lbin.begin(), lbin.end());
+      grid_pd.bins.push_back(grid_bin_pd);
+    }
+  }
+
+  // 2D connections
+  if constexpr (grid_type::DIM == 2u) {
+    for (unsigned int ib0 = 1u; ib0 <= axes[0u]->getNBins(); ++ib0) {
+      for (unsigned int ib1 = 1u; ib1 <= axes[1u]->getNBins(); ++ib1) {
+        typename grid_type::index_t lbin;
+        // Lookup bin - respect swap (if it happened) for the lookup
+        lbin[0u] = swapAxis ? ib1 : ib0;
+        lbin[1u] = swapAxis ? ib0 : ib1;
+
+        detray::io::grid_bin_payload<std::size_t> grid_bin_pd;
+
+        nlohmann::json jBin;
+        grid_bin_pd.content = grid.atLocalBins(lbin);
+        // Corrected bin for detray
+        lbin[0u] = ib0 - 1u;
+        lbin[1u] = ib1 - 1u;
+        grid_bin_pd.loc_index =
+            std::vector<unsigned int>(lbin.begin(), lbin.end());
+        grid_pd.bins.push_back(grid_bin_pd);
+      }
+    }
+  }
+
+  return grid_pd;
+}
+
+template <typename index_grid>
+detray::io::grid_payload<std::size_t, detray::io::accel_id>
+Acts::DetraySurfaceGridsConverter::convertImpl(const index_grid& indexGrid) {
+  bool swapAxes = true;
+
+  if constexpr (index_grid::grid_type::DIM == 2u) {
+    // Check for axis swap
+    swapAxes = (indexGrid.casts[0u] == Acts::BinningValue::binZ &&
+                indexGrid.casts[1u] == Acts::BinningValue::binPhi);
+  }
+
+  detray::io::grid_payload<std::size_t, detray::io::accel_id> grid_pd =
+      convertGrid(indexGrid.grid, swapAxes);
+
+  return grid_pd;
+}
+
+// convert
+template <typename instance_type>
+std::optional<detray::io::grid_payload<std::size_t, detray::io::accel_id>>
+Acts::DetraySurfaceGridsConverter::convert(
+    const Acts::Experimental::InternalNavigationDelegate& delegate,
+    [[maybe_unused]] const instance_type& refInstance) {
+  using GridType =
+      typename instance_type::template grid_type<std::vector<std::size_t>>;
+  // Defining a Delegate type
+  using ConversionDelegateType =
+      Acts::Experimental::IndexedSurfacesAllPortalsNavigation<
+          GridType, Acts::Experimental::IndexedSurfacesNavigation>;
+  using SubDelegateType =
+      Acts::Experimental::IndexedSurfacesNavigation<GridType>;
+
+  // Get the instance
+  const auto* instance = delegate.instance();
+  auto castedDelegate = dynamic_cast<const ConversionDelegateType*>(instance);
+
+  if (castedDelegate != nullptr) {
+    // Get the surface updator
+    detray::io::grid_payload<std::size_t, detray::io::accel_id> grid_pd;
+    auto indexedSurfaces = std::get<SubDelegateType>(castedDelegate->updators);
+    grid_pd = convertImpl<SubDelegateType>(indexedSurfaces);
+    grid_pd.grid_link.type = static_cast<detray::io::accel_id>(
+        Acts::DetrayJsonHelper::accelerationLink(indexedSurfaces.casts));
+    grid_pd.grid_link.index = std::numeric_limits<std::size_t>::max();
+    return grid_pd;
+  }
+
+  return std::nullopt;
+}
+
+template <typename... Args>
+std::vector<detray::io::grid_payload<std::size_t, detray::io::accel_id>>
+Acts::DetraySurfaceGridsConverter::unrollConvert(
+    const Acts::Experimental::InternalNavigationDelegate& delegate,
+    Acts::TypeList<Args...> /*unused*/) {
+  std::vector<detray::io::grid_payload<std::size_t, detray::io::accel_id>>
+      grid_pds;
+
+  const auto convertAndPush = [&grid_pds](const auto& adele,
+                                          const auto& args) -> void {
+    auto grid_pd = convert(adele, args);
+    if (grid_pd.has_value()) {
+      grid_pds.push_back(*grid_pd);
+    }
+  };
+
+  (convertAndPush(delegate, Args{}), ...);
+
+  return grid_pds;
+}
+
+detray::io::detector_grids_payload<std::size_t, detray::io::accel_id>
+Acts::DetraySurfaceGridsConverter::convertSurfaceGrids(
+    const Acts::Experimental::Detector& detector) {
+  detray::io::detector_grids_payload<std::size_t, detray::io::accel_id>
+      grids_pd = detray::io::detector_grids_payload<std::size_t,
+                                                    detray::io::accel_id>();
+  auto volumes = detector.volumes();
+
+  for (const auto [iv, volume] : Acts::enumerate(volumes)) {
+    std::vector<detray::io::grid_payload<std::size_t, detray::io::accel_id>>
+        grid_pd = unrollConvert(volume->internalNavigation(),
+                                Acts::GridAxisGenerators::PossibleAxes{});
+
+    for (auto& grid : grid_pd) {
+      detray::io::single_link_payload lnk;
+      lnk.link = iv;
+      grid.owner_link = lnk;
+      grids_pd.grids[iv].push_back(grid);
+    }
+  }
+  return grids_pd;
+}
+
+}  // namespace Acts
diff --git a/Plugins/EDM4hep/include/Acts/Plugins/EDM4hep/EDM4hepUtil.hpp b/Plugins/EDM4hep/include/Acts/Plugins/EDM4hep/EDM4hepUtil.hpp
index 505f9bbe1cc..c5fda03bc82 100644
--- a/Plugins/EDM4hep/include/Acts/Plugins/EDM4hep/EDM4hepUtil.hpp
+++ b/Plugins/EDM4hep/include/Acts/Plugins/EDM4hep/EDM4hepUtil.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2023 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 #pragma once
 
 #include "Acts/Definitions/Algebra.hpp"
@@ -14,6 +14,7 @@
 #include "Acts/EventData/MultiTrajectory.hpp"
 #include "Acts/EventData/TrackContainer.hpp"
 #include "Acts/EventData/TrackParameters.hpp"
+#include "Acts/EventData/TrackProxyConcept.hpp"
 #include "Acts/EventData/TrackStatePropMask.hpp"
 #include "Acts/Geometry/GeometryContext.hpp"
 #include "Acts/Surfaces/PerigeeSurface.hpp"
@@ -60,14 +61,10 @@ BoundTrackParameters convertTrackParametersFromEdm4hep(
 
 }  // namespace detail
 
-template <typename track_container_t, typename track_state_container_t,
-          template <typename> class holder_t>
-void writeTrack(
-    const Acts::GeometryContext& gctx,
-    Acts::TrackProxy<track_container_t, track_state_container_t, holder_t, true>
-        track,
-    edm4hep::MutableTrack to, double Bz,
-    const Logger& logger = getDummyLogger()) {
+template <TrackProxyConcept track_proxy_t>
+void writeTrack(const Acts::GeometryContext& gctx, track_proxy_t track,
+                edm4hep::MutableTrack to, double Bz,
+                const Logger& logger = getDummyLogger()) {
   ACTS_VERBOSE("Converting track to EDM4hep");
   to.setChi2(track.chi2());
   to.setNdf(track.nDoF());
@@ -164,13 +161,9 @@ void writeTrack(
   }
 }
 
-template <typename track_container_t, typename track_state_container_t,
-          template <typename> class holder_t>
-void readTrack(const edm4hep::Track& from,
-               Acts::TrackProxy<track_container_t, track_state_container_t,
-                                holder_t, false>
-                   track,
-               double Bz, const Logger& logger = getDummyLogger()) {
+template <TrackProxyConcept track_proxy_t>
+void readTrack(const edm4hep::Track& from, track_proxy_t track, double Bz,
+               const Logger& logger = getDummyLogger()) {
   ACTS_VERBOSE("Reading track from EDM4hep");
   TrackStatePropMask mask = TrackStatePropMask::Smoothed;
 
diff --git a/Plugins/EDM4hep/src/EDM4hepUtil.cpp b/Plugins/EDM4hep/src/EDM4hepUtil.cpp
index ec22eb9c1a2..515063da679 100644
--- a/Plugins/EDM4hep/src/EDM4hepUtil.cpp
+++ b/Plugins/EDM4hep/src/EDM4hepUtil.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2022 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include "Acts/Plugins/EDM4hep/EDM4hepUtil.hpp"
 
@@ -16,6 +16,8 @@
 #include "Acts/Propagator/detail/CovarianceEngine.hpp"
 #include "Acts/Propagator/detail/JacobianEngine.hpp"
 
+#include <numbers>
+
 #include "edm4hep/TrackState.h"
 
 namespace Acts::EDM4hepUtil::detail {
@@ -149,7 +151,8 @@ Parameters convertTrackParametersToEdm4hep(const Acts::GeometryContext& gctx,
   result.values[0] = targetPars[Acts::eBoundLoc0];
   result.values[1] = targetPars[Acts::eBoundLoc1];
   result.values[2] = targetPars[Acts::eBoundPhi];
-  result.values[3] = std::tan(M_PI_2 - targetPars[Acts::eBoundTheta]);
+  result.values[3] =
+      std::tan(std::numbers::pi / 2. - targetPars[Acts::eBoundTheta]);
   result.values[4] = targetPars[Acts::eBoundQOverP] /
                      std::sin(targetPars[Acts::eBoundTheta]) * Bz;
   result.values[5] = targetPars[Acts::eBoundTime];
@@ -174,7 +177,7 @@ BoundTrackParameters convertTrackParametersFromEdm4hep(
   targetPars[eBoundLoc0] = params.values[0];
   targetPars[eBoundLoc1] = params.values[1];
   targetPars[eBoundPhi] = params.values[2];
-  targetPars[eBoundTheta] = M_PI_2 - std::atan(params.values[3]);
+  targetPars[eBoundTheta] = std::numbers::pi / 2. - std::atan(params.values[3]);
   targetPars[eBoundQOverP] =
       params.values[4] * std::sin(targetPars[eBoundTheta]) / Bz;
   targetPars[eBoundTime] = params.values[5];
diff --git a/Plugins/ExaTrkX/include/Acts/Plugins/ExaTrkX/BoostTrackBuilding.hpp b/Plugins/ExaTrkX/include/Acts/Plugins/ExaTrkX/BoostTrackBuilding.hpp
index 9157c58a385..a6905d5b06c 100644
--- a/Plugins/ExaTrkX/include/Acts/Plugins/ExaTrkX/BoostTrackBuilding.hpp
+++ b/Plugins/ExaTrkX/include/Acts/Plugins/ExaTrkX/BoostTrackBuilding.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2023 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
diff --git a/Plugins/ExaTrkX/include/Acts/Plugins/ExaTrkX/CugraphTrackBuilding.hpp b/Plugins/ExaTrkX/include/Acts/Plugins/ExaTrkX/CugraphTrackBuilding.hpp
index 06d8d0bbeba..133ee79e187 100644
--- a/Plugins/ExaTrkX/include/Acts/Plugins/ExaTrkX/CugraphTrackBuilding.hpp
+++ b/Plugins/ExaTrkX/include/Acts/Plugins/ExaTrkX/CugraphTrackBuilding.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2023 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
diff --git a/Plugins/ExaTrkX/include/Acts/Plugins/ExaTrkX/ExaTrkXPipeline.hpp b/Plugins/ExaTrkX/include/Acts/Plugins/ExaTrkX/ExaTrkXPipeline.hpp
index b6f609727d8..60d822e4b1f 100644
--- a/Plugins/ExaTrkX/include/Acts/Plugins/ExaTrkX/ExaTrkXPipeline.hpp
+++ b/Plugins/ExaTrkX/include/Acts/Plugins/ExaTrkX/ExaTrkXPipeline.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2023 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
diff --git a/Plugins/ExaTrkX/include/Acts/Plugins/ExaTrkX/OnnxEdgeClassifier.hpp b/Plugins/ExaTrkX/include/Acts/Plugins/ExaTrkX/OnnxEdgeClassifier.hpp
index c506f3414a0..d672acfe78e 100644
--- a/Plugins/ExaTrkX/include/Acts/Plugins/ExaTrkX/OnnxEdgeClassifier.hpp
+++ b/Plugins/ExaTrkX/include/Acts/Plugins/ExaTrkX/OnnxEdgeClassifier.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2023 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
diff --git a/Plugins/ExaTrkX/include/Acts/Plugins/ExaTrkX/OnnxMetricLearning.hpp b/Plugins/ExaTrkX/include/Acts/Plugins/ExaTrkX/OnnxMetricLearning.hpp
index 0e12125574c..31c8adeea8e 100644
--- a/Plugins/ExaTrkX/include/Acts/Plugins/ExaTrkX/OnnxMetricLearning.hpp
+++ b/Plugins/ExaTrkX/include/Acts/Plugins/ExaTrkX/OnnxMetricLearning.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2023 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
diff --git a/Plugins/ExaTrkX/include/Acts/Plugins/ExaTrkX/Stages.hpp b/Plugins/ExaTrkX/include/Acts/Plugins/ExaTrkX/Stages.hpp
index 1e90b205cc2..2cb676b1bbe 100644
--- a/Plugins/ExaTrkX/include/Acts/Plugins/ExaTrkX/Stages.hpp
+++ b/Plugins/ExaTrkX/include/Acts/Plugins/ExaTrkX/Stages.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2023 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
diff --git a/Plugins/ExaTrkX/include/Acts/Plugins/ExaTrkX/TorchEdgeClassifier.hpp b/Plugins/ExaTrkX/include/Acts/Plugins/ExaTrkX/TorchEdgeClassifier.hpp
index c3cf46d30ca..3dcae08e0c6 100644
--- a/Plugins/ExaTrkX/include/Acts/Plugins/ExaTrkX/TorchEdgeClassifier.hpp
+++ b/Plugins/ExaTrkX/include/Acts/Plugins/ExaTrkX/TorchEdgeClassifier.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2023 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
diff --git a/Plugins/ExaTrkX/include/Acts/Plugins/ExaTrkX/TorchGraphStoreHook.hpp b/Plugins/ExaTrkX/include/Acts/Plugins/ExaTrkX/TorchGraphStoreHook.hpp
index 153811f0558..fddfa0fd50e 100644
--- a/Plugins/ExaTrkX/include/Acts/Plugins/ExaTrkX/TorchGraphStoreHook.hpp
+++ b/Plugins/ExaTrkX/include/Acts/Plugins/ExaTrkX/TorchGraphStoreHook.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2023 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
diff --git a/Plugins/ExaTrkX/include/Acts/Plugins/ExaTrkX/TorchMetricLearning.hpp b/Plugins/ExaTrkX/include/Acts/Plugins/ExaTrkX/TorchMetricLearning.hpp
index abaadd54b9c..fe31da1ee3e 100644
--- a/Plugins/ExaTrkX/include/Acts/Plugins/ExaTrkX/TorchMetricLearning.hpp
+++ b/Plugins/ExaTrkX/include/Acts/Plugins/ExaTrkX/TorchMetricLearning.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2023 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
diff --git a/Plugins/ExaTrkX/include/Acts/Plugins/ExaTrkX/TorchTruthGraphMetricsHook.hpp b/Plugins/ExaTrkX/include/Acts/Plugins/ExaTrkX/TorchTruthGraphMetricsHook.hpp
index 7116ea61e8c..032981b5b89 100644
--- a/Plugins/ExaTrkX/include/Acts/Plugins/ExaTrkX/TorchTruthGraphMetricsHook.hpp
+++ b/Plugins/ExaTrkX/include/Acts/Plugins/ExaTrkX/TorchTruthGraphMetricsHook.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2023 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
diff --git a/Plugins/ExaTrkX/include/Acts/Plugins/ExaTrkX/detail/CantorEdge.hpp b/Plugins/ExaTrkX/include/Acts/Plugins/ExaTrkX/detail/CantorEdge.hpp
index 05a029ab550..75b33446177 100644
--- a/Plugins/ExaTrkX/include/Acts/Plugins/ExaTrkX/detail/CantorEdge.hpp
+++ b/Plugins/ExaTrkX/include/Acts/Plugins/ExaTrkX/detail/CantorEdge.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2022 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
@@ -41,16 +41,8 @@ class CantorEdge {
   }
 
   T value() const { return m_value; }
-};
-
-template <typename T>
-bool operator==(const CantorEdge<T> &a, const CantorEdge<T> &b) {
-  return a.value() == b.value();
-}
 
-template <typename T>
-bool operator<(const CantorEdge<T> &a, const CantorEdge<T> &b) {
-  return a.value() < b.value();
-}
+  auto operator<=>(const CantorEdge<T>& other) const = default;
+};
 
 }  // namespace Acts::detail
diff --git a/Plugins/ExaTrkX/include/Acts/Plugins/ExaTrkX/detail/TensorVectorConversion.hpp b/Plugins/ExaTrkX/include/Acts/Plugins/ExaTrkX/detail/TensorVectorConversion.hpp
index 429888a5e5b..4a8172217a4 100644
--- a/Plugins/ExaTrkX/include/Acts/Plugins/ExaTrkX/detail/TensorVectorConversion.hpp
+++ b/Plugins/ExaTrkX/include/Acts/Plugins/ExaTrkX/detail/TensorVectorConversion.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2023 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
diff --git a/Plugins/ExaTrkX/include/Acts/Plugins/ExaTrkX/detail/buildEdges.hpp b/Plugins/ExaTrkX/include/Acts/Plugins/ExaTrkX/detail/buildEdges.hpp
index 1d41e9c3626..655e331c94e 100644
--- a/Plugins/ExaTrkX/include/Acts/Plugins/ExaTrkX/detail/buildEdges.hpp
+++ b/Plugins/ExaTrkX/include/Acts/Plugins/ExaTrkX/detail/buildEdges.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2022 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
diff --git a/Plugins/ExaTrkX/src/BoostTrackBuilding.cpp b/Plugins/ExaTrkX/src/BoostTrackBuilding.cpp
index 01083f50709..0d75b31cedd 100644
--- a/Plugins/ExaTrkX/src/BoostTrackBuilding.cpp
+++ b/Plugins/ExaTrkX/src/BoostTrackBuilding.cpp
@@ -1,15 +1,16 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2023 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include "Acts/Plugins/ExaTrkX/BoostTrackBuilding.hpp"
 
 #include "Acts/Utilities/Zip.hpp"
 
+#include <algorithm>
 #include <map>
 
 #include <boost/beast/core/span.hpp>
@@ -82,7 +83,7 @@ std::vector<std::vector<int>> BoostTrackBuilding::operator()(
   ACTS_VERBOSE("Number of track labels: " << trackLabels.size());
   ACTS_VERBOSE("Number of unique track labels: " << [&]() {
     std::vector<vertex_t> sorted(trackLabels);
-    std::sort(sorted.begin(), sorted.end());
+    std::ranges::sort(sorted);
     sorted.erase(std::unique(sorted.begin(), sorted.end()), sorted.end());
     return sorted.size();
   }());
diff --git a/Plugins/ExaTrkX/src/CugraphTrackBuilding.cpp b/Plugins/ExaTrkX/src/CugraphTrackBuilding.cpp
index 87e2adbf161..7750cd7b3ac 100644
--- a/Plugins/ExaTrkX/src/CugraphTrackBuilding.cpp
+++ b/Plugins/ExaTrkX/src/CugraphTrackBuilding.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2023 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include "Acts/Plugins/ExaTrkX/CugraphTrackBuilding.hpp"
 
@@ -65,7 +65,7 @@ std::vector<std::vector<int>> CugraphTrackBuilding::operator()(
     int spacepointID = spacepointIDs[idx];
 
     int trkId;
-    if (trackLableToIds.find(trackLabel) != trackLableToIds.end()) {
+    if (trackLableToIds.contains(trackLabel)) {
       trkId = trackLableToIds[trackLabel];
       trackCandidates[trkId].push_back(spacepointID);
     } else {
diff --git a/Plugins/ExaTrkX/src/ExaTrkXPipeline.cpp b/Plugins/ExaTrkX/src/ExaTrkXPipeline.cpp
index 0505e9d0ccd..d53de1d3071 100644
--- a/Plugins/ExaTrkX/src/ExaTrkXPipeline.cpp
+++ b/Plugins/ExaTrkX/src/ExaTrkXPipeline.cpp
@@ -1,13 +1,15 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2023 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include "Acts/Plugins/ExaTrkX/ExaTrkXPipeline.hpp"
 
+#include "Acts/Utilities/Helpers.hpp"
+
 #include <algorithm>
 
 namespace Acts {
@@ -27,9 +29,8 @@ ExaTrkXPipeline::ExaTrkXPipeline(
   if (!m_trackBuilder) {
     throw std::invalid_argument("Missing track building module");
   }
-  if (m_edgeClassifiers.empty() or
-      not std::all_of(m_edgeClassifiers.begin(), m_edgeClassifiers.end(),
-                      [](const auto &a) { return static_cast<bool>(a); })) {
+  if (m_edgeClassifiers.empty() ||
+      rangeContainsValue(m_edgeClassifiers, nullptr)) {
     throw std::invalid_argument("Missing graph construction module");
   }
 }
diff --git a/Plugins/ExaTrkX/src/OnnxEdgeClassifier.cpp b/Plugins/ExaTrkX/src/OnnxEdgeClassifier.cpp
index 0ac324ccc4f..ac6d28ce358 100644
--- a/Plugins/ExaTrkX/src/OnnxEdgeClassifier.cpp
+++ b/Plugins/ExaTrkX/src/OnnxEdgeClassifier.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2023 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include "Acts/Plugins/ExaTrkX/OnnxEdgeClassifier.hpp"
 
diff --git a/Plugins/ExaTrkX/src/OnnxMetricLearning.cpp b/Plugins/ExaTrkX/src/OnnxMetricLearning.cpp
index d1a7f7692e1..29ac6e87db9 100644
--- a/Plugins/ExaTrkX/src/OnnxMetricLearning.cpp
+++ b/Plugins/ExaTrkX/src/OnnxMetricLearning.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2022 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include "Acts/Plugins/ExaTrkX/OnnxMetricLearning.hpp"
 
diff --git a/Plugins/ExaTrkX/src/TorchEdgeClassifier.cpp b/Plugins/ExaTrkX/src/TorchEdgeClassifier.cpp
index e5089ddd4f4..6187765b4ce 100644
--- a/Plugins/ExaTrkX/src/TorchEdgeClassifier.cpp
+++ b/Plugins/ExaTrkX/src/TorchEdgeClassifier.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2023 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include "Acts/Plugins/ExaTrkX/TorchEdgeClassifier.hpp"
 
diff --git a/Plugins/ExaTrkX/src/TorchGraphStoreHook.cpp b/Plugins/ExaTrkX/src/TorchGraphStoreHook.cpp
index ccc208ca1fe..e4dc3a3413c 100644
--- a/Plugins/ExaTrkX/src/TorchGraphStoreHook.cpp
+++ b/Plugins/ExaTrkX/src/TorchGraphStoreHook.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2023 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include "Acts/Plugins/ExaTrkX/TorchGraphStoreHook.hpp"
 
diff --git a/Plugins/ExaTrkX/src/TorchMetricLearning.cpp b/Plugins/ExaTrkX/src/TorchMetricLearning.cpp
index 58b2a55d751..b65c551a63b 100644
--- a/Plugins/ExaTrkX/src/TorchMetricLearning.cpp
+++ b/Plugins/ExaTrkX/src/TorchMetricLearning.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2023 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include "Acts/Plugins/ExaTrkX/TorchMetricLearning.hpp"
 
diff --git a/Plugins/ExaTrkX/src/TorchTruthGraphMetricsHook.cpp b/Plugins/ExaTrkX/src/TorchTruthGraphMetricsHook.cpp
index f279c5bb2cd..ed766ffa16b 100644
--- a/Plugins/ExaTrkX/src/TorchTruthGraphMetricsHook.cpp
+++ b/Plugins/ExaTrkX/src/TorchTruthGraphMetricsHook.cpp
@@ -1,15 +1,17 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2023 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include "Acts/Plugins/ExaTrkX/TorchTruthGraphMetricsHook.hpp"
 
 #include "Acts/Plugins/ExaTrkX/detail/TensorVectorConversion.hpp"
 
+#include <algorithm>
+
 #include <torch/torch.h>
 
 namespace {
@@ -24,7 +26,8 @@ auto cantorize(std::vector<std::int64_t> edgeIndex,
     cantorEdgeIndex.emplace_back(*it, *std::next(it));
   }
 
-  std::sort(cantorEdgeIndex.begin(), cantorEdgeIndex.end());
+  std::ranges::sort(cantorEdgeIndex,
+                    std::less<Acts::detail::CantorEdge<std::int64_t>>{});
 
   auto new_end = std::unique(cantorEdgeIndex.begin(), cantorEdgeIndex.end());
   if (new_end != cantorEdgeIndex.end()) {
diff --git a/Plugins/ExaTrkX/src/buildEdges.cpp b/Plugins/ExaTrkX/src/buildEdges.cpp
index 699569b6161..1c0cf5a2ef0 100644
--- a/Plugins/ExaTrkX/src/buildEdges.cpp
+++ b/Plugins/ExaTrkX/src/buildEdges.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2022 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include "Acts/Plugins/ExaTrkX/detail/buildEdges.hpp"
 
diff --git a/Plugins/ExaTrkX/src/printCudaMemInfo.hpp b/Plugins/ExaTrkX/src/printCudaMemInfo.hpp
index 739c89c7921..64d5497dfc7 100644
--- a/Plugins/ExaTrkX/src/printCudaMemInfo.hpp
+++ b/Plugins/ExaTrkX/src/printCudaMemInfo.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2022 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
diff --git a/Plugins/ExaTrkX/src/runSessionWithIoBinding.hpp b/Plugins/ExaTrkX/src/runSessionWithIoBinding.hpp
index d8be7bfb332..bc93640b789 100644
--- a/Plugins/ExaTrkX/src/runSessionWithIoBinding.hpp
+++ b/Plugins/ExaTrkX/src/runSessionWithIoBinding.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2022 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
diff --git a/Plugins/ExaTrkX/src/weaklyConnectedComponentsCugraph.hpp b/Plugins/ExaTrkX/src/weaklyConnectedComponentsCugraph.hpp
index 514a0044dfc..4eb498a326d 100644
--- a/Plugins/ExaTrkX/src/weaklyConnectedComponentsCugraph.hpp
+++ b/Plugins/ExaTrkX/src/weaklyConnectedComponentsCugraph.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2022 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
diff --git a/Plugins/FpeMonitoring/CMakeLists.txt b/Plugins/FpeMonitoring/CMakeLists.txt
index 05a6126e2f3..ccd7c7f4ceb 100644
--- a/Plugins/FpeMonitoring/CMakeLists.txt
+++ b/Plugins/FpeMonitoring/CMakeLists.txt
@@ -24,6 +24,11 @@ else()
 
         set(_backtrace_setup_complete FALSE)
 
+        find_path(
+            boost_stacktrace_include
+            NAMES "boost/stacktrace.hpp"
+            REQUIRED
+        )
         if(Backtrace_FOUND)
             # check if we need to link against bracktrace or not
             set(backtrace_include "")
@@ -44,6 +49,7 @@ else()
                 "${CMAKE_BINARY_DIR}"
                 "${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmp/backtrace.cpp"
                 LINK_LIBRARIES ${dl_LIBRARY}
+                CMAKE_FLAGS "-DINCLUDE_DIRECTORIES=${boost_stacktrace_include}"
                 COMPILE_DEFINITIONS -DBOOST_STACKTRACE_USE_BACKTRACE
                 OUTPUT_VARIABLE __OUTPUT
             )
@@ -54,9 +60,9 @@ else()
                 message(CHECK_FAIL "no")
 
                 file(GLOB hints "/usr/lib/gcc/*/*/include")
-                find_file(backtrace_header "backtrace.h" HINTS ${hints})
+                find_file(backtrace_header NAMES "backtrace.h" HINTS ${hints})
 
-                if(${backtrace_header} STREQUAL "backtrcae_header-NOTFOUND")
+                if(${backtrace_header} STREQUAL "backtrace_header-NOTFOUND")
                     message(STATUS "Could not find backtrace header file")
                 else()
                     set(backtrace_include
@@ -82,6 +88,8 @@ else()
                         "${CMAKE_BINARY_DIR}"
                         "${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmp/backtrace.cpp"
                         LINK_LIBRARIES ${dl_LIBRARY}
+                        CMAKE_FLAGS
+                            "-DINCLUDE_DIRECTORIES=${boost_stacktrace_include}"
                         COMPILE_DEFINITIONS
                             -DBOOST_STACKTRACE_USE_BACKTRACE
                             ${backtrace_include}
@@ -111,6 +119,7 @@ else()
                 "${CMAKE_BINARY_DIR}"
                 "${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmp/backtrace.cpp"
                 LINK_LIBRARIES ${dl_LIBRARY}
+                CMAKE_FLAGS "-DINCLUDE_DIRECTORIES=${boost_stacktrace_include}"
                 COMPILE_DEFINITIONS
                     -DBOOST_STACKTRACE_USE_BACKTRACE
                     ${backtrace_include}
@@ -137,6 +146,8 @@ else()
                     "${CMAKE_BINARY_DIR}"
                     "${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmp/backtrace.cpp"
                     LINK_LIBRARIES backtrace ${dl_LIBRARY}
+                    CMAKE_FLAGS
+                        "-DINCLUDE_DIRECTORIES=${boost_stacktrace_include}"
                     COMPILE_DEFINITIONS
                         -DBOOST_STACKTRACE_USE_BACKTRACE
                         ${backtrace_include}
@@ -158,23 +169,6 @@ else()
             endif()
         endif()
 
-        if(NOT _backtrace_setup_complete)
-            message(CHECK_START "Is addr2line available")
-            if(addr2line_EXECUTABLE)
-                list(APPEND _fpe_options -DBOOST_STACKTRACE_USE_ADDR2LINE)
-                list(
-                    APPEND
-                    _fpe_options
-                    -DBOOST_STACKTRACE_ADDR2LINE_LOCATION=${addr2line_EXECUTABLE}
-                )
-                message(CHECK_PASS "yes")
-
-                set(_backtrace_setup_complete TRUE)
-            else()
-                message(CHECK_FAIL "no")
-            endif()
-        endif()
-
         if(NOT _backtrace_setup_complete)
             message(STATUS "Unable to set up stacktrace setup: use noop")
             list(APPEND _fpe_options -BOOST_STACKTRACE_USE_NOOP)
diff --git a/Plugins/FpeMonitoring/include/Acts/Plugins/FpeMonitoring/FpeMonitor.hpp b/Plugins/FpeMonitoring/include/Acts/Plugins/FpeMonitoring/FpeMonitor.hpp
index d78d0cf2633..022a07a3426 100644
--- a/Plugins/FpeMonitoring/include/Acts/Plugins/FpeMonitoring/FpeMonitor.hpp
+++ b/Plugins/FpeMonitoring/include/Acts/Plugins/FpeMonitoring/FpeMonitor.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2022 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
@@ -40,7 +40,7 @@ std::ostream &operator<<(std::ostream &os, FpeType type);
 class FpeMonitor {
  public:
   struct Buffer {
-    Buffer(std::size_t bufferSize)
+    explicit Buffer(std::size_t bufferSize)
         : m_data{std::make_unique<std::byte[]>(bufferSize)},
           m_size{bufferSize} {}
 
@@ -105,12 +105,12 @@ class FpeMonitor {
 
     Result() = default;
 
-    operator bool() const { return !m_stracktraces.empty(); }
+    bool hasStackTraces() const { return !m_stackTraces.empty(); }
 
     void add(Acts::FpeType type, void *stackPtr, std::size_t bufferSize);
 
    private:
-    std::vector<FpeInfo> m_stracktraces;
+    std::vector<FpeInfo> m_stackTraces;
     std::array<unsigned int, 32> m_counts{};
 
     friend FpeMonitor;
@@ -131,6 +131,8 @@ class FpeMonitor {
                                         std::size_t depth);
   static std::string getSourceLocation(const boost::stacktrace::frame &frame);
 
+  static bool canSymbolize();
+
  private:
   void enable();
   void disable();
diff --git a/Plugins/FpeMonitoring/src/FpeMonitor.cpp b/Plugins/FpeMonitoring/src/FpeMonitor.cpp
index 2940492c1e3..09dce1f4b0a 100644
--- a/Plugins/FpeMonitoring/src/FpeMonitor.cpp
+++ b/Plugins/FpeMonitoring/src/FpeMonitor.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2022-2023 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include "Acts/Plugins/FpeMonitoring/FpeMonitor.hpp"
 
@@ -61,10 +61,10 @@ FpeMonitor::Result FpeMonitor::Result::merged(const Result &with) const {
     result.m_counts[i] = m_counts[i] + with.m_counts[i];
   }
 
-  std::copy(with.m_stracktraces.begin(), with.m_stracktraces.end(),
-            std::back_inserter(result.m_stracktraces));
-  std::copy(m_stracktraces.begin(), m_stracktraces.end(),
-            std::back_inserter(result.m_stracktraces));
+  std::copy(with.m_stackTraces.begin(), with.m_stackTraces.end(),
+            std::back_inserter(result.m_stackTraces));
+  std::copy(m_stackTraces.begin(), m_stackTraces.end(),
+            std::back_inserter(result.m_stackTraces));
 
   result.deduplicate();
 
@@ -76,8 +76,8 @@ void FpeMonitor::Result::merge(const Result &with) {
     m_counts[i] = m_counts[i] + with.m_counts[i];
   }
 
-  std::copy(with.m_stracktraces.begin(), with.m_stracktraces.end(),
-            std::back_inserter(m_stracktraces));
+  std::copy(with.m_stackTraces.begin(), with.m_stackTraces.end(),
+            std::back_inserter(m_stackTraces));
 
   deduplicate();
 }
@@ -87,24 +87,22 @@ void FpeMonitor::Result::add(FpeType type, void *stackPtr,
   auto st = std::make_unique<boost::stacktrace::stacktrace>(
       boost::stacktrace::stacktrace::from_dump(stackPtr, bufferSize));
 
-  auto it = std::find_if(
-      m_stracktraces.begin(), m_stracktraces.end(), [&](const FpeInfo &el) {
-        return areFpesEquivalent({el.type, *el.st}, {type, *st});
-      });
+  auto it = std::ranges::find_if(m_stackTraces, [&](const FpeInfo &el) {
+    return areFpesEquivalent({el.type, *el.st}, {type, *st});
+  });
 
-  if (it != m_stracktraces.end()) {
+  if (it != m_stackTraces.end()) {
     it->count += 1;
   } else {
-    m_stracktraces.push_back({1, type, std::move(st)});
+    m_stackTraces.push_back({1, type, std::move(st)});
   }
 }
 
 bool FpeMonitor::Result::contains(
     FpeType type, const boost::stacktrace::stacktrace &st) const {
-  return std::find_if(m_stracktraces.begin(), m_stracktraces.end(),
-                      [&](const FpeInfo &el) {
-                        return areFpesEquivalent({el.type, *el.st}, {type, st});
-                      }) != m_stracktraces.end();
+  return std::ranges::any_of(m_stackTraces, [&](const FpeInfo &el) {
+    return areFpesEquivalent({el.type, *el.st}, {type, st});
+  });
 }
 
 FpeMonitor::Result &FpeMonitor::result() {
@@ -130,12 +128,12 @@ unsigned int FpeMonitor::Result::count(FpeType type) const {
 }
 
 unsigned int FpeMonitor::Result::numStackTraces() const {
-  return m_stracktraces.size();
+  return m_stackTraces.size();
 }
 
 const std::vector<FpeMonitor::Result::FpeInfo> &
 FpeMonitor::Result::stackTraces() const {
-  return m_stracktraces;
+  return m_stackTraces;
 }
 
 bool FpeMonitor::Result::encountered(FpeType type) const {
@@ -163,20 +161,18 @@ void FpeMonitor::Result::summary(std::ostream &os, std::size_t depth) const {
 
 void FpeMonitor::Result::deduplicate() {
   std::vector<FpeInfo> copy{};
-  copy = std::move(m_stracktraces);
-  m_stracktraces.clear();
+  copy = std::move(m_stackTraces);
+  m_stackTraces.clear();
 
   for (auto &info : copy) {
-    auto it = std::find_if(m_stracktraces.begin(), m_stracktraces.end(),
-                           [&info](const FpeInfo &el) {
-                             return areFpesEquivalent({el.type, *el.st},
-                                                      {info.type, *info.st});
-                           });
-    if (it != m_stracktraces.end()) {
+    auto it = std::ranges::find_if(m_stackTraces, [&info](const FpeInfo &el) {
+      return areFpesEquivalent({el.type, *el.st}, {info.type, *info.st});
+    });
+    if (it != m_stackTraces.end()) {
       it->count += info.count;
       continue;
     }
-    m_stracktraces.push_back({info.count, info.type, std::move(info.st)});
+    m_stackTraces.push_back({info.count, info.type, std::move(info.st)});
   }
 }
 
@@ -336,4 +332,12 @@ std::string FpeMonitor::getSourceLocation(
   return frame.source_file() + ":" + std::to_string(frame.source_line());
 }
 
+bool FpeMonitor::canSymbolize() {
+#if defined(BOOST_STACKTRACE_USE_NOOP)
+  return false;
+#else
+  return true;
+#endif
+}
+
 }  // namespace Acts
diff --git a/Plugins/Geant4/include/Acts/Plugins/Geant4/Geant4Converters.hpp b/Plugins/Geant4/include/Acts/Plugins/Geant4/Geant4Converters.hpp
index 61f3de729c4..a65b9d5c711 100644
--- a/Plugins/Geant4/include/Acts/Plugins/Geant4/Geant4Converters.hpp
+++ b/Plugins/Geant4/include/Acts/Plugins/Geant4/Geant4Converters.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2022 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
diff --git a/Plugins/Geant4/include/Acts/Plugins/Geant4/Geant4DetectorElement.hpp b/Plugins/Geant4/include/Acts/Plugins/Geant4/Geant4DetectorElement.hpp
index 3a2abb295b0..538cdc73853 100644
--- a/Plugins/Geant4/include/Acts/Plugins/Geant4/Geant4DetectorElement.hpp
+++ b/Plugins/Geant4/include/Acts/Plugins/Geant4/Geant4DetectorElement.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2022 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
diff --git a/Plugins/Geant4/include/Acts/Plugins/Geant4/Geant4DetectorSurfaceFactory.hpp b/Plugins/Geant4/include/Acts/Plugins/Geant4/Geant4DetectorSurfaceFactory.hpp
index 14f6438b121..d06c77412e4 100644
--- a/Plugins/Geant4/include/Acts/Plugins/Geant4/Geant4DetectorSurfaceFactory.hpp
+++ b/Plugins/Geant4/include/Acts/Plugins/Geant4/Geant4DetectorSurfaceFactory.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2022 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
@@ -67,7 +67,7 @@ class Geant4DetectorSurfaceFactory {
     /// Convert the length scale
     ActsScalar scaleConversion = 1.;
     /// Convert the material
-    bool convertMaterial = true;
+    bool convertMaterial = false;
     /// Converted material thickness (< 0 indicates keeping original thickness)
     ActsScalar convertedMaterialThickness = -1;
     /// A selector for sensitive surfaces
diff --git a/Plugins/Geant4/include/Acts/Plugins/Geant4/Geant4PhysicalVolumeSelectors.hpp b/Plugins/Geant4/include/Acts/Plugins/Geant4/Geant4PhysicalVolumeSelectors.hpp
index e5da2bc2bc1..fd05274a34d 100644
--- a/Plugins/Geant4/include/Acts/Plugins/Geant4/Geant4PhysicalVolumeSelectors.hpp
+++ b/Plugins/Geant4/include/Acts/Plugins/Geant4/Geant4PhysicalVolumeSelectors.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2022 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
@@ -70,7 +70,7 @@ struct PositionSelector : public IGeant4PhysicalVolumeSelector {
 
   /// Constructor with arguments
   /// @param ranges the provided map of axes of ranges
-  PositionSelector(
+  explicit PositionSelector(
       const std::map<unsigned int, std::tuple<double, double>>& ranges)
       : m_ranges(ranges) {}
 
diff --git a/Plugins/Geant4/include/Acts/Plugins/Geant4/Geant4SurfaceProvider.hpp b/Plugins/Geant4/include/Acts/Plugins/Geant4/Geant4SurfaceProvider.hpp
index 7747cce104a..0f0690bf079 100644
--- a/Plugins/Geant4/include/Acts/Plugins/Geant4/Geant4SurfaceProvider.hpp
+++ b/Plugins/Geant4/include/Acts/Plugins/Geant4/Geant4SurfaceProvider.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2023 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
diff --git a/Plugins/Geant4/src/Geant4Converters.cpp b/Plugins/Geant4/src/Geant4Converters.cpp
index fac1ebd8c92..d75e73ea13c 100644
--- a/Plugins/Geant4/src/Geant4Converters.cpp
+++ b/Plugins/Geant4/src/Geant4Converters.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2022 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include "Acts/Plugins/Geant4/Geant4Converters.hpp"
 
@@ -27,6 +27,7 @@
 #include <cmath>
 #include <cstdlib>
 #include <iterator>
+#include <numbers>
 #include <stdexcept>
 #include <utility>
 #include <vector>
@@ -98,9 +99,9 @@ Acts::Geant4ShapeConverter::cylinderBounds(const G4Tubs& g4Tubs) {
   tArray[B::eHalfLengthZ] = static_cast<ActsScalar>(g4Tubs.GetZHalfLength());
   tArray[B::eHalfPhiSector] =
       0.5 * static_cast<ActsScalar>(g4Tubs.GetDeltaPhiAngle());
-  // Geant fiddles around with user given values, i.e. it would not
-  // allow [-M_PI, +M_PI) as a full segment (has to be [0, 2PI)])
-  if (std::abs(tArray[B::eHalfPhiSector] - M_PI) <
+  // Geant fiddles around with user given values, i.e. it would not allow [-PI,
+  // +PI) as a full segment (has to be [0, 2PI)])
+  if (std::abs(tArray[B::eHalfPhiSector] - std::numbers::pi) <
       std::numeric_limits<ActsScalar>::epsilon()) {
     tArray[B::eAveragePhi] = 0.;
   } else {
@@ -122,9 +123,9 @@ Acts::Geant4ShapeConverter::radialBounds(const G4Tubs& g4Tubs) {
   tArray[B::eMaxR] = static_cast<ActsScalar>(g4Tubs.GetOuterRadius());
   tArray[B::eHalfPhiSector] =
       0.5 * static_cast<ActsScalar>(g4Tubs.GetDeltaPhiAngle());
-  // Geant fiddles around with user given values, i.e. it would not
-  // allow [-M_PI, +M_PI) as a full segment (has to be [0, 2PI)])
-  if (std::abs(tArray[B::eHalfPhiSector] - M_PI) <
+  // Geant fiddles around with user given values, i.e. it would not allow [-PI,
+  // +PI) as a full segment (has to be [0, 2PI)])
+  if (std::abs(tArray[B::eHalfPhiSector] - std::numbers::pi) <
       std::numeric_limits<ActsScalar>::epsilon()) {
     tArray[B::eAveragePhi] = 0.;
   } else {
diff --git a/Plugins/Geant4/src/Geant4DetectorElement.cpp b/Plugins/Geant4/src/Geant4DetectorElement.cpp
index 8d0bfe9677b..d5410d3b3de 100644
--- a/Plugins/Geant4/src/Geant4DetectorElement.cpp
+++ b/Plugins/Geant4/src/Geant4DetectorElement.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2022 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include "Acts/Plugins/Geant4/Geant4DetectorElement.hpp"
 
diff --git a/Plugins/Geant4/src/Geant4DetectorSurfaceFactory.cpp b/Plugins/Geant4/src/Geant4DetectorSurfaceFactory.cpp
index 5c9b841c6ff..40e082519c7 100644
--- a/Plugins/Geant4/src/Geant4DetectorSurfaceFactory.cpp
+++ b/Plugins/Geant4/src/Geant4DetectorSurfaceFactory.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2022 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include "Acts/Plugins/Geant4/Geant4DetectorSurfaceFactory.hpp"
 
diff --git a/Plugins/Geant4/src/Geant4PhysicalVolumeSelectors.cpp b/Plugins/Geant4/src/Geant4PhysicalVolumeSelectors.cpp
index fb37ce4ae84..8224a7b59f5 100644
--- a/Plugins/Geant4/src/Geant4PhysicalVolumeSelectors.cpp
+++ b/Plugins/Geant4/src/Geant4PhysicalVolumeSelectors.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2024 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include "Acts/Plugins/Geant4/Geant4PhysicalVolumeSelectors.hpp"
 
diff --git a/Plugins/GeoModel/CMakeLists.txt b/Plugins/GeoModel/CMakeLists.txt
index 5e40ade3230..90a672a012b 100644
--- a/Plugins/GeoModel/CMakeLists.txt
+++ b/Plugins/GeoModel/CMakeLists.txt
@@ -5,17 +5,22 @@ add_library(
     SHARED
     src/GeoModelBlueprintCreater.cpp
     src/GeoModelConversionError.cpp
+    src/GeoModelToDetectorVolume.cpp
     src/GeoModelReader.cpp
     src/GeoModelDetectorElement.cpp
-    src/GeoModelDetectorSurfaceFactory.cpp
+    src/GeoModelDetectorObjectFactory.cpp
+    src/GeoModelMaterialConverter.cpp
     src/detail/GeoBoxConverter.cpp
     src/detail/GeoTrdConverter.cpp
     src/detail/GeoTubeConverter.cpp
+    src/detail/GeoPolygonConverter.cpp
+    src/detail/GeoSubtractionConverter.cpp
     src/detail/GeoShiftConverter.cpp
     src/detail/GeoIntersectionAnnulusConverter.cpp
     src/detail/GeoModelBinningHelper.cpp
     src/detail/GeoModelExtentHelper.cpp
     src/detail/GeoUnionDoubleTrdConverter.cpp
+    src/GeoModelDetectorElementITk.cpp
 )
 target_include_directories(
     ActsPluginGeoModel
diff --git a/Plugins/GeoModel/include/Acts/Plugins/GeoModel/GeoModelBlueprintCreater.hpp b/Plugins/GeoModel/include/Acts/Plugins/GeoModel/GeoModelBlueprintCreater.hpp
index 7f832a4643a..c6358bdbec2 100644
--- a/Plugins/GeoModel/include/Acts/Plugins/GeoModel/GeoModelBlueprintCreater.hpp
+++ b/Plugins/GeoModel/include/Acts/Plugins/GeoModel/GeoModelBlueprintCreater.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2024 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
@@ -40,8 +40,8 @@ class GeoModelBlueprintCreater {
     std::vector<std::shared_ptr<Surface>> detectorSurfaces = {};
     /// The binning values for the KDTree sorting
     std::vector<BinningValue> kdtBinning = {};
-    /// Polyhedron approximations
-    unsigned int nSegments = 1u;
+    /// Polyhedron approximation: number of segments per circlequarter
+    unsigned int quarterSegments = 1u;
   };
 
   /// The cache struct
@@ -58,6 +58,8 @@ class GeoModelBlueprintCreater {
     std::string topEntry;
     /// Optionally override the top node bounds
     std::string topBoundsOverride = "";
+    /// Export dot graph
+    std::string dotGraph = "";
   };
 
   /// The Blueprint return object
diff --git a/Plugins/GeoModel/include/Acts/Plugins/GeoModel/GeoModelConversionError.hpp b/Plugins/GeoModel/include/Acts/Plugins/GeoModel/GeoModelConversionError.hpp
index a5e93f0d53b..afac7eebbc7 100644
--- a/Plugins/GeoModel/include/Acts/Plugins/GeoModel/GeoModelConversionError.hpp
+++ b/Plugins/GeoModel/include/Acts/Plugins/GeoModel/GeoModelConversionError.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2024 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
diff --git a/Plugins/GeoModel/include/Acts/Plugins/GeoModel/GeoModelConverters.hpp b/Plugins/GeoModel/include/Acts/Plugins/GeoModel/GeoModelConverters.hpp
index b9dc0a5d90f..28e49018525 100644
--- a/Plugins/GeoModel/include/Acts/Plugins/GeoModel/GeoModelConverters.hpp
+++ b/Plugins/GeoModel/include/Acts/Plugins/GeoModel/GeoModelConverters.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2024 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
@@ -15,7 +15,9 @@
 #include "Acts/Plugins/GeoModel/detail/GenericGeoShapeConverter.hpp"
 #include "Acts/Plugins/GeoModel/detail/GeoBoxConverter.hpp"
 #include "Acts/Plugins/GeoModel/detail/GeoIntersectionAnnulusConverter.hpp"
+#include "Acts/Plugins/GeoModel/detail/GeoPolygonConverter.hpp"
 #include "Acts/Plugins/GeoModel/detail/GeoShiftConverter.hpp"
+#include "Acts/Plugins/GeoModel/detail/GeoSubtractionConverter.hpp"
 #include "Acts/Plugins/GeoModel/detail/GeoTrdConverter.hpp"
 #include "Acts/Plugins/GeoModel/detail/GeoTubeConverter.hpp"
 #include "Acts/Plugins/GeoModel/detail/GeoUnionDoubleTrdConverter.hpp"
@@ -23,10 +25,12 @@
 
 #include <memory>
 #include <tuple>
+#include <unordered_map>
 
 #include <GeoModelKernel/GeoFullPhysVol.h>
 #include <GeoModelKernel/GeoLogVol.h>
 #include <GeoModelKernel/GeoShape.h>
+#include <GeoModelKernel/GeoShapeSubtraction.h>
 
 namespace Acts {
 
@@ -36,6 +40,13 @@ namespace Acts {
 using GeoBoxConverter =
     detail::GenericGeoShapeConverter<GeoBox, detail::GeoBoxConverter>;
 
+using GeoSubtractionConverter =
+    detail::GenericGeoShapeConverter<GeoShapeSubtraction,
+                                     detail::GeoSubtractionConverter>;
+
+using GeoPolygonConverter =
+    detail::GenericGeoShapeConverter<GeoSimplePolygonBrep,
+                                     detail::GeoPolygonConverter>;
 /// @brief A dedicated converter for GeoInterseciton that describe annulus bounds
 ///
 /// This is very much tailored to the AnnulusBounds class
@@ -68,4 +79,29 @@ using GeoUnionDoubleTrdConverter =
     detail::GenericGeoShapeConverter<GeoShapeUnion,
                                      detail::GeoUnionDoubleTrdConverter>;
 
+/// @brief The map that maps the converters with the shapes
+
+inline std::shared_ptr<const IGeoShapeConverter> geoShapesConverters(
+    int geoShapeId) {
+  static const std::unordered_map<int,
+                                  std::shared_ptr<const IGeoShapeConverter>>
+      converters{
+          {GeoBox::getClassTypeID(), std::make_shared<GeoBoxConverter>()},
+          {GeoShapeIntersection::getClassTypeID(),
+           std::make_shared<GeoIntersectionAnnulusConverter>()},
+          {GeoShapeShift::getClassTypeID(),
+           std::make_shared<GeoShiftConverter>()},
+          {GeoTrd::getClassTypeID(), std::make_shared<GeoTrdConverter>()},
+          {GeoTube::getClassTypeID(), std::make_shared<GeoTubeConverter>()},
+          {GeoSimplePolygonBrep::getClassTypeID(),
+           std::make_shared<GeoPolygonConverter>()},
+          {GeoShapeSubtraction::getClassTypeID(),
+           std::make_shared<GeoSubtractionConverter>()},
+          {GeoShapeUnion::getClassTypeID(),
+           std::make_shared<GeoUnionDoubleTrdConverter>()}};
+  auto itr = converters.find(geoShapeId);
+
+  return itr != converters.end() ? itr->second : nullptr;
+};
+
 }  // namespace Acts
diff --git a/Plugins/GeoModel/include/Acts/Plugins/GeoModel/GeoModelDetectorElement.hpp b/Plugins/GeoModel/include/Acts/Plugins/GeoModel/GeoModelDetectorElement.hpp
index 6e702dc6a8b..ab1cb025a4a 100644
--- a/Plugins/GeoModel/include/Acts/Plugins/GeoModel/GeoModelDetectorElement.hpp
+++ b/Plugins/GeoModel/include/Acts/Plugins/GeoModel/GeoModelDetectorElement.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2024 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
@@ -15,7 +15,9 @@
 
 #include <memory>
 
-class GeoFullPhysVol;
+#include <GeoModelKernel/GeoFullPhysVol.h>
+
+class GeoVPhysVol;
 
 namespace Acts {
 
@@ -48,9 +50,8 @@ class GeoModelDetectorElement : public DetectorElementBase {
   /// @return a shared pointer to an instance of the detector element
   template <typename SurfaceType, typename BoundsType>
   static std::shared_ptr<GeoModelDetectorElement> createDetectorElement(
-      const GeoFullPhysVol& geoPhysVol,
-      const std::shared_ptr<BoundsType> bounds, const Transform3& sfTransform,
-      ActsScalar thickness) {
+      const PVConstLink& geoPhysVol, const std::shared_ptr<BoundsType> bounds,
+      const Transform3& sfTransform, ActsScalar thickness) {
     // First create the detector element with a nullptr
     auto detElement = std::make_shared<GeoModelDetectorElement>(
         geoPhysVol, nullptr, sfTransform, thickness);
@@ -65,7 +66,7 @@ class GeoModelDetectorElement : public DetectorElementBase {
   /// @param surface the representing surface
   /// @param sfTransform the surface transform
   /// @param thickness the thickness of the detector element
-  GeoModelDetectorElement(const GeoFullPhysVol& geoPhysVol,
+  GeoModelDetectorElement(PVConstLink geoPhysVol,
                           std::shared_ptr<Surface> surface,
                           const Transform3& sfTransform, ActsScalar thickness);
 
@@ -84,9 +85,20 @@ class GeoModelDetectorElement : public DetectorElementBase {
   ActsScalar thickness() const override;
 
   /// @return to the Geant4 physical volume
-  const GeoFullPhysVol& physicalVolume() const;
+  PVConstLink physicalVolume() const;
 
- private:
+  /// Get the name of the logical volume
+  const std::string& logVolName() const;
+
+  /// Get the string identifier of the corresponding database entry
+  /// Note: This is not by defnitition a unique identifier, there can be
+  /// several detector elements created from a single database entry.
+  const std::string& databaseEntryName() const { return m_entryName; };
+
+  /// Set the corresponding database entry string
+  void setDatabaseEntryName(const std::string& n) { m_entryName = n; };
+
+ protected:
   /// Attach a surface
   ///
   /// @param surface The surface to attach
@@ -94,8 +106,11 @@ class GeoModelDetectorElement : public DetectorElementBase {
     m_surface = std::move(surface);
   }
 
+ private:
+  std::string m_entryName;
+
   /// The GeoModel full physical volume
-  const GeoFullPhysVol* m_geoPhysVol{nullptr};
+  PVConstLink m_geoPhysVol{nullptr};
   /// The surface
   std::shared_ptr<Surface> m_surface;
   /// The global transformation before the volume
diff --git a/Plugins/GeoModel/include/Acts/Plugins/GeoModel/GeoModelDetectorElementITk.hpp b/Plugins/GeoModel/include/Acts/Plugins/GeoModel/GeoModelDetectorElementITk.hpp
new file mode 100644
index 00000000000..31cce3360e9
--- /dev/null
+++ b/Plugins/GeoModel/include/Acts/Plugins/GeoModel/GeoModelDetectorElementITk.hpp
@@ -0,0 +1,87 @@
+// This file is part of the ACTS project.
+//
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
+//
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
+
+// This file is part of the Acts project.
+//
+// Copyright (C) 2024 CERN for the benefit of the Acts project
+//
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this
+// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+#pragma once
+
+#include "Acts/Plugins/GeoModel/GeoModelDetectorElement.hpp"
+#include "Acts/Utilities/MultiIndex.hpp"
+
+namespace Acts {
+
+class ITkIdentifier {
+  Acts::MultiIndex<std::size_t, 1, 2, 20, 1, 19, 20, 1> m_identifier{};
+
+ public:
+  ITkIdentifier(int hardware, int barrelEndcap, int layerWheel, int etaModule,
+                int phiModule, int side);
+
+  /// Access the hardware specifier (pixel=0, strip=1)
+  int hardware() const;
+
+  /// Access the barrel-endcap specifier (-2,0,2)
+  int barrelEndcap() const;
+
+  /// Access the layer specifier
+  int layerWheel() const;
+
+  /// Access the phi module specifier
+  int phiModule() const;
+
+  /// Access the eta module specifier
+  int etaModule() const;
+
+  /// Access the side (for double sided strip modules)
+  int side() const;
+
+  /// A unique identifier that represents the combination of specifiers
+  std::size_t value() const;
+};
+
+std::ostream& operator<<(std::ostream& os, const ITkIdentifier& id);
+
+/// Specialization of the GeoModelDetectorElement for the ITk. This allows
+/// mapping of Acts::GeometryIdentifiers to ITk modules in a straight-forward
+/// way.
+class GeoModelDetectorElementITk : public GeoModelDetectorElement {
+ public:
+  GeoModelDetectorElementITk(const PVConstLink& geoPhysVol,
+                             std::shared_ptr<Surface> surface,
+                             const Transform3& sfTransform,
+                             ActsScalar thickness, int hardware,
+                             int barrelEndcap, int layerWheel, int etaModule,
+                             int phiModule, int side)
+      : GeoModelDetectorElement(geoPhysVol, std::move(surface), sfTransform,
+                                thickness),
+        m_identifier(hardware, barrelEndcap, layerWheel, etaModule, phiModule,
+                     side) {}
+
+  ITkIdentifier identifier() const { return m_identifier; }
+
+  /// Convert a GeoModelDetectorElement to a GeoModelDetectorElementITk
+  /// A new surface is constructed.
+  /// @todo Remove redundancy in signature once plugin is refactored
+  static std::tuple<std::shared_ptr<GeoModelDetectorElementITk>,
+                    std::shared_ptr<Surface>>
+  convertFromGeomodel(std::shared_ptr<GeoModelDetectorElement> detEl,
+                      std::shared_ptr<Surface> srf, const GeometryContext& gctx,
+                      int hardware, int barrelEndcap, int layerWheel,
+                      int etaModule, int phiModule, int side);
+
+ private:
+  ITkIdentifier m_identifier;
+};
+
+}  // namespace Acts
diff --git a/Plugins/GeoModel/include/Acts/Plugins/GeoModel/GeoModelDetectorObjectFactory.hpp b/Plugins/GeoModel/include/Acts/Plugins/GeoModel/GeoModelDetectorObjectFactory.hpp
new file mode 100644
index 00000000000..6fa0e9ccf02
--- /dev/null
+++ b/Plugins/GeoModel/include/Acts/Plugins/GeoModel/GeoModelDetectorObjectFactory.hpp
@@ -0,0 +1,82 @@
+// This file is part of the ACTS project.
+//
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
+//
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
+
+#pragma once
+
+#include "Acts/Detector/DetectorVolume.hpp"
+#include "Acts/Geometry/GeometryContext.hpp"
+#include "Acts/Plugins/GeoModel/GeoModelDetectorElement.hpp"
+#include "Acts/Plugins/GeoModel/GeoModelToDetectorVolume.hpp"
+#include "Acts/Plugins/GeoModel/GeoModelTree.hpp"
+#include "Acts/Utilities/Logger.hpp"
+
+#include <GeoModelHelpers/getChildNodesWithTrf.h>
+
+#include "GeoModelKernel/GeoDefinitions.h"
+
+class GeoShape;
+struct GeoModelTree;
+class Surface;
+namespace Acts {
+class GeoModelDetectorObjectFactory {
+ public:
+  using GeoModelBoundingBox = std::shared_ptr<Experimental::DetectorVolume>;
+
+  struct Options {
+    std::vector<std::string> queries = {};
+  };
+
+  // substring matching for additional parameters
+  // empty vectors will be matched to everything
+  struct Config {
+    // List for names to match
+    std::vector<std::string> nameList;
+    // List for materials to match
+    std::vector<std::string> materialList;
+
+    // boolean flag to build subvolumes
+    bool convertSubVolumes = false;
+
+    // flag to build the desired bounding Boxes
+    std::vector<std::string> convertBox;
+  };
+
+  struct Cache {
+    // The created detector elements and their surfaces
+    std::vector<GeoModelSensitiveSurface> sensitiveSurfaces;
+    // The created representation of bounding box
+    std::vector<GeoModelBoundingBox> boundingBoxes;
+  };
+
+  GeoModelDetectorObjectFactory(
+      const Config& cfg,
+      std::unique_ptr<const Logger> mlogger = getDefaultLogger(
+          "GeoModelDetectorObjectFactory", Acts::Logging::WARNING));
+
+  void construct(Cache& cache, const GeometryContext& gctx,
+                 const GeoModelTree& geoModelTree, const Options& options);
+
+  void convertSensitive(const PVConstLink& geoPV,
+                        const Acts::Transform3& transform,
+                        std::vector<GeoModelSensitiveSurface>& sensitives);
+
+  std::vector<GeoChildNodeWithTrf> findAllSubVolumes(const PVConstLink& vol);
+
+  bool convertBox(std::string name);
+  bool matches(const std::string& name, const PVConstLink& physvol);
+
+  void convertFpv(const std::string& name, GeoFullPhysVol* fpv, Cache& cache,
+                  const GeometryContext& gctx);
+
+ private:
+  std::unique_ptr<const Logger> m_logger;
+  Config m_cfg;
+
+  const Logger& logger() const { return *m_logger; }
+};
+}  // namespace Acts
diff --git a/Plugins/GeoModel/include/Acts/Plugins/GeoModel/GeoModelDetectorSurfaceFactory.hpp b/Plugins/GeoModel/include/Acts/Plugins/GeoModel/GeoModelDetectorSurfaceFactory.hpp
deleted file mode 100644
index 13631293e9a..00000000000
--- a/Plugins/GeoModel/include/Acts/Plugins/GeoModel/GeoModelDetectorSurfaceFactory.hpp
+++ /dev/null
@@ -1,93 +0,0 @@
-// This file is part of the Acts project.
-//
-// Copyright (C) 2024 CERN for the benefit of the Acts project
-//
-// This Source Code Form is subject to the terms of the Mozilla Public
-// License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-#pragma once
-
-#include "Acts/Geometry/GeometryContext.hpp"
-#include "Acts/Plugins/GeoModel/GeoModelDetectorElement.hpp"
-#include "Acts/Plugins/GeoModel/IGeoShapeConverter.hpp"
-#include "Acts/Utilities/Logger.hpp"
-
-#include <memory>
-#include <string>
-#include <tuple>
-#include <vector>
-
-class GeoShape;
-class GeoFullPhysVol;
-
-namespace Acts {
-
-struct GeoModelTree;
-class Surface;
-
-/// A factory to convert GeoModel volume into sensitive
-/// or passive surfaces which are filled into a Cache object,
-/// also the create GeoModelDetectorElements which are also
-/// returned.
-class GeoModelDetectorSurfaceFactory {
- public:
-  /// Collect the passive surfaces, bool whether it should be
-  /// added as an "always try, i.e. assignToAll=true" surface
-  using GeoModelPassiveSurface = std::tuple<std::shared_ptr<Surface>, bool>;
-
-  // Configuration struct for the Detector surface factory
-  struct Config {
-    /// The shape converters to be use
-    std::vector<std::shared_ptr<const IGeoShapeConverter>> shapeConverters = {};
-    /// List for names to match
-    std::vector<std::string> nameList;
-    /// List for materials to match
-    std::vector<std::string> materialList;
-  };
-
-  /// Nested cache that records the conversion status
-  struct Cache {
-    /// The created detector elements and their surfaces
-    std::vector<GeoModelSensitiveSurface> sensitiveSurfaces;
-    /// The created passive representation surfaces
-    std::vector<GeoModelPassiveSurface> passiveSurfaces;
-  };
-
-  /// The options to steer the conversion
-  struct Options {
-    std::vector<std::string> queries = {};
-  };
-
-  /// The GeoModel detector element factory
-  ///
-  /// @param cfg the configuration struct
-  /// @param mlogger a screen output logger
-  GeoModelDetectorSurfaceFactory(
-      const Config& cfg,
-      std::unique_ptr<const Logger> mlogger = getDefaultLogger(
-          "GeoModelDetectorSurfaceFactory", Acts::Logging::INFO));
-
-  /// Construction method of the detector elements
-  ///
-  /// @param cache [in,out] into which the Elements are filled
-  /// @param gctx the geometry context
-  /// @param geoModelTree the gjeo model tree
-  /// @param options to steer the conversion
-  ///
-  /// @note this method will call the recursive construction
-  void construct(Cache& cache, const GeometryContext& gctx,
-                 const GeoModelTree& geoModelTree, const Options& options);
-
- private:
-  /// The configuration struct
-  Config m_cfg;
-
-  /// Logging instance
-  std::unique_ptr<const Logger> m_logger;
-
-  /// Private access to the logger
-  const Logger& logger() const { return *m_logger; }
-};
-
-}  // namespace Acts
diff --git a/Plugins/GeoModel/include/Acts/Plugins/GeoModel/GeoModelMaterialConverter.hpp b/Plugins/GeoModel/include/Acts/Plugins/GeoModel/GeoModelMaterialConverter.hpp
new file mode 100644
index 00000000000..bde253f2fc2
--- /dev/null
+++ b/Plugins/GeoModel/include/Acts/Plugins/GeoModel/GeoModelMaterialConverter.hpp
@@ -0,0 +1,23 @@
+// This file is part of the ACTS project.
+//
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
+//
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
+#pragma once
+
+#include "Acts/Material/Material.hpp"
+
+class GeoMaterial;
+
+namespace Acts::GeoModel {
+
+/// @brief Convert GeoMaterial to Acts::Material
+///
+/// @param gm The GeoMaterial to be converted
+/// @return the Acts::Material
+Material geoMaterialConverter(const GeoMaterial& gm,
+                              bool useMolarDensity = true);
+
+}  // namespace Acts::GeoModel
diff --git a/Plugins/GeoModel/include/Acts/Plugins/GeoModel/GeoModelReader.hpp b/Plugins/GeoModel/include/Acts/Plugins/GeoModel/GeoModelReader.hpp
index 8342edd5f30..b6faba5f77c 100644
--- a/Plugins/GeoModel/include/Acts/Plugins/GeoModel/GeoModelReader.hpp
+++ b/Plugins/GeoModel/include/Acts/Plugins/GeoModel/GeoModelReader.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2024 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
diff --git a/Plugins/GeoModel/include/Acts/Plugins/GeoModel/GeoModelToDetectorVolume.hpp b/Plugins/GeoModel/include/Acts/Plugins/GeoModel/GeoModelToDetectorVolume.hpp
new file mode 100644
index 00000000000..39d5899a911
--- /dev/null
+++ b/Plugins/GeoModel/include/Acts/Plugins/GeoModel/GeoModelToDetectorVolume.hpp
@@ -0,0 +1,31 @@
+// This file is part of the ACTS project.
+//
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
+//
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
+#pragma once
+
+#include "Acts/Detector/DetectorVolume.hpp"
+#include "Acts/Plugins/GeoModel/GeoModelDetectorElement.hpp"
+
+#include "GeoModelKernel/GeoDefinitions.h"
+class GeoShape;
+
+namespace Acts::GeoModel {
+
+// function converts GeoShape to Acts::Volume
+Volume convertVolume(const Transform3& trf, const GeoShape& shape);
+
+/// @brief Convert a GeoModel shape to a DetectorVolume
+///
+/// @param shape the GeoModel shape
+/// @param transform the transform to be applied
+/// @return the DetectorVolume
+std::shared_ptr<Experimental::DetectorVolume> convertDetectorVolume(
+    const GeometryContext& context, const GeoShape& shape,
+    const std::string& name, const GeoTrf::Transform3D& transform,
+    const std::vector<GeoModelSensitiveSurface>& sensitives);
+
+}  // namespace Acts::GeoModel
diff --git a/Plugins/GeoModel/include/Acts/Plugins/GeoModel/GeoModelTree.hpp b/Plugins/GeoModel/include/Acts/Plugins/GeoModel/GeoModelTree.hpp
index 838018d64b1..2979e61bc51 100644
--- a/Plugins/GeoModel/include/Acts/Plugins/GeoModel/GeoModelTree.hpp
+++ b/Plugins/GeoModel/include/Acts/Plugins/GeoModel/GeoModelTree.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2024 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
diff --git a/Plugins/GeoModel/include/Acts/Plugins/GeoModel/IGeoShapeConverter.hpp b/Plugins/GeoModel/include/Acts/Plugins/GeoModel/IGeoShapeConverter.hpp
index fb9f0f94052..7a0f5032d50 100644
--- a/Plugins/GeoModel/include/Acts/Plugins/GeoModel/IGeoShapeConverter.hpp
+++ b/Plugins/GeoModel/include/Acts/Plugins/GeoModel/IGeoShapeConverter.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2024 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
@@ -35,7 +35,7 @@ class IGeoShapeConverter {
   ///
   /// @return The detector element and surface
   virtual Result<GeoModelSensitiveSurface> toSensitiveSurface(
-      const GeoFullPhysVol& geoFPV) const = 0;
+      PVConstLink geoPV, const Transform3& transform) const = 0;
 
   /// @brief Convert a GeoShape to a detector element and passive surface
   ///
@@ -43,7 +43,7 @@ class IGeoShapeConverter {
   ///
   /// @return The representing surface
   virtual Result<std::shared_ptr<Surface>> toPassiveSurface(
-      const GeoFullPhysVol& geoFPV) const = 0;
+      PVConstLink geoPV, const Transform3& transform) const = 0;
 };
 
 }  // namespace Acts
diff --git a/Plugins/GeoModel/include/Acts/Plugins/GeoModel/detail/GenericGeoShapeConverter.hpp b/Plugins/GeoModel/include/Acts/Plugins/GeoModel/detail/GenericGeoShapeConverter.hpp
index 1115ee05545..f4aaedf9c54 100644
--- a/Plugins/GeoModel/include/Acts/Plugins/GeoModel/detail/GenericGeoShapeConverter.hpp
+++ b/Plugins/GeoModel/include/Acts/Plugins/GeoModel/detail/GenericGeoShapeConverter.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2024 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
@@ -20,15 +20,14 @@ namespace Acts::detail {
 template <typename Shape, typename Converter>
 struct GenericGeoShapeConverter : public IGeoShapeConverter {
   Acts::Result<Acts::GeoModelSensitiveSurface> toSensitiveSurface(
-      const GeoFullPhysVol& geoFPV) const override {
+      PVConstLink geoPV, const Transform3& transform) const override {
     // Retrieve logical volume and absolute transform
-    const GeoLogVol* logVol = geoFPV.getLogVol();
-    const Transform3& transform = geoFPV.getAbsoluteTransform(nullptr);
+    const GeoLogVol* logVol = geoPV->getLogVol();
     if (logVol != nullptr) {
       const GeoShape* geoShape = logVol->getShape();
       auto concreteShape = dynamic_cast<const Shape*>(geoShape);
       if (concreteShape != nullptr) {
-        return Converter{}(geoFPV, *concreteShape, transform, true);
+        return Converter{}(geoPV, *concreteShape, transform, true);
       }
       return Result<GeoModelSensitiveSurface>::failure(
           GeoModelConversionError::WrongShapeForConverter);
@@ -38,17 +37,16 @@ struct GenericGeoShapeConverter : public IGeoShapeConverter {
   }
 
   Acts::Result<std::shared_ptr<Acts::Surface>> toPassiveSurface(
-      const GeoFullPhysVol& geoFPV) const override {
+      PVConstLink geoPV, const Transform3& transform) const override {
     // Retrieve logical volume and absolute transform
-    const GeoLogVol* logVol = geoFPV.getLogVol();
-    const Transform3& transform = geoFPV.getAbsoluteTransform(nullptr);
+    const GeoLogVol* logVol = geoPV->getLogVol();
     if (logVol != nullptr) {
       const GeoShape* geoShape = logVol->getShape();
 
       auto concreteShape = dynamic_cast<const Shape*>(geoShape);
       if (concreteShape != nullptr) {
         // Conversion function call with sensitive = false
-        auto res = Converter{}(geoFPV, *concreteShape, transform, false);
+        auto res = Converter{}(geoPV, *concreteShape, transform, false);
         if (!res.ok()) {
           return res.error();
         }
diff --git a/Plugins/GeoModel/include/Acts/Plugins/GeoModel/detail/GeoBoxConverter.hpp b/Plugins/GeoModel/include/Acts/Plugins/GeoModel/detail/GeoBoxConverter.hpp
index 61190f88a38..a194d5ce58f 100644
--- a/Plugins/GeoModel/include/Acts/Plugins/GeoModel/detail/GeoBoxConverter.hpp
+++ b/Plugins/GeoModel/include/Acts/Plugins/GeoModel/detail/GeoBoxConverter.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2024 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
@@ -28,7 +28,7 @@ struct GeoBoxConverter {
   /// @param bool sensitive
   ///
   /// @return The detector element and surface
-  Result<GeoModelSensitiveSurface> operator()(const GeoFullPhysVol& geoFPV,
+  Result<GeoModelSensitiveSurface> operator()(const PVConstLink& geoPV,
                                               const GeoBox& geoBox,
                                               const Transform3& absTransform,
                                               bool sensitive) const;
diff --git a/Plugins/GeoModel/include/Acts/Plugins/GeoModel/detail/GeoIntersectionAnnulusConverter.hpp b/Plugins/GeoModel/include/Acts/Plugins/GeoModel/detail/GeoIntersectionAnnulusConverter.hpp
index 534f290a887..e33ba8f2552 100644
--- a/Plugins/GeoModel/include/Acts/Plugins/GeoModel/detail/GeoIntersectionAnnulusConverter.hpp
+++ b/Plugins/GeoModel/include/Acts/Plugins/GeoModel/detail/GeoIntersectionAnnulusConverter.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2024 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
@@ -29,7 +29,7 @@ struct GeoIntersectionAnnulusConverter {
   ///
   /// @return The detector element and surface
   Result<GeoModelSensitiveSurface> operator()(
-      const GeoFullPhysVol& geoFPV, const GeoShapeIntersection& geoIntersection,
+      const PVConstLink& geoPV, const GeoShapeIntersection& geoIntersection,
       const Transform3& absTransform, bool sensitive) const;
 };
 
diff --git a/Plugins/GeoModel/include/Acts/Plugins/GeoModel/detail/GeoModelBinningHelper.hpp b/Plugins/GeoModel/include/Acts/Plugins/GeoModel/detail/GeoModelBinningHelper.hpp
index 93a6ac74ee0..4cf2fde9b8d 100644
--- a/Plugins/GeoModel/include/Acts/Plugins/GeoModel/detail/GeoModelBinningHelper.hpp
+++ b/Plugins/GeoModel/include/Acts/Plugins/GeoModel/detail/GeoModelBinningHelper.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2024 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
diff --git a/Plugins/GeoModel/include/Acts/Plugins/GeoModel/detail/GeoModelExtentHelper.hpp b/Plugins/GeoModel/include/Acts/Plugins/GeoModel/detail/GeoModelExtentHelper.hpp
index 3a52c9c0f8f..5c27152b5f5 100644
--- a/Plugins/GeoModel/include/Acts/Plugins/GeoModel/detail/GeoModelExtentHelper.hpp
+++ b/Plugins/GeoModel/include/Acts/Plugins/GeoModel/detail/GeoModelExtentHelper.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2024 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
diff --git a/Plugins/GeoModel/include/Acts/Plugins/GeoModel/detail/GeoPolygonConverter.hpp b/Plugins/GeoModel/include/Acts/Plugins/GeoModel/detail/GeoPolygonConverter.hpp
new file mode 100644
index 00000000000..3d72c8e702a
--- /dev/null
+++ b/Plugins/GeoModel/include/Acts/Plugins/GeoModel/detail/GeoPolygonConverter.hpp
@@ -0,0 +1,34 @@
+// This file is part of the ACTS project.
+//
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
+//
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
+
+#pragma once
+
+#include "Acts/Definitions/Algebra.hpp"
+#include "Acts/Plugins/GeoModel/GeoModelDetectorElement.hpp"
+#include "Acts/Utilities/Result.hpp"
+
+#include <memory>
+#include <tuple>
+
+#include <GeoModelKernel/GeoSimplePolygonBrep.h>
+
+namespace Acts::detail {
+struct GeoPolygonConverter {
+  /// @brief Convert a GeoBox to a detector element and surface
+  ///
+  /// @param geoFPV The full physical volume to convert (contains shape)
+  /// @param geoBox The GeoBox to convert
+  /// @param absTransform from the GeoPhysVol
+  /// @param bool sensitive
+  ///
+  /// @return The detector element and surface
+  Result<GeoModelSensitiveSurface> operator()(
+      const PVConstLink& geoPV, const GeoSimplePolygonBrep& geoPolygon,
+      const Transform3& absTransform, bool sensitive) const;
+};
+}  // namespace Acts::detail
diff --git a/Plugins/GeoModel/include/Acts/Plugins/GeoModel/detail/GeoShiftConverter.hpp b/Plugins/GeoModel/include/Acts/Plugins/GeoModel/detail/GeoShiftConverter.hpp
index 95a5cd2403a..4a19a971dc5 100644
--- a/Plugins/GeoModel/include/Acts/Plugins/GeoModel/detail/GeoShiftConverter.hpp
+++ b/Plugins/GeoModel/include/Acts/Plugins/GeoModel/detail/GeoShiftConverter.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2024 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
@@ -27,7 +27,7 @@ struct GeoShiftConverter {
   /// @param bool sensitive
   ///
   /// @return The detector element and surface
-  Result<GeoModelSensitiveSurface> operator()(const GeoFullPhysVol& geoFPV,
+  Result<GeoModelSensitiveSurface> operator()(const PVConstLink& geoPV,
                                               const GeoShapeShift& geoShift,
                                               const Transform3& absTransform,
                                               bool sensitive) const;
diff --git a/Plugins/GeoModel/include/Acts/Plugins/GeoModel/detail/GeoSubtractionConverter.hpp b/Plugins/GeoModel/include/Acts/Plugins/GeoModel/detail/GeoSubtractionConverter.hpp
new file mode 100644
index 00000000000..88a80699360
--- /dev/null
+++ b/Plugins/GeoModel/include/Acts/Plugins/GeoModel/detail/GeoSubtractionConverter.hpp
@@ -0,0 +1,35 @@
+// This file is part of the ACTS project.
+//
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
+//
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
+
+#pragma once
+
+#include "Acts/Definitions/Algebra.hpp"
+#include "Acts/Plugins/GeoModel/GeoModelDetectorElement.hpp"
+#include "Acts/Utilities/Result.hpp"
+
+#include <memory>
+#include <tuple>
+
+#include <GeoModelKernel/GeoShapeSubtraction.h>
+
+namespace Acts::detail {
+struct GeoSubtractionConverter {
+  /// @brief Convert a GeoBox to a detector element and surface
+  ///
+  /// @param geoPV dummy to be compatible with other converters
+  /// @param geoSub The GeoShapeSubtraction to convert
+  /// @param absTransform from the GeoPhysVol
+  /// @param dummy to be compatible with other converters
+  ///
+  /// @return The detector element and surface
+  Result<GeoModelSensitiveSurface> operator()(
+      [[maybe_unused]] const PVConstLink& geoPV,
+      const GeoShapeSubtraction& geoSub, const Transform3& absTransform,
+      [[maybe_unused]] bool sensitive) const;
+};
+}  // namespace Acts::detail
diff --git a/Plugins/GeoModel/include/Acts/Plugins/GeoModel/detail/GeoTrdConverter.hpp b/Plugins/GeoModel/include/Acts/Plugins/GeoModel/detail/GeoTrdConverter.hpp
index c5fb8ae48fc..c2e165095af 100644
--- a/Plugins/GeoModel/include/Acts/Plugins/GeoModel/detail/GeoTrdConverter.hpp
+++ b/Plugins/GeoModel/include/Acts/Plugins/GeoModel/detail/GeoTrdConverter.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2024 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
@@ -34,7 +34,7 @@ struct GeoTrdConverter {
   /// @param bool sensitive
   ///
   /// @return The detector element and surface
-  Result<GeoModelSensitiveSurface> operator()(const GeoFullPhysVol& geoFPV,
+  Result<GeoModelSensitiveSurface> operator()(const PVConstLink& geoPV,
                                               const GeoTrd& geoTrd,
                                               const Transform3& absTransform,
                                               bool sensitive) const;
diff --git a/Plugins/GeoModel/include/Acts/Plugins/GeoModel/detail/GeoTubeConverter.hpp b/Plugins/GeoModel/include/Acts/Plugins/GeoModel/detail/GeoTubeConverter.hpp
index fe2f0f5adf3..6c58a07cc33 100644
--- a/Plugins/GeoModel/include/Acts/Plugins/GeoModel/detail/GeoTubeConverter.hpp
+++ b/Plugins/GeoModel/include/Acts/Plugins/GeoModel/detail/GeoTubeConverter.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2024 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
@@ -29,7 +29,7 @@ struct GeoTubeConverter {
   /// @param bool sensitive
   ///
   /// @return The detector element and surface
-  Result<GeoModelSensitiveSurface> operator()(const GeoFullPhysVol& geoFPV,
+  Result<GeoModelSensitiveSurface> operator()(const PVConstLink& geoPV,
                                               const GeoTube& geoTube,
                                               const Transform3& absTransform,
                                               bool sensitive) const;
diff --git a/Plugins/GeoModel/include/Acts/Plugins/GeoModel/detail/GeoUnionDoubleTrdConverter.hpp b/Plugins/GeoModel/include/Acts/Plugins/GeoModel/detail/GeoUnionDoubleTrdConverter.hpp
index a8b651e7409..af075ad01fc 100644
--- a/Plugins/GeoModel/include/Acts/Plugins/GeoModel/detail/GeoUnionDoubleTrdConverter.hpp
+++ b/Plugins/GeoModel/include/Acts/Plugins/GeoModel/detail/GeoUnionDoubleTrdConverter.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2024 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
@@ -35,7 +35,7 @@ struct GeoUnionDoubleTrdConverter {
   /// @param bool sensitive
   ///
   /// @return The detector element and surface
-  Result<GeoModelSensitiveSurface> operator()(const GeoFullPhysVol& geoFPV,
+  Result<GeoModelSensitiveSurface> operator()(const PVConstLink& geoPV,
                                               const GeoShapeUnion& geoUnion,
                                               const Transform3& absTransform,
                                               bool sensitive) const;
diff --git a/Plugins/GeoModel/src/GeoModelBlueprintCreater.cpp b/Plugins/GeoModel/src/GeoModelBlueprintCreater.cpp
index 7495f8cca39..0b3d2f66e42 100644
--- a/Plugins/GeoModel/src/GeoModelBlueprintCreater.cpp
+++ b/Plugins/GeoModel/src/GeoModelBlueprintCreater.cpp
@@ -1,15 +1,16 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2024 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include "Acts/Plugins/GeoModel/GeoModelBlueprintCreater.hpp"
 
 #include "Acts/Detector/GeometryIdGenerator.hpp"
 #include "Acts/Detector/LayerStructureBuilder.hpp"
+#include "Acts/Detector/detail/BlueprintDrawer.hpp"
 #include "Acts/Detector/detail/BlueprintHelper.hpp"
 #include "Acts/Detector/interface/IGeometryIdGenerator.hpp"
 #include "Acts/Plugins/GeoModel/GeoModelTree.hpp"
@@ -17,8 +18,11 @@
 #include "Acts/Plugins/GeoModel/detail/GeoModelExtentHelper.hpp"
 #include "Acts/Utilities/BinningType.hpp"
 #include "Acts/Utilities/Enumerate.hpp"
+#include "Acts/Utilities/Helpers.hpp"
 #include "Acts/Utilities/RangeXD.hpp"
 
+#include <fstream>
+
 #include <boost/algorithm/string.hpp>
 
 using namespace Acts::detail;
@@ -127,6 +131,14 @@ Acts::GeoModelBlueprintCreater::create(const GeometryContext& gctx,
   blueprint.topNode =
       createNode(cache, gctx, topEntry->second, blueprintTableMap, Extent());
 
+  // Export to dot graph if configured
+  if (!options.dotGraph.empty()) {
+    std::ofstream dotFile(options.dotGraph);
+    Experimental::detail::BlueprintDrawer::dotStream(dotFile,
+                                                     *blueprint.topNode);
+    dotFile.close();
+  }
+
   // Return the ready-to-use blueprint
   return blueprint;
 }
@@ -147,8 +159,7 @@ Acts::GeoModelBlueprintCreater::createNode(
       detail::GeoModelExentHelper::readBinningConstraints(entry.binnings);
   // Concatenate the binning constraints
   for (const auto& bc : binningConstraints) {
-    if (std::find(internalConstraints.begin(), internalConstraints.end(), bc) ==
-        internalConstraints.end()) {
+    if (!rangeContainsValue(internalConstraints, bc)) {
       internalConstraints.push_back(bc);
     }
   }
@@ -354,7 +365,7 @@ Acts::GeoModelBlueprintCreater::createInternalStructureBuilder(
       // Loop over surfaces and create an internal extent
       for (auto& sf : surfaces) {
         auto sfExtent =
-            sf->polyhedronRepresentation(gctx, m_cfg.nSegments).extent();
+            sf->polyhedronRepresentation(gctx, m_cfg.quarterSegments).extent();
         internalExtent.extend(sfExtent, internalConstraints);
       }
       ACTS_VERBOSE("Found " << surfaces.size() << " surfaces in range "
diff --git a/Plugins/GeoModel/src/GeoModelConversionError.cpp b/Plugins/GeoModel/src/GeoModelConversionError.cpp
index c435ecb722a..a4da1b244f8 100644
--- a/Plugins/GeoModel/src/GeoModelConversionError.cpp
+++ b/Plugins/GeoModel/src/GeoModelConversionError.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2024 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include "Acts/Plugins/GeoModel/GeoModelConversionError.hpp"
 
diff --git a/Plugins/GeoModel/src/GeoModelDetectorElement.cpp b/Plugins/GeoModel/src/GeoModelDetectorElement.cpp
index fb2894cbd4a..279a7b802b5 100644
--- a/Plugins/GeoModel/src/GeoModelDetectorElement.cpp
+++ b/Plugins/GeoModel/src/GeoModelDetectorElement.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2024 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include "Acts/Plugins/GeoModel/GeoModelDetectorElement.hpp"
 
@@ -12,10 +12,12 @@
 
 #include <utility>
 
+#include <GeoModelKernel/GeoFullPhysVol.h>
+
 Acts::GeoModelDetectorElement::GeoModelDetectorElement(
-    const GeoFullPhysVol& geoPhysVol, std::shared_ptr<Surface> surface,
+    PVConstLink geoPhysVol, std::shared_ptr<Surface> surface,
     const Transform3& sfTransform, ActsScalar thickness)
-    : m_geoPhysVol(&geoPhysVol),
+    : m_geoPhysVol(std::move(geoPhysVol)),
       m_surface(std::move(surface)),
       m_surfaceTransform(sfTransform),
       m_thickness(thickness) {}
@@ -37,6 +39,10 @@ Acts::ActsScalar Acts::GeoModelDetectorElement::thickness() const {
   return m_thickness;
 }
 
-const GeoFullPhysVol& Acts::GeoModelDetectorElement::physicalVolume() const {
-  return *m_geoPhysVol;
+PVConstLink Acts::GeoModelDetectorElement::physicalVolume() const {
+  return m_geoPhysVol;
+}
+
+const std::string& Acts::GeoModelDetectorElement::logVolName() const {
+  return m_geoPhysVol->getLogVol()->getName();
 }
diff --git a/Plugins/GeoModel/src/GeoModelDetectorElementITk.cpp b/Plugins/GeoModel/src/GeoModelDetectorElementITk.cpp
new file mode 100644
index 00000000000..f671386dec6
--- /dev/null
+++ b/Plugins/GeoModel/src/GeoModelDetectorElementITk.cpp
@@ -0,0 +1,131 @@
+// This file is part of the ACTS project.
+//
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
+//
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
+
+// This file is part of the Acts project.
+//
+// Copyright (C) 2024 CERN for the benefit of the Acts project
+//
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this
+// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+#include "Acts/Plugins/GeoModel/GeoModelDetectorElementITk.hpp"
+
+#include "Acts/Surfaces/AnnulusBounds.hpp"
+#include "Acts/Surfaces/DiscSurface.hpp"
+#include "Acts/Surfaces/PlaneSurface.hpp"
+#include "Acts/Surfaces/RectangleBounds.hpp"
+
+#include <ranges>
+
+namespace Acts {
+
+// Mapping between the barrel-endcap identifier and its unsigned representation
+constexpr static std::array<std::pair<unsigned, int>, 3> s_barrelEndcapMap{
+    {{0, 0}, {1, 2}, {2, -2}}};
+
+Acts::ITkIdentifier::ITkIdentifier(int hardware, int barrelEndcap,
+                                   int layerWheel, int etaModule, int phiModule,
+                                   int side) {
+  assert((hardware == 0) || (hardware == 1));
+  assert((barrelEndcap == 2) || (barrelEndcap == -2) || (barrelEndcap == 0));
+  assert(layerWheel >= 0);
+  assert(phiModule >= 0);
+  assert((side == 0) || (side == 1));
+
+  m_identifier.set(0, hardware);
+
+  auto found = std::ranges::find(s_barrelEndcapMap, barrelEndcap,
+                                 &std::pair<unsigned, int>::second);
+  if (found == s_barrelEndcapMap.end()) {
+    throw std::invalid_argument("Invalid barrel-endcap specifier");
+  }
+  m_identifier.set(1, found->first);
+  m_identifier.set(2, layerWheel);
+  m_identifier.set(3, static_cast<std::size_t>(etaModule < 0));
+  m_identifier.set(4, std::abs(etaModule));
+  m_identifier.set(5, phiModule);
+  m_identifier.set(6, side);
+}
+
+int Acts::ITkIdentifier::hardware() const {
+  return m_identifier.level(0);
+}
+
+int Acts::ITkIdentifier::barrelEndcap() const {
+  auto found = std::ranges::find(s_barrelEndcapMap, m_identifier.level(1),
+                                 &std::pair<unsigned, int>::first);
+  if (found == s_barrelEndcapMap.end()) {
+    throw std::invalid_argument("Invalid barrel-endcap specifier");
+  }
+  return found->second;
+}
+
+int Acts::ITkIdentifier::layerWheel() const {
+  return m_identifier.level(2);
+}
+
+int Acts::ITkIdentifier::etaModule() const {
+  int sign = (m_identifier.level(3) == 0) ? 1 : -1;
+  return sign * m_identifier.level(4);
+}
+
+int Acts::ITkIdentifier::phiModule() const {
+  return m_identifier.level(5);
+}
+
+int Acts::ITkIdentifier::side() const {
+  return m_identifier.level(6);
+}
+
+std::size_t Acts::ITkIdentifier::value() const {
+  return m_identifier.value();
+}
+
+std::ostream &operator<<(std::ostream &os, const ITkIdentifier &id) {
+  os << "(hw: " << id.hardware() << ", be: " << id.barrelEndcap()
+     << ", lw: " << id.layerWheel() << ", em: " << id.etaModule()
+     << ", pm: " << id.phiModule() << ", sd: " << id.side() << ")";
+  return os;
+}
+
+std::tuple<std::shared_ptr<Acts::GeoModelDetectorElementITk>,
+           std::shared_ptr<Acts::Surface>>
+Acts::GeoModelDetectorElementITk::convertFromGeomodel(
+    std::shared_ptr<GeoModelDetectorElement> detEl,
+    std::shared_ptr<Surface> srf, const GeometryContext &gctx, int hardware,
+    int barrelEndcap, int layerWheel, int etaModule, int phiModule, int side) {
+  auto helper = [&]<typename surface_t, typename bounds_t>() {
+    auto bounds = std::make_shared<bounds_t>(
+        dynamic_cast<const bounds_t &>(srf->bounds()));
+
+    auto itkEl = std::make_shared<GeoModelDetectorElementITk>(
+        detEl->physicalVolume(), nullptr, detEl->transform(gctx),
+        detEl->thickness(), hardware, barrelEndcap, layerWheel, etaModule,
+        phiModule, side);
+    auto surface = Surface::makeShared<surface_t>(bounds, *itkEl.get());
+
+    itkEl->attachSurface(surface);
+    itkEl->setDatabaseEntryName(detEl->databaseEntryName());
+    return std::pair{itkEl, surface};
+  };
+
+  if (srf->type() == Acts::Surface::Plane &&
+      srf->bounds().type() == Acts::SurfaceBounds::eRectangle) {
+    return helper.operator()<Acts::PlaneSurface, Acts::RectangleBounds>();
+  }
+  if (srf->type() == Acts::Surface::Disc &&
+      srf->bounds().type() == Acts::SurfaceBounds::eAnnulus) {
+    return helper.operator()<Acts::DiscSurface, Acts::AnnulusBounds>();
+  }
+
+  throw std::runtime_error(
+      "Only Plane+Rectangle and Disc+Annulus are converted for the ITk");
+}
+
+}  // namespace Acts
diff --git a/Plugins/GeoModel/src/GeoModelDetectorObjectFactory.cpp b/Plugins/GeoModel/src/GeoModelDetectorObjectFactory.cpp
new file mode 100644
index 00000000000..b68bb585358
--- /dev/null
+++ b/Plugins/GeoModel/src/GeoModelDetectorObjectFactory.cpp
@@ -0,0 +1,228 @@
+// This file is part of the ACTS project.
+//
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
+//
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
+
+#include "Acts/Plugins/GeoModel/GeoModelDetectorObjectFactory.hpp"
+
+#include "Acts/Detector/GeometryIdGenerator.hpp"
+#include "Acts/Detector/PortalGenerators.hpp"
+#include "Acts/Geometry/CuboidVolumeBounds.hpp"
+#include "Acts/Geometry/CutoutCylinderVolumeBounds.hpp"
+#include "Acts/Geometry/CylinderVolumeBounds.hpp"
+#include "Acts/Geometry/GeometryIdentifier.hpp"
+#include "Acts/Geometry/TrapezoidVolumeBounds.hpp"
+#include "Acts/Navigation/InternalNavigation.hpp"
+#include "Acts/Plugins/GeoModel/GeoModelConverters.hpp"
+#include "Acts/Plugins/GeoModel/IGeoShapeConverter.hpp"
+
+#include <algorithm>
+#include <iostream>
+#include <typeinfo>
+
+#include <GeoModelKernel/GeoBox.h>
+#include <GeoModelKernel/GeoPcon.h>
+#include <GeoModelKernel/GeoShapeShift.h>
+#include <GeoModelKernel/GeoShapeSubtraction.h>
+#include <GeoModelKernel/GeoShapeUnion.h>
+#include <GeoModelKernel/GeoSimplePolygonBrep.h>
+#include <GeoModelKernel/GeoTrd.h>
+#include <GeoModelKernel/GeoTube.h>
+#include <GeoModelKernel/GeoTubs.h>
+
+namespace {
+std::string recType(const GeoShapeShift &gshift);
+std::string recType(const GeoShapeUnion &gunion);
+std::string recType(const GeoShape &gshape);
+
+std::string recType(const GeoShapeShift &gshift) {
+  return "Shift[" + recType(*gshift.getOp()) + "]";
+}
+std::string recType(const GeoShapeUnion &gunion) {
+  return "Union[" + recType(*gunion.getOpA()) + ", " +
+         recType(*gunion.getOpB()) + "]";
+}
+std::string recType(const GeoShape &gshape) {
+  if (auto ptr = dynamic_cast<const GeoShapeUnion *>(&gshape); ptr != nullptr) {
+    return recType(*ptr);
+  }
+  if (auto ptr = dynamic_cast<const GeoShapeShift *>(&gshape); ptr != nullptr) {
+    return recType(*ptr);
+  }
+  return gshape.type();
+}
+
+}  // namespace
+
+namespace Acts {
+Acts::GeoModelDetectorObjectFactory::GeoModelDetectorObjectFactory(
+    const Config &cfg, std::unique_ptr<const Logger> mlogger)
+    : m_logger(std::move(mlogger)), m_cfg(cfg) {}
+
+void Acts::GeoModelDetectorObjectFactory::construct(
+    Cache &cache, const GeometryContext &gctx, const GeoModelTree &geoModelTree,
+    const Options &options) {
+  if (geoModelTree.geoReader == nullptr) {
+    throw std::invalid_argument("GeoModelTree has no GeoModelReader");
+  }
+  for (const auto &q : options.queries) {
+    ACTS_VERBOSE("Constructing detector elements for query " << q);
+    // load data from database according to querie (Muon)
+    auto qFPV = geoModelTree.geoReader
+                    ->getPublishedNodes<std::string, GeoFullPhysVol *>(q);
+
+    // go through each fpv
+    for (const auto &[name, fpv] : qFPV) {
+      PVConstLink physVol{fpv};
+      // if the match lambda returns false skip the rest of the loop
+      if (!matches(name, physVol)) {
+        continue;
+      }
+      convertFpv(name, fpv, cache, gctx);
+    }
+  }
+}
+
+void Acts::GeoModelDetectorObjectFactory::convertSensitive(
+    const PVConstLink &geoPV, const Acts::Transform3 &transform,
+    std::vector<GeoModelSensitiveSurface> &sensitives) {
+  const GeoLogVol *logVol = geoPV->getLogVol();
+  const GeoShape *shape = logVol->getShape();
+  int shapeId = shape->typeID();
+  std::string name = logVol->getName();
+  std::shared_ptr<const Acts::IGeoShapeConverter> converter =
+      Acts::geoShapesConverters(shapeId);
+  if (converter == nullptr) {
+    throw std::runtime_error("The converter for " + recType(*shape) +
+                             " is nullptr");
+  }
+
+  auto converted = converter->toSensitiveSurface(geoPV, transform);
+  if (converted.ok()) {
+    sensitives.push_back(converted.value());
+    const auto &[el, sf] = converted.value();
+    auto ss = std::get<1>(converted.value());
+
+    ACTS_VERBOSE("(successfully converted: "
+                 << name << " / " << recType(*shape) << " / "
+                 << logVol->getMaterial()->getName() << ")");
+
+    if (!el || !sf) {
+      throw std::runtime_error(
+          "The Detector Element or the Surface is nullptr");
+    }
+    return;
+  }
+  ACTS_ERROR(name << " / " << recType(*shape)
+                  << ") could not be converted by any converter");
+}
+
+std::vector<GeoChildNodeWithTrf>
+Acts::GeoModelDetectorObjectFactory::findAllSubVolumes(const PVConstLink &vol) {
+  std::vector<GeoChildNodeWithTrf> subvolumes = getChildrenWithRef(vol, false);
+  std::vector<GeoChildNodeWithTrf> sensitives;
+  for (auto subvolume : subvolumes) {
+    if (matches(subvolume.nodeName, subvolume.volume)) {
+      sensitives.push_back(subvolume);
+    }
+    std::vector<GeoChildNodeWithTrf> senssubsubvolumes =
+        findAllSubVolumes(subvolume.volume);
+    std::transform(std::make_move_iterator(senssubsubvolumes.begin()),
+                   std::make_move_iterator(senssubsubvolumes.end()),
+                   std::back_inserter(sensitives),
+                   [&subvolume](GeoChildNodeWithTrf &&volume) {
+                     volume.transform = subvolume.transform * volume.transform;
+                     return volume;
+                   });
+  }
+  return sensitives;
+}
+
+bool Acts::GeoModelDetectorObjectFactory::convertBox(std::string name) {
+  auto convB = std::ranges::any_of(m_cfg.convertBox, [&](const auto &n) {
+    return name.find(n) != std::string::npos;
+  });
+  return convB;
+}
+
+void Acts::GeoModelDetectorObjectFactory::convertFpv(
+    const std::string &name, GeoFullPhysVol *fpv, Cache &cache,
+    const GeometryContext &gctx) {
+  const auto prevSize = cache.sensitiveSurfaces.size();
+  PVConstLink physVol{fpv};
+
+  // get children
+  std::vector<GeoChildNodeWithTrf> subvolumes =
+      getChildrenWithRef(physVol, false);
+  // vector containing all subvolumes to be converted to surfaces
+  std::vector<GeoChildNodeWithTrf> surfaces = findAllSubVolumes(physVol);
+  std::vector<GeoModelSensitiveSurface> sensitives;
+
+  for (const auto &surface : surfaces) {
+    const Transform3 &transform =
+        fpv->getAbsoluteTransform() * surface.transform;
+    convertSensitive(surface.volume, transform, sensitives);
+  }
+  cache.sensitiveSurfaces.insert(cache.sensitiveSurfaces.end(),
+                                 sensitives.begin(), sensitives.end());
+  if (convertBox(name)) {
+    const GeoLogVol *logVol =
+        physVol->getLogVol();  // get logVol for the shape of the volume
+    const GeoShape *shape = logVol->getShape();  // get shape
+    const Acts::Transform3 &fpvtransform = fpv->getAbsoluteTransform(nullptr);
+
+    // convert bounding boxes with surfaces inside
+    std::shared_ptr<Experimental::DetectorVolume> box =
+        Acts::GeoModel::convertDetectorVolume(gctx, *shape, name, fpvtransform,
+                                              sensitives);
+    cache.boundingBoxes.push_back(box);
+  }
+  // If fpv has no subs and should not be converted to volume convert to surface
+  else if (subvolumes.empty()) {
+    // convert fpvs to surfaces
+    const Transform3 &transform = fpv->getAbsoluteTransform();
+    convertSensitive(fpv, transform, cache.sensitiveSurfaces);
+  }
+
+  // Set the corresponding database entry name to all sensitive surfaces
+  for (auto i = prevSize; i < cache.sensitiveSurfaces.size(); ++i) {
+    auto &[detEl, _] = cache.sensitiveSurfaces[i];
+    detEl->setDatabaseEntryName(name);
+  }
+}
+// function to determine if object fits query
+bool Acts::GeoModelDetectorObjectFactory::matches(const std::string &name,
+                                                  const PVConstLink &physvol) {
+  if (m_cfg.nameList.empty() && m_cfg.materialList.empty()) {
+    return true;
+  }
+
+  auto matchName = std::ranges::any_of(m_cfg.nameList, [&](const auto &n) {
+    return name.find(n) != std::string::npos;
+  });
+
+  std::string matStr = physvol->getLogVol()->getMaterial()->getName();
+
+  auto matchMaterial = std::ranges::any_of(
+      m_cfg.materialList,
+      [&](const auto &m) { return matStr.find(m) != std::string::npos; });
+
+  bool match = matchMaterial && matchName;
+  GeoIntrusivePtr<const GeoVFullPhysVol> fullVol =
+      dynamic_pointer_cast<const GeoVFullPhysVol>(physvol);
+
+  // for the fullphysvol we only check the name
+  if (m_cfg.nameList.empty()) {
+    return matchMaterial;
+  }
+
+  // if no material specified or we're looking at fpv judge by name only
+  if (m_cfg.materialList.empty() || !(fullVol == nullptr)) {
+    return matchName;
+  }
+  return match;
+}
+}  // namespace Acts
diff --git a/Plugins/GeoModel/src/GeoModelDetectorSurfaceFactory.cpp b/Plugins/GeoModel/src/GeoModelDetectorSurfaceFactory.cpp
deleted file mode 100644
index 2b7553b0512..00000000000
--- a/Plugins/GeoModel/src/GeoModelDetectorSurfaceFactory.cpp
+++ /dev/null
@@ -1,141 +0,0 @@
-// This file is part of the Acts project.
-//
-// Copyright (C) 2024 CERN for the benefit of the Acts project
-//
-// This Source Code Form is subject to the terms of the Mozilla Public
-// License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-#include "Acts/Plugins/GeoModel/GeoModelDetectorSurfaceFactory.hpp"
-
-#include "Acts/Plugins/GeoModel/GeoModelDetectorElement.hpp"
-#include "Acts/Plugins/GeoModel/GeoModelTree.hpp"
-
-#include <set>
-
-#include <GeoModelKernel/GeoShapeShift.h>
-#include <GeoModelKernel/GeoShapeUnion.h>
-
-namespace {
-std::string recType(const GeoShape &gshape);
-
-std::string recType(const GeoShapeShift &gshift) {
-  return "Shift[" + recType(*gshift.getOp()) + "]";
-}
-std::string recType(const GeoShapeUnion &gunion) {
-  return "Union[" + recType(*gunion.getOpA()) + ", " +
-         recType(*gunion.getOpB()) + "]";
-}
-std::string recType(const GeoShape &gshape) {
-  if (auto ptr = dynamic_cast<const GeoShapeUnion *>(&gshape); ptr != nullptr) {
-    return recType(*ptr);
-  }
-  if (auto ptr = dynamic_cast<const GeoShapeShift *>(&gshape); ptr != nullptr) {
-    return recType(*ptr);
-  }
-  return gshape.type();
-}
-
-}  // namespace
-
-Acts::GeoModelDetectorSurfaceFactory::GeoModelDetectorSurfaceFactory(
-    const Config &cfg, std::unique_ptr<const Logger> mlogger)
-    : m_cfg(cfg), m_logger(std::move(mlogger)) {}
-
-void Acts::GeoModelDetectorSurfaceFactory::construct(
-    Cache &cache, const GeometryContext & /*gctx*/,
-    const GeoModelTree &geoModelTree, const Options &options) {
-  if (geoModelTree.geoReader == nullptr) {
-    throw std::invalid_argument("GeoModelTree has no GeoModelReader");
-  }
-
-  for (const auto &q : options.queries) {
-    ACTS_VERBOSE("Constructing detector elements for query " << q);
-    auto qFPV = geoModelTree.geoReader
-                    ->getPublishedNodes<std::string, GeoFullPhysVol *>(q);
-
-    auto matches = [&](const std::string &name, const GeoVFullPhysVol &fpv) {
-      bool match = m_cfg.nameList.empty() && m_cfg.materialList.empty();
-      if (match) {
-        return true;
-      }
-
-      match |= std::any_of(
-          m_cfg.nameList.begin(), m_cfg.nameList.end(),
-          [&](const auto &n) { return name.find(n) != std::string::npos; });
-      if (match) {
-        return true;
-      }
-
-      const auto &matStr = fpv.getLogVol()->getMaterial()->getName();
-      match |= std::any_of(
-          m_cfg.materialList.begin(), m_cfg.materialList.end(),
-          [&](const auto &m) { return matStr.find(m) != std::string::npos; });
-
-      return match;
-    };
-
-    // Store stems of volume names and materials for INFO output
-    std::set<std::string> volNameStems;
-    std::set<std::string> materials;
-
-    for (auto &[name, fpv] : qFPV) {
-      if (fpv == nullptr) {
-        ACTS_WARNING("Pointer to volume '" << name << "' is null");
-        continue;
-      }
-
-      const std::string &vname = fpv->getLogVol()->getName();
-      const GeoShape &shape = *fpv->getLogVol()->getShape();
-
-      if (!matches(name, *fpv)) {
-        continue;
-      }
-
-      // Convert using the list of converters
-      bool success = false;
-
-      for (const auto &converter : m_cfg.shapeConverters) {
-        auto converted = converter->toSensitiveSurface(*fpv);
-        if (converted.ok()) {
-          // Add the element and surface to the cache
-          cache.sensitiveSurfaces.push_back(converted.value());
-          const auto &[el, sf] = converted.value();
-          success = true;
-          ACTS_VERBOSE("successfully converted "
-                       << name << " (" << vname << " / " << recType(shape)
-                       << " / " << fpv->getLogVol()->getMaterial()->getName()
-                       << ")");
-          if (!(el && sf)) {
-            throw std::runtime_error("something is nullptr");
-          }
-          break;
-        }
-      }
-
-      if (!success) {
-        ACTS_DEBUG(name << " (" << vname << " / " << recType(shape)
-                        << ") could not be converted by any converter");
-      } else {
-        volNameStems.emplace(name.substr(0, 6));
-        materials.emplace(fpv->getLogVol()->getMaterial()->getName());
-      }
-    }
-    ACTS_VERBOSE("Found " << qFPV.size()
-                          << " full physical volumes matching the query.");
-
-    auto streamVec = [](const auto &v) {
-      std::stringstream ss;
-      for (const auto &el : v) {
-        ss << el << " ";
-      }
-      return ss.str();
-    };
-
-    ACTS_INFO("Converted volumes (stems): " << streamVec(volNameStems));
-    ACTS_INFO("Materials of converted volumes: " << streamVec(materials));
-  }
-  ACTS_DEBUG("Constructed "
-             << cache.sensitiveSurfaces.size() << " sensitive elements and "
-             << cache.passiveSurfaces.size() << " passive elements");
-}
diff --git a/Plugins/GeoModel/src/GeoModelMaterialConverter.cpp b/Plugins/GeoModel/src/GeoModelMaterialConverter.cpp
new file mode 100644
index 00000000000..bb53101b3e1
--- /dev/null
+++ b/Plugins/GeoModel/src/GeoModelMaterialConverter.cpp
@@ -0,0 +1,39 @@
+// This file is part of the ACTS project.
+//
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
+//
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
+
+#include "Acts/Plugins/GeoModel/GeoModelMaterialConverter.hpp"
+
+#include "Acts/Material/Material.hpp"
+
+#include "GeoModelKernel/GeoMaterial.h"
+#include "GeoModelKernel/Units.h"
+namespace {
+constexpr double s_densityCnvFactor = 1. / GeoModelKernelUnits::gram;
+}
+Acts::Material Acts::GeoModel::geoMaterialConverter(const GeoMaterial& gm,
+                                                    bool useMolarDensity) {
+  double x0 = gm.getRadLength();
+  double l0 = gm.getIntLength();
+  double density = gm.getDensity() * s_densityCnvFactor;
+  double A = 0.;
+  double Z = 0.;
+  // Get number elements
+  int numberOfElements = gm.getNumElements();
+  // Loop
+  for (int iEl = 0; iEl < numberOfElements; ++iEl) {
+    const GeoElement* geoEl = gm.getElement(iEl);
+    double fraction = gm.getFraction(iEl);
+    A += fraction * (geoEl->getA() / GeoModelKernelUnits::gram);
+    Z += fraction * geoEl->getZ();
+  }
+  if (useMolarDensity) {
+    return Material::fromMolarDensity(x0, l0, A, Z, density);
+  } else {
+    return Material::fromMassDensity(x0, l0, A, Z, density);
+  }
+}
diff --git a/Plugins/GeoModel/src/GeoModelReader.cpp b/Plugins/GeoModel/src/GeoModelReader.cpp
index 46bd8dba779..400eb00a529 100644
--- a/Plugins/GeoModel/src/GeoModelReader.cpp
+++ b/Plugins/GeoModel/src/GeoModelReader.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2024 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include "Acts/Plugins/GeoModel/GeoModelReader.hpp"
 
diff --git a/Plugins/GeoModel/src/GeoModelToDetectorVolume.cpp b/Plugins/GeoModel/src/GeoModelToDetectorVolume.cpp
new file mode 100644
index 00000000000..854c85103af
--- /dev/null
+++ b/Plugins/GeoModel/src/GeoModelToDetectorVolume.cpp
@@ -0,0 +1,157 @@
+// This file is part of the ACTS project.
+//
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
+//
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
+
+#include "Acts/Plugins/GeoModel/GeoModelToDetectorVolume.hpp"
+
+#include "Acts/Detector/GeometryIdGenerator.hpp"
+#include "Acts/Detector/PortalGenerators.hpp"
+#include "Acts/Geometry/CuboidVolumeBounds.hpp"
+#include "Acts/Geometry/CutoutCylinderVolumeBounds.hpp"
+#include "Acts/Geometry/CylinderVolumeBounds.hpp"
+#include "Acts/Geometry/GeometryIdentifier.hpp"
+#include "Acts/Geometry/TrapezoidVolumeBounds.hpp"
+#include "Acts/Navigation/DetectorVolumeFinders.hpp"
+#include "Acts/Navigation/InternalNavigation.hpp"
+
+#include <numbers>
+
+#include <GeoModelKernel/GeoBox.h>
+#include <GeoModelKernel/GeoPcon.h>
+#include <GeoModelKernel/GeoShapeShift.h>
+#include <GeoModelKernel/GeoShapeSubtraction.h>
+#include <GeoModelKernel/GeoShapeUnion.h>
+#include <GeoModelKernel/GeoSimplePolygonBrep.h>
+#include <GeoModelKernel/GeoTrd.h>
+#include <GeoModelKernel/GeoTube.h>
+#include <GeoModelKernel/GeoTubs.h>
+
+namespace Acts::GeoModel {
+Volume convertVolume(const Transform3& trf, const GeoShape& shape) {
+  std::shared_ptr<VolumeBounds> bounds;
+  GeoTrf::Transform3D newTrf = trf;
+  if (shape.typeID() == GeoTube::getClassTypeID()) {
+    const GeoTube* tube = dynamic_cast<const GeoTube*>(&shape);
+    bounds = std::make_shared<CylinderVolumeBounds>(
+        tube->getRMin(), tube->getRMax(), tube->getZHalfLength());
+  } else if (shape.typeID() == GeoTubs::getClassTypeID()) {
+    const GeoTubs* tubs = dynamic_cast<const GeoTubs*>(&shape);
+    bounds = std::make_shared<CylinderVolumeBounds>(
+        tubs->getRMin(), tubs->getRMax(), tubs->getZHalfLength(),
+        tubs->getDPhi() / 2);
+    newTrf = trf * GeoTrf::RotateZ3D(tubs->getSPhi() + 0.5 * tubs->getDPhi());
+  } else if (shape.typeID() == GeoBox::getClassTypeID()) {
+    const GeoBox* box = dynamic_cast<const GeoBox*>(&shape);
+    bounds = std::make_shared<CuboidVolumeBounds>(
+        box->getXHalfLength(), box->getYHalfLength(), box->getZHalfLength());
+  } else if (shape.typeID() == GeoSimplePolygonBrep::getClassTypeID()) {
+    const GeoSimplePolygonBrep* brep =
+        dynamic_cast<const GeoSimplePolygonBrep*>(&shape);
+    double xmin{0}, xmax{0}, ymin{0}, ymax{0}, zmin{0}, zmax{0};
+    brep->extent(xmin, ymin, zmin, xmax, ymax, zmax);
+    bounds = std::make_shared<CuboidVolumeBounds>(
+        (xmax - xmin) / 2, (ymax - ymin) / 2, (zmax - zmin) / 2);
+  } else if (shape.typeID() == GeoTrd::getClassTypeID()) {
+    const GeoTrd* trd = dynamic_cast<const GeoTrd*>(&shape);
+    double x1 = trd->getXHalfLength1();
+    double x2 = trd->getXHalfLength2();
+    double y1 = trd->getYHalfLength1();
+    double y2 = trd->getYHalfLength2();
+    double z = trd->getZHalfLength();
+
+    if (y1 == y2) {
+      if (x1 <= x2) {
+        // y axis in ACTS is z axis in geomodel
+        bounds = std::make_shared<TrapezoidVolumeBounds>(x1, x2, z, y1);
+        constexpr double rotationAngle = std::numbers::pi / 2.;
+        newTrf = trf * GeoTrf::RotateX3D(rotationAngle);
+      } else {
+        bounds = std::make_shared<TrapezoidVolumeBounds>(x2, x1, z, y1);
+        constexpr double rotationAngle = std::numbers::pi;
+        newTrf = trf * GeoTrf::RotateY3D(rotationAngle) *
+                 GeoTrf::RotateZ3D(rotationAngle);
+      }
+    } else if (x1 == x2) {
+      if (y1 < y2) {
+        bounds = std::make_shared<TrapezoidVolumeBounds>(y1, y2, z, x1);
+        auto rotationAngle = std::numbers::pi / 2.;
+        newTrf = trf * GeoTrf::RotateZ3D(rotationAngle) *
+                 GeoTrf::RotateX3D(rotationAngle);
+      } else {
+        bounds = std::make_shared<TrapezoidVolumeBounds>(y2, y1, z, x1);
+        auto rotationAngle = std::numbers::pi;
+        newTrf = trf * GeoTrf::RotateX3D(rotationAngle) *
+                 GeoTrf::RotateZ3D(rotationAngle / 2) *
+                 GeoTrf::RotateX3D(rotationAngle / 2);
+      }
+    } else {
+      throw std::runtime_error("FATAL: Translating GeoTrd to ACTS failed");
+    }
+  }
+
+  else if (shape.typeID() == GeoShapeUnion::getClassTypeID()) {
+    const GeoShapeUnion* unionShape =
+        dynamic_cast<const GeoShapeUnion*>(&shape);
+    double xmin{0}, xmax{0}, ymin{0}, ymax{0}, zmin{0}, zmax{0};
+    unionShape->extent(xmin, ymin, zmin, xmax, ymax, zmax);
+    bounds = std::make_shared<CuboidVolumeBounds>(
+        (xmax - xmin) / 2, (ymax - ymin) / 2, (zmax - zmin) / 2);
+  } else if (shape.typeID() == GeoShapeSubtraction::getClassTypeID()) {
+    // Go down the left side (opA) of the subtraction until we reach a normal
+    // shape
+    const GeoShapeSubtraction* subtractionShape =
+        dynamic_cast<const GeoShapeSubtraction*>(&shape);
+    const GeoShape* shapeA = subtractionShape->getOpA();
+    return convertVolume(trf, *shapeA);
+  } else if (shape.typeID() == GeoShapeSubtraction::getClassTypeID()) {
+    // Go down the left side (opA) of the subtraction until we reach a normal
+    // shape
+    const GeoShapeSubtraction* subtractionShape =
+        dynamic_cast<const GeoShapeSubtraction*>(&shape);
+    const GeoShape* shapeA = subtractionShape->getOpA();
+    return convertVolume(trf, *shapeA);
+  } else if (shape.typeID() == GeoPcon::getClassTypeID()) {
+    // Will change in future, get bounding box for now
+    double xmin{0}, xmax{0}, ymin{0}, ymax{0}, zmin{0}, zmax{0};
+    const GeoPcon* pcon = dynamic_cast<const GeoPcon*>(&shape);
+    pcon->extent(xmin, ymin, zmin, xmax, ymax, zmax);
+    bounds = std::make_shared<CuboidVolumeBounds>(
+        (xmax - xmin) / 2, (ymax - ymin) / 2, (zmax - zmin) / 2);
+  } else if (shape.typeID() == GeoShapeShift::getClassTypeID()) {
+    const GeoShapeShift* shiftShape =
+        dynamic_cast<const GeoShapeShift*>(&shape);
+    const GeoShape* shapeOp = shiftShape->getOp();
+    newTrf = trf * shiftShape->getX();
+    return convertVolume(newTrf, *shapeOp);
+  } else {
+    throw std::runtime_error("FATAL: Unsupported GeoModel shape: " +
+                             shape.type());
+  }
+  return Volume(newTrf, bounds);
+}
+
+std::shared_ptr<Experimental::DetectorVolume> convertDetectorVolume(
+    const GeometryContext& context, const GeoShape& shape,
+    const std::string& name, const GeoTrf::Transform3D& transform,
+    const std::vector<GeoModelSensitiveSurface>& sensitives) {
+  // type conversion from GeoModelSensitiveSurface to Surface
+  std::vector<std::shared_ptr<Surface>> sensSurfaces(sensitives.size());
+  std::transform(sensitives.begin(), sensitives.end(), sensSurfaces.begin(),
+                 [](const std::tuple<std::shared_ptr<GeoModelDetectorElement>,
+                                     std::shared_ptr<Surface>>& t) {
+                   return std::get<1>(t);
+                 });
+  auto portalGenerator = Experimental::defaultPortalAndSubPortalGenerator();
+  Volume vol = convertVolume(transform, shape);
+  return Experimental::DetectorVolumeFactory::construct(
+      portalGenerator, context, name, vol.transform(), vol.volumeBoundsPtr(),
+      sensSurfaces,
+      std::vector<std::shared_ptr<Acts::Experimental::DetectorVolume>>{},
+      Experimental::tryNoVolumes(), Experimental::tryAllPortalsAndSurfaces());
+}
+
+}  // namespace Acts::GeoModel
diff --git a/Plugins/GeoModel/src/detail/GeoBoxConverter.cpp b/Plugins/GeoModel/src/detail/GeoBoxConverter.cpp
index a1c65c3564a..cb6e1cc6031 100644
--- a/Plugins/GeoModel/src/detail/GeoBoxConverter.cpp
+++ b/Plugins/GeoModel/src/detail/GeoBoxConverter.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2024 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include "Acts/Plugins/GeoModel/detail/GeoBoxConverter.hpp"
 
@@ -22,7 +22,7 @@
 #include <GeoModelKernel/Units.h>
 
 Acts::Result<Acts::GeoModelSensitiveSurface>
-Acts::detail::GeoBoxConverter::operator()(const GeoFullPhysVol& geoFPV,
+Acts::detail::GeoBoxConverter::operator()(const PVConstLink& geoPV,
                                           const GeoBox& geoBox,
                                           const Transform3& absTransform,
                                           bool sensitive) const {
@@ -64,7 +64,7 @@ Acts::detail::GeoBoxConverter::operator()(const GeoFullPhysVol& geoFPV,
   // Create the element and the surface
   auto detectorElement =
       GeoModelDetectorElement::createDetectorElement<PlaneSurface>(
-          geoFPV, rectangleBounds, transform,
+          geoPV, rectangleBounds, transform,
           2 * unitLength * halfLengths[zIndex]);
   auto surface = detectorElement->surface().getSharedPtr();
   // Return the detector element and surface
diff --git a/Plugins/GeoModel/src/detail/GeoIntersectionAnnulusConverter.cpp b/Plugins/GeoModel/src/detail/GeoIntersectionAnnulusConverter.cpp
index 5fdaf563db6..297db3a2292 100644
--- a/Plugins/GeoModel/src/detail/GeoIntersectionAnnulusConverter.cpp
+++ b/Plugins/GeoModel/src/detail/GeoIntersectionAnnulusConverter.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2024 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include "Acts/Plugins/GeoModel/detail/GeoIntersectionAnnulusConverter.hpp"
 
@@ -16,6 +16,8 @@
 #include "Acts/Surfaces/Surface.hpp"
 #include "Acts/Surfaces/detail/AnnulusBoundsHelper.hpp"
 
+#include <algorithm>
+
 #include <GeoModelKernel/GeoFullPhysVol.h>
 #include <GeoModelKernel/GeoGenericTrap.h>
 #include <GeoModelKernel/GeoLogVol.h>
@@ -26,7 +28,7 @@
 
 Acts::Result<Acts::GeoModelSensitiveSurface>
 Acts::detail::GeoIntersectionAnnulusConverter::operator()(
-    const GeoFullPhysVol& geoFPV, const GeoShapeIntersection& geoIntersection,
+    const PVConstLink& geoPV, const GeoShapeIntersection& geoIntersection,
     const Transform3& absTransform, bool sensitive) const {
   /// auto-calculate the unit length conversion
   static constexpr ActsScalar unitLength =
@@ -56,10 +58,9 @@ Acts::detail::GeoIntersectionAnnulusConverter::operator()(
         std::vector<Vector2> faceVertices(trapVertices.begin(),
                                           trapVertices.begin() + 4u);
         // to make sure they are in the right order
-        std::sort(faceVertices.begin(), faceVertices.end(),
-                  [](const auto& a, const auto& b) {
-                    return (VectorHelpers::phi(a) > VectorHelpers::phi(b));
-                  });
+        std::ranges::sort(faceVertices, std::greater{}, [](const auto& f) {
+          return (VectorHelpers::phi(f));
+        });
 
         // Turn them into global
         std::vector<Vector3> faceVertices3D;
@@ -85,7 +86,7 @@ Acts::detail::GeoIntersectionAnnulusConverter::operator()(
         // Create the detector element
         auto detectorElement =
             GeoModelDetectorElement::createDetectorElement<DiscSurface>(
-                geoFPV, annulusBounds, annulusTransform, thickness);
+                geoPV, annulusBounds, annulusTransform, thickness);
         auto surface = detectorElement->surface().getSharedPtr();
         return std::make_tuple(detectorElement, surface);
       }
diff --git a/Plugins/GeoModel/src/detail/GeoModelBinningHelper.cpp b/Plugins/GeoModel/src/detail/GeoModelBinningHelper.cpp
index 6723f602d8d..0cfa03870e8 100644
--- a/Plugins/GeoModel/src/detail/GeoModelBinningHelper.cpp
+++ b/Plugins/GeoModel/src/detail/GeoModelBinningHelper.cpp
@@ -1,13 +1,15 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2024 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include "Acts/Plugins/GeoModel/detail/GeoModelBinningHelper.hpp"
 
+#include <numbers>
+
 #include <boost/algorithm/string.hpp>
 
 Acts::Experimental::ProtoBinning
@@ -47,8 +49,8 @@ Acts::detail::GeoModelBinningHelper::toProtoBinning(
   ActsScalar rangeMax = 0.;
   if (bValue == BinningValue::binPhi &&
       boundaryType == AxisBoundaryType::Closed) {
-    rangeMin = -M_PI;
-    rangeMax = M_PI;
+    rangeMin = -std::numbers::pi_v<ActsScalar>;
+    rangeMax = std::numbers::pi_v<ActsScalar>;
   } else {
     if (binningDetails.size() > 3u && binningDetails[3] != "*") {
       autoRange = false;
diff --git a/Plugins/GeoModel/src/detail/GeoModelExtentHelper.cpp b/Plugins/GeoModel/src/detail/GeoModelExtentHelper.cpp
index 200cbf2d8fd..a56b7ccc265 100644
--- a/Plugins/GeoModel/src/detail/GeoModelExtentHelper.cpp
+++ b/Plugins/GeoModel/src/detail/GeoModelExtentHelper.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2024 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include "Acts/Plugins/GeoModel/detail/GeoModelExtentHelper.hpp"
 
diff --git a/Plugins/GeoModel/src/detail/GeoPolygonConverter.cpp b/Plugins/GeoModel/src/detail/GeoPolygonConverter.cpp
new file mode 100644
index 00000000000..11a0f983f1a
--- /dev/null
+++ b/Plugins/GeoModel/src/detail/GeoPolygonConverter.cpp
@@ -0,0 +1,124 @@
+// This file is part of the ACTS project.
+//
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
+//
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
+
+#include "Acts/Plugins/GeoModel/detail/GeoPolygonConverter.hpp"
+
+#include "Acts/Definitions/Common.hpp"
+#include "Acts/Definitions/Units.hpp"
+#include "Acts/Plugins/GeoModel/GeoModelConversionError.hpp"
+#include "Acts/Surfaces/DiamondBounds.hpp"
+#include "Acts/Surfaces/PlaneSurface.hpp"
+#include "Acts/Surfaces/RectangleBounds.hpp"
+#include "Acts/Surfaces/Surface.hpp"
+#include "Acts/Surfaces/TrapezoidBounds.hpp"
+
+#include <algorithm>
+
+#include <GeoModelKernel/GeoBox.h>
+#include <GeoModelKernel/GeoFullPhysVol.h>
+#include <GeoModelKernel/GeoLogVol.h>
+#include <GeoModelKernel/GeoShape.h>
+#include <GeoModelKernel/Units.h>
+
+Acts::Result<Acts::GeoModelSensitiveSurface>
+Acts::detail::GeoPolygonConverter::operator()(
+    const PVConstLink& geoPV, const GeoSimplePolygonBrep& polygon,
+    const Transform3& absTransform, bool sensitive) const {
+  /// auto-calculate the unit length conversion
+  static constexpr ActsScalar unitLength =
+      Acts::UnitConstants::mm / GeoModelKernelUnits::millimeter;
+
+  // Create the surface transform
+  Transform3 transform = Transform3::Identity();
+  transform.translation() = unitLength * absTransform.translation();
+  auto rotation = absTransform.rotation();
+  // Get the half lengths
+  int nVertices = polygon.getNVertices();
+  std::vector<std::vector<double>> vertices;
+
+  for (int i = 0; i < nVertices; i++) {
+    vertices.push_back({polygon.getXVertex(i), polygon.getYVertex(i)});
+  }
+  // sort based on the y-coordinate
+  std::ranges::sort(vertices, {}, [](const auto& v) { return v[1]; });
+  if (nVertices == 4) {
+    double hlxnegy = std::abs(vertices[0][0] - vertices[1][0]) / 2;
+    double hlxposy = std::abs(vertices[2][0] - vertices[3][0]) / 2;
+    double hly = std::abs(vertices[0][1] - vertices[3][1]) / 2;
+    std::vector<ActsScalar> halfLengths = {hlxnegy, hlxposy, hly};
+
+    // Create the surface
+    Vector3 colX = rotation.col(0);
+    Vector3 colY = rotation.col(1);
+    Vector3 colZ = rotation.col(2);
+    rotation.col(0) = colX;
+    rotation.col(1) = colY;
+    rotation.col(2) = colZ;
+    transform.linear() = rotation;
+    // Create the surface bounds
+    ActsScalar halfXnegY = unitLength * halfLengths[0];
+    ActsScalar halfXposY = unitLength * halfLengths[1];
+    ActsScalar halfY = unitLength * halfLengths[2];
+    auto trapBounds =
+        std::make_shared<Acts::TrapezoidBounds>(halfXnegY, halfXposY, halfY);
+    if (!sensitive) {
+      auto surface = Surface::makeShared<PlaneSurface>(transform, trapBounds);
+      return std::make_tuple(nullptr, surface);
+    }
+    // Create the element and the surface
+    auto detectorElement =
+        GeoModelDetectorElement::createDetectorElement<PlaneSurface>(
+            geoPV, trapBounds, transform, unitLength * polygon.getDZ());
+    auto surface = detectorElement->surface().getSharedPtr();
+    // Return the detector element and surface
+    return std::make_tuple(detectorElement, surface);
+  } else if (nVertices == 6) {
+    double hlxnegy = std::abs(vertices[0][0] - vertices[1][0]) / 2;
+    double hlxzeroy = std::abs(vertices[2][0] - vertices[3][0]) / 2;
+    double hlxposy = std::abs(vertices[4][0] - vertices[5][0]) / 2;
+    double hly = std::abs(vertices[0][1] - vertices[4][1]) / 2;
+    std::vector<ActsScalar> halfLengths = {hlxnegy, hlxzeroy, hlxposy, hly,
+                                           hly};
+
+    // Create the surface
+
+    Vector3 colX = rotation.col(0);
+    Vector3 colY = rotation.col(1);
+    Vector3 colZ = rotation.col(2);
+    rotation.col(0) = colX;
+    rotation.col(1) = colY;
+    rotation.col(2) = colZ;
+    transform.linear() = rotation;
+
+    // Create the surface bounds
+    ActsScalar halfXnegY = unitLength * halfLengths[0];
+    ActsScalar halfXzeroY = unitLength * halfLengths[1];
+    ActsScalar halfXposY = unitLength * halfLengths[2];
+    ActsScalar halfYnegX = unitLength * halfLengths[3];
+    ActsScalar halfYposX = unitLength * halfLengths[4];
+
+    auto diamondBounds = std::make_shared<Acts::DiamondBounds>(
+        halfXnegY, halfXzeroY, halfXposY, halfYnegX, halfYposX);
+    if (!sensitive) {
+      auto surface =
+          Surface::makeShared<PlaneSurface>(transform, diamondBounds);
+      return std::make_tuple(nullptr, surface);
+    }
+    // Create the element and the surface
+    auto detectorElement =
+        GeoModelDetectorElement::createDetectorElement<PlaneSurface>(
+            geoPV, diamondBounds, transform, unitLength * polygon.getDZ());
+    auto surface = detectorElement->surface().getSharedPtr();
+    // Return the detector element and surface
+    return std::make_tuple(detectorElement, surface);
+  } else {
+    throw std::runtime_error("GeoSimplePolygonBrep with " +
+                             std::to_string(nVertices) +
+                             " vertices can not be converted");
+  }
+}
diff --git a/Plugins/GeoModel/src/detail/GeoShiftConverter.cpp b/Plugins/GeoModel/src/detail/GeoShiftConverter.cpp
index ffba7e7c011..0574df02d32 100644
--- a/Plugins/GeoModel/src/detail/GeoShiftConverter.cpp
+++ b/Plugins/GeoModel/src/detail/GeoShiftConverter.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2024 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include "Acts/Plugins/GeoModel/detail/GeoShiftConverter.hpp"
 
@@ -25,7 +25,7 @@ namespace {
 
 template <typename ContainedShape, typename Converter, typename Surface,
           typename Bounds>
-Result<GeoModelSensitiveSurface> impl(const GeoFullPhysVol& geoFPV,
+Result<GeoModelSensitiveSurface> impl(PVConstLink geoPV,
                                       const GeoShapeShift& geoShift,
                                       const Transform3& absTransform,
                                       bool sensitive) {
@@ -39,7 +39,7 @@ Result<GeoModelSensitiveSurface> impl(const GeoFullPhysVol& geoFPV,
   const Transform3& shift = geoShift.getX();
 
   const auto& conversionRes =
-      Converter{}(geoFPV, *trd, absTransform * shift, sensitive);
+      Converter{}(geoPV, *trd, absTransform * shift, sensitive);
   if (!conversionRes.ok()) {
     return conversionRes.error();
   }
@@ -66,17 +66,17 @@ Result<GeoModelSensitiveSurface> impl(const GeoFullPhysVol& geoFPV,
 }  // namespace
 
 Result<GeoModelSensitiveSurface> GeoShiftConverter::operator()(
-    const GeoFullPhysVol& geoFPV, const GeoShapeShift& geoShift,
+    const PVConstLink& geoPV, const GeoShapeShift& geoShift,
     const Transform3& absTransform, bool sensitive) const {
   auto r = impl<GeoTrd, detail::GeoTrdConverter, PlaneSurface, TrapezoidBounds>(
-      geoFPV, geoShift, absTransform, sensitive);
+      geoPV, geoShift, absTransform, sensitive);
 
   if (r.ok()) {
     return r;
   }
 
   r = impl<GeoBox, detail::GeoBoxConverter, PlaneSurface, RectangleBounds>(
-      geoFPV, geoShift, absTransform, sensitive);
+      geoPV, geoShift, absTransform, sensitive);
 
   if (r.ok()) {
     return r;
@@ -84,7 +84,7 @@ Result<GeoModelSensitiveSurface> GeoShiftConverter::operator()(
 
   // For now this does straw by default
   r = impl<GeoTube, detail::GeoTubeConverter, StrawSurface, LineBounds>(
-      geoFPV, geoShift, absTransform, sensitive);
+      geoPV, geoShift, absTransform, sensitive);
 
   if (r.ok()) {
     return r;
diff --git a/Plugins/GeoModel/src/detail/GeoSubtractionConverter.cpp b/Plugins/GeoModel/src/detail/GeoSubtractionConverter.cpp
new file mode 100644
index 00000000000..c5757e4f144
--- /dev/null
+++ b/Plugins/GeoModel/src/detail/GeoSubtractionConverter.cpp
@@ -0,0 +1,55 @@
+// This file is part of the ACTS project.
+//
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
+//
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
+
+#include "Acts/Plugins/GeoModel/detail/GeoSubtractionConverter.hpp"
+
+#include "Acts/Definitions/Common.hpp"
+#include "Acts/Definitions/Units.hpp"
+#include "Acts/Plugins/GeoModel/GeoModelConversionError.hpp"
+#include "Acts/Plugins/GeoModel/GeoModelConverters.hpp"
+#include "Acts/Plugins/GeoModel/IGeoShapeConverter.hpp"
+#include "Acts/Surfaces/DiamondBounds.hpp"
+#include "Acts/Surfaces/PlaneSurface.hpp"
+#include "Acts/Surfaces/RectangleBounds.hpp"
+#include "Acts/Surfaces/Surface.hpp"
+#include "Acts/Surfaces/TrapezoidBounds.hpp"
+
+#include <GeoModelKernel/GeoBox.h>
+#include <GeoModelKernel/GeoFullPhysVol.h>
+#include <GeoModelKernel/GeoLogVol.h>
+#include <GeoModelKernel/GeoShape.h>
+#include <GeoModelKernel/GeoShapeShift.h>
+#include <GeoModelKernel/Units.h>
+
+Acts::Result<Acts::GeoModelSensitiveSurface>
+Acts::detail::GeoSubtractionConverter::operator()(
+    [[maybe_unused]] const PVConstLink& geoPV,
+    const GeoShapeSubtraction& geoSub, const Transform3& absTransform,
+    [[maybe_unused]] bool sensitive) const {
+  const GeoShape* shapeA = geoSub.getOpA();
+  int shapeId = shapeA->typeID();
+  std::shared_ptr<const Acts::IGeoShapeConverter> converter =
+      Acts::geoShapesConverters(shapeId);
+  if (converter == nullptr) {
+    throw std::runtime_error("The converter for " + shapeA->type() +
+                             " is nullptr");
+  }
+  // Material and name for the PVConstLink declaration are dummie variables
+  GeoIntrusivePtr<GeoMaterial> material(new GeoMaterial("Material", 1.0));
+  GeoIntrusivePtr<GeoLogVol> logA(new GeoLogVol("", shapeA, material));
+  PVConstLink pvA = new GeoVPhysVol(logA);
+
+  // recursively call the the converter
+  auto converted = converter->toSensitiveSurface(pvA, absTransform);
+  if (converted.ok()) {
+    return converted.value();
+  } else {
+    throw std::runtime_error("Unexpected error in the conversion of " +
+                             shapeA->type());
+  }
+}
diff --git a/Plugins/GeoModel/src/detail/GeoTrdConverter.cpp b/Plugins/GeoModel/src/detail/GeoTrdConverter.cpp
index 9ba9cb29bed..802aa2adeae 100644
--- a/Plugins/GeoModel/src/detail/GeoTrdConverter.cpp
+++ b/Plugins/GeoModel/src/detail/GeoTrdConverter.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2024 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include "Acts/Plugins/GeoModel/detail/GeoTrdConverter.hpp"
 
@@ -24,7 +24,7 @@
 #include <GeoModelKernel/Units.h>
 
 Acts::Result<Acts::GeoModelSensitiveSurface>
-Acts::detail::GeoTrdConverter::operator()(const GeoFullPhysVol& geoFPV,
+Acts::detail::GeoTrdConverter::operator()(const PVConstLink& geoPV,
                                           const GeoTrd& geoTrd,
                                           const Transform3& absTransform,
                                           bool sensitive) const {
@@ -36,8 +36,8 @@ Acts::detail::GeoTrdConverter::operator()(const GeoFullPhysVol& geoFPV,
   Transform3 transform = Transform3::Identity();
   transform.translation() = unitLength * absTransform.translation();
 
-  // GeoTrd is defined that halfZ needs to map onto surface halfY
-  // Create the surface
+  // GeoTrd coordinates: x is the extrusion direction, y is orthogonal to the
+  // symmetry axis and z is along the symmetry axis
   ActsScalar halfX1 = geoTrd.getXHalfLength1();
   ActsScalar halfX2 = geoTrd.getXHalfLength2();
   ActsScalar halfY1 = geoTrd.getYHalfLength1();
@@ -84,8 +84,7 @@ Acts::detail::GeoTrdConverter::operator()(const GeoFullPhysVol& geoFPV,
 
   auto trapezoidBounds =
       std::make_shared<TrapezoidBounds>(minHalfX, maxHalfX, halfZ);
-  // std::cout << "     TrapezoidBounds: minHalfX=" << minHalfX << ", maxHalfX="
-  // << maxHalfX << ", halfz=" << halfZ << std::endl;
+
   if (!sensitive) {
     auto surface =
         Surface::makeShared<PlaneSurface>(transform, trapezoidBounds);
@@ -93,9 +92,10 @@ Acts::detail::GeoTrdConverter::operator()(const GeoFullPhysVol& geoFPV,
   }
 
   // Create the element and the surface
+
   auto detectorElement =
       GeoModelDetectorElement::createDetectorElement<PlaneSurface>(
-          geoFPV, trapezoidBounds, transform, thickness);
+          geoPV, trapezoidBounds, transform, thickness);
   auto surface = detectorElement->surface().getSharedPtr();
   return std::make_tuple(detectorElement, surface);
 }
diff --git a/Plugins/GeoModel/src/detail/GeoTubeConverter.cpp b/Plugins/GeoModel/src/detail/GeoTubeConverter.cpp
index 1ab1bb2233a..3513bff9f95 100644
--- a/Plugins/GeoModel/src/detail/GeoTubeConverter.cpp
+++ b/Plugins/GeoModel/src/detail/GeoTubeConverter.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2024 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include "Acts/Plugins/GeoModel/detail/GeoTubeConverter.hpp"
 
@@ -25,7 +25,7 @@
 #include <GeoModelKernel/Units.h>
 
 Acts::Result<Acts::GeoModelSensitiveSurface>
-Acts::detail::GeoTubeConverter::operator()(const GeoFullPhysVol& geoFPV,
+Acts::detail::GeoTubeConverter::operator()(const PVConstLink& geoPV,
                                            const GeoTube& geoTube,
                                            const Transform3& absTransform,
                                            bool sensitive) const {
@@ -53,7 +53,7 @@ Acts::detail::GeoTubeConverter::operator()(const GeoFullPhysVol& geoFPV,
 
     auto detectorElement =
         GeoModelDetectorElement::createDetectorElement<StrawSurface>(
-            geoFPV, lineBounds, transform, 2 * outerRadius);
+            geoPV, lineBounds, transform, 2 * outerRadius);
     auto surface = detectorElement->surface().getSharedPtr();
     return std::make_tuple(detectorElement, surface);
     // Next option is translation to disc
@@ -68,7 +68,7 @@ Acts::detail::GeoTubeConverter::operator()(const GeoFullPhysVol& geoFPV,
     // Create the element and the surface
     auto detectorElement =
         GeoModelDetectorElement::createDetectorElement<DiscSurface>(
-            geoFPV, radialBounds, transform, 2 * halfZ);
+            geoPV, radialBounds, transform, 2 * halfZ);
     auto surface = detectorElement->surface().getSharedPtr();
     return std::make_tuple(detectorElement, surface);
   }
@@ -80,9 +80,10 @@ Acts::detail::GeoTubeConverter::operator()(const GeoFullPhysVol& geoFPV,
     return std::make_tuple(nullptr, surface);
   }
   // Create the element and the surface
+
   auto detectorElement =
       GeoModelDetectorElement::createDetectorElement<CylinderSurface>(
-          geoFPV, cylinderBounds, transform, outerRadius - innerRadius);
+          geoPV, cylinderBounds, transform, outerRadius - innerRadius);
   auto surface = detectorElement->surface().getSharedPtr();
   return std::make_tuple(detectorElement, surface);
 }
diff --git a/Plugins/GeoModel/src/detail/GeoUnionDoubleTrdConverter.cpp b/Plugins/GeoModel/src/detail/GeoUnionDoubleTrdConverter.cpp
index 310c1c07963..2a9b1288638 100644
--- a/Plugins/GeoModel/src/detail/GeoUnionDoubleTrdConverter.cpp
+++ b/Plugins/GeoModel/src/detail/GeoUnionDoubleTrdConverter.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2024 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include "Acts/Plugins/GeoModel/detail/GeoUnionDoubleTrdConverter.hpp"
 
@@ -47,7 +47,7 @@ bool trapezoidsAreMergeable(const std::vector<Acts::Vector3> &vtxsa,
 namespace Acts::detail {
 
 Result<GeoModelSensitiveSurface> GeoUnionDoubleTrdConverter::operator()(
-    const GeoFullPhysVol &geoFPV, const GeoShapeUnion &geoUnion,
+    const PVConstLink &geoPV, const GeoShapeUnion &geoUnion,
     const Transform3 &absTransform, bool sensitive) const {
   const auto shiftA = dynamic_cast<const GeoShapeShift *>(geoUnion.getOpA());
   const auto shiftB = dynamic_cast<const GeoShapeShift *>(geoUnion.getOpB());
@@ -57,12 +57,12 @@ Result<GeoModelSensitiveSurface> GeoUnionDoubleTrdConverter::operator()(
   }
 
   auto shiftARes =
-      detail::GeoShiftConverter{}(geoFPV, *shiftA, absTransform, sensitive);
+      detail::GeoShiftConverter{}(geoPV, *shiftA, absTransform, sensitive);
   if (!shiftARes.ok()) {
     return shiftARes.error();
   }
   auto shiftBRes =
-      detail::GeoShiftConverter{}(geoFPV, *shiftB, absTransform, sensitive);
+      detail::GeoShiftConverter{}(geoPV, *shiftB, absTransform, sensitive);
   if (!shiftBRes.ok()) {
     return shiftBRes.error();
   }
@@ -145,7 +145,7 @@ Result<GeoModelSensitiveSurface> GeoUnionDoubleTrdConverter::operator()(
   // Create the element and the surface (we assume both have equal thickness)
   auto detectorElement =
       GeoModelDetectorElement::createDetectorElement<PlaneSurface>(
-          geoFPV, trapezoidBounds, transform, elA->thickness());
+          geoPV, trapezoidBounds, transform, elA->thickness());
   auto surface = detectorElement->surface().getSharedPtr();
 
   return std::make_tuple(detectorElement, surface);
diff --git a/Plugins/Hashing/CMakeLists.txt b/Plugins/Hashing/CMakeLists.txt
new file mode 100644
index 00000000000..e02c0bf887f
--- /dev/null
+++ b/Plugins/Hashing/CMakeLists.txt
@@ -0,0 +1,15 @@
+add_library(ActsPluginHashing INTERFACE)
+target_include_directories(
+    ActsPluginHashing
+    INTERFACE
+        $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
+        $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}>
+)
+target_link_libraries(ActsPluginHashing INTERFACE Annoy)
+
+install(
+    TARGETS ActsPluginHashing
+    EXPORT ActsPluginHashingTargets
+    LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
+)
+install(DIRECTORY include/Acts DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
diff --git a/Plugins/Hashing/include/Acts/Plugins/Hashing/AnnoyForwardDeclarations.hpp b/Plugins/Hashing/include/Acts/Plugins/Hashing/AnnoyForwardDeclarations.hpp
new file mode 100644
index 00000000000..d16d8e91208
--- /dev/null
+++ b/Plugins/Hashing/include/Acts/Plugins/Hashing/AnnoyForwardDeclarations.hpp
@@ -0,0 +1,28 @@
+// This file is part of the ACTS project.
+//
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
+//
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
+
+#pragma once
+
+namespace Annoy {
+// Forward declarations for the Annoy classes we use.
+struct AngularEuclidean;  // Metric used
+struct Kiss32Random;      // Random type, not a template
+template <typename S, typename T, typename Distance, typename Random,
+          typename BuildPolicy>
+class AnnoyIndex;  // AnnoyIndex template class
+
+class AnnoyIndexSingleThreadedBuildPolicy;  // Build policy
+}  // namespace Annoy
+
+// Define commonly used Annoy types
+namespace Acts {
+using AnnoyMetric = Annoy::AngularEuclidean;
+using AnnoyModel =
+    Annoy::AnnoyIndex<unsigned int, double, AnnoyMetric, Annoy::Kiss32Random,
+                      Annoy::AnnoyIndexSingleThreadedBuildPolicy>;
+}  // namespace Acts
diff --git a/Plugins/Hashing/include/Acts/Plugins/Hashing/HashingAlgorithm.hpp b/Plugins/Hashing/include/Acts/Plugins/Hashing/HashingAlgorithm.hpp
new file mode 100755
index 00000000000..6229144867d
--- /dev/null
+++ b/Plugins/Hashing/include/Acts/Plugins/Hashing/HashingAlgorithm.hpp
@@ -0,0 +1,36 @@
+// This file is part of the ACTS project.
+//
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
+//
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
+
+#pragma once
+
+#include "Acts/Plugins/Hashing/AnnoyForwardDeclarations.hpp"
+#include "Acts/Plugins/Hashing/HashingAlgorithmConfig.hpp"
+
+namespace Acts {
+
+template <typename external_spacepoint_t, typename SpacePointContainer>
+class HashingAlgorithm {
+ public:
+  explicit HashingAlgorithm(const HashingAlgorithmConfig& cfg);
+
+  HashingAlgorithm() = default;
+
+  template <typename collection_t>
+  void execute(SpacePointContainer& spacePoints, AnnoyModel* annoyModel,
+               collection_t& outputCollection) const;
+
+  /// Get readonly access to the config parameters
+  const Acts::HashingAlgorithmConfig& config() const { return m_cfg; }
+
+ private:
+  HashingAlgorithmConfig m_cfg;
+};
+
+}  // namespace Acts
+
+#include "Acts/Plugins/Hashing/HashingAlgorithm.ipp"
diff --git a/Plugins/Hashing/include/Acts/Plugins/Hashing/HashingAlgorithm.ipp b/Plugins/Hashing/include/Acts/Plugins/Hashing/HashingAlgorithm.ipp
new file mode 100644
index 00000000000..e15f125be5c
--- /dev/null
+++ b/Plugins/Hashing/include/Acts/Plugins/Hashing/HashingAlgorithm.ipp
@@ -0,0 +1,91 @@
+// This file is part of the ACTS project.
+//
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
+//
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
+
+#include "Acts/Plugins/Hashing/HashingAnnoy.hpp"
+#include "Acts/Seeding/detail/UtilityFunctions.hpp"
+
+#include <memory>
+#include <vector>
+
+namespace Acts {
+// constructor
+template <typename external_spacepoint_t, typename SpacePointContainer>
+HashingAlgorithm<external_spacepoint_t, SpacePointContainer>::HashingAlgorithm(
+    const HashingAlgorithmConfig& cfg)
+    : m_cfg(cfg) {
+  if (m_cfg.bucketSize <= 0) {
+    throw std::invalid_argument("Invalid bucket size");
+  }
+}
+
+// function to create the buckets of spacepoints.
+template <typename external_spacepoint_t, typename SpacePointContainer>
+template <typename collection_t>
+void HashingAlgorithm<external_spacepoint_t, SpacePointContainer>::execute(
+    SpacePointContainer& spacePoints, AnnoyModel* annoyModel,
+    collection_t& outputCollection) const {
+  // Define a map to store the buckets of spacepoints a set is used to exclude
+  // duplicates
+  using map_t = std::map<unsigned int, std::set<external_spacepoint_t>>;
+
+  // Get the number of space points
+  const std::size_t nSpacePoints = spacePoints.size();
+
+  // Get the bucket size, zBins, and phiBins from the configuration
+  const unsigned int bucketSize = m_cfg.bucketSize;
+  const unsigned int zBins = m_cfg.zBins;
+  const unsigned int phiBins = m_cfg.phiBins;
+
+  // Get the layer selection from the configuration
+  const double layerRMin = m_cfg.layerRMin;
+  const double layerRMax = m_cfg.layerRMax;
+  const double layerZMin = m_cfg.layerZMin;
+  const double layerZMax = m_cfg.layerZMax;
+
+  // Create an instance of the HashingAnnoy class
+  auto annoyHashingInstance = std::make_unique<
+      HashingAnnoy<external_spacepoint_t, SpacePointContainer>>();
+
+  // Compute the buckets of spacepoints using the Annoy model
+  annoyHashingInstance->computeSpacePointsBuckets(
+      annoyModel, spacePoints, bucketSize, zBins, phiBins, layerRMin, layerRMax,
+      layerZMin, layerZMax);
+
+  // Get the map of buckets and the number of buckets
+  map_t bucketsSPMap = annoyHashingInstance->m_bucketsSPMap;
+  auto nBuckets = static_cast<unsigned int>(bucketsSPMap.size());
+
+  // Check if the number of buckets is greater than the number of space points
+  if (nBuckets > nSpacePoints) {
+    throw std::runtime_error("More buckets than the number of Space Points");
+  }
+
+  // Convert the map to a SpacePointContainer of SpacePointContainers
+  for (unsigned int bucketIdx = 0; bucketIdx < nBuckets; bucketIdx++) {
+    // Find the bucket in the map
+    typename map_t::iterator iterator = bucketsSPMap.find(bucketIdx);
+    if (iterator == bucketsSPMap.end()) {
+      throw std::runtime_error("Not every bucket have been found");
+    }
+
+    // Get the set of spacepoints in the bucket
+    std::set<external_spacepoint_t> bucketSet = iterator->second;
+
+    // Convert the set to a SpacePointContainer
+    SpacePointContainer bucket;
+    for (external_spacepoint_t spacePoint : bucketSet) {
+      bucket.push_back(spacePoint);
+    }
+
+    // Add the bucket container to the output collection
+    Acts::detail::pushBackOrInsertAtEnd(outputCollection,
+                                        SpacePointContainer{bucket});
+  }
+}
+
+}  // namespace Acts
diff --git a/Plugins/Hashing/include/Acts/Plugins/Hashing/HashingAlgorithmConfig.hpp b/Plugins/Hashing/include/Acts/Plugins/Hashing/HashingAlgorithmConfig.hpp
new file mode 100755
index 00000000000..8722bf0305e
--- /dev/null
+++ b/Plugins/Hashing/include/Acts/Plugins/Hashing/HashingAlgorithmConfig.hpp
@@ -0,0 +1,27 @@
+// This file is part of the ACTS project.
+//
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
+//
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
+
+#pragma once
+
+namespace Acts {
+struct HashingAlgorithmConfig {
+  /// Size of the buckets = number of spacepoints in the bucket
+  unsigned int bucketSize = 10;
+  /// Number of zBins
+  unsigned int zBins = 0;
+  /// Number of phiBins
+  unsigned int phiBins = 50;
+
+  /// Layer selection
+  double layerRMin = 25;
+  double layerRMax = 40;
+  double layerZMin = -550;
+  double layerZMax = 550;
+};
+
+}  // namespace Acts
diff --git a/Plugins/Hashing/include/Acts/Plugins/Hashing/HashingAnnoy.hpp b/Plugins/Hashing/include/Acts/Plugins/Hashing/HashingAnnoy.hpp
new file mode 100755
index 00000000000..18a519f1899
--- /dev/null
+++ b/Plugins/Hashing/include/Acts/Plugins/Hashing/HashingAnnoy.hpp
@@ -0,0 +1,31 @@
+// This file is part of the ACTS project.
+//
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
+//
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
+
+#pragma once
+
+#include "Acts/Definitions/Algebra.hpp"
+#include "Acts/Plugins/Hashing/AnnoyForwardDeclarations.hpp"
+
+#include <map>
+#include <set>
+
+namespace Acts {
+
+template <typename external_spacepoint_t, typename SpacePointContainer>
+class HashingAnnoy {
+ public:
+  void computeSpacePointsBuckets(
+      const AnnoyModel* annoyModel, const SpacePointContainer& spacePoints,
+      const unsigned int bucketSize, const unsigned int zBins,
+      const unsigned int phiBins, const double layerRMin,
+      const double layerRMax, const double layerZMin, const double layerZMax);
+  std::map<unsigned int, std::set<external_spacepoint_t>> m_bucketsSPMap;
+};
+}  // namespace Acts
+
+#include "Acts/Plugins/Hashing/HashingAnnoy.ipp"
diff --git a/Plugins/Hashing/include/Acts/Plugins/Hashing/HashingAnnoy.ipp b/Plugins/Hashing/include/Acts/Plugins/Hashing/HashingAnnoy.ipp
new file mode 100644
index 00000000000..d5e4f28f3a5
--- /dev/null
+++ b/Plugins/Hashing/include/Acts/Plugins/Hashing/HashingAnnoy.ipp
@@ -0,0 +1,129 @@
+// This file is part of the ACTS project.
+//
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
+//
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
+
+#include "Acts/Definitions/Algebra.hpp"
+#include "Acts/Definitions/Units.hpp"
+
+#include <map>
+#include <numbers>
+#include <set>
+#include <vector>
+
+#include <annoy/annoylib.h>
+#include <annoy/kissrandom.h>
+
+namespace Acts {
+
+template <typename external_spacepoint_t, typename SpacePointContainer>
+void HashingAnnoy<external_spacepoint_t, SpacePointContainer>::
+    computeSpacePointsBuckets(const AnnoyModel* annoyModel,
+                              const SpacePointContainer& spacePoints,
+                              const unsigned int bucketSize,
+                              const unsigned int zBins,
+                              const unsigned int phiBins,
+                              const double layerRMin, const double layerRMax,
+                              const double layerZMin, const double layerZMax) {
+  using Scalar = Acts::ActsScalar;
+
+  static thread_local std::vector<std::set<external_spacepoint_t>>
+      bucketsSetSPMap;
+  bucketsSetSPMap.clear();
+
+  unsigned int nBins = 0;
+  if (zBins > 0) {
+    nBins = zBins;
+  } else if (phiBins > 0) {
+    nBins = phiBins;
+  } else {
+    throw std::runtime_error("No bins defined");
+  }
+  bucketsSetSPMap.reserve(nBins);
+
+  // Create the set of spacePoints for each bucket
+  for (unsigned int binIndex = 0; binIndex < nBins; binIndex++) {
+    static thread_local std::set<external_spacepoint_t> bucket;
+    bucket.clear();
+    bucketsSetSPMap.push_back(bucket);
+  }
+
+  // Function to check if a spacePoint is inside the layer
+  auto layerSelection = [&layerRMin, &layerRMax, &layerZMin, &layerZMax](
+                            double r2, double z) {
+    bool isInside =
+        (r2 >= layerRMin * layerRMin && r2 <= layerRMax * layerRMax) &&
+        (z >= layerZMin && z <= layerZMax);
+    return isInside;
+  };
+
+  // Functions to get the bin index
+  auto getBinIndexZ = [&zBins, &layerZMin, &layerZMax](Scalar z) {
+    Scalar binSize = (layerZMax - layerZMin) / zBins;
+    auto binIndex = static_cast<int>((z - layerZMin + 0.5 * binSize) / binSize);
+    return binIndex;
+  };
+
+  auto getBinIndexPhi = [&phiBins](Scalar phi) {
+    Scalar binSize = 2 * std::numbers::pi / phiBins;
+    auto binIndex = static_cast<int>((phi + std::numbers::pi) / binSize);
+    return binIndex;
+  };
+
+  // Function pointers to a unified bin index function for z and phi
+  auto getBinIndex = [&zBins, &phiBins, &getBinIndexZ, &getBinIndexPhi](
+                         Scalar z, Scalar phi) -> int {
+    if (zBins > 0) {
+      return getBinIndexZ(z);
+    } else if (phiBins > 0) {
+      return getBinIndexPhi(phi);
+    } else {
+      throw std::runtime_error("No bins defined");
+    }
+  };
+
+  // Loop over spacePoints
+  for (unsigned int spacePointIndex = 0; spacePointIndex < spacePoints.size();
+       spacePointIndex++) {
+    external_spacepoint_t spacePoint = spacePoints[spacePointIndex];
+    Scalar x = spacePoint->x() / Acts::UnitConstants::mm;
+    Scalar y = spacePoint->y() / Acts::UnitConstants::mm;
+    Scalar z = spacePoint->z() / Acts::UnitConstants::mm;
+
+    // Helix transform
+    if (Scalar r2 = x * x + y * y; !layerSelection(r2, z)) {
+      continue;
+    }
+
+    Scalar phi = atan2(y, x);
+
+    int binIndex = getBinIndex(z, phi);
+    if (binIndex < 0 || static_cast<unsigned int>(binIndex) >= nBins) {
+      throw std::runtime_error("binIndex outside of bins covering");
+    }
+
+    std::vector<unsigned int> bucketIds;
+
+    /// Get the bucketSize closest spacePoints
+    annoyModel->get_nns_by_item(spacePointIndex, bucketSize, -1, &bucketIds,
+                                nullptr);
+
+    for (const unsigned int& bucketSpacePointIndex : bucketIds) {
+      bucketsSetSPMap[static_cast<unsigned int>(binIndex)].insert(
+          spacePoints.at(bucketSpacePointIndex));
+    }
+  }
+
+  unsigned int n_buckets = 0;
+  for (unsigned int binIndex = 0; binIndex < nBins; binIndex++) {
+    if (bucketsSetSPMap[binIndex].size() > 0) {
+      m_bucketsSPMap[n_buckets] = bucketsSetSPMap[binIndex];
+      n_buckets++;
+    }
+  }
+}
+
+}  // namespace Acts
diff --git a/Plugins/Hashing/include/Acts/Plugins/Hashing/HashingTraining.hpp b/Plugins/Hashing/include/Acts/Plugins/Hashing/HashingTraining.hpp
new file mode 100755
index 00000000000..666e1e754e9
--- /dev/null
+++ b/Plugins/Hashing/include/Acts/Plugins/Hashing/HashingTraining.hpp
@@ -0,0 +1,38 @@
+// This file is part of the ACTS project.
+//
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
+//
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
+
+#pragma once
+
+#include "Acts/Plugins/Hashing/AnnoyForwardDeclarations.hpp"
+#include "Acts/Plugins/Hashing/HashingTrainingConfig.hpp"
+
+namespace Acts {
+
+template <typename SpacePointContainer>
+class HashingTrainingAlgorithm {
+ public:
+  explicit HashingTrainingAlgorithm(const HashingTrainingConfig &cfg);
+
+  HashingTrainingAlgorithm() = default;
+  HashingTrainingAlgorithm(
+      const HashingTrainingAlgorithm<SpacePointContainer> &) = delete;
+  HashingTrainingAlgorithm<SpacePointContainer> &operator=(
+      const HashingTrainingAlgorithm<SpacePointContainer> &) = default;
+
+  AnnoyModel execute(SpacePointContainer spacePoints) const;
+
+  // / Get readonly access to the config parameters
+  const Acts::HashingTrainingConfig &config() const { return m_cfg; }
+
+ private:
+  HashingTrainingConfig m_cfg;
+};
+
+}  // namespace Acts
+
+#include "Acts/Plugins/Hashing/HashingTraining.ipp"
diff --git a/Plugins/Hashing/include/Acts/Plugins/Hashing/HashingTraining.ipp b/Plugins/Hashing/include/Acts/Plugins/Hashing/HashingTraining.ipp
new file mode 100644
index 00000000000..3e24e828177
--- /dev/null
+++ b/Plugins/Hashing/include/Acts/Plugins/Hashing/HashingTraining.ipp
@@ -0,0 +1,81 @@
+// This file is part of the ACTS project.
+//
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
+//
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
+
+#include "Acts/Definitions/Algebra.hpp"
+#include "Acts/Definitions/Units.hpp"
+#include "Acts/Utilities/AngleHelpers.hpp"
+
+#include <cmath>
+#include <cstdint>
+
+#include <annoy/annoylib.h>
+#include <annoy/kissrandom.h>
+
+namespace Acts {
+
+// constructor
+template <typename SpacePointContainer>
+HashingTrainingAlgorithm<SpacePointContainer>::HashingTrainingAlgorithm(
+    const Acts::HashingTrainingConfig& cfg)
+    : m_cfg(cfg) {
+  if (m_cfg.f <= 0) {
+    throw std::invalid_argument("Invalid f, f must be positive");
+  }
+  if (m_cfg.annoySeed <= 0) {
+    throw std::invalid_argument(
+        "Invalid Annoy random seed, Annoy random seed must be positive");
+  }
+}
+
+template <typename SpacePointContainer>
+AnnoyModel HashingTrainingAlgorithm<SpacePointContainer>::execute(
+    SpacePointContainer spacePoints) const {
+  const unsigned int annoySeed = m_cfg.annoySeed;
+  const std::int32_t f = m_cfg.f;
+
+  auto annoyModel = AnnoyModel(f);
+
+  using Scalar = Acts::ActsScalar;
+
+  annoyModel.set_seed(annoySeed);
+
+  unsigned int spacePointIndex = 0;
+  // Add spacePoints parameters to Annoy
+  for (const auto& spacePoint : spacePoints) {
+    Scalar x = spacePoint->x() / Acts::UnitConstants::mm;
+    Scalar y = spacePoint->y() / Acts::UnitConstants::mm;
+
+    // Helix transform
+    Scalar phi = std::atan2(y, x);
+
+    std::vector<double> vec(f);
+    // Avoid potential null pointer dereference
+    if (f >= 1) {
+      vec[0] = phi;
+    }
+    if (f >= 2) {
+      Scalar z = spacePoint->z() / Acts::UnitConstants::mm;
+      Scalar r2 = x * x + y * y;
+      Scalar rho = std::sqrt(r2 + z * z);
+      Scalar theta = std::acos(z / rho);
+      Scalar eta = Acts::AngleHelpers::etaFromTheta(theta);
+      vec[1] = eta;
+    }
+
+    annoyModel.add_item(spacePointIndex, vec.data());
+    spacePointIndex++;
+  }
+
+  unsigned int nTrees = 2 * f;
+
+  annoyModel.build(nTrees);
+
+  return annoyModel;
+}
+
+}  // namespace Acts
diff --git a/Plugins/Hashing/include/Acts/Plugins/Hashing/HashingTrainingConfig.hpp b/Plugins/Hashing/include/Acts/Plugins/Hashing/HashingTrainingConfig.hpp
new file mode 100755
index 00000000000..151052d5f77
--- /dev/null
+++ b/Plugins/Hashing/include/Acts/Plugins/Hashing/HashingTrainingConfig.hpp
@@ -0,0 +1,23 @@
+// This file is part of the ACTS project.
+//
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
+//
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
+
+#pragma once
+
+#include <cstdint>
+
+namespace Acts {
+
+struct HashingTrainingConfig {
+  /// Random seed for Annoy
+  unsigned int annoySeed = 123456789;
+
+  /// Number of features to use
+  std::int32_t f = 1;
+};
+
+}  // namespace Acts
diff --git a/Plugins/Json/include/Acts/Plugins/Json/ActsJson.hpp b/Plugins/Json/include/Acts/Plugins/Json/ActsJson.hpp
index 727cd31a896..b0ba7e6d103 100644
--- a/Plugins/Json/include/Acts/Plugins/Json/ActsJson.hpp
+++ b/Plugins/Json/include/Acts/Plugins/Json/ActsJson.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2021 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
diff --git a/Plugins/Json/include/Acts/Plugins/Json/AlgebraJsonConverter.hpp b/Plugins/Json/include/Acts/Plugins/Json/AlgebraJsonConverter.hpp
index b93a8703795..6a3f9dec02c 100644
--- a/Plugins/Json/include/Acts/Plugins/Json/AlgebraJsonConverter.hpp
+++ b/Plugins/Json/include/Acts/Plugins/Json/AlgebraJsonConverter.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2021-2023 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
diff --git a/Plugins/Json/include/Acts/Plugins/Json/AmbiguityConfigJsonConverter.hpp b/Plugins/Json/include/Acts/Plugins/Json/AmbiguityConfigJsonConverter.hpp
index 816680f3544..7fd7a4f75e9 100644
--- a/Plugins/Json/include/Acts/Plugins/Json/AmbiguityConfigJsonConverter.hpp
+++ b/Plugins/Json/include/Acts/Plugins/Json/AmbiguityConfigJsonConverter.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2023-2024 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
diff --git a/Plugins/Json/include/Acts/Plugins/Json/DetectorJsonConverter.hpp b/Plugins/Json/include/Acts/Plugins/Json/DetectorJsonConverter.hpp
index a196b4296b3..bfa2b4e90e6 100644
--- a/Plugins/Json/include/Acts/Plugins/Json/DetectorJsonConverter.hpp
+++ b/Plugins/Json/include/Acts/Plugins/Json/DetectorJsonConverter.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2023 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
diff --git a/Plugins/Json/include/Acts/Plugins/Json/DetectorVolumeFinderJsonConverter.hpp b/Plugins/Json/include/Acts/Plugins/Json/DetectorVolumeFinderJsonConverter.hpp
index d3a377ad645..7b391a53fb5 100644
--- a/Plugins/Json/include/Acts/Plugins/Json/DetectorVolumeFinderJsonConverter.hpp
+++ b/Plugins/Json/include/Acts/Plugins/Json/DetectorVolumeFinderJsonConverter.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2023 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
diff --git a/Plugins/Json/include/Acts/Plugins/Json/DetectorVolumeJsonConverter.hpp b/Plugins/Json/include/Acts/Plugins/Json/DetectorVolumeJsonConverter.hpp
index 3f70dae30be..816224ac517 100644
--- a/Plugins/Json/include/Acts/Plugins/Json/DetectorVolumeJsonConverter.hpp
+++ b/Plugins/Json/include/Acts/Plugins/Json/DetectorVolumeJsonConverter.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2023 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
diff --git a/Plugins/Json/include/Acts/Plugins/Json/DetrayJsonHelper.hpp b/Plugins/Json/include/Acts/Plugins/Json/DetrayJsonHelper.hpp
index 15f5f461963..e8a2132e293 100644
--- a/Plugins/Json/include/Acts/Plugins/Json/DetrayJsonHelper.hpp
+++ b/Plugins/Json/include/Acts/Plugins/Json/DetrayJsonHelper.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2023 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
diff --git a/Plugins/Json/include/Acts/Plugins/Json/ExtentJsonConverter.hpp b/Plugins/Json/include/Acts/Plugins/Json/ExtentJsonConverter.hpp
index 755aa048607..3a5e0b66161 100644
--- a/Plugins/Json/include/Acts/Plugins/Json/ExtentJsonConverter.hpp
+++ b/Plugins/Json/include/Acts/Plugins/Json/ExtentJsonConverter.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2022 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
diff --git a/Plugins/Json/include/Acts/Plugins/Json/GeometryHierarchyMapJsonConverter.hpp b/Plugins/Json/include/Acts/Plugins/Json/GeometryHierarchyMapJsonConverter.hpp
index eaef0aa8e0f..74ce7109975 100644
--- a/Plugins/Json/include/Acts/Plugins/Json/GeometryHierarchyMapJsonConverter.hpp
+++ b/Plugins/Json/include/Acts/Plugins/Json/GeometryHierarchyMapJsonConverter.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2020-2023 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
@@ -42,7 +42,7 @@ class GeometryHierarchyMapJsonConverter {
   /// Construct the converter.
   ///
   /// @param valueIdentifier user-defined identifier for the stored value
-  GeometryHierarchyMapJsonConverter(std::string valueIdentifier)
+  explicit GeometryHierarchyMapJsonConverter(std::string valueIdentifier)
       : m_valueIdentifier(std::move(valueIdentifier)) {
     if (m_valueIdentifier.empty()) {
       throw std::invalid_argument("Value identifier must be non-empty");
@@ -155,7 +155,7 @@ nlohmann::json GeometryHierarchyMapJsonConverter<value_t, decorator_t>::toJson(
   for (std::size_t i = 0; i < container.size(); ++i) {
     auto entry = encodeIdentifier(container.idAt(i));
     auto value_json = nlohmann::json(container.valueAt(i));
-    if constexpr (!std::is_same<decorator_t, void>::value) {
+    if constexpr (!std::is_same_v<decorator_t, void>) {
       decorateJson(decorator, container.valueAt(i), value_json);
     }
     entry["value"] = std::move(value_json);
diff --git a/Plugins/Json/include/Acts/Plugins/Json/GeometryJsonKeys.hpp b/Plugins/Json/include/Acts/Plugins/Json/GeometryJsonKeys.hpp
index 9b0ded87262..24e877b5026 100644
--- a/Plugins/Json/include/Acts/Plugins/Json/GeometryJsonKeys.hpp
+++ b/Plugins/Json/include/Acts/Plugins/Json/GeometryJsonKeys.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2021 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
diff --git a/Plugins/Json/include/Acts/Plugins/Json/GridJsonConverter.hpp b/Plugins/Json/include/Acts/Plugins/Json/GridJsonConverter.hpp
index 2428df865b0..3215bd66eae 100644
--- a/Plugins/Json/include/Acts/Plugins/Json/GridJsonConverter.hpp
+++ b/Plugins/Json/include/Acts/Plugins/Json/GridJsonConverter.hpp
@@ -1,14 +1,15 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2023 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
 #include "Acts/Plugins/Json/ActsJson.hpp"
+#include "Acts/Plugins/Json/TrackParametersJsonConverter.hpp"
 #include "Acts/Utilities/AxisFwd.hpp"
 #include "Acts/Utilities/GridAccessHelpers.hpp"
 #include "Acts/Utilities/IAxis.hpp"
@@ -266,15 +267,17 @@ auto fromJson(const nlohmann::json& jGrid,
   if constexpr (GridType::DIM == 1u) {
     for (const auto& jd : jData) {
       std::array<std::size_t, 1u> lbin = jd[0u];
-      value_type values = jd[1u];
-      grid.atLocalBins(lbin) = values;
+      if (!jd[1u].is_null()) {
+        grid.atLocalBins(lbin) = jd[1u].get<value_type>();
+      }
     }
   }
   if constexpr (GridType::DIM == 2u) {
     for (const auto& jd : jData) {
       std::array<std::size_t, 2u> lbin = jd[0u];
-      value_type values = jd[1u];
-      grid.atLocalBins(lbin) = values;
+      if (!jd[1u].is_null()) {
+        grid.atLocalBins(lbin) = jd[1u].get<value_type>();
+      }
     }
   }
   return grid;
diff --git a/Plugins/Json/include/Acts/Plugins/Json/ITrackingGeometryJsonDecorator.hpp b/Plugins/Json/include/Acts/Plugins/Json/ITrackingGeometryJsonDecorator.hpp
index 7d37edfc388..d330dcb239a 100644
--- a/Plugins/Json/include/Acts/Plugins/Json/ITrackingGeometryJsonDecorator.hpp
+++ b/Plugins/Json/include/Acts/Plugins/Json/ITrackingGeometryJsonDecorator.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2017-2023 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
diff --git a/Plugins/Json/include/Acts/Plugins/Json/IVolumeMaterialJsonDecorator.hpp b/Plugins/Json/include/Acts/Plugins/Json/IVolumeMaterialJsonDecorator.hpp
index 00040f9db7a..ced492a9f16 100644
--- a/Plugins/Json/include/Acts/Plugins/Json/IVolumeMaterialJsonDecorator.hpp
+++ b/Plugins/Json/include/Acts/Plugins/Json/IVolumeMaterialJsonDecorator.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2017-2023 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
diff --git a/Plugins/Json/include/Acts/Plugins/Json/IndexedGridJsonHelper.hpp b/Plugins/Json/include/Acts/Plugins/Json/IndexedGridJsonHelper.hpp
index 27f8c60fa59..581130a8852 100644
--- a/Plugins/Json/include/Acts/Plugins/Json/IndexedGridJsonHelper.hpp
+++ b/Plugins/Json/include/Acts/Plugins/Json/IndexedGridJsonHelper.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2023 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
@@ -83,7 +83,7 @@ updator_type generateFromJson(const nlohmann::json& jUpdater,
       -> std::tuple<std::array<ActsScalar, 2u>, std::size_t> {
     std::array<ActsScalar, 2u> range = jAxis["range"];
     std::size_t bins = jAxis["bins"];
-    return std::make_tuple(range, bins);
+    return {range, bins};
   };
 
   /// Helper extractor for variable axis
diff --git a/Plugins/Json/include/Acts/Plugins/Json/IndexedSurfacesJsonConverter.hpp b/Plugins/Json/include/Acts/Plugins/Json/IndexedSurfacesJsonConverter.hpp
index 95998705a97..4e0b8982a62 100644
--- a/Plugins/Json/include/Acts/Plugins/Json/IndexedSurfacesJsonConverter.hpp
+++ b/Plugins/Json/include/Acts/Plugins/Json/IndexedSurfacesJsonConverter.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2023 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
diff --git a/Plugins/Json/include/Acts/Plugins/Json/JsonMaterialDecorator.hpp b/Plugins/Json/include/Acts/Plugins/Json/JsonMaterialDecorator.hpp
index b3d03ccc97e..c38046468ce 100644
--- a/Plugins/Json/include/Acts/Plugins/Json/JsonMaterialDecorator.hpp
+++ b/Plugins/Json/include/Acts/Plugins/Json/JsonMaterialDecorator.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2017-2019 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
diff --git a/Plugins/Json/include/Acts/Plugins/Json/MaterialJsonConverter.hpp b/Plugins/Json/include/Acts/Plugins/Json/MaterialJsonConverter.hpp
index 69977c5a36e..1c49376e421 100644
--- a/Plugins/Json/include/Acts/Plugins/Json/MaterialJsonConverter.hpp
+++ b/Plugins/Json/include/Acts/Plugins/Json/MaterialJsonConverter.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2021 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
diff --git a/Plugins/Json/include/Acts/Plugins/Json/MaterialMapJsonConverter.hpp b/Plugins/Json/include/Acts/Plugins/Json/MaterialMapJsonConverter.hpp
index eb462edc8d6..9fdb3f7c284 100644
--- a/Plugins/Json/include/Acts/Plugins/Json/MaterialMapJsonConverter.hpp
+++ b/Plugins/Json/include/Acts/Plugins/Json/MaterialMapJsonConverter.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2017-2023 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
diff --git a/Plugins/Json/include/Acts/Plugins/Json/PortalJsonConverter.hpp b/Plugins/Json/include/Acts/Plugins/Json/PortalJsonConverter.hpp
index 6e7f9114689..9e0a6d7ec4f 100644
--- a/Plugins/Json/include/Acts/Plugins/Json/PortalJsonConverter.hpp
+++ b/Plugins/Json/include/Acts/Plugins/Json/PortalJsonConverter.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2023 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
diff --git a/Plugins/Json/include/Acts/Plugins/Json/ProtoDetectorJsonConverter.hpp b/Plugins/Json/include/Acts/Plugins/Json/ProtoDetectorJsonConverter.hpp
index 282b0f57e5b..7f69f8e4e18 100644
--- a/Plugins/Json/include/Acts/Plugins/Json/ProtoDetectorJsonConverter.hpp
+++ b/Plugins/Json/include/Acts/Plugins/Json/ProtoDetectorJsonConverter.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2022 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
diff --git a/Plugins/Json/include/Acts/Plugins/Json/SurfaceBoundsJsonConverter.hpp b/Plugins/Json/include/Acts/Plugins/Json/SurfaceBoundsJsonConverter.hpp
index 54bd6f5b02f..637bbc5053d 100644
--- a/Plugins/Json/include/Acts/Plugins/Json/SurfaceBoundsJsonConverter.hpp
+++ b/Plugins/Json/include/Acts/Plugins/Json/SurfaceBoundsJsonConverter.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2021-2023 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
diff --git a/Plugins/Json/include/Acts/Plugins/Json/SurfaceJsonConverter.hpp b/Plugins/Json/include/Acts/Plugins/Json/SurfaceJsonConverter.hpp
index 64b270626ab..3e4e2339db2 100644
--- a/Plugins/Json/include/Acts/Plugins/Json/SurfaceJsonConverter.hpp
+++ b/Plugins/Json/include/Acts/Plugins/Json/SurfaceJsonConverter.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2021-2023 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
diff --git a/Plugins/Json/include/Acts/Plugins/Json/TrackParametersJsonConverter.hpp b/Plugins/Json/include/Acts/Plugins/Json/TrackParametersJsonConverter.hpp
new file mode 100644
index 00000000000..ebf7d5c6054
--- /dev/null
+++ b/Plugins/Json/include/Acts/Plugins/Json/TrackParametersJsonConverter.hpp
@@ -0,0 +1,221 @@
+// This file is part of the ACTS project.
+//
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
+//
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
+
+#pragma once
+
+#include "Acts/EventData/TrackParameters.hpp"
+#include "Acts/Plugins/Json/ActsJson.hpp"
+#include "Acts/Plugins/Json/SurfaceJsonConverter.hpp"
+
+#include <nlohmann/json.hpp>
+
+namespace {
+
+// Alias to bound adl_serializer specialization
+// only to track parameters
+template <class parameters_t>
+concept TrackParameters = Acts::FreeTrackParametersConcept<parameters_t> ||
+                          Acts::BoundTrackParametersConcept<parameters_t>;
+
+// Shorthand for bound track parameters
+template <class parameters_t>
+concept IsGenericBound =
+    std::same_as<parameters_t, Acts::GenericBoundTrackParameters<
+                                   typename parameters_t::ParticleHypothesis>>;
+
+}  // namespace
+
+namespace Acts {
+NLOHMANN_JSON_SERIALIZE_ENUM(Acts::PdgParticle,
+
+                             {{Acts::PdgParticle::eInvalid, "Invalid"},
+                              {Acts::PdgParticle::eElectron, "Electron"},
+                              {Acts::PdgParticle::eAntiElectron,
+                               "AntiElectron"},
+                              {Acts::PdgParticle::ePositron, "Positron"},
+                              {Acts::PdgParticle::eMuon, "Muon"},
+                              {Acts::PdgParticle::eAntiMuon, "AntiMuon"},
+                              {Acts::PdgParticle::eTau, "Tau"},
+                              {Acts::PdgParticle::eAntiTau, "AntiTau"},
+                              {Acts::PdgParticle::eGamma, "Gamma"},
+                              {Acts::PdgParticle::ePionZero, "PionZero"},
+                              {Acts::PdgParticle::ePionPlus, "PionPlus"},
+                              {Acts::PdgParticle::ePionMinus, "PionMinus"},
+                              {Acts::PdgParticle::eKaonPlus, "KaonPlus"},
+                              {Acts::PdgParticle::eKaonMinus, "KaonMinus"},
+                              {Acts::PdgParticle::eNeutron, "Neutron"},
+                              {Acts::PdgParticle::eAntiNeutron, "AntiNeutron"},
+                              {Acts::PdgParticle::eProton, "Proton"},
+                              {Acts::PdgParticle::eAntiProton, "AntiProton"},
+                              {Acts::PdgParticle::eLead, "Lead"}}
+
+)
+}
+
+namespace nlohmann {
+
+/// @brief Serialize a track parameters object to json
+///
+/// nlohmann::json serializer specialized for track parameters
+/// as they are not default constructible. Is able to serialize
+/// either bound or free track parameters given that the constructor
+/// convention is followed.
+///
+/// @tparam parameters_t The track parameters type
+template <TrackParameters parameters_t>
+struct adl_serializer<parameters_t> {
+  /// Covariance matrix type attached to the parameters
+  using CovarianceMatrix = typename parameters_t::CovarianceMatrix;
+
+  /// @brief Serialize track parameters object to json
+  ///
+  /// @param j Json object to write to
+  /// @param t Track parameters object to serialize
+  static void to_json(nlohmann::json& j, const parameters_t& t) {
+    // Serialize parameters
+    // common to all track parameters
+    j["direction"] = t.direction();
+    j["qOverP"] = t.qOverP();
+    j["particleHypothesis"] = t.particleHypothesis().absolutePdg();
+
+    // Covariance is optional
+    j["covariance"];
+    if (t.covariance().has_value()) {
+      // Extract covariance matrix
+      // parameters and serialize
+      auto cov = t.covariance().value();
+      constexpr unsigned int size = cov.rows();
+      std::array<Acts::ActsScalar, size * size> covData{};
+      for (std::size_t n = 0; n < size; ++n) {
+        for (std::size_t m = 0; m < size; ++m) {
+          covData[n * size + m] = cov(n, m);
+        }
+      }
+      j["covariance"] = covData;
+    }
+    // Bound track parameters have
+    // reference surface attached
+    // and position takes a geometry context
+    if constexpr (IsGenericBound<parameters_t>) {
+      Acts::GeometryContext gctx;
+      j["position"] = t.fourPosition(gctx);
+
+      j["referenceSurface"] =
+          Acts::SurfaceJsonConverter::toJson(gctx, t.referenceSurface());
+    } else {
+      j["position"] = t.fourPosition();
+    }
+  }
+
+  /// @brief Deserialize track parameters object from json
+  ///
+  /// @param j Json object to read from
+  /// @return Track parameters object
+  static parameters_t from_json(const nlohmann::json& j) {
+    // Extract common parameters
+    std::array<Acts::ActsScalar, 4> posData = j.at("position");
+    Acts::Vector4 position(posData[0], posData[1], posData[2], posData[3]);
+
+    std::array<Acts::ActsScalar, 3> dirData = j.at("direction");
+    Acts::Vector3 direction(dirData[0], dirData[1], dirData[2]);
+
+    Acts::ActsScalar qOverP = j.at("qOverP");
+    Acts::PdgParticle absPdg = j.at("particleHypothesis");
+
+    // Covariance is optional
+    std::optional<CovarianceMatrix> cov;
+    if (j.at("covariance").is_null()) {
+      cov = std::nullopt;
+    } else {
+      // Extract covariance matrix
+      // parameters and deserialize
+      CovarianceMatrix mat;
+      constexpr unsigned int size = mat.rows();
+      std::array<Acts::ActsScalar, size * size> covData = j.at("covariance");
+      for (std::size_t n = 0; n < size; ++n) {
+        for (std::size_t m = 0; m < size; ++m) {
+          mat(n, m) = covData[n * size + m];
+        }
+      }
+      cov.emplace(std::move(mat));
+    }
+
+    // Create particle hypothesis
+    typename parameters_t::ParticleHypothesis particle(absPdg);
+
+    // Bound track parameters have
+    // reference surface attached
+    // and constructor is hidden
+    // behind a factory method
+    if constexpr (IsGenericBound<parameters_t>) {
+      Acts::GeometryContext gctx;
+      auto referenceSurface =
+          Acts::SurfaceJsonConverter::fromJson(j.at("referenceSurface"));
+
+      auto res = parameters_t::create(referenceSurface, gctx, position,
+                                      direction, qOverP, cov, particle);
+
+      if (!res.ok()) {
+        throw std::invalid_argument("Invalid bound track parameters");
+      }
+      return res.value();
+    } else {
+      return parameters_t(position, direction, qOverP, cov, particle);
+    }
+  }
+};
+
+/// @brief Serialize a shared pointer to track parameters object to json
+///
+/// nlohmann::json serializer specialized for shared pointers to track
+/// parameters as they are not default constructible. Is able to serialize
+/// either bound or free track parameters given that the constructor
+/// convention is followed.
+///
+/// @tparam parameters_t The track parameters type
+template <TrackParameters parameters_t>
+struct adl_serializer<std::shared_ptr<parameters_t>> {
+  using CovarianceMatrix = typename parameters_t::CovarianceMatrix;
+  static void to_json(nlohmann::json& j,
+                      const std::shared_ptr<parameters_t>& t) {
+    if (t == nullptr) {
+      return;
+    }
+    j = *t;
+  }
+
+  static std::shared_ptr<parameters_t> from_json(const nlohmann::json& j) {
+    return std::make_shared<parameters_t>(j.get<parameters_t>());
+  }
+};
+
+/// @brief Serialize a unique pointer to track parameters object to json
+///
+/// nlohmann::json serializer specialized for unique pointers to track
+/// parameters as they are not default constructible. Is able to serialize
+/// either bound or free track parameters given that the constructor
+/// convention is followed.
+///
+/// @tparam parameters_t The track parameters type
+template <TrackParameters parameters_t>
+struct adl_serializer<std::unique_ptr<parameters_t>> {
+  using CovarianceMatrix = typename parameters_t::CovarianceMatrix;
+  static void to_json(nlohmann::json& j,
+                      const std::unique_ptr<parameters_t>& t) {
+    if (t == nullptr) {
+      return;
+    }
+    j = *t;
+  }
+
+  static std::unique_ptr<parameters_t> from_json(const nlohmann::json& j) {
+    return std::make_unique<parameters_t>(j.get<parameters_t>());
+  }
+};
+
+}  // namespace nlohmann
diff --git a/Plugins/Json/include/Acts/Plugins/Json/UtilitiesJsonConverter.hpp b/Plugins/Json/include/Acts/Plugins/Json/UtilitiesJsonConverter.hpp
index 8fa33854b0d..4874f7b49ad 100644
--- a/Plugins/Json/include/Acts/Plugins/Json/UtilitiesJsonConverter.hpp
+++ b/Plugins/Json/include/Acts/Plugins/Json/UtilitiesJsonConverter.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2021-2023 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
diff --git a/Plugins/Json/include/Acts/Plugins/Json/VolumeBoundsJsonConverter.hpp b/Plugins/Json/include/Acts/Plugins/Json/VolumeBoundsJsonConverter.hpp
index 5aa57a36150..dd54abdd170 100644
--- a/Plugins/Json/include/Acts/Plugins/Json/VolumeBoundsJsonConverter.hpp
+++ b/Plugins/Json/include/Acts/Plugins/Json/VolumeBoundsJsonConverter.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2022-2023 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
diff --git a/Plugins/Json/include/Acts/Plugins/Json/VolumeJsonConverter.hpp b/Plugins/Json/include/Acts/Plugins/Json/VolumeJsonConverter.hpp
index d03bb7e6202..1019dacbfb9 100644
--- a/Plugins/Json/include/Acts/Plugins/Json/VolumeJsonConverter.hpp
+++ b/Plugins/Json/include/Acts/Plugins/Json/VolumeJsonConverter.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2021 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
diff --git a/Plugins/Json/src/AlgebraJsonConverter.cpp b/Plugins/Json/src/AlgebraJsonConverter.cpp
index 8d47eb58649..dfc7dbb9cb1 100644
--- a/Plugins/Json/src/AlgebraJsonConverter.cpp
+++ b/Plugins/Json/src/AlgebraJsonConverter.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2021 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include "Acts/Plugins/Json/AlgebraJsonConverter.hpp"
 
diff --git a/Plugins/Json/src/AmbiguityConfigJsonConverter.cpp b/Plugins/Json/src/AmbiguityConfigJsonConverter.cpp
index 2542a237b52..ded95d8c122 100644
--- a/Plugins/Json/src/AmbiguityConfigJsonConverter.cpp
+++ b/Plugins/Json/src/AmbiguityConfigJsonConverter.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2023-2024 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include "Acts/Plugins/Json/AmbiguityConfigJsonConverter.hpp"
 
@@ -35,15 +35,26 @@ void from_json(const nlohmann::json& j, ConfigPair& p) {
 
     detectorConfig.sharedHitsFlag = value["sharedHitsFlag"];
 
-    std::vector<double> factorHits = value["factorHits"];
-    std::vector<double> factorHoles = value["factorHoles"];
+    const std::vector<double>& goodHits = value["goodHits"];
+    const std::vector<double>& goodHoles = value["goodHoles"];
 
-    for (auto factor : factorHits) {
-      detectorConfig.factorHits.push_back(factor);
+    const std::vector<double>& fakeHits = value["fakeHits"];
+    const std::vector<double>& fakeHoles = value["fakeHoles"];
+
+    if (goodHits.size() != fakeHits.size()) {
+      throw std::invalid_argument("goodHits and FakeHits size mismatch");
+    }
+
+    for (std::size_t i = 0; i < goodHits.size(); i++) {
+      detectorConfig.factorHits.push_back(goodHits[i] / fakeHits[i]);
+    }
+
+    if (goodHoles.size() != fakeHoles.size()) {
+      throw std::invalid_argument("goodHoles and FakeHoles size mismatch");
     }
 
-    for (auto factor : factorHoles) {
-      detectorConfig.factorHoles.push_back(factor);
+    for (std::size_t i = 0; i < goodHoles.size(); i++) {
+      detectorConfig.factorHoles.push_back(goodHoles[i] / fakeHoles[i]);
     }
 
     detectorConfigs.push_back(detectorConfig);
diff --git a/Plugins/Json/src/DetectorJsonConverter.cpp b/Plugins/Json/src/DetectorJsonConverter.cpp
index 0dd8d7520f8..72e809e4dbd 100644
--- a/Plugins/Json/src/DetectorJsonConverter.cpp
+++ b/Plugins/Json/src/DetectorJsonConverter.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2023 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include "Acts/Plugins/Json/DetectorJsonConverter.hpp"
 
@@ -27,6 +27,7 @@
 #include <map>
 #include <memory>
 #include <set>
+#include <string>
 
 nlohmann::json Acts::DetectorJsonConverter::toJson(
     const GeometryContext& gctx, const Experimental::Detector& detector,
@@ -44,7 +45,7 @@ nlohmann::json Acts::DetectorJsonConverter::toJson(
   for (const auto* volume : detector.volumes()) {
     nSurfaces += volume->surfaces().size();
     for (const auto& portal : volume->portals()) {
-      if (std::find(portals.begin(), portals.end(), portal) == portals.end()) {
+      if (!rangeContainsValue(portals, portal)) {
         portals.push_back(portal);
       }
     }
@@ -81,7 +82,9 @@ nlohmann::json Acts::DetectorJsonConverter::toJson(
   nlohmann::json jHeader;
   jHeader["detector"] = detector.name();
   jHeader["type"] = "acts";
-  jHeader["date"] = std::asctime(ti);
+  char buffer[100];
+  strftime(buffer, sizeof(buffer), "%Y-%m-%d %H:%M:%S", ti);
+  jHeader["date"] = std::string(buffer);
   jHeader["surface_count"] = nSurfaces;
   jHeader["portal_count"] = portals.size();
   jHeader["volume_count"] = detector.volumes().size();
@@ -102,7 +105,9 @@ nlohmann::json Acts::DetectorJsonConverter::toJsonDetray(
 
   nlohmann::json jCommonHeader;
   jCommonHeader["detector"] = detector.name();
-  jCommonHeader["date"] = std::asctime(ti);
+  char buffer[100];
+  strftime(buffer, sizeof(buffer), "%Y-%m-%d %H:%M:%S", ti);
+  jCommonHeader["date"] = std::string(buffer);
   jCommonHeader["version"] = "detray - 0.44.0";
   jCommonHeader["tag"] = "geometry";
 
diff --git a/Plugins/Json/src/DetectorVolumeFinderJsonConverter.cpp b/Plugins/Json/src/DetectorVolumeFinderJsonConverter.cpp
index 9b4d93532f2..8defd1ef5da 100644
--- a/Plugins/Json/src/DetectorVolumeFinderJsonConverter.cpp
+++ b/Plugins/Json/src/DetectorVolumeFinderJsonConverter.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2023 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include "Acts/Plugins/Json/DetectorVolumeFinderJsonConverter.hpp"
 
diff --git a/Plugins/Json/src/DetectorVolumeJsonConverter.cpp b/Plugins/Json/src/DetectorVolumeJsonConverter.cpp
index 65f511ea9c3..3d5c03c020d 100644
--- a/Plugins/Json/src/DetectorVolumeJsonConverter.cpp
+++ b/Plugins/Json/src/DetectorVolumeJsonConverter.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2023 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include "Acts/Plugins/Json/DetectorVolumeJsonConverter.hpp"
 
@@ -21,6 +21,7 @@
 #include "Acts/Plugins/Json/VolumeBoundsJsonConverter.hpp"
 #include "Acts/Utilities/Enumerate.hpp"
 
+#include <algorithm>
 #include <ctime>
 
 nlohmann::json Acts::DetectorVolumeJsonConverter::toJson(
@@ -59,7 +60,7 @@ nlohmann::json Acts::DetectorVolumeJsonConverter::toJson(
   nlohmann::json jPortals;
   if (!portals.empty()) {
     for (const auto* p : volume.portals()) {
-      auto it = std::find(portals.begin(), portals.end(), p);
+      auto it = std::ranges::find(portals, p);
       if (it != portals.end()) {
         jPortals.push_back(std::distance(portals.begin(), it));
       } else {
diff --git a/Plugins/Json/src/DetrayJsonHelper.cpp b/Plugins/Json/src/DetrayJsonHelper.cpp
index 50c6a3639d9..e902657da21 100644
--- a/Plugins/Json/src/DetrayJsonHelper.cpp
+++ b/Plugins/Json/src/DetrayJsonHelper.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2024 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include "Acts/Plugins/Json/DetrayJsonHelper.hpp"
 
@@ -50,7 +50,7 @@ std::tuple<unsigned int, std::vector<ActsScalar>> maskFromBounds(
         break;
     }
   }
-  return std::tie(type, boundaries);
+  return {type, boundaries};
 }
 
 void addVolumeLink(nlohmann::json& jSurface, int vLink) {
diff --git a/Plugins/Json/src/ExtentJsonConverter.cpp b/Plugins/Json/src/ExtentJsonConverter.cpp
index 5e509d74e97..fd56eea866b 100644
--- a/Plugins/Json/src/ExtentJsonConverter.cpp
+++ b/Plugins/Json/src/ExtentJsonConverter.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2022 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include "Acts/Plugins/Json/ExtentJsonConverter.hpp"
 
diff --git a/Plugins/Json/src/GridJsonConverter.cpp b/Plugins/Json/src/GridJsonConverter.cpp
index 8d9a805b685..67f19ce7c36 100644
--- a/Plugins/Json/src/GridJsonConverter.cpp
+++ b/Plugins/Json/src/GridJsonConverter.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2023 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include "Acts/Plugins/Json/GridJsonConverter.hpp"
 
diff --git a/Plugins/Json/src/IndexedSurfacesJsonConverter.cpp b/Plugins/Json/src/IndexedSurfacesJsonConverter.cpp
index a0e027c9bf0..40548ede336 100644
--- a/Plugins/Json/src/IndexedSurfacesJsonConverter.cpp
+++ b/Plugins/Json/src/IndexedSurfacesJsonConverter.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2023 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include "Acts/Plugins/Json/IndexedSurfacesJsonConverter.hpp"
 
diff --git a/Plugins/Json/src/JsonMaterialDecorator.cpp b/Plugins/Json/src/JsonMaterialDecorator.cpp
index 03180b9ac19..a76997fcf36 100644
--- a/Plugins/Json/src/JsonMaterialDecorator.cpp
+++ b/Plugins/Json/src/JsonMaterialDecorator.cpp
@@ -1,18 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2017-2019 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-// This file is part of the Acts project.
-//
-// Copyright (C) 2017-2019 CERN for the benefit of the Acts project
-//
-// This Source Code Form is subject to the terms of the Mozilla Public
-// License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include "Acts/Plugins/Json/JsonMaterialDecorator.hpp"
 
diff --git a/Plugins/Json/src/MaterialJsonConverter.cpp b/Plugins/Json/src/MaterialJsonConverter.cpp
index cb718f01ba4..a3935d4bbc2 100644
--- a/Plugins/Json/src/MaterialJsonConverter.cpp
+++ b/Plugins/Json/src/MaterialJsonConverter.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2021 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include "Acts/Plugins/Json/MaterialJsonConverter.hpp"
 
@@ -35,6 +35,7 @@
 #include <functional>
 #include <iosfwd>
 #include <memory>
+#include <numbers>
 #include <stdexcept>
 #include <string>
 #include <tuple>
@@ -283,7 +284,7 @@ Acts::ISurfaceMaterial* indexedMaterialFromJson(nlohmann::json& jMaterial) {
 }  // namespace
 
 void Acts::to_json(nlohmann::json& j, const Material& t) {
-  if (!t) {
+  if (!t.isValid()) {
     return;
   }
   for (unsigned i = 0; i < t.parameters().size(); ++i) {
@@ -687,10 +688,12 @@ nlohmann::json Acts::MaterialJsonConverter::toJsonDetray(
     if (bUtility.dimensions() == 1u) {
       if (bUtility.binningData()[0u].binvalue == BinningValue::binR) {
         // Turn to R-Phi
-        bUtility += BinUtility(1u, -M_PI, M_PI, closed, BinningValue::binR);
+        bUtility += BinUtility(1u, -std::numbers::pi, std::numbers::pi, closed,
+                               BinningValue::binPhi);
       } else if (bUtility.binningData()[0u].binvalue == BinningValue::binZ) {
         // Turn to Phi-Z - swap needed
-        BinUtility nbUtility(1u, -M_PI, M_PI, closed, BinningValue::binPhi);
+        BinUtility nbUtility(1u, -std::numbers::pi, std::numbers::pi, closed,
+                             BinningValue::binPhi);
         nbUtility += bUtility;
         bUtility = std::move(nbUtility);
         swapped = true;
@@ -726,7 +729,7 @@ nlohmann::json Acts::MaterialJsonConverter::toJsonDetray(
     nlohmann::json jGridLink;
     jGridLink["type"] = gridIndexType;
     std::size_t gridIndex = 0;
-    if (gridLink.find(gridIndexType) != gridLink.end()) {
+    if (gridLink.contains(gridIndexType)) {
       std::size_t& fGridIndex = gridLink[gridIndex];
       gridIndex = fGridIndex;
       fGridIndex++;
diff --git a/Plugins/Json/src/MaterialMapJsonConverter.cpp b/Plugins/Json/src/MaterialMapJsonConverter.cpp
index afa1cec1ad5..dc423ecc50b 100644
--- a/Plugins/Json/src/MaterialMapJsonConverter.cpp
+++ b/Plugins/Json/src/MaterialMapJsonConverter.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2017-2023 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include "Acts/Plugins/Json/MaterialMapJsonConverter.hpp"
 
@@ -45,6 +45,7 @@
 #include <cmath>
 #include <cstddef>
 #include <map>
+#include <numbers>
 #include <stdexcept>
 
 namespace Acts {
@@ -114,8 +115,8 @@ Acts::SurfaceAndMaterialWithContext defaultSurfaceMaterial(
             radialBounds->get(Acts::RadialBounds::eHalfPhiSector),
         radialBounds->get(Acts::RadialBounds::eAveragePhi) +
             radialBounds->get(Acts::RadialBounds::eHalfPhiSector),
-        (radialBounds->get(Acts::RadialBounds::eHalfPhiSector) - M_PI) <
-                Acts::s_epsilon
+        (radialBounds->get(Acts::RadialBounds::eHalfPhiSector) -
+         std::numbers::pi) < Acts::s_epsilon
             ? Acts::closed
             : Acts::open,
         Acts::BinningValue::binPhi);
@@ -129,8 +130,8 @@ Acts::SurfaceAndMaterialWithContext defaultSurfaceMaterial(
             cylinderBounds->get(Acts::CylinderBounds::eHalfPhiSector),
         cylinderBounds->get(Acts::CylinderBounds::eAveragePhi) +
             cylinderBounds->get(Acts::CylinderBounds::eHalfPhiSector),
-        (cylinderBounds->get(Acts::CylinderBounds::eHalfPhiSector) - M_PI) <
-                Acts::s_epsilon
+        (cylinderBounds->get(Acts::CylinderBounds::eHalfPhiSector) -
+         std::numbers::pi) < Acts::s_epsilon
             ? Acts::closed
             : Acts::open,
         Acts::BinningValue::binPhi);
@@ -176,8 +177,8 @@ Acts::SurfaceAndMaterialWithContext defaultSurfaceMaterial(
 Acts::TrackingVolumeAndMaterial defaultVolumeMaterial(
     const Acts::TrackingVolume* volume) {
   Acts::BinUtility bUtility;
-  if (volume->volumeMaterialSharedPtr() != nullptr) {
-    return {volume, volume->volumeMaterialSharedPtr()};
+  if (volume->volumeMaterialPtr() != nullptr) {
+    return {volume, volume->volumeMaterialPtr()};
   }
   // Check which type of bound is associated to the volume
   auto cyBounds = dynamic_cast<const Acts::CylinderVolumeBounds*>(
@@ -195,8 +196,8 @@ Acts::TrackingVolumeAndMaterial defaultVolumeMaterial(
     bUtility += Acts::BinUtility(
         1, -cyBounds->get(Acts::CylinderVolumeBounds::eHalfPhiSector),
         cyBounds->get(Acts::CylinderVolumeBounds::eHalfPhiSector),
-        (cyBounds->get(Acts::CylinderVolumeBounds::eHalfPhiSector) - M_PI) <
-                Acts::s_epsilon
+        (cyBounds->get(Acts::CylinderVolumeBounds::eHalfPhiSector) -
+         std::numbers::pi) < Acts::s_epsilon
             ? Acts::closed
             : Acts::open,
         Acts::BinningValue::binPhi);
@@ -210,9 +211,9 @@ Acts::TrackingVolumeAndMaterial defaultVolumeMaterial(
         1, cutcylBounds->get(Acts::CutoutCylinderVolumeBounds::eMinR),
         cutcylBounds->get(Acts::CutoutCylinderVolumeBounds::eMaxR), Acts::open,
         Acts::BinningValue::binR);
-    bUtility +=
-        Acts::BinUtility(1, -static_cast<float>(M_PI), static_cast<float>(M_PI),
-                         Acts::closed, Acts::BinningValue::binPhi);
+    bUtility += Acts::BinUtility(1, -std::numbers::pi_v<float>,
+                                 std::numbers::pi_v<float>, Acts::closed,
+                                 Acts::BinningValue::binPhi);
     bUtility += Acts::BinUtility(
         1, -cutcylBounds->get(Acts::CutoutCylinderVolumeBounds::eHalfLengthZ),
         cutcylBounds->get(Acts::CutoutCylinderVolumeBounds::eHalfLengthZ),
@@ -253,8 +254,8 @@ nlohmann::json Acts::MaterialMapJsonConverter::materialMapsToJson(
   VolumeMaterialMap volumeMap = maps.second;
   std::vector<std::pair<GeometryIdentifier, const IVolumeMaterial*>>
       mapVolumeInit;
-  for (auto it = volumeMap.begin(); it != volumeMap.end(); it++) {
-    mapVolumeInit.push_back({it->first, it->second.get()});
+  for (const auto& [key, value] : volumeMap) {
+    mapVolumeInit.push_back({key, value.get()});
   }
   GeometryHierarchyMap<const IVolumeMaterial*> hierarchyVolumeMap(
       mapVolumeInit);
@@ -263,8 +264,8 @@ nlohmann::json Acts::MaterialMapJsonConverter::materialMapsToJson(
   SurfaceMaterialMap surfaceMap = maps.first;
   std::vector<std::pair<GeometryIdentifier, const ISurfaceMaterial*>>
       mapSurfaceInit;
-  for (auto it = surfaceMap.begin(); it != surfaceMap.end(); it++) {
-    mapSurfaceInit.push_back({it->first, it->second.get()});
+  for (const auto& [key, value] : surfaceMap) {
+    mapSurfaceInit.push_back({key, value.get()});
   }
   GeometryHierarchyMap<const ISurfaceMaterial*> hierarchySurfaceMap(
       mapSurfaceInit);
@@ -336,12 +337,10 @@ void Acts::MaterialMapJsonConverter::convertToHierarchy(
         std::pair<GeometryIdentifier, Acts::SurfaceAndMaterialWithContext>>&
         surfaceHierarchy,
     const Acts::TrackingVolume* tVolume) {
-  auto sameId =
-      [tVolume](
-          const std::pair<GeometryIdentifier, Acts::TrackingVolumeAndMaterial>&
-              pair) { return (tVolume->geometryId() == pair.first); };
-  if (std::find_if(volumeHierarchy.begin(), volumeHierarchy.end(), sameId) !=
-      volumeHierarchy.end()) {
+  auto sameId = [tVolume](const auto& pair) {
+    return (tVolume->geometryId() == pair.first);
+  };
+  if (std::ranges::any_of(volumeHierarchy, sameId)) {
     // this volume was already visited
     return;
   }
diff --git a/Plugins/Json/src/PortalJsonConverter.cpp b/Plugins/Json/src/PortalJsonConverter.cpp
index a394525a957..e39b6efca17 100644
--- a/Plugins/Json/src/PortalJsonConverter.cpp
+++ b/Plugins/Json/src/PortalJsonConverter.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2023 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include "Acts/Plugins/Json/PortalJsonConverter.hpp"
 
@@ -40,7 +40,7 @@ namespace {
 int findVolume(
     const Acts::Experimental::DetectorVolume* volume,
     const std::vector<const Acts::Experimental::DetectorVolume*>& volumes) {
-  auto candidate = std::find(volumes.begin(), volumes.end(), volume);
+  auto candidate = std::ranges::find(volumes, volume);
   if (candidate != volumes.end()) {
     return std::distance(volumes.begin(), candidate);
   }
diff --git a/Plugins/Json/src/ProtoDetectorJsonConverter.cpp b/Plugins/Json/src/ProtoDetectorJsonConverter.cpp
index 7b3acec7373..7d05001ab3f 100644
--- a/Plugins/Json/src/ProtoDetectorJsonConverter.cpp
+++ b/Plugins/Json/src/ProtoDetectorJsonConverter.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2022 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include "Acts/Plugins/Json/ProtoDetectorJsonConverter.hpp"
 
diff --git a/Plugins/Json/src/SurfaceBoundsJsonConverter.cpp b/Plugins/Json/src/SurfaceBoundsJsonConverter.cpp
index a398be352f9..173dc09436a 100644
--- a/Plugins/Json/src/SurfaceBoundsJsonConverter.cpp
+++ b/Plugins/Json/src/SurfaceBoundsJsonConverter.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2021 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include "Acts/Plugins/Json/SurfaceBoundsJsonConverter.hpp"
 
diff --git a/Plugins/Json/src/SurfaceJsonConverter.cpp b/Plugins/Json/src/SurfaceJsonConverter.cpp
index b0911366da7..0df6dc8b08b 100644
--- a/Plugins/Json/src/SurfaceJsonConverter.cpp
+++ b/Plugins/Json/src/SurfaceJsonConverter.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2021 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include "Acts/Plugins/Json/SurfaceJsonConverter.hpp"
 
diff --git a/Plugins/Json/src/UtilitiesJsonConverter.cpp b/Plugins/Json/src/UtilitiesJsonConverter.cpp
index d43f87243cd..558bb8aa048 100644
--- a/Plugins/Json/src/UtilitiesJsonConverter.cpp
+++ b/Plugins/Json/src/UtilitiesJsonConverter.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2021 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include "Acts/Plugins/Json/UtilitiesJsonConverter.hpp"
 
diff --git a/Plugins/Json/src/VolumeBoundsJsonConverter.cpp b/Plugins/Json/src/VolumeBoundsJsonConverter.cpp
index af6c08eab8c..dc72ebea517 100644
--- a/Plugins/Json/src/VolumeBoundsJsonConverter.cpp
+++ b/Plugins/Json/src/VolumeBoundsJsonConverter.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2022 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include "Acts/Plugins/Json/VolumeBoundsJsonConverter.hpp"
 
diff --git a/Plugins/Json/src/VolumeJsonConverter.cpp b/Plugins/Json/src/VolumeJsonConverter.cpp
index 55cbc28b4ee..e00843db720 100644
--- a/Plugins/Json/src/VolumeJsonConverter.cpp
+++ b/Plugins/Json/src/VolumeJsonConverter.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2021 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include "Acts/Plugins/Json/VolumeJsonConverter.hpp"
 
diff --git a/Plugins/Legacy/include/Acts/Seeding/AtlasSeedFinder.hpp b/Plugins/Legacy/include/Acts/Seeding/AtlasSeedFinder.hpp
index 706d0823f2d..b7e060a1f80 100644
--- a/Plugins/Legacy/include/Acts/Seeding/AtlasSeedFinder.hpp
+++ b/Plugins/Legacy/include/Acts/Seeding/AtlasSeedFinder.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2018 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 ///////////////////////////////////////////////////////////////////
 // AtlasSeedFinder.hpp Acts project
@@ -318,7 +318,7 @@ inline SPForSeed<SpacePoint>* AtlasSeedFinder<SpacePoint>::newSpacePoint(
 
   if (m_checketa) {
     // filter SP outside of eta-range
-    float z = (fabs(r[2]) + m_zmax);
+    float z = std::abs(r[2]) + m_zmax;
     float x = r[0] * m_dzdrmin;
     float y = r[1] * m_dzdrmin;
     if ((z * z) < (x * x + y * y)) {
diff --git a/Plugins/Legacy/include/Acts/Seeding/AtlasSeedFinder.ipp b/Plugins/Legacy/include/Acts/Seeding/AtlasSeedFinder.ipp
index 869ea097238..76f53cd12da 100644
--- a/Plugins/Legacy/include/Acts/Seeding/AtlasSeedFinder.ipp
+++ b/Plugins/Legacy/include/Acts/Seeding/AtlasSeedFinder.ipp
@@ -1,16 +1,17 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2018 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 ///////////////////////////////////////////////////////////////////
 // AtlasSeedFinder.ipp Acts project
 ///////////////////////////////////////////////////////////////////
 
 #include <algorithm>
+#include <numbers>
 
 ///////////////////////////////////////////////////////////////////
 // Constructor
@@ -205,7 +206,7 @@ void Acts::Legacy::AtlasSeedFinder<SpacePoint>::findNext() {
 ///////////////////////////////////////////////////////////////////
 template <class SpacePoint>
 void Acts::Legacy::AtlasSeedFinder<SpacePoint>::buildFrameWork() {
-  m_ptmin = fabs(m_ptmin);
+  m_ptmin = std::abs(m_ptmin);
 
   if (m_ptmin < 100.) {
     m_ptmin = 100.;
@@ -218,7 +219,7 @@ void Acts::Legacy::AtlasSeedFinder<SpacePoint>::buildFrameWork() {
     m_divermax = m_diversss;
   }
 
-  if (fabs(m_etamin) < .1) {
+  if (std::abs(m_etamin) < 0.1) {
     m_etamin = -m_etamax;
   }
   m_dzdrmax0 = 1. / tan(2. * atan(exp(-m_etamax)));
@@ -227,7 +228,7 @@ void Acts::Legacy::AtlasSeedFinder<SpacePoint>::buildFrameWork() {
   // scattering factor. depends on error, forward direction and distance between
   // SP
   m_COF = 134 * .05 * 9.;
-  m_ipt = 1. / fabs(.9 * m_ptmin);
+  m_ipt = 1. / std::abs(0.9 * m_ptmin);
   m_ipt2 = m_ipt * m_ipt;
   m_K = 0.;
 
@@ -247,7 +248,7 @@ void Acts::Legacy::AtlasSeedFinder<SpacePoint>::buildFrameWork() {
 
   // Build radius-azimuthal sorted containers
   //
-  const float pi2 = 2. * M_PI;
+  const float pi2 = 2. * std::numbers::pi;
   const int NFmax = 53;
   const float sFmax = static_cast<float>(NFmax) / pi2;
   const float m_sFmin = 100. / 60.;
@@ -413,7 +414,7 @@ void Acts::Legacy::AtlasSeedFinder<SpacePoint>::convertToBeamFrameWork(
 ///////////////////////////////////////////////////////////////////
 template <class SpacePoint>
 void Acts::Legacy::AtlasSeedFinder<SpacePoint>::fillLists() {
-  const float pi2 = 2. * M_PI;
+  const float pi2 = 2. * std::numbers::pi;
   typename std::list<Acts::Legacy::SPForSeed<SpacePoint>*>::iterator r, re;
 
   int ir0 = 0;
@@ -646,7 +647,7 @@ void Acts::Legacy::AtlasSeedFinder<SpacePoint>::production3Sp(
         }
         // forward direction of SP duplet
         float Tz = (Z - (*r)->z()) / dR;
-        float aTz = fabs(Tz);
+        float aTz = std::abs(Tz);
         // why also exclude seeds with small pseudorapidity??
         if (aTz < m_dzdrmin || aTz > m_dzdrmax) {
           continue;
@@ -690,7 +691,7 @@ void Acts::Legacy::AtlasSeedFinder<SpacePoint>::production3Sp(
         }
 
         float Tz = ((*r)->z() - Z) / dR;
-        float aTz = fabs(Tz);
+        float aTz = std::abs(Tz);
 
         if (aTz < m_dzdrmin || aTz > m_dzdrmax) {
           continue;
@@ -793,14 +794,14 @@ void Acts::Legacy::AtlasSeedFinder<SpacePoint>::production3Sp(
           continue;
         }
 
-        float Im = fabs((A - B * R) * R);
+        float Im = std::abs((A - B * R) * R);
 
         if (Im <= imax) {
           // Add penalty factor dependent on difference between cot(theta) to
           // the quality Im (previously Impact)
           float dr = 0;
           m_R[t] < m_R[b] ? dr = m_R[t] : dr = m_R[b];
-          Im += fabs((Tzb - m_Tz[t]) / (dr * sTzb2));
+          Im += std::abs((Tzb - m_Tz[t]) / (dr * sTzb2));
           // B/sqrt(S2) = 1/helixradius
           m_CmSp.push_back(std::make_pair(B / sqrt(S2), m_SP[t]));
           m_SP[t]->setParam(Im);
@@ -926,7 +927,7 @@ void Acts::Legacy::AtlasSeedFinder<SpacePoint>::
       }
       // Compared seeds should have at least deltaRMin distance
       float Rj = (*j).second->radius();
-      if (fabs(Rj - Ri) < m_drmin) {
+      if (std::abs(Rj - Ri) < m_drmin) {
         continue;
       }
 
diff --git a/Plugins/Legacy/include/Acts/Seeding/LegacyInternalSeed.hpp b/Plugins/Legacy/include/Acts/Seeding/LegacyInternalSeed.hpp
index cab28c9c6c6..9c6be79a4d6 100644
--- a/Plugins/Legacy/include/Acts/Seeding/LegacyInternalSeed.hpp
+++ b/Plugins/Legacy/include/Acts/Seeding/LegacyInternalSeed.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2018 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 ///////////////////////////////////////////////////////////////////
 // InternalSeed.hpp Acts project
diff --git a/Plugins/Legacy/include/Acts/Seeding/LegacySeed.hpp b/Plugins/Legacy/include/Acts/Seeding/LegacySeed.hpp
index 45f9406083b..f4f0e3bab68 100644
--- a/Plugins/Legacy/include/Acts/Seeding/LegacySeed.hpp
+++ b/Plugins/Legacy/include/Acts/Seeding/LegacySeed.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2018 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 ///////////////////////////////////////////////////////////////////
 // Seed.hpp Acts project
diff --git a/Plugins/Legacy/include/Acts/Seeding/SPForSeed.hpp b/Plugins/Legacy/include/Acts/Seeding/SPForSeed.hpp
index fc4d3ac435c..2bc823d5925 100644
--- a/Plugins/Legacy/include/Acts/Seeding/SPForSeed.hpp
+++ b/Plugins/Legacy/include/Acts/Seeding/SPForSeed.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2018 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 ///////////////////////////////////////////////////////////////////
 // SPForSeed.hpp Acts project
diff --git a/Plugins/Onnx/include/Acts/Plugins/Onnx/AmbiguityTrackClassifier.hpp b/Plugins/Onnx/include/Acts/Plugins/Onnx/AmbiguityTrackClassifier.hpp
index 8759450abd4..3e1450f2b85 100644
--- a/Plugins/Onnx/include/Acts/Plugins/Onnx/AmbiguityTrackClassifier.hpp
+++ b/Plugins/Onnx/include/Acts/Plugins/Onnx/AmbiguityTrackClassifier.hpp
@@ -1,15 +1,17 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2023 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
 #include "Acts/EventData/MultiTrajectoryHelpers.hpp"
 #include "Acts/EventData/TrackContainer.hpp"
+#include "Acts/EventData/TrackContainerFrontendConcept.hpp"
+#include "Acts/EventData/TrackProxyConcept.hpp"
 #include "Acts/Plugins/Onnx/OnnxRuntimeBase.hpp"
 #include "Acts/TrackFinding/detail/AmbiguityTrackClustering.hpp"
 
@@ -36,12 +38,10 @@ class AmbiguityTrackClassifier {
   /// @param clusters is a map of clusters, each cluster correspond to a vector of track ID
   /// @param tracks is the input track container
   /// @return a vector of vector of track score. Due to the architecture of the network each track only have a size 1 score vector.
-  template <typename track_container_t, typename traj_t,
-            template <typename> class holder_t>
+  template <TrackContainerFrontend track_container_t>
   std::vector<std::vector<float>> inferScores(
       std::unordered_map<std::size_t, std::vector<std::size_t>>& clusters,
-      const Acts::TrackContainer<track_container_t, traj_t, holder_t>& tracks)
-      const {
+      const track_container_t& tracks) const {
     // Compute the number of entry (since it is smaller than the number of
     // track)
     int trackNb = 0;
@@ -107,12 +107,10 @@ class AmbiguityTrackClassifier {
   /// @param clusters is a map of clusters, each cluster correspond to a vector of track ID
   /// @param tracks is the input track container
   /// @return a vector of trackID corresponding tho the good tracks
-  template <typename track_container_t, typename traj_t,
-            template <typename> class holder_t>
+  template <TrackContainerFrontend track_container_t>
   std::vector<std::size_t> solveAmbiguity(
       std::unordered_map<std::size_t, std::vector<std::size_t>>& clusters,
-      const Acts::TrackContainer<track_container_t, traj_t, holder_t>& tracks)
-      const {
+      const track_container_t& tracks) const {
     std::vector<std::vector<float>> outputTensor =
         inferScores(clusters, tracks);
     std::vector<std::size_t> goodTracks =
diff --git a/Plugins/Onnx/include/Acts/Plugins/Onnx/MLTrackClassifier.hpp b/Plugins/Onnx/include/Acts/Plugins/Onnx/MLTrackClassifier.hpp
index a6d58196fe6..54147213992 100644
--- a/Plugins/Onnx/include/Acts/Plugins/Onnx/MLTrackClassifier.hpp
+++ b/Plugins/Onnx/include/Acts/Plugins/Onnx/MLTrackClassifier.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2020 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
diff --git a/Plugins/Onnx/include/Acts/Plugins/Onnx/OnnxRuntimeBase.hpp b/Plugins/Onnx/include/Acts/Plugins/Onnx/OnnxRuntimeBase.hpp
index ae0e15ab926..0418a7cd5ac 100644
--- a/Plugins/Onnx/include/Acts/Plugins/Onnx/OnnxRuntimeBase.hpp
+++ b/Plugins/Onnx/include/Acts/Plugins/Onnx/OnnxRuntimeBase.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2020 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 #include <vector>
diff --git a/Plugins/Onnx/include/Acts/Plugins/Onnx/SeedClassifier.hpp b/Plugins/Onnx/include/Acts/Plugins/Onnx/SeedClassifier.hpp
index 85d22116829..d72c48c3497 100644
--- a/Plugins/Onnx/include/Acts/Plugins/Onnx/SeedClassifier.hpp
+++ b/Plugins/Onnx/include/Acts/Plugins/Onnx/SeedClassifier.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2023 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
diff --git a/Plugins/Onnx/src/MLTrackClassifier.cpp b/Plugins/Onnx/src/MLTrackClassifier.cpp
index d4b7f49ca64..48ae55f66eb 100644
--- a/Plugins/Onnx/src/MLTrackClassifier.cpp
+++ b/Plugins/Onnx/src/MLTrackClassifier.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2020 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include "Acts/Plugins/Onnx/MLTrackClassifier.hpp"
 
diff --git a/Plugins/Onnx/src/OnnxRuntimeBase.cpp b/Plugins/Onnx/src/OnnxRuntimeBase.cpp
index 9abb55349aa..da0f2a6a459 100644
--- a/Plugins/Onnx/src/OnnxRuntimeBase.cpp
+++ b/Plugins/Onnx/src/OnnxRuntimeBase.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2020 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include "Acts/Plugins/Onnx/OnnxRuntimeBase.hpp"
 
diff --git a/Plugins/Podio/include/Acts/Plugins/Podio/PodioDynamicColumns.hpp b/Plugins/Podio/include/Acts/Plugins/Podio/PodioDynamicColumns.hpp
index 39e6ec326df..295937efe7e 100644
--- a/Plugins/Podio/include/Acts/Plugins/Podio/PodioDynamicColumns.hpp
+++ b/Plugins/Podio/include/Acts/Plugins/Podio/PodioDynamicColumns.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2023 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
@@ -18,7 +18,7 @@
 namespace Acts::podio_detail {
 
 struct ConstDynamicColumnBase {
-  ConstDynamicColumnBase(std::string_view name) : m_name{name} {}
+  explicit ConstDynamicColumnBase(std::string_view name) : m_name{name} {}
 
   virtual ~ConstDynamicColumnBase() = default;
 
@@ -45,7 +45,8 @@ struct ConstDynamicColumn : public ConstDynamicColumnBase {
 };
 
 struct DynamicColumnBase : public ConstDynamicColumnBase {
-  DynamicColumnBase(std::string_view name) : ConstDynamicColumnBase{name} {}
+  explicit DynamicColumnBase(std::string_view name)
+      : ConstDynamicColumnBase{name} {}
 
   virtual std::any get(std::size_t i) = 0;
   std::any get(std::size_t i) const override = 0;
diff --git a/Plugins/Podio/include/Acts/Plugins/Podio/PodioTrackContainer.hpp b/Plugins/Podio/include/Acts/Plugins/Podio/PodioTrackContainer.hpp
index 8ef787b32c4..b6cba524a8e 100644
--- a/Plugins/Podio/include/Acts/Plugins/Podio/PodioTrackContainer.hpp
+++ b/Plugins/Podio/include/Acts/Plugins/Podio/PodioTrackContainer.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2023 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
@@ -15,6 +15,8 @@
 #include "Acts/EventData/detail/DynamicColumn.hpp"
 #include "Acts/Plugins/Podio/PodioDynamicColumns.hpp"
 #include "Acts/Plugins/Podio/PodioUtil.hpp"
+#include "Acts/Utilities/Helpers.hpp"
+#include "ActsPodioEdm/Surface.h"
 
 #pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Wold-style-cast"
@@ -187,7 +189,7 @@ class MutablePodioTrackContainer : public PodioTrackContainerBase {
   }
 
   bool hasColumn_impl(HashedString key) const {
-    return m_dynamic.find(key) != m_dynamic.end();
+    return m_dynamic.contains(key);
   }
 
   std::size_t size_impl() const { return m_collection->size(); }
@@ -207,9 +209,15 @@ class MutablePodioTrackContainer : public PodioTrackContainerBase {
   void setReferenceSurface_impl(IndexType itrack,
                                 std::shared_ptr<const Surface> surface) {
     auto track = m_collection->at(itrack);
-    track.setReferenceSurface(
-        PodioUtil::convertSurfaceToPodio(m_helper, *surface));
-    m_surfaces.at(itrack) = std::move(surface);
+    if (surface == nullptr) {
+      track.setReferenceSurface({.surfaceType = PodioUtil::kNoSurface,
+                                 .identifier = PodioUtil::kNoIdentifier});
+      m_surfaces.at(itrack) = nullptr;
+    } else {
+      track.setReferenceSurface(
+          PodioUtil::convertSurfaceToPodio(m_helper, *surface));
+      m_surfaces.at(itrack) = std::move(surface);
+    }
   }
 
  public:
@@ -332,8 +340,7 @@ class ConstPodioTrackContainer : public PodioTrackContainerBase {
     std::string tracksKey = "tracks" + s;
 
     std::vector<std::string> available = frame.getAvailableCollections();
-    if (std::find(available.begin(), available.end(), tracksKey) ==
-        available.end()) {
+    if (!rangeContainsValue(available, tracksKey)) {
       throw std::runtime_error{"Track collection '" + tracksKey +
                                "' not found in frame"};
     }
@@ -358,7 +365,7 @@ class ConstPodioTrackContainer : public PodioTrackContainerBase {
   }
 
   bool hasColumn_impl(HashedString key) const {
-    return m_dynamic.find(key) != m_dynamic.end();
+    return m_dynamic.contains(key);
   }
 
   std::size_t size_impl() const { return m_collection->size(); }
diff --git a/Plugins/Podio/include/Acts/Plugins/Podio/PodioTrackStateContainer.hpp b/Plugins/Podio/include/Acts/Plugins/Podio/PodioTrackStateContainer.hpp
index 60951942618..8322249a654 100644
--- a/Plugins/Podio/include/Acts/Plugins/Podio/PodioTrackStateContainer.hpp
+++ b/Plugins/Podio/include/Acts/Plugins/Podio/PodioTrackStateContainer.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2023 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
@@ -88,7 +88,7 @@ class PodioTrackStateContainerBase {
       case "typeFlags"_hash:
         return true;
       default:
-        return instance.m_dynamic.find(key) != instance.m_dynamic.end();
+        return instance.m_dynamic.contains(key);
     }
 
     return false;
@@ -166,7 +166,7 @@ class PodioTrackStateContainerBase {
       case "typeFlags"_hash:
         return true;
       default:
-        return instance.m_dynamic.find(key) != instance.m_dynamic.end();
+        return instance.m_dynamic.contains(key);
     }
   }
 
@@ -224,20 +224,17 @@ class ConstPodioTrackStateContainer final
     std::string paramsKey = "trackStateParameters" + s;
     std::string jacsKey = "trackStateJacobians" + s;
 
-    if (std::find(available.begin(), available.end(), trackStatesKey) ==
-        available.end()) {
+    if (!rangeContainsValue(available, trackStatesKey)) {
       throw std::runtime_error{"Track state collection '" + trackStatesKey +
                                "' not found in frame"};
     }
 
-    if (std::find(available.begin(), available.end(), paramsKey) ==
-        available.end()) {
+    if (!rangeContainsValue(available, paramsKey)) {
       throw std::runtime_error{"Track state parameters collection '" +
                                paramsKey + "' not found in frame"};
     }
 
-    if (std::find(available.begin(), available.end(), jacsKey) ==
-        available.end()) {
+    if (!rangeContainsValue(available, jacsKey)) {
       throw std::runtime_error{"Track state jacobian collection '" + jacsKey +
                                "' not found in frame"};
     }
diff --git a/Plugins/Podio/include/Acts/Plugins/Podio/PodioUtil.hpp b/Plugins/Podio/include/Acts/Plugins/Podio/PodioUtil.hpp
index 50a61059bba..8f6e0944ff1 100644
--- a/Plugins/Podio/include/Acts/Plugins/Podio/PodioUtil.hpp
+++ b/Plugins/Podio/include/Acts/Plugins/Podio/PodioUtil.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2023 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
diff --git a/Plugins/Podio/src/PodioUtil.cpp b/Plugins/Podio/src/PodioUtil.cpp
index 2fd73c0db3a..6518fcdff07 100644
--- a/Plugins/Podio/src/PodioUtil.cpp
+++ b/Plugins/Podio/src/PodioUtil.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2023 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include "Acts/Plugins/Podio//PodioUtil.hpp"
 
diff --git a/Plugins/TGeo/include/Acts/Plugins/TGeo/ITGeoDetectorElementSplitter.hpp b/Plugins/TGeo/include/Acts/Plugins/TGeo/ITGeoDetectorElementSplitter.hpp
index a0b3bd76571..9a59637bb35 100644
--- a/Plugins/TGeo/include/Acts/Plugins/TGeo/ITGeoDetectorElementSplitter.hpp
+++ b/Plugins/TGeo/include/Acts/Plugins/TGeo/ITGeoDetectorElementSplitter.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2021 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
diff --git a/Plugins/TGeo/include/Acts/Plugins/TGeo/ITGeoIdentifierProvider.hpp b/Plugins/TGeo/include/Acts/Plugins/TGeo/ITGeoIdentifierProvider.hpp
index 61352a653bb..842477dfc6a 100644
--- a/Plugins/TGeo/include/Acts/Plugins/TGeo/ITGeoIdentifierProvider.hpp
+++ b/Plugins/TGeo/include/Acts/Plugins/TGeo/ITGeoIdentifierProvider.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2019 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
diff --git a/Plugins/TGeo/include/Acts/Plugins/TGeo/TGeoCylinderDiscSplitter.hpp b/Plugins/TGeo/include/Acts/Plugins/TGeo/TGeoCylinderDiscSplitter.hpp
index 90d8cec92b9..24a21320619 100644
--- a/Plugins/TGeo/include/Acts/Plugins/TGeo/TGeoCylinderDiscSplitter.hpp
+++ b/Plugins/TGeo/include/Acts/Plugins/TGeo/TGeoCylinderDiscSplitter.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2021 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
diff --git a/Plugins/TGeo/include/Acts/Plugins/TGeo/TGeoDetectorElement.hpp b/Plugins/TGeo/include/Acts/Plugins/TGeo/TGeoDetectorElement.hpp
index 9b48baf30d1..73a3fb7e807 100644
--- a/Plugins/TGeo/include/Acts/Plugins/TGeo/TGeoDetectorElement.hpp
+++ b/Plugins/TGeo/include/Acts/Plugins/TGeo/TGeoDetectorElement.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2017-2019 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
diff --git a/Plugins/TGeo/include/Acts/Plugins/TGeo/TGeoLayerBuilder.hpp b/Plugins/TGeo/include/Acts/Plugins/TGeo/TGeoLayerBuilder.hpp
index faab2fd148e..8bd87122332 100644
--- a/Plugins/TGeo/include/Acts/Plugins/TGeo/TGeoLayerBuilder.hpp
+++ b/Plugins/TGeo/include/Acts/Plugins/TGeo/TGeoLayerBuilder.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2017-2018 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
diff --git a/Plugins/TGeo/include/Acts/Plugins/TGeo/TGeoMaterialConverter.hpp b/Plugins/TGeo/include/Acts/Plugins/TGeo/TGeoMaterialConverter.hpp
index a7d5721334a..566e40b32e2 100644
--- a/Plugins/TGeo/include/Acts/Plugins/TGeo/TGeoMaterialConverter.hpp
+++ b/Plugins/TGeo/include/Acts/Plugins/TGeo/TGeoMaterialConverter.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2023 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
diff --git a/Plugins/TGeo/include/Acts/Plugins/TGeo/TGeoParser.hpp b/Plugins/TGeo/include/Acts/Plugins/TGeo/TGeoParser.hpp
index 5c10a39a3ee..3a99a008819 100644
--- a/Plugins/TGeo/include/Acts/Plugins/TGeo/TGeoParser.hpp
+++ b/Plugins/TGeo/include/Acts/Plugins/TGeo/TGeoParser.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2020 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
diff --git a/Plugins/TGeo/include/Acts/Plugins/TGeo/TGeoPrimitivesHelper.hpp b/Plugins/TGeo/include/Acts/Plugins/TGeo/TGeoPrimitivesHelper.hpp
index 440b0feb5eb..45dede1f820 100644
--- a/Plugins/TGeo/include/Acts/Plugins/TGeo/TGeoPrimitivesHelper.hpp
+++ b/Plugins/TGeo/include/Acts/Plugins/TGeo/TGeoPrimitivesHelper.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2018-2020 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
diff --git a/Plugins/TGeo/include/Acts/Plugins/TGeo/TGeoSurfaceConverter.hpp b/Plugins/TGeo/include/Acts/Plugins/TGeo/TGeoSurfaceConverter.hpp
index ca6da28a308..d796e18830d 100644
--- a/Plugins/TGeo/include/Acts/Plugins/TGeo/TGeoSurfaceConverter.hpp
+++ b/Plugins/TGeo/include/Acts/Plugins/TGeo/TGeoSurfaceConverter.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2020 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
@@ -12,6 +12,7 @@
 
 #include <cmath>
 #include <memory>
+#include <numbers>
 #include <string>
 #include <tuple>
 
@@ -77,7 +78,7 @@ struct TGeoSurfaceConverter {
   /// Convert a TGeoShape to a Surface
   ///
   /// @param tgShape The TGeoShape
-  /// @param tgMatrix The matrix representing the tranbsform
+  /// @param tgMatrix The matrix representing the transform
   /// @param axes The axes definition
   /// @param scalor The unit scalor between TGeo and Acts
   ///
@@ -95,7 +96,7 @@ struct TGeoSurfaceConverter {
     if (degree > 180. && degree < 360.) {
       degree -= 360.;
     }
-    return degree / 180. * M_PI;
+    return degree / 180. * std::numbers::pi;
   }
 };
 
diff --git a/Plugins/TGeo/src/TGeoCylinderDiscSplitter.cpp b/Plugins/TGeo/src/TGeoCylinderDiscSplitter.cpp
index 007cc2b858b..4ad967d8c29 100644
--- a/Plugins/TGeo/src/TGeoCylinderDiscSplitter.cpp
+++ b/Plugins/TGeo/src/TGeoCylinderDiscSplitter.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2021 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include "Acts/Plugins/TGeo/TGeoCylinderDiscSplitter.hpp"
 
@@ -19,6 +19,7 @@
 
 #include <cmath>
 #include <cstdlib>
+#include <numbers>
 #include <utility>
 
 Acts::TGeoCylinderDiscSplitter::TGeoCylinderDiscSplitter(
@@ -54,7 +55,7 @@ Acts::TGeoCylinderDiscSplitter::split(
       ActsScalar discMinR = boundValues[Acts::RadialBounds::eMinR];
       ActsScalar discMaxR = boundValues[Acts::RadialBounds::eMaxR];
 
-      ActsScalar phiStep = 2 * M_PI / m_cfg.discPhiSegments;
+      ActsScalar phiStep = 2 * std::numbers::pi / m_cfg.discPhiSegments;
       ActsScalar cosPhiHalf = std::cos(0.5 * phiStep);
       ActsScalar sinPhiHalf = std::sin(0.5 * phiStep);
 
@@ -86,11 +87,11 @@ Acts::TGeoCylinderDiscSplitter::split(
 
         for (int im = 0; im < m_cfg.discPhiSegments; ++im) {
           // Get the moduleTransform
-          ActsScalar phi = -M_PI + im * phiStep;
-          auto tgTransform =
-              Transform3(Translation3(hR * std::cos(phi), hR * std::sin(phi),
-                                      discCenter.z()) *
-                         AngleAxis3(phi - 0.5 * M_PI, Vector3::UnitZ()));
+          ActsScalar phi = -std::numbers::pi + im * phiStep;
+          auto tgTransform = Transform3(
+              Translation3(hR * std::cos(phi), hR * std::sin(phi),
+                           discCenter.z()) *
+              AngleAxis3(phi - std::numbers::pi / 2., Vector3::UnitZ()));
 
           // Create a new detector element per split
           auto tgDetectorElement = std::make_shared<Acts::TGeoDetectorElement>(
@@ -120,7 +121,7 @@ Acts::TGeoCylinderDiscSplitter::split(
       ActsScalar cylinderHalfZ =
           boundValues[Acts::CylinderBounds::eHalfLengthZ];
 
-      ActsScalar phiStep = 2 * M_PI / m_cfg.cylinderPhiSegments;
+      ActsScalar phiStep = 2 * std::numbers::pi / m_cfg.cylinderPhiSegments;
       ActsScalar cosPhiHalf = std::cos(0.5 * phiStep);
       ActsScalar sinPhiHalf = std::sin(0.5 * phiStep);
 
@@ -151,7 +152,7 @@ Acts::TGeoCylinderDiscSplitter::split(
 
         for (int im = 0; im < m_cfg.cylinderPhiSegments; ++im) {
           // Get the moduleTransform
-          ActsScalar phi = -M_PI + im * phiStep;
+          ActsScalar phi = -std::numbers::pi + im * phiStep;
           ActsScalar cosPhi = std::cos(phi);
           ActsScalar sinPhi = std::sin(phi);
           ActsScalar planeX = planeR * cosPhi;
diff --git a/Plugins/TGeo/src/TGeoDetectorElement.cpp b/Plugins/TGeo/src/TGeoDetectorElement.cpp
index c9295ce8313..c6e32487ecd 100644
--- a/Plugins/TGeo/src/TGeoDetectorElement.cpp
+++ b/Plugins/TGeo/src/TGeoDetectorElement.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2017-2018 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include "Acts/Plugins/TGeo/TGeoDetectorElement.hpp"
 
diff --git a/Plugins/TGeo/src/TGeoLayerBuilder.cpp b/Plugins/TGeo/src/TGeoLayerBuilder.cpp
index 9476bca114a..73cd8bb25ec 100644
--- a/Plugins/TGeo/src/TGeoLayerBuilder.cpp
+++ b/Plugins/TGeo/src/TGeoLayerBuilder.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2017-2018 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include "Acts/Plugins/TGeo/TGeoLayerBuilder.hpp"
 
diff --git a/Plugins/TGeo/src/TGeoMaterialConverter.cpp b/Plugins/TGeo/src/TGeoMaterialConverter.cpp
index 9588d325942..675c79dcb75 100644
--- a/Plugins/TGeo/src/TGeoMaterialConverter.cpp
+++ b/Plugins/TGeo/src/TGeoMaterialConverter.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2023 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include "Acts/Plugins/TGeo/TGeoMaterialConverter.hpp"
 
diff --git a/Plugins/TGeo/src/TGeoParser.cpp b/Plugins/TGeo/src/TGeoParser.cpp
index 3e757fa75ae..422d47d1412 100644
--- a/Plugins/TGeo/src/TGeoParser.cpp
+++ b/Plugins/TGeo/src/TGeoParser.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2020 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include "Acts/Plugins/TGeo/TGeoParser.hpp"
 
diff --git a/Plugins/TGeo/src/TGeoPrimitivesHelper.cpp b/Plugins/TGeo/src/TGeoPrimitivesHelper.cpp
index 42874d62f25..ff743a542a8 100644
--- a/Plugins/TGeo/src/TGeoPrimitivesHelper.cpp
+++ b/Plugins/TGeo/src/TGeoPrimitivesHelper.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2020 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include "Acts/Plugins/TGeo/TGeoPrimitivesHelper.hpp"
 
diff --git a/Plugins/TGeo/src/TGeoSurfaceConverter.cpp b/Plugins/TGeo/src/TGeoSurfaceConverter.cpp
index 41653d92e1a..a00275f5231 100644
--- a/Plugins/TGeo/src/TGeoSurfaceConverter.cpp
+++ b/Plugins/TGeo/src/TGeoSurfaceConverter.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2020-2023 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include "Acts/Plugins/TGeo/TGeoSurfaceConverter.hpp"
 
@@ -27,6 +27,7 @@
 #include <cctype>
 #include <cstddef>
 #include <memory>
+#include <numbers>
 #include <stdexcept>
 #include <tuple>
 #include <utility>
@@ -87,14 +88,14 @@ Acts::TGeoSurfaceConverter::cylinderComponents(const TGeoShape& tgShape,
     double halfZ = tube->GetDz() * scalor;
     if (halfZ > deltaR) {
       transform = TGeoPrimitivesHelper::makeTransform(ax, ay, az, t);
-      double halfPhi = M_PI;
+      double halfPhi = std::numbers::pi;
       double avgPhi = 0.;
       // Check if it's a segment
       auto tubeSeg = dynamic_cast<const TGeoTubeSeg*>(tube);
       if (tubeSeg != nullptr) {
         double phi1 = toRadian(tubeSeg->GetPhi1());
         double phi2 = toRadian(tubeSeg->GetPhi2());
-        if (std::abs(phi2 - phi1) < M_PI * (1. - s_epsilon)) {
+        if (std::abs(phi2 - phi1) < std::numbers::pi * (1. - s_epsilon)) {
           if (!boost::starts_with(axes, "X")) {
             throw std::invalid_argument(
                 "TGeoShape -> CylinderSurface (sectorial): can only be "
@@ -176,7 +177,8 @@ Acts::TGeoSurfaceConverter::discComponents(const TGeoShape& tgShape,
             Vector2 ab = b - a;
             double phi = VectorHelpers::phi(ab);
 
-            if (std::abs(phi) > 3 * M_PI / 4. || std::abs(phi) < M_PI / 4.) {
+            if (std::abs(phi) > 3 * std::numbers::pi / 4. ||
+                std::abs(phi) < std::numbers::pi / 4.) {
               if (a.norm() < b.norm()) {
                 boundLines.push_back(std::make_pair(a, b));
               } else {
@@ -245,14 +247,14 @@ Acts::TGeoSurfaceConverter::discComponents(const TGeoShape& tgShape,
       double minR = tube->GetRmin() * scalor;
       double maxR = tube->GetRmax() * scalor;
       double halfZ = tube->GetDz() * scalor;
-      double halfPhi = M_PI;
+      double halfPhi = std::numbers::pi;
       double avgPhi = 0.;
       // Check if it's a segment
       auto tubeSeg = dynamic_cast<const TGeoTubeSeg*>(tube);
       if (tubeSeg != nullptr) {
         double phi1 = toRadian(tubeSeg->GetPhi1());
         double phi2 = toRadian(tubeSeg->GetPhi2());
-        if (std::abs(phi2 - phi1) < 2 * M_PI * (1. - s_epsilon)) {
+        if (std::abs(phi2 - phi1) < 2 * std::numbers::pi * (1. - s_epsilon)) {
           if (!boost::starts_with(axes, "X")) {
             throw std::invalid_argument(
                 "TGeoShape -> CylinderSurface (sectorial): can only be "
diff --git a/README.md b/README.md
index 6cb20bfbe6c..7b75acee190 100644
--- a/README.md
+++ b/README.md
@@ -4,7 +4,7 @@ or *A Common Tracking Software* if you do not like recursive acronyms
 
 [![10.5281/zenodo.5141418](https://zenodo.org/badge/DOI/10.5281/zenodo.5141418.svg)](https://doi.org/10.5281/zenodo.5141418)
 [![Chat on Mattermost](https://badgen.net/badge/chat/on%20mattermost/cyan)](https://mattermost.web.cern.ch/acts/)
-[![codecov](https://codecov.io/gh/acts-project/acts/graph/badge.svg)](https://codecov.io/gh/acts-project/acts)
+[![Coverage](https://sonarcloud.io/api/project_badges/measure?project=acts-project_acts&metric=coverage)](https://sonarcloud.io/summary/new_code?id=acts-project_acts)
 [![Latest release](https://badgen.net/github/release/acts-project/acts)](https://github.com/acts-project/acts/releases)
 [![Status](https://badgen.net/github/checks/acts-project/acts/main)](https://github.com/acts-project/acts/actions)
 [![Metrics](https://badgen.net/badge/metric/tracker/purple)](https://acts-project.github.io/metrics/)
diff --git a/Tests/Benchmarks/AnnulusBoundsBenchmark.cpp b/Tests/Benchmarks/AnnulusBoundsBenchmark.cpp
index 790437865a7..fcfddd42adb 100644
--- a/Tests/Benchmarks/AnnulusBoundsBenchmark.cpp
+++ b/Tests/Benchmarks/AnnulusBoundsBenchmark.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2017-2018 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include "Acts/Definitions/Algebra.hpp"
 #include "Acts/Definitions/Units.hpp"
diff --git a/Tests/Benchmarks/AtlasStepperBenchmark.cpp b/Tests/Benchmarks/AtlasStepperBenchmark.cpp
index 4a0e028fe27..2daebfba14b 100644
--- a/Tests/Benchmarks/AtlasStepperBenchmark.cpp
+++ b/Tests/Benchmarks/AtlasStepperBenchmark.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2017-2024 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include "Acts/Propagator/AtlasStepper.hpp"
 
diff --git a/Tests/Benchmarks/BinUtilityBenchmark.cpp b/Tests/Benchmarks/BinUtilityBenchmark.cpp
index 6c9abdf5e4d..251503e2f73 100644
--- a/Tests/Benchmarks/BinUtilityBenchmark.cpp
+++ b/Tests/Benchmarks/BinUtilityBenchmark.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2017-2019 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include "Acts/Tests/CommonHelpers/BenchmarkTools.hpp"
 #include "Acts/Utilities/BinUtility.hpp"
@@ -34,7 +34,7 @@ int main(int argc, char* argv[]) {
     po::store(po::parse_command_line(argc, argv, desc), vm);
     po::notify(vm);
 
-    if (vm.count("help") != 0u) {
+    if (vm.contains("help")) {
       std::cout << desc << std::endl;
       return 0;
     }
diff --git a/Tests/Benchmarks/BoundaryToleranceBenchmark.cpp b/Tests/Benchmarks/BoundaryToleranceBenchmark.cpp
index d6310a687ce..f18a32070be 100644
--- a/Tests/Benchmarks/BoundaryToleranceBenchmark.cpp
+++ b/Tests/Benchmarks/BoundaryToleranceBenchmark.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2017-2018 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include "Acts/Definitions/Algebra.hpp"
 #include "Acts/Definitions/Units.hpp"
diff --git a/Tests/Benchmarks/CMakeLists.txt b/Tests/Benchmarks/CMakeLists.txt
index 8906375caea..0edff123e9d 100644
--- a/Tests/Benchmarks/CMakeLists.txt
+++ b/Tests/Benchmarks/CMakeLists.txt
@@ -29,7 +29,7 @@ add_benchmark(SurfaceIntersection SurfaceIntersectionBenchmark.cpp)
 add_benchmark(RayFrustum RayFrustumBenchmark.cpp)
 add_benchmark(AnnulusBounds AnnulusBoundsBenchmark.cpp)
 add_benchmark(StraightLineStepper StraightLineStepperBenchmark.cpp)
-add_benchmark(QuickMath QuickMathBenchmark.cpp)
 add_benchmark(SympyStepper SympyStepperBenchmark.cpp)
 add_benchmark(Stepper StepperBenchmark.cpp)
 add_benchmark(SourceLink SourceLinkBenchmark.cpp)
+add_benchmark(TrackEdm TrackEdmBenchmark.cpp)
diff --git a/Tests/Benchmarks/EigenStepperBenchmark.cpp b/Tests/Benchmarks/EigenStepperBenchmark.cpp
index 4b15bad24fd..8b45bf1ef0e 100644
--- a/Tests/Benchmarks/EigenStepperBenchmark.cpp
+++ b/Tests/Benchmarks/EigenStepperBenchmark.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2017-2024 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include "Acts/Propagator/EigenStepper.hpp"
 
diff --git a/Tests/Benchmarks/QuickMathBenchmark.cpp b/Tests/Benchmarks/QuickMathBenchmark.cpp
deleted file mode 100644
index 9fe1aa75cfa..00000000000
--- a/Tests/Benchmarks/QuickMathBenchmark.cpp
+++ /dev/null
@@ -1,92 +0,0 @@
-// This file is part of the Acts project.
-//
-// Copyright (C) 2024 CERN for the benefit of the Acts project
-//
-// This Source Code Form is subject to the terms of the Mozilla Public
-// License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-#include <boost/test/data/test_case.hpp>
-#include <boost/test/unit_test.hpp>
-
-#include "Acts/Tests/CommonHelpers/BenchmarkTools.hpp"
-#include "Acts/Utilities/QuickMath.hpp"
-
-#include <cmath>
-#include <random>
-
-namespace bdata = boost::unit_test::data;
-
-namespace Acts::Test {
-
-/// @brief Another fast power function @see `fastPow`
-// Taken from
-// https://martin.ankerl.com/2007/02/11/optimized-exponential-functions-for-java
-/// @param a the base
-/// @param b the exponent
-constexpr double fastPowAnother(double a, double b) {
-  // enable only on IEEE 754
-  static_assert(std::numeric_limits<double>::is_iec559);
-
-  union {
-    double f;
-    std::int64_t i;
-  } u = {};
-
-  u.i = static_cast<std::int64_t>(
-      9076650 * (a - 1) / (a + 1 + 4 * std::sqrt(a)) * b + 1072632447);
-  u.i <<= 32;
-
-  // result seems broken?
-  return u.f;
-}
-
-// Some randomness & number crunching
-const unsigned int nTests = 10;
-const unsigned int nReps = 10000;
-
-BOOST_DATA_TEST_CASE(
-    benchmark_pow_25,
-    bdata::random(
-        (bdata::engine = std::mt19937(), bdata::seed = 21,
-         bdata::distribution = std::uniform_real_distribution<double>(-4, 4))) ^
-        bdata::xrange(nTests),
-    baseExp, index) {
-  (void)index;
-
-  const double base = std::pow(10, baseExp);
-  const double exp = 0.25;
-
-  std::cout << std::endl
-            << "Benchmarking base=" << base << ", exp=" << exp << "..."
-            << std::endl;
-  std::cout << "- void: "
-            << Acts::Test::microBenchmark([&] { return 0; }, nReps)
-            << std::endl;
-  std::cout << "- std::pow: "
-            << Acts::Test::microBenchmark([&] { return std::pow(base, exp); },
-                                          nReps)
-            << std::endl;
-  std::cout << "- std::exp: "
-            << Acts::Test::microBenchmark(
-                   [&] { return std::exp(std::log(base) * exp); }, nReps)
-            << std::endl;
-  std::cout << "- std::sqrt: "
-            << Acts::Test::microBenchmark(
-                   [&] { return std::sqrt(std::sqrt(base)); }, nReps)
-            << std::endl;
-  std::cout << "- fastPow: "
-            << Acts::Test::microBenchmark([&] { return fastPow(base, exp); },
-                                          nReps)
-            << std::endl;
-  std::cout << "- fastPowMorePrecise: "
-            << Acts::Test::microBenchmark(
-                   [&] { return fastPowMorePrecise(base, exp); }, nReps)
-            << std::endl;
-  std::cout << "- fastPowAnother: "
-            << Acts::Test::microBenchmark(
-                   [&] { return fastPowAnother(base, exp); }, nReps)
-            << std::endl;
-}
-
-}  // namespace Acts::Test
diff --git a/Tests/Benchmarks/RayFrustumBenchmark.cpp b/Tests/Benchmarks/RayFrustumBenchmark.cpp
index 261b199d05f..c5b666a5f23 100644
--- a/Tests/Benchmarks/RayFrustumBenchmark.cpp
+++ b/Tests/Benchmarks/RayFrustumBenchmark.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2017-2018 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include "Acts/Definitions/Algebra.hpp"
 #include "Acts/Definitions/Units.hpp"
@@ -19,6 +19,7 @@
 #include <functional>
 #include <iostream>
 #include <map>
+#include <numbers>
 #include <random>
 #include <vector>
 
@@ -38,7 +39,8 @@ int main(int /*argc*/, char** /*argv[]*/) {
   std::mt19937 rng(42);
   std::uniform_real_distribution<float> dir(0, 1);
   std::uniform_real_distribution<float> loc(-10, 10);
-  std::uniform_real_distribution<float> ang(M_PI / 10., M_PI / 4.);
+  std::uniform_real_distribution<float> ang(std::numbers::pi / 10.,
+                                            std::numbers::pi / 4.);
 
   Box testBox{nullptr, {0, 0, 0}, Box::Size{{1, 2, 3}}};
 
@@ -187,10 +189,10 @@ int main(int /*argc*/, char** /*argv[]*/) {
                      return {name, func(testBox, ray)};
                    });
 
-    bool all = std::all_of(results.begin(), results.end(),
-                           [](const auto& r) { return r.second; });
-    bool none = std::none_of(results.begin(), results.end(),
-                             [](const auto& r) { return r.second; });
+    bool all =
+        std::ranges::all_of(results, [](const auto& r) { return r.second; });
+    bool none =
+        std::ranges::none_of(results, [](const auto& r) { return r.second; });
 
     if (!all && !none) {
       std::cerr << "Discrepancy: " << std::endl;
@@ -351,7 +353,8 @@ int main(int /*argc*/, char** /*argv[]*/) {
         return result;
       };
 
-  std::vector<Frustum3> frustums{n, Frustum3{{0, 0, 0}, {1, 0, 0}, M_PI / 2.}};
+  std::vector<Frustum3> frustums{
+      n, Frustum3{{0, 0, 0}, {1, 0, 0}, std::numbers::pi / 2.}};
   std::generate(frustums.begin(), frustums.end(), [&]() {
     const Vector3F d{dir(rng), dir(rng), dir(rng)};
     const Vector3F l{loc(rng), loc(rng), loc(rng)};
@@ -369,10 +372,10 @@ int main(int /*argc*/, char** /*argv[]*/) {
                      return {name, func(testBox, fr)};
                    });
 
-    bool all = std::all_of(results.begin(), results.end(),
-                           [](const auto& r) { return r.second; });
-    bool none = std::none_of(results.begin(), results.end(),
-                             [](const auto& r) { return r.second; });
+    bool all =
+        std::ranges::all_of(results, [](const auto& r) { return r.second; });
+    bool none =
+        std::ranges::none_of(results, [](const auto& r) { return r.second; });
 
     if (!all && !none) {
       std::cerr << "Discrepancy: " << std::endl;
@@ -392,12 +395,12 @@ int main(int /*argc*/, char** /*argv[]*/) {
   std::size_t iters_per_run = 1000;
 
   std::vector<std::pair<std::string, Frustum3>> testFrusts = {
-      {"away", Frustum3{{0, 0, -10}, {0, 0, -1}, M_PI / 4.}},
-      {"towards", Frustum3{{0, 0, -10}, {0, 0, 1}, M_PI / 4.}},
-      {"left", Frustum3{{0, 0, -10}, {0, 1, 0}, M_PI / 4.}},
-      {"right", Frustum3{{0, 0, -10}, {0, -1, 0}, M_PI / 4.}},
-      {"up", Frustum3{{0, 0, -10}, {1, 0, 0}, M_PI / 4.}},
-      {"down", Frustum3{{0, 0, -10}, {-1, 0, 0}, M_PI / 4.}},
+      {"away", Frustum3{{0, 0, -10}, {0, 0, -1}, std::numbers::pi / 4.}},
+      {"towards", Frustum3{{0, 0, -10}, {0, 0, 1}, std::numbers::pi / 4.}},
+      {"left", Frustum3{{0, 0, -10}, {0, 1, 0}, std::numbers::pi / 4.}},
+      {"right", Frustum3{{0, 0, -10}, {0, -1, 0}, std::numbers::pi / 4.}},
+      {"up", Frustum3{{0, 0, -10}, {1, 0, 0}, std::numbers::pi / 4.}},
+      {"down", Frustum3{{0, 0, -10}, {-1, 0, 0}, std::numbers::pi / 4.}},
   };
 
   std::cout << "Run benchmarks: " << std::endl;
diff --git a/Tests/Benchmarks/SolenoidFieldBenchmark.cpp b/Tests/Benchmarks/SolenoidFieldBenchmark.cpp
index 30cc4e951b8..dca46a5e531 100644
--- a/Tests/Benchmarks/SolenoidFieldBenchmark.cpp
+++ b/Tests/Benchmarks/SolenoidFieldBenchmark.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2018 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include "Acts/Definitions/TrackParametrization.hpp"
 #include "Acts/Definitions/Units.hpp"
@@ -17,6 +17,7 @@
 #include <chrono>
 #include <fstream>
 #include <iostream>
+#include <numbers>
 #include <random>
 #include <string>
 
@@ -57,7 +58,8 @@ int main(int argc, char* argv[]) {
   std::minstd_rand rng;
   std::uniform_real_distribution<double> zDist(1.5 * (-L / 2.), 1.5 * L / 2.);
   std::uniform_real_distribution<double> rDist(0, R * 1.5);
-  std::uniform_real_distribution<double> phiDist(-M_PI, M_PI);
+  std::uniform_real_distribution<double> phiDist(-std::numbers::pi,
+                                                 std::numbers::pi);
   auto genPos = [&]() -> Acts::Vector3 {
     const double z = zDist(rng), r = rDist(rng), phi = phiDist(rng);
     return {r * std::cos(phi), r * std::sin(phi), z};
diff --git a/Tests/Benchmarks/SourceLinkBenchmark.cpp b/Tests/Benchmarks/SourceLinkBenchmark.cpp
index b65f89907e2..7d9c4c86681 100644
--- a/Tests/Benchmarks/SourceLinkBenchmark.cpp
+++ b/Tests/Benchmarks/SourceLinkBenchmark.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2024 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include "Acts/EventData/VectorMultiTrajectory.hpp"
 #include "Acts/Geometry/GeometryIdentifier.hpp"
@@ -43,10 +43,6 @@ class BenchmarkSourceLink final {
     return (lhs.geometryId() == rhs.geometryId()) &&
            (lhs.m_index == rhs.m_index);
   }
-  friend bool operator!=(const BenchmarkSourceLink& lhs,
-                         const BenchmarkSourceLink& rhs) {
-    return !(lhs == rhs);
-  }
 };
 
 int main(int /*argc*/, char** /*argv[]*/) {
@@ -66,13 +62,13 @@ int main(int /*argc*/, char** /*argv[]*/) {
   BenchmarkSourceLink bsl{gid, 1234};
 
   std::cout << "Creating source link" << std::endl;
-  auto source_link_construction = Acts::Test::microBenchmark(
+  auto sourceLinkConstruction = Acts::Test::microBenchmark(
       [&]() {
         SourceLink sl{bsl};
         return sl;
       },
       n);
-  std::cout << "  " << source_link_construction << std::endl;
+  std::cout << "  " << sourceLinkConstruction << std::endl;
 
   std::vector<SourceLink> inputs;
   inputs.reserve(n);
@@ -81,23 +77,23 @@ int main(int /*argc*/, char** /*argv[]*/) {
   }
 
   std::cout << "Copy construct source link" << std::endl;
-  auto copy_construct_source_link = Acts::Test::microBenchmark(
+  auto copyConstructSourceLink = Acts::Test::microBenchmark(
       [&](const SourceLink& input) {
         SourceLink copy{input};
         return copy;
       },
       inputs);
-  std::cout << copy_construct_source_link << std::endl;
+  std::cout << copyConstructSourceLink << std::endl;
 
   std::cout << "Copy then move construct source link" << std::endl;
-  auto copy_move_construct_source_link = Acts::Test::microBenchmark(
+  auto copyMoveConstructSourceLink = Acts::Test::microBenchmark(
       [&](const SourceLink& input) {
         SourceLink copy{input};
         SourceLink mv{std::move(copy)};
         return mv;
       },
       inputs);
-  std::cout << copy_move_construct_source_link << std::endl;
+  std::cout << copyMoveConstructSourceLink << std::endl;
 
   std::cout << "Optional assignment" << std::endl;
   auto opt_assignment = Acts::Test::microBenchmark(
@@ -122,7 +118,7 @@ int main(int /*argc*/, char** /*argv[]*/) {
   std::cout << create_track_state << std::endl;
 
   std::cout << "Assign source link to track state" << std::endl;
-  auto assign_source_link = Acts::Test::microBenchmark(
+  auto assignSourceLink = Acts::Test::microBenchmark(
       [&]() {
         SourceLink sl{bsl};
         auto ts = mtj.makeTrackState(TrackStatePropMask::None);
@@ -130,7 +126,7 @@ int main(int /*argc*/, char** /*argv[]*/) {
         return ts;
       },
       n / 10);
-  std::cout << assign_source_link << std::endl;
+  std::cout << assignSourceLink << std::endl;
 
   return 0;
 }
diff --git a/Tests/Benchmarks/StepperBenchmark.cpp b/Tests/Benchmarks/StepperBenchmark.cpp
index bfa21d76450..c68a5ec87b3 100644
--- a/Tests/Benchmarks/StepperBenchmark.cpp
+++ b/Tests/Benchmarks/StepperBenchmark.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2017-2024 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include "Acts/MagneticField/MagneticFieldProvider.hpp"
 #include "Acts/Propagator/AtlasStepper.hpp"
diff --git a/Tests/Benchmarks/StepperBenchmarkCommons.hpp b/Tests/Benchmarks/StepperBenchmarkCommons.hpp
index 3fc6d361bef..206f1479837 100644
--- a/Tests/Benchmarks/StepperBenchmarkCommons.hpp
+++ b/Tests/Benchmarks/StepperBenchmarkCommons.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2024 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
@@ -54,7 +54,7 @@ struct BenchmarkStepper {
       po::store(po::parse_command_line(argc, argv, desc), vm);
       po::notify(vm);
 
-      if (vm.count("help") != 0u) {
+      if (vm.contains("help")) {
         std::cout << desc << std::endl;
         return 0;
       }
diff --git a/Tests/Benchmarks/StraightLineStepperBenchmark.cpp b/Tests/Benchmarks/StraightLineStepperBenchmark.cpp
index bd449c9942f..05483620312 100644
--- a/Tests/Benchmarks/StraightLineStepperBenchmark.cpp
+++ b/Tests/Benchmarks/StraightLineStepperBenchmark.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2024 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include "Acts/Propagator/StraightLineStepper.hpp"
 
diff --git a/Tests/Benchmarks/SurfaceIntersectionBenchmark.cpp b/Tests/Benchmarks/SurfaceIntersectionBenchmark.cpp
index 0ae8ecba92e..4d92589bd66 100644
--- a/Tests/Benchmarks/SurfaceIntersectionBenchmark.cpp
+++ b/Tests/Benchmarks/SurfaceIntersectionBenchmark.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2019 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include <boost/test/data/test_case.hpp>
 #include <boost/test/unit_test.hpp>
@@ -21,6 +21,7 @@
 #include "Acts/Tests/CommonHelpers/BenchmarkTools.hpp"
 
 #include <cmath>
+#include <numbers>
 #include <random>
 
 namespace bdata = boost::unit_test::data;
@@ -88,8 +89,8 @@ MicroBenchmarkResult intersectionTest(const surface_t& surface, double phi,
 BOOST_DATA_TEST_CASE(
     benchmark_surface_intersections,
     bdata::random((bdata::engine = std::mt19937(), bdata::seed = 21,
-                   bdata::distribution =
-                       std::uniform_real_distribution<double>(-M_PI, M_PI))) ^
+                   bdata::distribution = std::uniform_real_distribution<double>(
+                       -std::numbers::pi, std::numbers::pi))) ^
         bdata::random((bdata::engine = std::mt19937(), bdata::seed = 22,
                        bdata::distribution =
                            std::uniform_real_distribution<double>(-0.3, 0.3))) ^
@@ -116,7 +117,8 @@ BOOST_DATA_TEST_CASE(
   }
   if (testStraw) {
     std::cout << "- Straw: "
-              << intersectionTest<StrawSurface>(*aStraw, phi, theta + M_PI)
+              << intersectionTest<StrawSurface>(*aStraw, phi,
+                                                theta + std::numbers::pi)
               << std::endl;
   }
 }
diff --git a/Tests/Benchmarks/SympyStepperBenchmark.cpp b/Tests/Benchmarks/SympyStepperBenchmark.cpp
index bdc76655886..830244bb7dc 100644
--- a/Tests/Benchmarks/SympyStepperBenchmark.cpp
+++ b/Tests/Benchmarks/SympyStepperBenchmark.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2024 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include "Acts/Propagator/SympyStepper.hpp"
 
diff --git a/Tests/Benchmarks/TrackEdmBenchmark.cpp b/Tests/Benchmarks/TrackEdmBenchmark.cpp
new file mode 100644
index 00000000000..b063254e154
--- /dev/null
+++ b/Tests/Benchmarks/TrackEdmBenchmark.cpp
@@ -0,0 +1,184 @@
+// This file is part of the ACTS project.
+//
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
+//
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
+
+#include "Acts/EventData/SubspaceHelpers.hpp"
+#include "Acts/EventData/TrackContainer.hpp"
+#include "Acts/EventData/TrackStatePropMask.hpp"
+#include "Acts/EventData/TrackStateType.hpp"
+#include "Acts/EventData/VectorMultiTrajectory.hpp"
+#include "Acts/EventData/VectorTrackContainer.hpp"
+#include "Acts/EventData/detail/GenerateParameters.hpp"
+#include "Acts/Geometry/GeometryIdentifier.hpp"
+#include "Acts/Surfaces/PerigeeSurface.hpp"
+#include "Acts/Surfaces/PlaneSurface.hpp"
+#include "Acts/Surfaces/RectangleBounds.hpp"
+#include "Acts/Utilities/TrackHelpers.hpp"
+
+#include <iostream>
+#include <numeric>
+#include <random>
+#include <type_traits>
+
+using namespace Acts;
+
+class BenchmarkSourceLink final {
+ public:
+  using Index = std::uint32_t;
+
+  /// Construct from geometry identifier and index.
+  constexpr BenchmarkSourceLink(Acts::GeometryIdentifier gid, Index idx)
+      : m_geometryId(gid), m_index(idx) {}
+
+  BenchmarkSourceLink() = default;
+  BenchmarkSourceLink(const BenchmarkSourceLink&) = default;
+  BenchmarkSourceLink(BenchmarkSourceLink&&) = default;
+  BenchmarkSourceLink& operator=(const BenchmarkSourceLink&) = default;
+  BenchmarkSourceLink& operator=(BenchmarkSourceLink&&) = default;
+
+  /// Access the index.
+  constexpr Index index() const { return m_index; }
+
+  Acts::GeometryIdentifier geometryId() const { return m_geometryId; }
+
+ private:
+  Acts::GeometryIdentifier m_geometryId;
+  Index m_index = 0;
+
+  friend bool operator==(const BenchmarkSourceLink& lhs,
+                         const BenchmarkSourceLink& rhs) {
+    return (lhs.geometryId() == rhs.geometryId()) &&
+           (lhs.m_index == rhs.m_index);
+  }
+};
+
+int main(int /*argc*/, char** /*argv[]*/) {
+  std::size_t runs = 1000000;
+  std::size_t nTracks = 10000;
+
+  VectorMultiTrajectory mtj;
+  VectorTrackContainer vtc;
+  TrackContainer tc{vtc, mtj};
+
+  VectorMultiTrajectory mtjOut;
+  VectorTrackContainer vtcOut;
+  TrackContainer output{vtcOut, mtjOut};
+
+  GeometryIdentifier gid;
+  gid.setVolume(5);
+  gid.setLayer(3);
+  gid.setSensitive(1);
+
+  static_assert(sizeof(BenchmarkSourceLink) <= ACTS_SOURCELINK_SBO_SIZE);
+
+  static_assert(std::is_trivially_move_constructible_v<BenchmarkSourceLink>);
+
+  std::uniform_int_distribution<> nStatesDist(1, 20);
+  std::uniform_int_distribution<> measDimDist(1, 3);
+  std::uniform_real_distribution<> typeDist(0, 1);
+  std::uniform_real_distribution<> copyDist(0, 1);
+  std::mt19937 rng{42};
+
+  std::vector<std::shared_ptr<Surface>> surfaces;
+  std::vector<std::pair<BoundVector, BoundMatrix>> parametersVector;
+  for (std::size_t s = 0; s < 50; ++s) {
+    surfaces.push_back(Surface::makeShared<PlaneSurface>(
+        Transform3::Identity(), std::make_shared<RectangleBounds>(50, 50)));
+
+    parametersVector.push_back(
+        detail::Test::generateBoundParametersCovariance(rng, {}));
+  }
+
+  std::size_t nSurface = 0;
+  auto surface = [&]() {
+    nSurface++;
+    return surfaces.at(nSurface % surfaces.size());
+  };
+
+  std::size_t nParams = 0;
+  auto parameters = [&]() -> const std::pair<BoundVector, BoundMatrix>& {
+    nParams++;
+    return parametersVector.at(nParams % parametersVector.size());
+  };
+
+  auto perigee = Surface::makeShared<PerigeeSurface>(Vector3::Zero());
+
+  std::cout << "Creating " << nTracks << " tracks x " << runs << " runs"
+            << std::endl;
+  for (std::size_t r = 0; r < runs; ++r) {
+    tc.clear();
+    for (std::size_t i = 0; i < nTracks; ++i) {
+      auto track = tc.makeTrack();
+
+      std::size_t nStates = nStatesDist(rng);
+
+      for (std::size_t j = 0; j < nStates; ++j) {
+        auto trackState = track.appendTrackState(TrackStatePropMask::All);
+        trackState.setReferenceSurface(surface());
+
+        trackState.jacobian().setZero();
+        trackState.jacobian().row(j % eBoundSize).setOnes();
+
+        double crit = typeDist(rng);
+
+        if (crit < 0.1) {
+          // hole
+          trackState.typeFlags().set(TrackStateFlag::HoleFlag);
+        } else if (crit < 0.2) {
+          // material
+          trackState.typeFlags().set(TrackStateFlag::MaterialFlag);
+        } else {
+          BenchmarkSourceLink bsl{gid, 123};
+          trackState.allocateCalibrated(measDimDist(rng));
+
+          const auto& [predicted, covariance] = parameters();
+          trackState.predicted() = predicted;
+          trackState.predictedCovariance() = covariance;
+
+          visit_measurement(
+              trackState.calibratedSize(),
+              [&]<std::size_t N>(std::integral_constant<std::size_t, N> /*d*/) {
+                trackState.calibrated<N>().setOnes();
+                trackState.calibratedCovariance<N>().setIdentity();
+
+                std::array<std::uint8_t, eBoundSize> indices{0};
+                std::iota(indices.begin(), indices.end(), 0);
+                trackState.setBoundSubspaceIndices(indices);
+              });
+
+          trackState.typeFlags().set(TrackStateFlag::MeasurementFlag);
+          if (crit < 0.4) {
+            // outlier
+            trackState.typeFlags().set(TrackStateFlag::OutlierFlag);
+          }
+        }
+      }
+
+      track.setReferenceSurface(perigee);
+
+      const auto& [ref, cov] = parameters();
+      track.parameters() = ref;
+      track.covariance() = cov;
+
+      track.linkForward();
+
+      calculateTrackQuantities(track);
+    }
+
+    for (const auto& track : tc) {
+      if (copyDist(rng) > 0.1) {
+        // copy only 10% of tracks
+        continue;
+      }
+
+      auto target = output.makeTrack();
+      target.copyFrom(track);
+    }
+  }
+
+  return 0;
+}
diff --git a/Tests/CommonHelpers/Acts/Tests/CommonHelpers/Assertions.hpp b/Tests/CommonHelpers/Acts/Tests/CommonHelpers/Assertions.hpp
index 6cc28348c35..3fee5af18ae 100644
--- a/Tests/CommonHelpers/Acts/Tests/CommonHelpers/Assertions.hpp
+++ b/Tests/CommonHelpers/Acts/Tests/CommonHelpers/Assertions.hpp
@@ -1,24 +1,24 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2020 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
 #include <boost/test/unit_test.hpp>
 
+#include <algorithm>
 #include <vector>
 
-#define CHECK_NE_COLLECTIONS(col1, col2)                                       \
-  do {                                                                         \
-    BOOST_CHECK_EQUAL(col1.size(), col2.size());                               \
-    std::vector<bool> result;                                                  \
-    for (std::size_t i = 0; i < col1.size(); i++) {                            \
-      result.push_back(col1[i] == col2[i]);                                    \
-    }                                                                          \
-    BOOST_CHECK(                                                               \
-        !std::all_of(result.begin(), result.end(), [](bool r) { return r; })); \
+#define CHECK_NE_COLLECTIONS(col1, col2)                                 \
+  do {                                                                   \
+    BOOST_CHECK_EQUAL(col1.size(), col2.size());                         \
+    std::vector<bool> result;                                            \
+    for (std::size_t i = 0; i < col1.size(); i++) {                      \
+      result.push_back(col1[i] == col2[i]);                              \
+    }                                                                    \
+    BOOST_CHECK(!std::ranges::all_of(result, [](bool r) { return r; })); \
   } while (0)
diff --git a/Tests/CommonHelpers/Acts/Tests/CommonHelpers/BenchmarkTools.hpp b/Tests/CommonHelpers/Acts/Tests/CommonHelpers/BenchmarkTools.hpp
index a53eba2f3f0..4988150c735 100644
--- a/Tests/CommonHelpers/Acts/Tests/CommonHelpers/BenchmarkTools.hpp
+++ b/Tests/CommonHelpers/Acts/Tests/CommonHelpers/BenchmarkTools.hpp
@@ -1,20 +1,19 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2019-2020 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
-#include "Acts/Utilities/TypeTraits.hpp"
-
 #include <algorithm>
 #include <cassert>
 #include <chrono>
 #include <cmath>
 #include <iomanip>
+#include <numbers>
 #include <numeric>
 #include <ostream>
 #include <type_traits>
@@ -235,7 +234,7 @@ struct MicroBenchmarkResult {
   // Sorted benchmark run times, used for computing outlier-robust statistics
   std::vector<Duration> sortedRunTimes() const {
     std::vector<Duration> sorted_timings = run_timings;
-    std::sort(sorted_timings.begin(), sorted_timings.end());
+    std::ranges::sort(sorted_timings);
     return sorted_timings;
   }
 
@@ -301,7 +300,8 @@ struct MicroBenchmarkResult {
   //
   Duration runTimeRobustStddev() const {
     auto [firstq, thirdq] = runTimeQuartiles();
-    return (thirdq - firstq) / (2. * std::sqrt(2.) * 0.4769362762044698733814);
+    return (thirdq - firstq) /
+           (2. * std::numbers::sqrt2 * 0.4769362762044698733814);
   }
 
   // Standard error on the median benchmark run time
@@ -392,14 +392,11 @@ using call_without_input_t = decltype(std::declval<T>()());
 // this specialization will be selected...
 template <typename Callable, typename Input = void>
 struct MicroBenchmarkIter {
-  constexpr static bool is_callable =
-      Concepts ::exists<call_with_input_t, Callable, Input>;
-  static inline void iter(const Callable& iteration, const Input* input) {
-    static_assert(is_callable, "Gave callable that is not callable with input");
-    if constexpr (is_callable) {
-      using Result = std::invoke_result_t<Callable, const Input&>;
-      MicroBenchmarkIterImpl<Callable, Input, Result>::iter(iteration, *input);
-    }
+  static inline void iter(const Callable& iteration, const Input* input)
+    requires std::invocable<Callable, Input>
+  {
+    using Result = std::invoke_result_t<Callable, const Input&>;
+    MicroBenchmarkIterImpl<Callable, Input, Result>::iter(iteration, *input);
   }
 };
 
@@ -407,17 +404,12 @@ struct MicroBenchmarkIter {
 // picked instead of the one above...
 template <typename Callable>
 struct MicroBenchmarkIter<Callable, void> {
-  constexpr static bool is_callable =
-      Concepts ::exists<call_without_input_t, Callable>;
-
   static inline void iter(const Callable& iteration,
-                          const void* /*input*/ = nullptr) {
-    static_assert(is_callable,
-                  "Gave callable that is not callable without input");
-    if constexpr (is_callable) {
-      using Result = std::invoke_result_t<Callable>;
-      MicroBenchmarkIterImpl<Callable, void, Result>::iter(iteration);
-    }
+                          const void* /*input*/ = nullptr)
+    requires std::invocable<Callable>
+  {
+    using Result = std::invoke_result_t<Callable>;
+    MicroBenchmarkIterImpl<Callable, void, Result>::iter(iteration);
   }
 };
 
diff --git a/Tests/CommonHelpers/Acts/Tests/CommonHelpers/CubicTrackingGeometry.hpp b/Tests/CommonHelpers/Acts/Tests/CommonHelpers/CubicTrackingGeometry.hpp
index c0165d38164..55793113d99 100644
--- a/Tests/CommonHelpers/Acts/Tests/CommonHelpers/CubicTrackingGeometry.hpp
+++ b/Tests/CommonHelpers/Acts/Tests/CommonHelpers/CubicTrackingGeometry.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2016-2018 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
diff --git a/Tests/CommonHelpers/Acts/Tests/CommonHelpers/CylindricalDetector.cpp b/Tests/CommonHelpers/Acts/Tests/CommonHelpers/CylindricalDetector.cpp
new file mode 100644
index 00000000000..7ab854d4e65
--- /dev/null
+++ b/Tests/CommonHelpers/Acts/Tests/CommonHelpers/CylindricalDetector.cpp
@@ -0,0 +1,115 @@
+// This file is part of the ACTS project.
+//
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
+//
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
+
+#include "Acts/Tests/CommonHelpers/CylindricalDetector.hpp"
+
+#include "Acts/Detector/CylindricalContainerBuilder.hpp"
+#include "Acts/Detector/DetectorBuilder.hpp"
+#include "Acts/Detector/DetectorComponents.hpp"
+#include "Acts/Detector/DetectorVolume.hpp"
+#include "Acts/Detector/GeometryIdGenerator.hpp"
+#include "Acts/Geometry/CylinderVolumeBounds.hpp"
+#include "Acts/Geometry/GeometryContext.hpp"
+#include "Acts/Material/BinnedSurfaceMaterial.hpp"
+#include "Acts/Material/HomogeneousSurfaceMaterial.hpp"
+#include "Acts/Material/Material.hpp"
+#include "Acts/Material/MaterialSlab.hpp"
+#include "Acts/Navigation/DetectorVolumeFinders.hpp"
+#include "Acts/Navigation/InternalNavigation.hpp"
+#include "Acts/Surfaces/CylinderBounds.hpp"
+#include "Acts/Surfaces/CylinderSurface.hpp"
+#include "Acts/Surfaces/DiscSurface.hpp"
+#include "Acts/Surfaces/RadialBounds.hpp"
+
+#include <memory>
+
+auto materialSlab =
+    Acts::MaterialSlab(Acts::Material::fromMolarDensity(1, 2, 3, 4, 5), 1.);
+
+using namespace Acts;
+using namespace Acts::Experimental;
+
+std::shared_ptr<const Detector> Acts::Test::buildCylindricalDetector(
+    const Acts::GeometryContext& tContext) {
+  auto material =
+      std::make_shared<const HomogeneousSurfaceMaterial>(materialSlab);
+
+  auto beampipe = std::make_shared<
+      CylindricalVolumeBuilder<CylinderSurface, CylinderBounds>>(
+      Transform3::Identity(), CylinderVolumeBounds(0., 50., 400.),
+      CylinderBounds(25., 380.), "BeamPipe", material);
+
+  // Declare a negative disc builder
+  Transform3 negZ = Transform3::Identity();
+  negZ.pretranslate(Vector3(0., 0., -300.));
+  auto endcapN =
+      std::make_shared<CylindricalVolumeBuilder<DiscSurface, RadialBounds>>(
+          negZ, CylinderVolumeBounds(50., 140., 100.), RadialBounds(60., 120.),
+          "NegativeEndcap", material);
+
+  // Declare a barrel sub builder
+  auto barrel0 = std::make_shared<
+      CylindricalVolumeBuilder<CylinderSurface, CylinderBounds>>(
+      Transform3::Identity(), CylinderVolumeBounds(50., 80., 200.),
+      CylinderBounds(65., 180.), "Barrel0", material);
+
+  // Declare a barrel sub builder
+  auto barrel1 = std::make_shared<
+      CylindricalVolumeBuilder<CylinderSurface, CylinderBounds>>(
+      Transform3::Identity(), CylinderVolumeBounds(80., 110., 200.),
+      CylinderBounds(95., 180.), "Barrel1", material);
+
+  // Declare a barrel sub builder
+  auto barrel2 = std::make_shared<
+      CylindricalVolumeBuilder<CylinderSurface, CylinderBounds>>(
+      Transform3::Identity(), CylinderVolumeBounds(110., 140., 200.),
+      CylinderBounds(125., 180.), "Barrel2", material);
+
+  // Create the barrel container builder
+  CylindricalContainerBuilder::Config barrelRCfg;
+  barrelRCfg.builders = {barrel0, barrel1, barrel2};
+  barrelRCfg.binning = {BinningValue::binR};
+
+  auto barrel = std::make_shared<CylindricalContainerBuilder>(
+      barrelRCfg, getDefaultLogger("BarrelBuilderR", Logging::INFO));
+
+  Transform3 posZ = Transform3::Identity();
+  posZ.pretranslate(Vector3(0., 0., 300.));
+  auto endcapP =
+      std::make_shared<CylindricalVolumeBuilder<DiscSurface, RadialBounds>>(
+          posZ, CylinderVolumeBounds(50., 140., 100.), RadialBounds(60., 120.),
+          "PositiveEndcap", material);
+
+  // Create the barrel container builder
+  CylindricalContainerBuilder::Config barrelEndcapCfg;
+  barrelEndcapCfg.builders = {endcapN, barrel, endcapP};
+  barrelEndcapCfg.binning = {BinningValue::binZ};
+
+  auto barrelEndcap = std::make_shared<CylindricalContainerBuilder>(
+      barrelEndcapCfg, getDefaultLogger("BarrelEndcapBuilder", Logging::INFO));
+
+  // Create the barrel container builder
+  CylindricalContainerBuilder::Config detectorCfg;
+  detectorCfg.builders = {beampipe, barrelEndcap};
+  detectorCfg.binning = {BinningValue::binR};
+
+  auto containerBuilder = std::make_shared<CylindricalContainerBuilder>(
+      detectorCfg, getDefaultLogger("DetectorBuilder", Logging::INFO));
+
+  // Detector builder
+  auto gigConfig = GeometryIdGenerator::Config();
+  auto gig = std::make_shared<GeometryIdGenerator>(gigConfig);
+
+  Acts::Experimental::DetectorBuilder::Config dCfg;
+  dCfg.auxiliary = "*** Test : Cylindrical Detector ***";
+  dCfg.name = "CylindricalDetector";
+  dCfg.builder = containerBuilder;
+  dCfg.geoIdGenerator = gig;
+
+  return DetectorBuilder(dCfg).construct(tContext);
+}
diff --git a/Tests/CommonHelpers/Acts/Tests/CommonHelpers/CylindricalDetector.hpp b/Tests/CommonHelpers/Acts/Tests/CommonHelpers/CylindricalDetector.hpp
new file mode 100644
index 00000000000..0bceb098f6f
--- /dev/null
+++ b/Tests/CommonHelpers/Acts/Tests/CommonHelpers/CylindricalDetector.hpp
@@ -0,0 +1,91 @@
+// This file is part of the ACTS project.
+//
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
+//
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
+
+#pragma once
+
+#include "Acts/Definitions/Algebra.hpp"
+#include "Acts/Detector/DetectorComponents.hpp"
+#include "Acts/Detector/DetectorVolume.hpp"
+#include "Acts/Detector/PortalGenerators.hpp"
+#include "Acts/Detector/interface/IDetectorComponentBuilder.hpp"
+#include "Acts/Geometry/CylinderVolumeBounds.hpp"
+#include "Acts/Navigation/DetectorVolumeFinders.hpp"
+#include "Acts/Navigation/InternalNavigation.hpp"
+
+#include <memory>
+#include <string>
+
+namespace Acts {
+
+class ISurfaceMaterial;
+
+using namespace Experimental;
+
+namespace Test {
+
+/// @brief A mockup volume builder, it generates volumes with
+/// a single surface filled in in order to use the CylindricalContainerBuilder
+/// infrastructure.
+template <typename surface_type, typename surface_bounds_type>
+class CylindricalVolumeBuilder : public IDetectorComponentBuilder {
+ public:
+  CylindricalVolumeBuilder(
+      const Transform3& transform, const CylinderVolumeBounds& vBounds,
+      const surface_bounds_type& sBounds, const std::string& vName,
+      std::shared_ptr<const ISurfaceMaterial> material = nullptr)
+      : IDetectorComponentBuilder(),
+        m_transform(transform),
+        m_volumeBounds(vBounds),
+        m_surfaceBounds(sBounds),
+        m_name(vName),
+        m_material(std::move(material)) {}
+
+  DetectorComponent construct(
+      [[maybe_unused]] const GeometryContext& gctx) const final {
+    // The outgoing root volumes
+    std::vector<std::shared_ptr<DetectorVolume>> rootVolumes;
+
+    // Ingredients
+    auto surface = Surface::makeShared<surface_type>(
+        (m_transform), std::make_shared<surface_bounds_type>(m_surfaceBounds));
+    surface->assignSurfaceMaterial(m_material);
+
+    auto bounds = std::make_unique<CylinderVolumeBounds>(m_volumeBounds);
+    auto portalGenerator = defaultPortalGenerator();
+    auto volume = DetectorVolumeFactory::construct(
+        portalGenerator, gctx, m_name, m_transform, std::move(bounds),
+        {surface}, {}, tryNoVolumes(), tryAllPortalsAndSurfaces());
+
+    // Add to the roots
+    rootVolumes.push_back(volume);
+
+    DetectorComponent::PortalContainer dContainer;
+    for (auto [ip, p] : enumerate(volume->portalPtrs())) {
+      dContainer[ip] = p;
+    }
+    return DetectorComponent{
+        {volume},
+        dContainer,
+        RootDetectorVolumes{rootVolumes, tryRootVolumes()}};
+  }
+
+ private:
+  Transform3 m_transform;
+  CylinderVolumeBounds m_volumeBounds;
+  surface_bounds_type m_surfaceBounds;
+  std::string m_name;
+  std::shared_ptr<const ISurfaceMaterial> m_material = nullptr;
+};
+
+/// @brief A mockup container builder, it generates a container with
+/// serval cylindrical volumes in it.
+std::shared_ptr<const Detector> buildCylindricalDetector(
+    const GeometryContext& tContext);
+
+}  // namespace Test
+}  // namespace Acts
diff --git a/Tests/CommonHelpers/Acts/Tests/CommonHelpers/CylindricalTrackingGeometry.hpp b/Tests/CommonHelpers/Acts/Tests/CommonHelpers/CylindricalTrackingGeometry.hpp
index b13c4843baf..a37bbcb1e8f 100644
--- a/Tests/CommonHelpers/Acts/Tests/CommonHelpers/CylindricalTrackingGeometry.hpp
+++ b/Tests/CommonHelpers/Acts/Tests/CommonHelpers/CylindricalTrackingGeometry.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2017-2018 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
@@ -36,6 +36,7 @@
 #include "Acts/Tests/CommonHelpers/PredefinedMaterials.hpp"
 
 #include <functional>
+#include <numbers>
 #include <vector>
 
 namespace Acts::Test {
@@ -88,15 +89,15 @@ struct CylindricalTrackingGeometry {
                                                   moduleHalfXmaxY, moduleHalfY);
     }
 
-    double phiStep = 2 * M_PI / nPhi;
+    double phiStep = 2 * std::numbers::pi / nPhi;
 
     for (int im = 0; im < nPhi; ++im) {
       // Get the moduleTransform
-      double phi = -M_PI + im * phiStep;
+      double phi = -std::numbers::pi + im * phiStep;
       auto mModuleTransform = Transform3(
           Translation3(ringRadius * std::cos(phi), ringRadius * std::sin(phi),
                        ringZ + (im % 2) * zStagger) *
-          AngleAxis3(phi - 0.5 * M_PI, Vector3::UnitZ()) *
+          AngleAxis3(phi - std::numbers::pi / 2., Vector3::UnitZ()) *
           AngleAxis3(moduleTilt, Vector3::UnitY()));
 
       // Create the detector element
@@ -186,8 +187,8 @@ struct CylindricalTrackingGeometry {
     std::vector<Vector3> mPositions;
     mPositions.reserve(nPhiBins * nZbins);
     // prep work
-    double phiStep = 2 * M_PI / (nPhiBins);
-    double minPhi = -M_PI + 0.5 * phiStep;
+    double phiStep = 2 * std::numbers::pi / (nPhiBins);
+    double minPhi = -std::numbers::pi + phiStep / 2.;
     double zStart = -0.5 * (nZbins - 1) * (2 * moduleHalfLength - lOverlap);
     double zStep = 2 * std::abs(zStart) / (nZbins - 1);
     // loop over the bins
diff --git a/Tests/CommonHelpers/Acts/Tests/CommonHelpers/DataDirectory.cpp b/Tests/CommonHelpers/Acts/Tests/CommonHelpers/DataDirectory.cpp
index e3c029730e5..de2770d4c4a 100644
--- a/Tests/CommonHelpers/Acts/Tests/CommonHelpers/DataDirectory.cpp
+++ b/Tests/CommonHelpers/Acts/Tests/CommonHelpers/DataDirectory.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2020 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include "Acts/Tests/CommonHelpers/DataDirectory.hpp"
 
diff --git a/Tests/CommonHelpers/Acts/Tests/CommonHelpers/DataDirectory.hpp b/Tests/CommonHelpers/Acts/Tests/CommonHelpers/DataDirectory.hpp
index 378abb4f697..169135c85e4 100644
--- a/Tests/CommonHelpers/Acts/Tests/CommonHelpers/DataDirectory.hpp
+++ b/Tests/CommonHelpers/Acts/Tests/CommonHelpers/DataDirectory.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2020 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
diff --git a/Tests/CommonHelpers/Acts/Tests/CommonHelpers/DetectorElementStub.hpp b/Tests/CommonHelpers/Acts/Tests/CommonHelpers/DetectorElementStub.hpp
index 2aa26de3998..4f6b0d5ce79 100644
--- a/Tests/CommonHelpers/Acts/Tests/CommonHelpers/DetectorElementStub.hpp
+++ b/Tests/CommonHelpers/Acts/Tests/CommonHelpers/DetectorElementStub.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2017-2018 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
diff --git a/Tests/CommonHelpers/Acts/Tests/CommonHelpers/FloatComparisons.hpp b/Tests/CommonHelpers/Acts/Tests/CommonHelpers/FloatComparisons.hpp
index e6b9550e728..d84b0228d0d 100644
--- a/Tests/CommonHelpers/Acts/Tests/CommonHelpers/FloatComparisons.hpp
+++ b/Tests/CommonHelpers/Acts/Tests/CommonHelpers/FloatComparisons.hpp
@@ -1,17 +1,16 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2017 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
 #include <boost/test/unit_test.hpp>
 
 #include "Acts/Definitions/Algebra.hpp"
-#include "Acts/Utilities/TypeTraits.hpp"
 
 #include <algorithm>
 #include <limits>
@@ -155,25 +154,23 @@ predicate_result matrixCompare(const Eigen::DenseBase<Derived1>& val,
 }
 
 template <typename T>
-using has_begin_t = decltype(std::declval<T>().cbegin());
-template <typename T>
-using has_end_t = decltype(std::declval<T>().cend());
-template <typename T>
-using has_eval_t = decltype(std::declval<T>().eval());
+concept is_eigen_type = requires(const T& t) {
+  { t.eval() };
+};
 
 // STL container frontend
 //
 // FIXME: The algorithm only supports ordered containers, so the API should
 //        only accept them. Does someone know a clean way to do that in C++?
 //
-template <typename Container,
-          typename = std::enable_if_t<
-              !Acts::Concepts::exists<has_eval_t, Container> &&
-                  Acts::Concepts::exists<has_begin_t, Container> &&
-                  Acts::Concepts::exists<has_end_t, Container>,
-              int>>
+template <typename Container>
 predicate_result compare(const Container& val, const Container& ref,
-                         ScalarComparison&& compareImpl) {
+                         ScalarComparison&& compareImpl)
+  requires(!is_eigen_type<Container>) && requires(const Container& t) {
+    { t.cbegin() };
+    { t.cend() };
+  }
+{
   // Make sure that the two input containers have the same number of items
   // (in order to provide better error reporting when they don't)
   std::size_t numVals = std::distance(std::cbegin(val), std::cend(val));
diff --git a/Tests/CommonHelpers/Acts/Tests/CommonHelpers/LineSurfaceStub.hpp b/Tests/CommonHelpers/Acts/Tests/CommonHelpers/LineSurfaceStub.hpp
index 55448f11445..662969bc450 100644
--- a/Tests/CommonHelpers/Acts/Tests/CommonHelpers/LineSurfaceStub.hpp
+++ b/Tests/CommonHelpers/Acts/Tests/CommonHelpers/LineSurfaceStub.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2017-2018 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 #pragma once
 
 #include "Acts/Definitions/Algebra.hpp"
@@ -52,11 +52,11 @@ class LineSurfaceStub : public LineSurface {
   /// Return a Polyhedron for the surfaces
   ///
   /// @param gctx The current geometry context object, e.g. alignment
-  /// @param lseg is ignored for a perigee @note ignored
+  /// @param ingoredSegmeent is ignored for the srub
   ///
   /// @return A list of vertices and a face/facett description of it
   Polyhedron polyhedronRepresentation(const GeometryContext& /*gctx*/,
-                                      std::size_t /*lseg*/) const final {
+                                      unsigned int /*lseg*/) const final {
     return Polyhedron({}, {}, {});
   }
 };
diff --git a/Tests/CommonHelpers/Acts/Tests/CommonHelpers/MeasurementsCreator.hpp b/Tests/CommonHelpers/Acts/Tests/CommonHelpers/MeasurementsCreator.hpp
index f88d86c4c88..80044571c4b 100644
--- a/Tests/CommonHelpers/Acts/Tests/CommonHelpers/MeasurementsCreator.hpp
+++ b/Tests/CommonHelpers/Acts/Tests/CommonHelpers/MeasurementsCreator.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2020 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
@@ -13,8 +13,7 @@
 #include "Acts/Geometry/GeometryContext.hpp"
 #include "Acts/Geometry/GeometryHierarchyMap.hpp"
 #include "Acts/MagneticField/MagneticFieldContext.hpp"
-#include "Acts/Propagator/AbortList.hpp"
-#include "Acts/Propagator/ActionList.hpp"
+#include "Acts/Propagator/ActorList.hpp"
 #include "Acts/Propagator/StandardAborters.hpp"
 #include "Acts/Utilities/Logger.hpp"
 
@@ -59,7 +58,7 @@ struct MeasurementsCreator {
   // how far away from the measurements the outliers should be
   double distanceOutlier = 10 * Acts::UnitConstants::mm;
 
-  /// @brief Operator that is callable by an ActionList. The function
+  /// @brief Operator that is callable by an ActorList. The function
   /// collects the surfaces
   ///
   /// @tparam propagator_state_t Type of the propagator state
@@ -70,9 +69,9 @@ struct MeasurementsCreator {
   /// @param [in] state State of the propagator
   template <typename propagator_state_t, typename stepper_t,
             typename navigator_t>
-  void operator()(propagator_state_t& state, const stepper_t& stepper,
-                  const navigator_t& navigator, result_type& result,
-                  const Logger& logger) const {
+  void act(propagator_state_t& state, const stepper_t& stepper,
+           const navigator_t& navigator, result_type& result,
+           const Logger& logger) const {
     using namespace Acts::UnitLiterals;
 
     // only generate measurements on surfaces
@@ -155,14 +154,13 @@ Measurements createMeasurements(const propagator_t& propagator,
                                 const MeasurementResolutionMap& resolutions,
                                 std::default_random_engine& rng,
                                 std::size_t sourceId = 0u) {
-  using Actions = Acts::ActionList<MeasurementsCreator>;
-  using Aborters = Acts::AbortList<Acts::EndOfWorldReached>;
-  using PropagatorOptions =
-      typename propagator_t::template Options<Actions, Aborters>;
+  using ActorList =
+      Acts::ActorList<MeasurementsCreator, Acts::EndOfWorldReached>;
+  using PropagatorOptions = typename propagator_t::template Options<ActorList>;
 
   // Set options for propagator
   PropagatorOptions options(geoCtx, magCtx);
-  auto& creator = options.actionList.template get<MeasurementsCreator>();
+  auto& creator = options.actorList.template get<MeasurementsCreator>();
   creator.resolutions = resolutions;
   creator.rng = &rng;
   creator.sourceId = sourceId;
diff --git a/Tests/CommonHelpers/Acts/Tests/CommonHelpers/NonCompileTestHelpers.hpp b/Tests/CommonHelpers/Acts/Tests/CommonHelpers/NonCompileTestHelpers.hpp
index 7070250e5e5..4bd5926cf74 100644
--- a/Tests/CommonHelpers/Acts/Tests/CommonHelpers/NonCompileTestHelpers.hpp
+++ b/Tests/CommonHelpers/Acts/Tests/CommonHelpers/NonCompileTestHelpers.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2023 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
diff --git a/Tests/CommonHelpers/Acts/Tests/CommonHelpers/PredefinedMaterials.hpp b/Tests/CommonHelpers/Acts/Tests/CommonHelpers/PredefinedMaterials.hpp
index b3a50971eae..463adcda004 100644
--- a/Tests/CommonHelpers/Acts/Tests/CommonHelpers/PredefinedMaterials.hpp
+++ b/Tests/CommonHelpers/Acts/Tests/CommonHelpers/PredefinedMaterials.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2019 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
diff --git a/Tests/CommonHelpers/Acts/Tests/CommonHelpers/TestSpacePoint.hpp b/Tests/CommonHelpers/Acts/Tests/CommonHelpers/TestSpacePoint.hpp
index aec14a5d0f8..b50451e0e7d 100644
--- a/Tests/CommonHelpers/Acts/Tests/CommonHelpers/TestSpacePoint.hpp
+++ b/Tests/CommonHelpers/Acts/Tests/CommonHelpers/TestSpacePoint.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2022 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
diff --git a/Tests/CommonHelpers/Acts/Tests/CommonHelpers/WhiteBoardUtilities.hpp b/Tests/CommonHelpers/Acts/Tests/CommonHelpers/WhiteBoardUtilities.hpp
index 461f90759d5..85a760bd6af 100644
--- a/Tests/CommonHelpers/Acts/Tests/CommonHelpers/WhiteBoardUtilities.hpp
+++ b/Tests/CommonHelpers/Acts/Tests/CommonHelpers/WhiteBoardUtilities.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2023 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
@@ -15,6 +15,7 @@
 #include <tuple>
 
 namespace Acts::Test {
+
 struct DummySequenceElement : public ActsExamples::SequenceElement {
   ActsExamples::ProcessCode initialize() override { return {}; };
   ActsExamples::ProcessCode finalize() override { return {}; };
@@ -102,4 +103,5 @@ struct GenericReadWriteTool {
     return get(get, std::tuple<>{}, std::integral_constant<std::size_t, 0>{});
   }
 };
+
 }  // namespace Acts::Test
diff --git a/Tests/CommonHelpers/CMakeLists.txt b/Tests/CommonHelpers/CMakeLists.txt
index 12d42d851ab..84417f3ddb4 100644
--- a/Tests/CommonHelpers/CMakeLists.txt
+++ b/Tests/CommonHelpers/CMakeLists.txt
@@ -5,6 +5,7 @@ add_library(
     ActsTestsCommonHelpers
     SHARED
     Acts/Tests/CommonHelpers/DataDirectory.cpp
+    Acts/Tests/CommonHelpers/CylindricalDetector.cpp
 )
 target_compile_definitions(
     ActsTestsCommonHelpers
diff --git a/Tests/DownstreamProject/CMakeLists.txt b/Tests/DownstreamProject/CMakeLists.txt
index 27f2f10583b..0cb5ca1f9ea 100644
--- a/Tests/DownstreamProject/CMakeLists.txt
+++ b/Tests/DownstreamProject/CMakeLists.txt
@@ -7,7 +7,7 @@ find_package(
     Acts
     CONFIG
     REQUIRED
-    COMPONENTS Core Fatras PluginJson PluginLegacy PluginTGeo
+    COMPONENTS Core Fatras PluginJson PluginLegacy PluginTGeo PluginCovfie
 )
 
 # place artifacts in GNU-like paths, e.g. binaries in `<build>/bin`
@@ -24,7 +24,13 @@ set(CMAKE_LIBRARY_OUTPUT_DIRECTORY
 add_executable(ShowActsVersion ShowActsVersion.cpp)
 target_link_libraries(
     ShowActsVersion
-    PRIVATE ActsCore ActsFatras ActsPluginJson ActsPluginLegacy ActsPluginTGeo
+    PRIVATE
+        ActsCore
+        ActsFatras
+        ActsPluginJson
+        ActsPluginLegacy
+        ActsPluginTGeo
+        ActsPluginCovfie
 )
 
 option(DD4HEP "Build with DD4hep" ON)
@@ -47,3 +53,10 @@ if(EDM4HEP)
     find_package(Acts CONFIG REQUIRED COMPONENTS PluginEDM4hep)
     target_link_libraries(ShowActsVersion PRIVATE ActsPluginEDM4hep)
 endif()
+
+option(GEOMODEL "Build with GeoModel" ON)
+if(GEOMODEL)
+    message(STATUS "Adding GeoModel plugin")
+    find_package(Acts CONFIG REQUIRED COMPONENTS PluginGeoModel)
+    target_link_libraries(ShowActsVersion PRIVATE ActsPluginGeoModel)
+endif()
diff --git a/Tests/DownstreamProject/ShowActsVersion.cpp b/Tests/DownstreamProject/ShowActsVersion.cpp
index 144c3c8a18b..3602aa0a3af 100644
--- a/Tests/DownstreamProject/ShowActsVersion.cpp
+++ b/Tests/DownstreamProject/ShowActsVersion.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2020 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include <Acts/ActsVersion.hpp>
 
diff --git a/Tests/DownstreamProjectNodeps/ShowActsVersion.cpp b/Tests/DownstreamProjectNodeps/ShowActsVersion.cpp
index 52fd8709f4f..aa0662a920b 100644
--- a/Tests/DownstreamProjectNodeps/ShowActsVersion.cpp
+++ b/Tests/DownstreamProjectNodeps/ShowActsVersion.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2020 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include <Acts/ActsVersion.hpp>
 
diff --git a/Tests/IntegrationTests/Fatras/FatrasSimulationTests.cpp b/Tests/IntegrationTests/Fatras/FatrasSimulationTests.cpp
index 6355f804ce0..f459feb0f24 100644
--- a/Tests/IntegrationTests/Fatras/FatrasSimulationTests.cpp
+++ b/Tests/IntegrationTests/Fatras/FatrasSimulationTests.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2020-2021 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include <boost/test/data/test_case.hpp>
 #include <boost/test/unit_test.hpp>
@@ -123,10 +123,8 @@ const auto dataset =
 // helper functions for tests
 template <typename Container>
 void sortByParticleId(Container& container) {
-  std::sort(container.begin(), container.end(),
-            [](const auto& lhs, const auto& rhs) {
-              return lhs.particleId() < rhs.particleId();
-            });
+  std::ranges::sort(container, std::less{},
+                    [](const auto& c) { return c.particleId(); });
 }
 template <typename Container>
 bool areParticleIdsUnique(const Container& sortedByParticleId) {
diff --git a/Tests/IntegrationTests/InterpolatedSolenoidBFieldTest.cpp b/Tests/IntegrationTests/InterpolatedSolenoidBFieldTest.cpp
index 4715cbdc606..9bfd63e6a88 100644
--- a/Tests/IntegrationTests/InterpolatedSolenoidBFieldTest.cpp
+++ b/Tests/IntegrationTests/InterpolatedSolenoidBFieldTest.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2017-2018 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include <boost/test/data/test_case.hpp>
 #include <boost/test/unit_test.hpp>
@@ -20,6 +20,7 @@
 #include <cmath>
 #include <fstream>
 #include <iostream>
+#include <numbers>
 #include <random>
 #include <type_traits>
 
@@ -100,10 +101,10 @@ BOOST_DATA_TEST_CASE(
                        bdata::distribution =
                            std::uniform_real_distribution<double>(0,
                                                                   R * 1.5))) ^
-        bdata::random((bdata::engine = std::mt19937(), bdata::seed = 3,
-                       bdata::distribution =
-                           std::uniform_real_distribution<double>(-M_PI,
-                                                                  M_PI))) ^
+        bdata::random(
+            (bdata::engine = std::mt19937(), bdata::seed = 3,
+             bdata::distribution = std::uniform_real_distribution<double>(
+                 -std::numbers::pi, std::numbers::pi))) ^
         bdata::xrange(ntests),
     z, r, phi, index) {
   if (index % 1000 == 0) {
diff --git a/Tests/IntegrationTests/Legacy/ATLSeedingIntegrationTest.cpp b/Tests/IntegrationTests/Legacy/ATLSeedingIntegrationTest.cpp
index 0e6c730bfac..910556b02e1 100644
--- a/Tests/IntegrationTests/Legacy/ATLSeedingIntegrationTest.cpp
+++ b/Tests/IntegrationTests/Legacy/ATLSeedingIntegrationTest.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2018 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include <boost/test/unit_test.hpp>
 
@@ -137,8 +137,8 @@ BOOST_AUTO_TEST_CASE(number_of_seeds_correct_) {
 
   // sorting required for set_difference call. sorting assumes space points
   // inside seed are already sorted.
-  std::sort(refVec.begin(), refVec.end(), seedComparator());
-  std::sort(seedVec.begin(), seedVec.end(), seedComparator());
+  std::ranges::sort(refVec, seedComparator());
+  std::ranges::sort(seedVec, seedComparator());
 
   // difference between reference and result shows if results exactly the same
   // (i.e. difference is 0)
diff --git a/Tests/IntegrationTests/NavigatorConsistency.cpp b/Tests/IntegrationTests/NavigatorConsistency.cpp
index 5a73a90bf57..49cbe27c953 100644
--- a/Tests/IntegrationTests/NavigatorConsistency.cpp
+++ b/Tests/IntegrationTests/NavigatorConsistency.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2024 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include <boost/test/data/test_case.hpp>
 #include <boost/test/unit_test.hpp>
@@ -23,6 +23,9 @@
 #include "Acts/Tests/CommonHelpers/CylindricalTrackingGeometry.hpp"
 #include "Acts/Utilities/VectorHelpers.hpp"
 
+#include <algorithm>
+#include <numbers>
+
 namespace bdata = boost::unit_test::data;
 using namespace Acts::UnitLiterals;
 using Acts::VectorHelpers::perp;
@@ -69,11 +72,9 @@ template <typename propagator_t>
 void runSelfConsistencyTest(const propagator_t& prop,
                             const CurvilinearTrackParameters& start,
                             const Acts::Logger& logger) {
-  // Action list and abort list
-  using ActionListType = ActionList<SurfaceCollector>;
-  using AbortListType = AbortList<>;
-  using Options =
-      typename propagator_t::template Options<ActionListType, AbortListType>;
+  // Actor list
+  using ActorList = ActorList<SurfaceCollector>;
+  using Options = typename propagator_t::template Options<ActorList>;
 
   // forward surface test
   Options fwdOptions(tgContext, mfContext);
@@ -81,7 +82,7 @@ void runSelfConsistencyTest(const propagator_t& prop,
 
   // get the surface collector and configure it
   auto& fwdSurfaceCollector =
-      fwdOptions.actionList.template get<SurfaceCollector>();
+      fwdOptions.actorList.template get<SurfaceCollector>();
   fwdSurfaceCollector.selector.selectSensitive = true;
   fwdSurfaceCollector.selector.selectMaterial = true;
   fwdSurfaceCollector.selector.selectPassive = true;
@@ -106,7 +107,7 @@ void runSelfConsistencyTest(const propagator_t& prop,
 
   // get the surface collector and configure it
   auto& bwdMSurfaceCollector =
-      bwdOptions.actionList.template get<SurfaceCollector>();
+      bwdOptions.actorList.template get<SurfaceCollector>();
   bwdMSurfaceCollector.selector.selectSensitive = true;
   bwdMSurfaceCollector.selector.selectMaterial = true;
   bwdMSurfaceCollector.selector.selectPassive = true;
@@ -130,7 +131,7 @@ void runSelfConsistencyTest(const propagator_t& prop,
 
   // forward-backward compatibility test
   {
-    std::reverse(bwdSurfaces.begin(), bwdSurfaces.end());
+    std::ranges::reverse(bwdSurfaces);
     BOOST_CHECK_EQUAL_COLLECTIONS(bwdSurfaces.begin(), bwdSurfaces.end(),
                                   fwdSurfaces.begin(), fwdSurfaces.end());
   }
@@ -141,7 +142,7 @@ void runSelfConsistencyTest(const propagator_t& prop,
 
   // get the surface collector and configure it
   auto& fwdStepSurfaceCollector =
-      fwdOptions.actionList.template get<SurfaceCollector>();
+      fwdOptions.actorList.template get<SurfaceCollector>();
   fwdStepSurfaceCollector.selector.selectSensitive = true;
   fwdStepSurfaceCollector.selector.selectMaterial = true;
   fwdStepSurfaceCollector.selector.selectPassive = true;
@@ -192,7 +193,7 @@ void runSelfConsistencyTest(const propagator_t& prop,
 
   // get the surface collector and configure it
   auto& bwdStepSurfaceCollector =
-      bwdOptions.actionList.template get<SurfaceCollector>();
+      bwdOptions.actorList.template get<SurfaceCollector>();
   bwdStepSurfaceCollector.selector.selectSensitive = true;
   bwdStepSurfaceCollector.selector.selectMaterial = true;
   bwdStepSurfaceCollector.selector.selectPassive = true;
@@ -235,7 +236,7 @@ void runSelfConsistencyTest(const propagator_t& prop,
 
   // TODO backward-backward step compatibility test
 
-  std::reverse(bwdStepSurfaces.begin(), bwdStepSurfaces.end());
+  std::ranges::reverse(bwdStepSurfaces);
   BOOST_CHECK_EQUAL_COLLECTIONS(bwdStepSurfaces.begin(), bwdStepSurfaces.end(),
                                 fwdStepSurfaces.begin(), fwdStepSurfaces.end());
 }
@@ -256,13 +257,11 @@ void runConsistencyTest(const propagator_probe_t& propProbe,
                         const CurvilinearTrackParameters& start,
                         const Acts::Logger& logger) {
   // Action list and abort list
-  using ActionListType = ActionList<SurfaceCollector>;
-  using AbortListType = AbortList<>;
+  using ActorList = ActorList<SurfaceCollector>;
 
   auto run = [&](const auto& prop) {
     using propagator_t = std::decay_t<decltype(prop)>;
-    using Options =
-        typename propagator_t::template Options<ActionListType, AbortListType>;
+    using Options = typename propagator_t::template Options<ActorList>;
 
     // forward surface test
     Options fwdOptions(tgContext, mfContext);
@@ -271,7 +270,7 @@ void runConsistencyTest(const propagator_probe_t& propProbe,
 
     // get the surface collector and configure it
     auto& fwdSurfaceCollector =
-        fwdOptions.actionList.template get<SurfaceCollector>();
+        fwdOptions.actorList.template get<SurfaceCollector>();
     fwdSurfaceCollector.selector.selectSensitive = true;
     fwdSurfaceCollector.selector.selectMaterial = true;
     fwdSurfaceCollector.selector.selectPassive = true;
@@ -358,11 +357,11 @@ auto eventGen =
                    bdata::distribution = std::uniform_real_distribution<double>(
                        0.5_GeV, 10_GeV))) ^
     bdata::random((bdata::engine = std::mt19937(), bdata::seed = 21,
-                   bdata::distribution =
-                       std::uniform_real_distribution<double>(-M_PI, M_PI))) ^
+                   bdata::distribution = std::uniform_real_distribution<double>(
+                       -std::numbers::pi, std::numbers::pi))) ^
     bdata::random((bdata::engine = std::mt19937(), bdata::seed = 22,
                    bdata::distribution = std::uniform_real_distribution<double>(
-                       1.0, M_PI - 1.0))) ^
+                       1., std::numbers::pi - 1.))) ^
     bdata::random(
         (bdata::engine = std::mt19937(), bdata::seed = 23,
          bdata::distribution = std::uniform_int_distribution<int>(0, 1)));
diff --git a/Tests/IntegrationTests/PrintDataDirectory.cpp b/Tests/IntegrationTests/PrintDataDirectory.cpp
index a7eef5c14d4..883a19ceb8c 100644
--- a/Tests/IntegrationTests/PrintDataDirectory.cpp
+++ b/Tests/IntegrationTests/PrintDataDirectory.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2020 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 // This is an example on how to access data from the test data directory.
 // It is not really an integration test, but since it does not use the
diff --git a/Tests/IntegrationTests/PropagationAtlasConstant.cpp b/Tests/IntegrationTests/PropagationAtlasConstant.cpp
index 912f604aa65..9839797c226 100644
--- a/Tests/IntegrationTests/PropagationAtlasConstant.cpp
+++ b/Tests/IntegrationTests/PropagationAtlasConstant.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2020 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include <boost/test/data/test_case.hpp>
 #include <boost/test/unit_test.hpp>
diff --git a/Tests/IntegrationTests/PropagationBentTracks.cpp b/Tests/IntegrationTests/PropagationBentTracks.cpp
index 5b7a96404f7..9fb49a6c559 100644
--- a/Tests/IntegrationTests/PropagationBentTracks.cpp
+++ b/Tests/IntegrationTests/PropagationBentTracks.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2023 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include <boost/test/unit_test.hpp>
 
@@ -56,8 +56,8 @@ std::vector<double> xPositionsOfPassedSurfaces(Acts::Navigator::Config navCfg,
       Acts::Vector4(0.01, 0, 0, 0), dir.normalized(), 1 / 1_GeV, std::nullopt,
       Acts::ParticleHypothesis::pion());
 
-  Propagator::Options<Acts::ActionList<Acts::detail::SteppingLogger>,
-                      Acts::AbortList<Acts::EndOfWorldReached>>
+  Propagator::Options<
+      Acts::ActorList<Acts::detail::SteppingLogger, Acts::EndOfWorldReached>>
       opts(geoCtx, magCtx);
 
   auto res = propagator.propagate(start, opts);
diff --git a/Tests/IntegrationTests/PropagationCompareAtlasEigenConstant.cpp b/Tests/IntegrationTests/PropagationCompareAtlasEigenConstant.cpp
index 6dbdfbe936c..a59433ae6c1 100644
--- a/Tests/IntegrationTests/PropagationCompareAtlasEigenConstant.cpp
+++ b/Tests/IntegrationTests/PropagationCompareAtlasEigenConstant.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2020 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include <boost/test/data/test_case.hpp>
 #include <boost/test/unit_test.hpp>
diff --git a/Tests/IntegrationTests/PropagationCompareEigenStraightLine.cpp b/Tests/IntegrationTests/PropagationCompareEigenStraightLine.cpp
index 877e79ba47c..6165c98df99 100644
--- a/Tests/IntegrationTests/PropagationCompareEigenStraightLine.cpp
+++ b/Tests/IntegrationTests/PropagationCompareEigenStraightLine.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2020 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include <boost/test/data/test_case.hpp>
 #include <boost/test/unit_test.hpp>
diff --git a/Tests/IntegrationTests/PropagationDatasets.hpp b/Tests/IntegrationTests/PropagationDatasets.hpp
index 6b65e21c85f..4d95837bd4a 100644
--- a/Tests/IntegrationTests/PropagationDatasets.hpp
+++ b/Tests/IntegrationTests/PropagationDatasets.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2020 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
diff --git a/Tests/IntegrationTests/PropagationDenseConstant.cpp b/Tests/IntegrationTests/PropagationDenseConstant.cpp
index 381e7639111..3d2afa7779e 100644
--- a/Tests/IntegrationTests/PropagationDenseConstant.cpp
+++ b/Tests/IntegrationTests/PropagationDenseConstant.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2020 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include <boost/test/data/test_case.hpp>
 #include <boost/test/unit_test.hpp>
@@ -15,8 +15,8 @@
 #include "Acts/MagneticField/ConstantBField.hpp"
 #include "Acts/MagneticField/MagneticFieldContext.hpp"
 #include "Acts/Material/HomogeneousVolumeMaterial.hpp"
-#include "Acts/Propagator/DenseEnvironmentExtension.hpp"
 #include "Acts/Propagator/EigenStepper.hpp"
+#include "Acts/Propagator/EigenStepperDenseExtension.hpp"
 #include "Acts/Propagator/Navigator.hpp"
 #include "Acts/Propagator/Propagator.hpp"
 #include "Acts/Propagator/RiddersPropagator.hpp"
@@ -34,8 +34,7 @@ namespace ds = ActsTests::PropagationDatasets;
 using namespace Acts::UnitLiterals;
 
 using MagneticField = Acts::ConstantBField;
-using Stepper = Acts::EigenStepper<
-    Acts::StepperExtensionList<Acts::DenseEnvironmentExtension>>;
+using Stepper = Acts::EigenStepper<Acts::EigenStepperDenseExtension>;
 using Propagator = Acts::Propagator<Stepper, Acts::Navigator>;
 using RiddersPropagator = Acts::RiddersPropagator<Propagator>;
 
diff --git a/Tests/IntegrationTests/PropagationEigenConstant.cpp b/Tests/IntegrationTests/PropagationEigenConstant.cpp
index 0c76437e156..55041acb015 100644
--- a/Tests/IntegrationTests/PropagationEigenConstant.cpp
+++ b/Tests/IntegrationTests/PropagationEigenConstant.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2020 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include <boost/test/data/test_case.hpp>
 #include <boost/test/unit_test.hpp>
diff --git a/Tests/IntegrationTests/PropagationStraightLine.cpp b/Tests/IntegrationTests/PropagationStraightLine.cpp
index 9fef03c4f5a..7b321f3486c 100644
--- a/Tests/IntegrationTests/PropagationStraightLine.cpp
+++ b/Tests/IntegrationTests/PropagationStraightLine.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2020 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include <boost/test/data/test_case.hpp>
 #include <boost/test/unit_test.hpp>
diff --git a/Tests/IntegrationTests/PropagationTests.hpp b/Tests/IntegrationTests/PropagationTests.hpp
index 6be2ebd220d..fc2e2cfcfe5 100644
--- a/Tests/IntegrationTests/PropagationTests.hpp
+++ b/Tests/IntegrationTests/PropagationTests.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2020 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
@@ -21,6 +21,7 @@
 #include "Acts/Utilities/UnitVectors.hpp"
 #include "Acts/Utilities/detail/periodic.hpp"
 
+#include <numbers>
 #include <utility>
 
 // parameter construction helpers
@@ -33,7 +34,7 @@ inline Acts::CurvilinearTrackParameters makeParametersCurvilinear(
 
   // phi is ill-defined in forward/backward tracks. normalize the value to
   // ensure parameter comparisons give correct answers.
-  if (!((0 < theta) && (theta < M_PI))) {
+  if (!((0 < theta) && (theta < std::numbers::pi))) {
     phi = 0;
   }
 
@@ -52,7 +53,7 @@ inline Acts::CurvilinearTrackParameters makeParametersCurvilinearWithCovariance(
 
   // phi is ill-defined in forward/backward tracks. normalize the value to
   // ensure parameter comparisons give correct answers.
-  if (!((0 < theta) && (theta < M_PI))) {
+  if (!((0 < theta) && (theta < std::numbers::pi))) {
     phi = 0;
   }
 
@@ -89,7 +90,7 @@ inline Acts::CurvilinearTrackParameters makeParametersCurvilinearNeutral(
 
   // phi is ill-defined in forward/backward tracks. normalize the value to
   // ensure parameter comparisons give correct answers.
-  if (!((0 < theta) && (theta < M_PI))) {
+  if (!((0 < theta) && (theta < std::numbers::pi))) {
     phi = 0;
   }
 
diff --git a/Tests/UnitTests/Alignment/Kernel/AlignmentTests.cpp b/Tests/UnitTests/Alignment/Kernel/AlignmentTests.cpp
index 5a388d3a307..82c2176814c 100644
--- a/Tests/UnitTests/Alignment/Kernel/AlignmentTests.cpp
+++ b/Tests/UnitTests/Alignment/Kernel/AlignmentTests.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2020 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include <boost/test/unit_test.hpp>
 
@@ -239,7 +239,7 @@ const MeasurementResolutionMap resolutions = {
 
 struct KalmanFitterInputTrajectory {
   // The source links
-  std::vector<TestSourceLink> sourcelinks;
+  std::vector<TestSourceLink> sourceLinks;
   // The start parameters
   std::optional<CurvilinearTrackParameters> startParameters;
 };
@@ -264,7 +264,7 @@ std::vector<KalmanFitterInputTrajectory> createTrajectories(
     // Extract measurements from result of propagation.
     KalmanFitterInputTrajectory traj;
     traj.startParameters = start;
-    traj.sourcelinks = measurements.sourceLinks;
+    traj.sourceLinks = measurements.sourceLinks;
 
     trajectories.push_back(std::move(traj));
   }
@@ -330,7 +330,7 @@ BOOST_AUTO_TEST_CASE(ZeroFieldKalmanAlignment) {
   kfOptions.referenceSurface = &(*inputTraj.startParameters).referenceSurface();
 
   auto evaluateRes = alignZero.evaluateTrackAlignmentState(
-      kfOptions.geoContext, inputTraj.sourcelinks, *inputTraj.startParameters,
+      kfOptions.geoContext, inputTraj.sourceLinks, *inputTraj.startParameters,
       kfOptions, idxedAlignSurfaces, AlignmentMask::All);
   BOOST_CHECK(evaluateRes.ok());
 
@@ -376,7 +376,7 @@ BOOST_AUTO_TEST_CASE(ZeroFieldKalmanAlignment) {
   std::vector<CurvilinearTrackParameters> sParametersCollection;
   sParametersCollection.reserve(10);
   for (const auto& traj : trajectories) {
-    trajCollection.push_back(traj.sourcelinks);
+    trajCollection.push_back(traj.sourceLinks);
     sParametersCollection.push_back(*traj.startParameters);
   }
   auto alignRes =
diff --git a/Tests/UnitTests/Benchmarks/BenchmarkTools.cpp b/Tests/UnitTests/Benchmarks/BenchmarkTools.cpp
index ebd3c901fb5..55bd41e83ed 100644
--- a/Tests/UnitTests/Benchmarks/BenchmarkTools.cpp
+++ b/Tests/UnitTests/Benchmarks/BenchmarkTools.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2020 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include <boost/test/unit_test.hpp>
 
diff --git a/Tests/UnitTests/Core/AmbiguityResolution/ScoreBasedAmbiguityResolutionTest.cpp b/Tests/UnitTests/Core/AmbiguityResolution/ScoreBasedAmbiguityResolutionTest.cpp
index b9a4eb5beb5..568e817031a 100644
--- a/Tests/UnitTests/Core/AmbiguityResolution/ScoreBasedAmbiguityResolutionTest.cpp
+++ b/Tests/UnitTests/Core/AmbiguityResolution/ScoreBasedAmbiguityResolutionTest.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2024 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include <boost/test/unit_test.hpp>
 
diff --git a/Tests/UnitTests/Core/Clusterization/CMakeLists.txt b/Tests/UnitTests/Core/Clusterization/CMakeLists.txt
index 38dffefd462..a6c4844bdb9 100644
--- a/Tests/UnitTests/Core/Clusterization/CMakeLists.txt
+++ b/Tests/UnitTests/Core/Clusterization/CMakeLists.txt
@@ -1,2 +1,3 @@
 add_unittest(Clusterization1D ClusterizationTests1D.cpp)
 add_unittest(Clusterization2D ClusterizationTests2D.cpp)
+add_unittest(TimedClusterization TimedClusterizationTests.cpp)
diff --git a/Tests/UnitTests/Core/Clusterization/ClusterizationTests1D.cpp b/Tests/UnitTests/Core/Clusterization/ClusterizationTests1D.cpp
index 83423852791..1d30f88e646 100644
--- a/Tests/UnitTests/Core/Clusterization/ClusterizationTests1D.cpp
+++ b/Tests/UnitTests/Core/Clusterization/ClusterizationTests1D.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2022 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include <boost/test/unit_test.hpp>
 
@@ -54,7 +54,7 @@ bool clHashComp(const Cluster1D& left, const Cluster1D& right) {
 }
 
 void hash(Cluster1D& cl) {
-  std::sort(cl.cells.begin(), cl.cells.end(), cellComp);
+  std::ranges::sort(cl.cells, cellComp);
   cl.hash = 0;
   for (const Cell1D& c : cl.cells) {
     boost::hash_combine(cl.hash, c.col);
@@ -117,8 +117,8 @@ BOOST_AUTO_TEST_CASE(Grid_1D_rand) {
       hash(cl);
     }
 
-    std::sort(clusters.begin(), clusters.end(), clHashComp);
-    std::sort(newCls.begin(), newCls.end(), clHashComp);
+    std::ranges::sort(clusters, clHashComp);
+    std::ranges::sort(newCls, clHashComp);
 
     BOOST_CHECK_EQUAL(clusters.size(), newCls.size());
     for (std::size_t i = 0; i < clusters.size(); i++) {
diff --git a/Tests/UnitTests/Core/Clusterization/ClusterizationTests2D.cpp b/Tests/UnitTests/Core/Clusterization/ClusterizationTests2D.cpp
index e850d213551..9ed0edd7780 100644
--- a/Tests/UnitTests/Core/Clusterization/ClusterizationTests2D.cpp
+++ b/Tests/UnitTests/Core/Clusterization/ClusterizationTests2D.cpp
@@ -1,14 +1,15 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2022 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include <boost/test/unit_test.hpp>
 
 #include "Acts/Clusterization/Clusterization.hpp"
+#include "Acts/Utilities/Helpers.hpp"
 
 #include <algorithm>
 #include <array>
@@ -113,7 +114,7 @@ void clusterAddCell(Cluster2D& cl, const Cell2D& cell) {
 }
 
 void hash(Cluster2D& cl) {
-  std::sort(cl.cells.begin(), cl.cells.end(), cellComp);
+  std::ranges::sort(cl.cells, cellComp);
   cl.hash = 0;
   for (const Cell2D& c : cl.cells) {
     boost::hash_combine(cl.hash, c.col);
@@ -133,7 +134,7 @@ void genclusterw(int x, int y, int x0, int y0, int x1, int y1,
   auto maybe_add = [&](int x_, int y_) {
     Cell2D c(x_, y_);
     if (std::uniform_real_distribution<double>()(rng) < startp &&
-        std::find(cells.begin(), cells.end(), c) == cells.end()) {
+        !rangeContainsValue(cells, c)) {
       cells.push_back(c);
       add.push_back(c);
     }
@@ -236,8 +237,8 @@ BOOST_AUTO_TEST_CASE(Grid_2D_rand) {
       hash(cl);
     }
 
-    std::sort(cls.begin(), cls.end(), clHashComp);
-    std::sort(newCls.begin(), newCls.end(), clHashComp);
+    std::ranges::sort(cls, clHashComp);
+    std::ranges::sort(newCls, clHashComp);
 
     BOOST_CHECK_EQUAL(cls.size(), newCls.size());
     for (std::size_t i = 0; i < cls.size(); i++) {
diff --git a/Tests/UnitTests/Core/Clusterization/TimedClusterizationTests.cpp b/Tests/UnitTests/Core/Clusterization/TimedClusterizationTests.cpp
new file mode 100644
index 00000000000..ac60393d9b6
--- /dev/null
+++ b/Tests/UnitTests/Core/Clusterization/TimedClusterizationTests.cpp
@@ -0,0 +1,260 @@
+// This file is part of the ACTS project.
+//
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
+//
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
+
+#include <boost/test/unit_test.hpp>
+
+#include "Acts/Clusterization/TimedClusterization.hpp"
+
+namespace Acts::Test {
+
+// Define objects
+using Identifier = std::size_t;
+struct Cell {
+  Cell(Identifier identifier, int c, int r, double t)
+      : id(identifier), column(c), row(r), time(t) {}
+
+  Identifier id{};
+  int column{0};
+  int row{0};
+  int label{-1};
+  double time{0.};
+};
+
+struct Cluster {
+  std::vector<Identifier> ids{};
+};
+
+using CellCollection = std::vector<Acts::Test::Cell>;
+using ClusterCollection = std::vector<Acts::Test::Cluster>;
+
+// Define functions
+static inline int getCellRow(const Cell& cell) {
+  return cell.row;
+}
+
+static inline int getCellColumn(const Cell& cell) {
+  return cell.column;
+}
+
+static inline int& getCellLabel(Cell& cell) {
+  return cell.label;
+}
+
+static inline double getCellTime(const Cell& cell) {
+  return cell.time;
+}
+
+static void clusterAddCell(Cluster& cl, const Cell& cell) {
+  cl.ids.push_back(cell.id);
+}
+
+BOOST_AUTO_TEST_CASE(TimedGrid_1D_withtime) {
+  // 1x10 matrix
+  /*
+    X X X Y O X Y Y X X
+  */
+  // 6 + 3 cells -> 3 + 2 clusters in total
+
+  std::vector<Cell> cells;
+  // X
+  cells.emplace_back(0ul, 0, -1, 0);
+  cells.emplace_back(1ul, 1, -1, 0);
+  cells.emplace_back(2ul, 2, -1, 0);
+  cells.emplace_back(3ul, 5, -1, 0);
+  cells.emplace_back(4ul, 8, -1, 0);
+  cells.emplace_back(5ul, 9, -1, 0);
+  // Y
+  cells.emplace_back(6ul, 3, 0, 1);
+  cells.emplace_back(7ul, 6, 1, 1);
+  cells.emplace_back(8ul, 7, 1, 1);
+
+  std::vector<std::vector<Identifier>> expectedResults;
+  expectedResults.push_back({0ul, 1ul, 2ul});
+  expectedResults.push_back({6ul});
+  expectedResults.push_back({3ul});
+  expectedResults.push_back({7ul, 8ul});
+  expectedResults.push_back({4ul, 5ul});
+
+  ClusterCollection clusters =
+      Acts::Ccl::createClusters<CellCollection, ClusterCollection, 1>(
+          cells, Acts::Ccl::TimedConnect<Cell, 1>(0.5));
+
+  BOOST_CHECK_EQUAL(5ul, clusters.size());
+
+  for (std::size_t i(0); i < clusters.size(); ++i) {
+    std::vector<Identifier>& timedIds = clusters[i].ids;
+    const std::vector<Identifier>& expected = expectedResults[i];
+    std::sort(timedIds.begin(), timedIds.end());
+    BOOST_CHECK_EQUAL(timedIds.size(), expected.size());
+
+    for (std::size_t j(0); j < timedIds.size(); ++j) {
+      BOOST_CHECK_EQUAL(timedIds[j], expected[j]);
+    }
+  }
+}
+
+BOOST_AUTO_TEST_CASE(TimedGrid_2D_notime) {
+  // 4x4 matrix
+  /*
+    X O O X
+    O O O X
+    X X O O
+    X O O X
+  */
+  // 7 cells -> 4 clusters in total
+
+  std::vector<Cell> cells;
+  cells.emplace_back(0ul, 0, 0, 0);
+  cells.emplace_back(1ul, 3, 0, 0);
+  cells.emplace_back(2ul, 3, 1, 0);
+  cells.emplace_back(3ul, 0, 2, 0);
+  cells.emplace_back(4ul, 1, 2, 0);
+  cells.emplace_back(5ul, 0, 3, 0);
+  cells.emplace_back(6ul, 3, 3, 0);
+
+  std::vector<std::vector<Identifier>> expectedResults;
+  expectedResults.push_back({0ul});
+  expectedResults.push_back({3ul, 4ul, 5ul});
+  expectedResults.push_back({1ul, 2ul});
+  expectedResults.push_back({6ul});
+
+  ClusterCollection clusters =
+      Acts::Ccl::createClusters<CellCollection, ClusterCollection, 2>(
+          cells,
+          Acts::Ccl::TimedConnect<Cell, 2>(std::numeric_limits<double>::max()));
+
+  BOOST_CHECK_EQUAL(4ul, clusters.size());
+
+  // Compare against default connect (only space)
+  ClusterCollection defaultClusters =
+      Acts::Ccl::createClusters<CellCollection, ClusterCollection, 2>(
+          cells, Acts::Ccl::DefaultConnect<Cell, 2>());
+
+  BOOST_CHECK_EQUAL(4ul, defaultClusters.size());
+  BOOST_CHECK_EQUAL(defaultClusters.size(), expectedResults.size());
+
+  std::vector<std::size_t> sizes{1, 3, 2, 1};
+  for (std::size_t i(0); i < clusters.size(); ++i) {
+    std::vector<Identifier>& timedIds = clusters[i].ids;
+    std::vector<Identifier>& defaultIds = defaultClusters[i].ids;
+    const std::vector<Identifier>& expected = expectedResults[i];
+    BOOST_CHECK_EQUAL(timedIds.size(), defaultIds.size());
+    BOOST_CHECK_EQUAL(timedIds.size(), sizes[i]);
+    BOOST_CHECK_EQUAL(timedIds.size(), expected.size());
+
+    std::sort(timedIds.begin(), timedIds.end());
+    std::sort(defaultIds.begin(), defaultIds.end());
+    for (std::size_t j(0); j < timedIds.size(); ++j) {
+      BOOST_CHECK_EQUAL(timedIds[j], defaultIds[j]);
+      BOOST_CHECK_EQUAL(timedIds[j], expected[j]);
+    }
+  }
+}
+
+BOOST_AUTO_TEST_CASE(TimedGrid_2D_withtime) {
+  // 4x4 matrix
+  /*
+    X Y O X
+    O Y Y X
+    X X Z Z
+    X O O X
+  */
+  // 7 + 3 + 2 cells -> 4 + 1 + 1 clusters in total
+
+  std::vector<Cell> cells;
+  // X
+  cells.emplace_back(0ul, 0, 0, 0);
+  cells.emplace_back(1ul, 3, 0, 0);
+  cells.emplace_back(2ul, 3, 1, 0);
+  cells.emplace_back(3ul, 0, 2, 0);
+  cells.emplace_back(4ul, 1, 2, 0);
+  cells.emplace_back(5ul, 0, 3, 0);
+  cells.emplace_back(6ul, 3, 3, 0);
+  // Y
+  cells.emplace_back(7ul, 1, 0, 1);
+  cells.emplace_back(8ul, 1, 1, 1);
+  cells.emplace_back(9ul, 2, 1, 1);
+  // Z
+  cells.emplace_back(10ul, 2, 2, 2);
+  cells.emplace_back(11ul, 3, 2, 2);
+
+  std::vector<std::vector<Identifier>> expectedResults;
+  expectedResults.push_back({0ul});
+  expectedResults.push_back({3ul, 4ul, 5ul});
+  expectedResults.push_back({7ul, 8ul, 9ul});
+  expectedResults.push_back({10ul, 11ul});
+  expectedResults.push_back({1ul, 2ul});
+  expectedResults.push_back({6ul});
+
+  ClusterCollection clusters =
+      Acts::Ccl::createClusters<CellCollection, ClusterCollection, 2>(
+          cells, Acts::Ccl::TimedConnect<Cell, 2>(0.5));
+
+  BOOST_CHECK_EQUAL(6ul, clusters.size());
+
+  std::vector<std::size_t> sizes{1, 3, 3, 2, 2, 1};
+  for (std::size_t i(0); i < clusters.size(); ++i) {
+    std::vector<Identifier>& timedIds = clusters[i].ids;
+    BOOST_CHECK_EQUAL(timedIds.size(), sizes[i]);
+    std::sort(timedIds.begin(), timedIds.end());
+
+    const std::vector<Identifier>& expected = expectedResults[i];
+    BOOST_CHECK_EQUAL(timedIds.size(), expected.size());
+
+    for (std::size_t j(0); j < timedIds.size(); ++j) {
+      BOOST_CHECK_EQUAL(timedIds[j], expected[j]);
+    }
+  }
+}
+
+BOOST_AUTO_TEST_CASE(TimedGrid_2D_noTollerance) {
+  // 4x4 matrix
+  /*
+    X O O X
+    O O O X
+    X X O O
+    X O O X
+   */
+  // 7 cells -> 7 clusters in total
+  // since time requirement will never be satisfied
+
+  std::vector<Cell> cells;
+  cells.emplace_back(0ul, 0, 0, 0);
+  cells.emplace_back(1ul, 3, 0, 0);
+  cells.emplace_back(2ul, 3, 1, 0);
+  cells.emplace_back(3ul, 0, 2, 0);
+  cells.emplace_back(4ul, 1, 2, 0);
+  cells.emplace_back(5ul, 0, 3, 0);
+  cells.emplace_back(6ul, 3, 3, 0);
+
+  std::vector<std::vector<Identifier>> expectedResults;
+  expectedResults.push_back({0ul});
+  expectedResults.push_back({3ul});
+  expectedResults.push_back({5ul});
+  expectedResults.push_back({4ul});
+  expectedResults.push_back({1ul});
+  expectedResults.push_back({2ul});
+  expectedResults.push_back({6ul});
+
+  ClusterCollection clusters =
+      Acts::Ccl::createClusters<CellCollection, ClusterCollection, 2>(
+          cells, Acts::Ccl::TimedConnect<Cell, 2>(0.));
+
+  BOOST_CHECK_EQUAL(7ul, clusters.size());
+
+  for (std::size_t i(0); i < clusters.size(); ++i) {
+    std::vector<Identifier>& timedIds = clusters[i].ids;
+    const std::vector<Identifier>& expected = expectedResults[i];
+
+    BOOST_CHECK_EQUAL(timedIds.size(), 1);
+    BOOST_CHECK_EQUAL(timedIds.size(), expected.size());
+    BOOST_CHECK_EQUAL(timedIds[0], expected[0]);
+  }
+}
+
+}  // namespace Acts::Test
diff --git a/Tests/UnitTests/Core/Definitions/DirectionTests.cpp b/Tests/UnitTests/Core/Definitions/DirectionTests.cpp
index cf7b910f6de..0badd75c66a 100644
--- a/Tests/UnitTests/Core/Definitions/DirectionTests.cpp
+++ b/Tests/UnitTests/Core/Definitions/DirectionTests.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2017-2020 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include <boost/test/unit_test.hpp>
 
diff --git a/Tests/UnitTests/Core/Definitions/UnitsTests.cpp b/Tests/UnitTests/Core/Definitions/UnitsTests.cpp
index f3c88d2cbc6..1cb42011e21 100644
--- a/Tests/UnitTests/Core/Definitions/UnitsTests.cpp
+++ b/Tests/UnitTests/Core/Definitions/UnitsTests.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2017-2020 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include <boost/test/unit_test.hpp>
 
@@ -13,6 +13,7 @@
 
 #include <cmath>
 #include <limits>
+#include <numbers>
 
 using namespace Acts::UnitLiterals;
 
@@ -63,10 +64,10 @@ BOOST_AUTO_TEST_CASE(Time) {
 }
 
 BOOST_AUTO_TEST_CASE(Angle) {
-  CHECK_CLOSE_REL(45_degree, M_PI / 4 * 1_rad, eps);
-  CHECK_CLOSE_REL(90_degree, M_PI / 2 * 1_rad, eps);
-  CHECK_CLOSE_REL(180_degree, M_PI * 1_rad, eps);
-  CHECK_CLOSE_REL(360_degree, 2 * M_PI * 1_rad, eps);
+  CHECK_CLOSE_REL(45_degree, std::numbers::pi / 4. * 1_rad, eps);
+  CHECK_CLOSE_REL(90_degree, std::numbers::pi / 2. * 1_rad, eps);
+  CHECK_CLOSE_REL(180_degree, std::numbers::pi * 1_rad, eps);
+  CHECK_CLOSE_REL(360_degree, 2 * std::numbers::pi * 1_rad, eps);
   CHECK_CLOSE_REL(1_mm / 1_m, 1_mrad, eps);
   CHECK_CLOSE_REL(1_um / 1_mm, 1_mrad, eps);
 }
@@ -126,8 +127,10 @@ BOOST_AUTO_TEST_CASE(MomentumRadius) {
 BOOST_AUTO_TEST_CASE(PhysicalConstants) {
   using Acts::PhysicalConstants::hbar;
   // see https://en.wikipedia.org/wiki/Planck_constant
-  CHECK_CLOSE_REL(hbar, 6.62607015e-34 * 1_J * 1_s / (2 * M_PI), 1e-6);
-  CHECK_CLOSE_REL(hbar, 4.135667696e-15 * 1_eV * 1_s / (2 * M_PI), 1e-7);
+  CHECK_CLOSE_REL(hbar, 6.62607015e-34 * 1_J * 1_s / (2 * std::numbers::pi),
+                  1e-6);
+  CHECK_CLOSE_REL(hbar, 4.135667696e-15 * 1_eV * 1_s / (2 * std::numbers::pi),
+                  1e-7);
 
   using Acts::PhysicalConstants::c;
   // we really want c to be 1
diff --git a/Tests/UnitTests/Core/Detector/BlueprintHelperTests.cpp b/Tests/UnitTests/Core/Detector/BlueprintHelperTests.cpp
index a307d8cba8d..7674d721115 100644
--- a/Tests/UnitTests/Core/Detector/BlueprintHelperTests.cpp
+++ b/Tests/UnitTests/Core/Detector/BlueprintHelperTests.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2023 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include <boost/test/unit_test.hpp>
 
diff --git a/Tests/UnitTests/Core/Detector/BlueprintTests.cpp b/Tests/UnitTests/Core/Detector/BlueprintTests.cpp
index 323de9218a7..0542730e145 100644
--- a/Tests/UnitTests/Core/Detector/BlueprintTests.cpp
+++ b/Tests/UnitTests/Core/Detector/BlueprintTests.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2023 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include <boost/test/unit_test.hpp>
 
diff --git a/Tests/UnitTests/Core/Detector/CMakeLists.txt b/Tests/UnitTests/Core/Detector/CMakeLists.txt
index 5ad3c568db0..eff298adb84 100644
--- a/Tests/UnitTests/Core/Detector/CMakeLists.txt
+++ b/Tests/UnitTests/Core/Detector/CMakeLists.txt
@@ -21,7 +21,7 @@ add_unittest(ReferenceGenerators ReferenceGeneratorsTests.cpp)
 add_unittest(SupportSurfacesHelper SupportSurfacesHelperTests.cpp)
 add_unittest(ProtoDetector ProtoDetectorTests.cpp)
 add_unittest(ProtoBinning ProtoBinningTests.cpp)
-add_unittest(Portal PortalTests.cpp)
+add_unittest(DetectorPortal PortalTests.cpp)
 add_unittest(PortalGenerators PortalGeneratorsTests.cpp)
 add_unittest(VolumeStructureBuilder VolumeStructureBuilderTests.cpp)
 add_unittest(MultiWireStructureBuilder MultiWireStructureBuilderTests.cpp)
diff --git a/Tests/UnitTests/Core/Detector/CuboidalContainerBuilderTests.cpp b/Tests/UnitTests/Core/Detector/CuboidalContainerBuilderTests.cpp
index 70243622fe9..8578b282a76 100644
--- a/Tests/UnitTests/Core/Detector/CuboidalContainerBuilderTests.cpp
+++ b/Tests/UnitTests/Core/Detector/CuboidalContainerBuilderTests.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2023 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include <boost/test/unit_test.hpp>
 
diff --git a/Tests/UnitTests/Core/Detector/CuboidalDetectorFromBlueprintTests.cpp b/Tests/UnitTests/Core/Detector/CuboidalDetectorFromBlueprintTests.cpp
index aba5426de06..c3991164027 100644
--- a/Tests/UnitTests/Core/Detector/CuboidalDetectorFromBlueprintTests.cpp
+++ b/Tests/UnitTests/Core/Detector/CuboidalDetectorFromBlueprintTests.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2023 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include <boost/test/unit_test.hpp>
 
@@ -26,6 +26,7 @@
 #include "Acts/Surfaces/Surface.hpp"
 #include "Acts/Utilities/BinningData.hpp"
 
+#include <algorithm>
 #include <fstream>
 
 class SurfaceBuilder : public Acts::Experimental::IInternalStructureBuilder {
@@ -363,7 +364,7 @@ BOOST_AUTO_TEST_CASE(CuboidalDetectorFromBlueprintTest) {
     portals.insert(portals.end(), volume->portals().begin(),
                    volume->portals().end());
   }
-  std::sort(portals.begin(), portals.end());
+  std::ranges::sort(portals);
   auto last = std::unique(portals.begin(), portals.end());
   portals.erase(last, portals.end());
   BOOST_CHECK_EQUAL(portals.size(), 19u);
diff --git a/Tests/UnitTests/Core/Detector/CuboidalDetectorHelperTests.cpp b/Tests/UnitTests/Core/Detector/CuboidalDetectorHelperTests.cpp
index 2159a62b763..adfbff85b04 100644
--- a/Tests/UnitTests/Core/Detector/CuboidalDetectorHelperTests.cpp
+++ b/Tests/UnitTests/Core/Detector/CuboidalDetectorHelperTests.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2023 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include <boost/test/unit_test.hpp>
 
diff --git a/Tests/UnitTests/Core/Detector/CylindricalContainerBuilderTests.cpp b/Tests/UnitTests/Core/Detector/CylindricalContainerBuilderTests.cpp
index 5fe880f57dd..87681ee8ae0 100644
--- a/Tests/UnitTests/Core/Detector/CylindricalContainerBuilderTests.cpp
+++ b/Tests/UnitTests/Core/Detector/CylindricalContainerBuilderTests.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2022 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include <boost/test/unit_test.hpp>
 
@@ -26,6 +26,7 @@
 #include "Acts/Surfaces/DiscSurface.hpp"
 #include "Acts/Surfaces/RadialBounds.hpp"
 #include "Acts/Surfaces/Surface.hpp"
+#include "Acts/Tests/CommonHelpers/CylindricalDetector.hpp"
 #include "Acts/Utilities/BinningType.hpp"
 #include "Acts/Utilities/Enumerate.hpp"
 #include "Acts/Utilities/Logger.hpp"
@@ -34,67 +35,18 @@
 #include <cmath>
 #include <iterator>
 #include <memory>
+#include <numbers>
 #include <stdexcept>
 #include <string>
 #include <utility>
 #include <vector>
 
 using namespace Acts;
+using namespace Acts::Test;
 using namespace Acts::Experimental;
 
 GeometryContext tContext;
 
-/// @brief A mockup volume builder, it generates volumes with
-/// a single surface filled in in order to use the CylindricalContainerBuilder
-/// infrastructure.
-template <typename surface_type, typename surface_bounds_type>
-class CylindricalVolumeBuilder : public IDetectorComponentBuilder {
- public:
-  CylindricalVolumeBuilder(const Transform3& transform,
-                           const CylinderVolumeBounds& vBounds,
-                           const surface_bounds_type& sBounds,
-                           const std::string& vName)
-      : IDetectorComponentBuilder(),
-        m_transform(transform),
-        m_volumeBounds(vBounds),
-        m_surfaceBounds(sBounds),
-        m_name(vName) {}
-
-  DetectorComponent construct(
-      [[maybe_unused]] const GeometryContext& gctx) const final {
-    // The outgoing root volumes
-    std::vector<std::shared_ptr<DetectorVolume>> rootVolumes;
-
-    // Ingredients
-    auto surface = Surface::makeShared<surface_type>(
-        (m_transform), std::make_shared<surface_bounds_type>(m_surfaceBounds));
-
-    auto bounds = std::make_unique<CylinderVolumeBounds>(m_volumeBounds);
-    auto portalGenerator = defaultPortalGenerator();
-    auto volume = DetectorVolumeFactory::construct(
-        portalGenerator, tContext, m_name, m_transform, std::move(bounds),
-        {surface}, {}, tryNoVolumes(), tryAllPortalsAndSurfaces());
-
-    // Add to the roots
-    rootVolumes.push_back(volume);
-
-    DetectorComponent::PortalContainer dContainer;
-    for (auto [ip, p] : enumerate(volume->portalPtrs())) {
-      dContainer[ip] = p;
-    }
-    return DetectorComponent{
-        {volume},
-        dContainer,
-        RootDetectorVolumes{rootVolumes, tryRootVolumes()}};
-  }
-
- private:
-  Transform3 m_transform;
-  CylinderVolumeBounds m_volumeBounds;
-  surface_bounds_type m_surfaceBounds;
-  std::string m_name;
-};
-
 class VolumeGeoIdGenerator : public IGeometryIdGenerator {
  public:
   struct Cache {
@@ -180,8 +132,8 @@ BOOST_AUTO_TEST_CASE(CylindricaContainerBuildingZ) {
   // Create a materialBinning
   tripleZCfg.portalMaterialBinning[2u] = BinningDescription{
       {ProtoBinning(BinningValue::binZ, Acts::AxisBoundaryType::Bound, 50),
-       ProtoBinning(BinningValue::binPhi, Acts::AxisBoundaryType::Closed, -M_PI,
-                    M_PI, 12)}};
+       ProtoBinning(BinningValue::binPhi, Acts::AxisBoundaryType::Closed,
+                    -std::numbers::pi, std::numbers::pi, 12)}};
 
   // Let's test the reverse generation
   tripleZCfg.geoIdReverseGen = true;
@@ -250,16 +202,18 @@ BOOST_AUTO_TEST_CASE(CylindricaContainerBuildingPhi) {
   barrelPhiCfg.binning = {BinningValue::binPhi};
 
   unsigned int phiSectors = 5;
-  Acts::ActsScalar phiHalfSector = M_PI / phiSectors;
+  Acts::ActsScalar phiHalfSector = std::numbers::pi / phiSectors;
 
   std::vector<std::shared_ptr<DetectorVolume>> phiVolumes = {};
   for (unsigned int i = 0; i < phiSectors; ++i) {
     // The volume bounds
     Acts::CylinderVolumeBounds volumeBounds(
-        10., 100., 100., phiHalfSector, -M_PI + (2u * i + 1u) * phiHalfSector);
-    // The surface boudns
-    Acts::CylinderBounds surfaceBounds(50., 90., 0.99 * phiHalfSector,
-                                       -M_PI + (2u * i + 1u) * phiHalfSector);
+        10., 100., 100., phiHalfSector,
+        -std::numbers::pi + (2u * i + 1u) * phiHalfSector);
+    // The surface bounds
+    Acts::CylinderBounds surfaceBounds(
+        50., 90., 0.99 * phiHalfSector,
+        -std::numbers::pi + (2u * i + 1u) * phiHalfSector);
 
     auto builder = std::make_shared<
         CylindricalVolumeBuilder<CylinderSurface, CylinderBounds>>(
diff --git a/Tests/UnitTests/Core/Detector/CylindricalDetectorFromBlueprintTests.cpp b/Tests/UnitTests/Core/Detector/CylindricalDetectorFromBlueprintTests.cpp
index 427a1effa11..c91a0d72a9f 100644
--- a/Tests/UnitTests/Core/Detector/CylindricalDetectorFromBlueprintTests.cpp
+++ b/Tests/UnitTests/Core/Detector/CylindricalDetectorFromBlueprintTests.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2023 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include <boost/test/unit_test.hpp>
 
diff --git a/Tests/UnitTests/Core/Detector/CylindricalDetectorHelperTests.cpp b/Tests/UnitTests/Core/Detector/CylindricalDetectorHelperTests.cpp
index f0a13b368dd..4c9bfee3fbe 100644
--- a/Tests/UnitTests/Core/Detector/CylindricalDetectorHelperTests.cpp
+++ b/Tests/UnitTests/Core/Detector/CylindricalDetectorHelperTests.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2023 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include <boost/test/unit_test.hpp>
 
@@ -30,6 +30,7 @@
 #include <iterator>
 #include <map>
 #include <memory>
+#include <numbers>
 #include <ostream>
 #include <stdexcept>
 #include <string>
@@ -110,7 +111,8 @@ BOOST_AUTO_TEST_CASE(ConnectInR) {
   ACTS_LOCAL_LOGGER(getDefaultLogger("Connect: R", logLevel));
   ACTS_INFO("*** Test: connect DetectorVolumes in R, create proto container");
   // Test with different opening angles
-  std::vector<ActsScalar> testOpenings = {M_PI, 0.5 * M_PI};
+  std::vector<ActsScalar> testOpenings = {std::numbers::pi,
+                                          std::numbers::pi / 2.};
 
   std::vector<ActsScalar> radii = {0., 10., 100., 200.};
   ActsScalar halfZ = 100.;
@@ -345,7 +347,7 @@ BOOST_AUTO_TEST_CASE(ConnectInPhi) {
 
   std::vector<Transform3> transforms = {Transform3::Identity()};
   unsigned int phiSectors = 5;
-  ActsScalar phiHalfSector = M_PI / phiSectors;
+  ActsScalar phiHalfSector = std::numbers::pi / phiSectors;
 
   for (auto [it, t] : enumerate(transforms)) {
     ACTS_INFO("    -> test series with transform id " << it);
@@ -354,7 +356,7 @@ BOOST_AUTO_TEST_CASE(ConnectInPhi) {
     for (unsigned int i = 0; i < phiSectors; ++i) {
       auto cBounds = std::make_unique<CylinderVolumeBounds>(
           10., 100., 100., phiHalfSector,
-          -M_PI + (2u * i + 1u) * phiHalfSector);
+          -std::numbers::pi + (2u * i + 1u) * phiHalfSector);
 
       // create the volume
       phiVolumes.push_back(DetectorVolumeFactory::construct(
diff --git a/Tests/UnitTests/Core/Detector/DetectorBuilderTests.cpp b/Tests/UnitTests/Core/Detector/DetectorBuilderTests.cpp
index 4e8b9117f91..5f56d266a05 100644
--- a/Tests/UnitTests/Core/Detector/DetectorBuilderTests.cpp
+++ b/Tests/UnitTests/Core/Detector/DetectorBuilderTests.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2022 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include <boost/test/unit_test.hpp>
 
diff --git a/Tests/UnitTests/Core/Detector/DetectorTests.cpp b/Tests/UnitTests/Core/Detector/DetectorTests.cpp
index d5fe8f18c11..ce8ac911933 100644
--- a/Tests/UnitTests/Core/Detector/DetectorTests.cpp
+++ b/Tests/UnitTests/Core/Detector/DetectorTests.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2022 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include <boost/test/unit_test.hpp>
 
diff --git a/Tests/UnitTests/Core/Detector/DetectorVolumeBuilderTests.cpp b/Tests/UnitTests/Core/Detector/DetectorVolumeBuilderTests.cpp
index 641226f0c43..7b0a551f36e 100644
--- a/Tests/UnitTests/Core/Detector/DetectorVolumeBuilderTests.cpp
+++ b/Tests/UnitTests/Core/Detector/DetectorVolumeBuilderTests.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2022 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include <boost/test/unit_test.hpp>
 
@@ -27,6 +27,7 @@
 #include "Acts/Utilities/Logger.hpp"
 
 #include <memory>
+#include <numbers>
 #include <stdexcept>
 #include <string>
 #include <utility>
@@ -161,8 +162,8 @@ BOOST_AUTO_TEST_CASE(DetectorVolumeBuilder_EmptyVolume) {
   // Assign proto material to
   dvCfg.portalMaterialBinning[2u] = BinningDescription{
       {ProtoBinning(BinningValue::binZ, Acts::AxisBoundaryType::Bound, 50),
-       ProtoBinning(BinningValue::binPhi, Acts::AxisBoundaryType::Closed, -M_PI,
-                    M_PI, 12)}};
+       ProtoBinning(BinningValue::binPhi, Acts::AxisBoundaryType::Closed,
+                    -std::numbers::pi, std::numbers::pi, 12)}};
 
   auto dvBuilder = std::make_shared<DetectorVolumeBuilder>(
       dvCfg, getDefaultLogger("DetectorVolumeBuilder", Logging::VERBOSE));
diff --git a/Tests/UnitTests/Core/Detector/DetectorVolumeConsistencyTests.cpp b/Tests/UnitTests/Core/Detector/DetectorVolumeConsistencyTests.cpp
index 0bbabbaf293..d46133b4760 100644
--- a/Tests/UnitTests/Core/Detector/DetectorVolumeConsistencyTests.cpp
+++ b/Tests/UnitTests/Core/Detector/DetectorVolumeConsistencyTests.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2023 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include <boost/test/unit_test.hpp>
 
diff --git a/Tests/UnitTests/Core/Detector/DetectorVolumeTests.cpp b/Tests/UnitTests/Core/Detector/DetectorVolumeTests.cpp
index 9221bc0eed0..fba1875c169 100644
--- a/Tests/UnitTests/Core/Detector/DetectorVolumeTests.cpp
+++ b/Tests/UnitTests/Core/Detector/DetectorVolumeTests.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2022 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include <boost/test/unit_test.hpp>
 
diff --git a/Tests/UnitTests/Core/Detector/GeometryIdGeneratorTests.cpp b/Tests/UnitTests/Core/Detector/GeometryIdGeneratorTests.cpp
index 931a55f865d..2d315ecb6a7 100644
--- a/Tests/UnitTests/Core/Detector/GeometryIdGeneratorTests.cpp
+++ b/Tests/UnitTests/Core/Detector/GeometryIdGeneratorTests.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2023 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include <boost/test/unit_test.hpp>
 
diff --git a/Tests/UnitTests/Core/Detector/IndexedRootVolumeFinderBuilderTests.cpp b/Tests/UnitTests/Core/Detector/IndexedRootVolumeFinderBuilderTests.cpp
index 956bb597047..f505e901236 100644
--- a/Tests/UnitTests/Core/Detector/IndexedRootVolumeFinderBuilderTests.cpp
+++ b/Tests/UnitTests/Core/Detector/IndexedRootVolumeFinderBuilderTests.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2023 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include <boost/test/unit_test.hpp>
 
diff --git a/Tests/UnitTests/Core/Detector/IndexedSurfaceGridFillerTests.cpp b/Tests/UnitTests/Core/Detector/IndexedSurfaceGridFillerTests.cpp
index d67b6a8fbe5..ffe66a708c6 100644
--- a/Tests/UnitTests/Core/Detector/IndexedSurfaceGridFillerTests.cpp
+++ b/Tests/UnitTests/Core/Detector/IndexedSurfaceGridFillerTests.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2023 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include <boost/test/unit_test.hpp>
 
@@ -25,12 +25,12 @@
 #include "Acts/Utilities/Enumerate.hpp"
 #include "Acts/Utilities/Grid.hpp"
 #include "Acts/Utilities/Logger.hpp"
-#include "Acts/Utilities/TypeTraits.hpp"
 
 #include <array>
 #include <cmath>
 #include <cstddef>
 #include <memory>
+#include <numbers>
 #include <ostream>
 #include <set>
 #include <utility>
@@ -268,7 +268,7 @@ BOOST_AUTO_TEST_CASE(IndexGridZPhiYOneSurfacePolyhedronBinExpansion) {
 
   // z-phi Axes & Grid
   Axis axisZ(AxisBound, -9., 9., 9);
-  Axis axisPhi(AxisClosed, -M_PI, M_PI, 36);
+  Axis axisPhi(AxisClosed, -std::numbers::pi, std::numbers::pi, 36);
   Grid gridZPhi(Type<std::vector<unsigned int>>, std::move(axisZ),
                 std::move(axisPhi));
 
@@ -276,7 +276,8 @@ BOOST_AUTO_TEST_CASE(IndexGridZPhiYOneSurfacePolyhedronBinExpansion) {
   IndexedSurfacesNavigation<decltype(gridZPhi)> indexedGridZPhi(
       std::move(gridZPhi), {BinningValue::binZ, BinningValue::binPhi});
 
-  auto cBounds = std::make_shared<CylinderBounds>(10, 2., M_PI / 30, 0.);
+  auto cBounds =
+      std::make_shared<CylinderBounds>(10, 2., std::numbers::pi / 30, 0.);
   auto cSurface = Surface::makeShared<CylinderSurface>(Transform3::Identity(),
                                                        std::move(cBounds));
 
@@ -299,11 +300,13 @@ BOOST_AUTO_TEST_CASE(IndexGridZPhiYOneSurfacePolyhedronBinExpansion) {
 BOOST_AUTO_TEST_CASE(IndexGridZPhiYOneSurfaceMPIPolyhedronBinExpansion) {
   ACTS_LOCAL_LOGGER(getDefaultLogger("*** Test 4", logLevel));
   ACTS_INFO("Testing Phi-Z grid.");
-  ACTS_INFO("Testing one surface at M_PI jump, with polyhedron generator");
+  ACTS_INFO(
+      "Testing one surface at std::numbers::pi jump, with polyhedron "
+      "generator");
 
   // z-phi Axes & Grid
   Axis axisZ(AxisBound, -9., 9., 9);
-  Axis axisPhi(AxisClosed, -M_PI, M_PI, 36);
+  Axis axisPhi(AxisClosed, -std::numbers::pi, std::numbers::pi, 36);
   Grid gridZPhi(Type<std::vector<unsigned int>>, std::move(axisZ),
                 std::move(axisPhi));
 
@@ -311,8 +314,10 @@ BOOST_AUTO_TEST_CASE(IndexGridZPhiYOneSurfaceMPIPolyhedronBinExpansion) {
   IndexedSurfacesNavigation<decltype(gridZPhi)> indexedGridZPhi(
       std::move(gridZPhi), {BinningValue::binZ, BinningValue::binPhi});
 
-  auto cBounds = std::make_shared<CylinderBounds>(10, 2., M_PI / 10, 0.);
-  auto tf = AngleAxis3(M_PI, Vector3::UnitZ()) * Transform3::Identity();
+  auto cBounds =
+      std::make_shared<CylinderBounds>(10, 2., std::numbers::pi / 10, 0.);
+  auto tf =
+      AngleAxis3(std::numbers::pi, Vector3::UnitZ()) * Transform3::Identity();
   auto cSurface = Surface::makeShared<CylinderSurface>(tf, std::move(cBounds));
 
   // The Filler instance and a center based generator
diff --git a/Tests/UnitTests/Core/Detector/IndexedSurfacesGeneratorTests.cpp b/Tests/UnitTests/Core/Detector/IndexedSurfacesGeneratorTests.cpp
index ab1212e4887..f95adbdcb3b 100644
--- a/Tests/UnitTests/Core/Detector/IndexedSurfacesGeneratorTests.cpp
+++ b/Tests/UnitTests/Core/Detector/IndexedSurfacesGeneratorTests.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2023 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include <boost/test/unit_test.hpp>
 
@@ -31,6 +31,7 @@
 #include <cmath>
 #include <cstddef>
 #include <memory>
+#include <numbers>
 #include <set>
 #include <tuple>
 #include <utility>
@@ -55,7 +56,8 @@ BOOST_AUTO_TEST_CASE(RingDisc1D) {
   IndexedSurfacesGenerator<decltype(rSurfaces), IndexedSurfacesNavigation>
       irSurfaces{rSurfaces, {}, {BinningValue::binPhi}};
 
-  GridAxisGenerators::EqClosed aGenerator{{-M_PI, M_PI}, 44u};
+  GridAxisGenerators::EqClosed aGenerator{{-std::numbers::pi, std::numbers::pi},
+                                          44u};
   PolyhedronReferenceGenerator<1u, true> rGenerator;
 
   auto indexedRing = irSurfaces(tContext, aGenerator, rGenerator);
@@ -80,9 +82,9 @@ BOOST_AUTO_TEST_CASE(RingDisc1D) {
 
   BOOST_CHECK(grid.atPosition(p) == reference);
 
-  // Check that surfaces 0, 1, 21 build the bins at phi == -M_PI + epsilon
+  // Check that surfaces 0, 1, 21 build the bins at phi == -pi + epsilon
   reference = {0, 1, 21};
-  p = {-M_PI + 0.05};
+  p = {-std::numbers::pi + 0.05};
   BOOST_CHECK(grid.atPosition(p) == reference);
 }
 
@@ -100,7 +102,8 @@ BOOST_AUTO_TEST_CASE(RingDisc1DWithSupport) {
   IndexedSurfacesGenerator<decltype(rSurfaces), IndexedSurfacesNavigation>
       irSurfaces{rSurfaces, {rSurfaces.size() - 1u}, {BinningValue::binPhi}};
 
-  GridAxisGenerators::EqClosed aGenerator{{-M_PI, M_PI}, 44u};
+  GridAxisGenerators::EqClosed aGenerator{{-std::numbers::pi, std::numbers::pi},
+                                          44u};
   PolyhedronReferenceGenerator<1u, true> rGenerator;
 
   auto indexedRing = irSurfaces(tContext, aGenerator, rGenerator);
@@ -126,9 +129,9 @@ BOOST_AUTO_TEST_CASE(RingDisc1DWithSupport) {
   GridType::point_t p = {0.05};
   BOOST_CHECK(grid.atPosition(p) == reference);
 
-  // Check that surfaces 0, 1, 21 build the bins at phi == -M_PI + epsilon
+  // Check that surfaces 0, 1, 21 build the bins at phi == -pi + epsilon
   reference = {0, 1, 21, 22};
-  p = {-M_PI + 0.05};
+  p = {-std::numbers::pi + 0.05};
   BOOST_CHECK(grid.atPosition(p) == reference);
 }
 
@@ -148,7 +151,7 @@ BOOST_AUTO_TEST_CASE(RingDisc2D) {
       irSurfaces{rSurfaces, {}, {BinningValue::binR, BinningValue::binPhi}};
 
   GridAxisGenerators::VarBoundEqClosed aGenerator{
-      {24., 74., 110.}, {-M_PI, M_PI}, 44u};
+      {24., 74., 110.}, {-std::numbers::pi, std::numbers::pi}, 44u};
   PolyhedronReferenceGenerator<1u, true> rGenerator;
 
   auto indexedRing = irSurfaces(tContext, aGenerator, rGenerator);
@@ -170,7 +173,7 @@ BOOST_AUTO_TEST_CASE(RingDisc2D) {
 
   // Check that now two rows of surfaces are given
   std::vector<std::size_t> reference = {16, 17, 38, 39};
-  GridType::point_t p = {65., M_PI * 0.49};
+  GridType::point_t p = {65., std::numbers::pi * 0.49};
   BOOST_CHECK(grid.atPosition(p) == reference);
 }
 
@@ -194,7 +197,7 @@ BOOST_AUTO_TEST_CASE(RingDisc2DFine) {
       irSurfaces{rSurfaces, {}, {BinningValue::binR, BinningValue::binPhi}};
 
   GridAxisGenerators::EqBoundEqClosed aGenerator{
-      {24., 152}, 8u, {-M_PI, M_PI}, 88u};
+      {24., 152}, 8u, {-std::numbers::pi, std::numbers::pi}, 88u};
 
   PolyhedronReferenceGenerator<1u, true> rGenerator;
 
@@ -217,7 +220,7 @@ BOOST_AUTO_TEST_CASE(RingDisc2DFine) {
 
   // Fine binning created fewer candidates
   std::vector<std::size_t> reference = {38, 39};
-  GridType::point_t p = {80., M_PI * 0.49};
+  GridType::point_t p = {80., std::numbers::pi * 0.49};
   BOOST_CHECK(grid.atPosition(p) == reference);
 }
 
@@ -242,7 +245,7 @@ BOOST_AUTO_TEST_CASE(RingDisc2DFineExpanded) {
           rSurfaces, {}, {BinningValue::binR, BinningValue::binPhi}, {2u, 4u}};
 
   GridAxisGenerators::EqBoundEqClosed aGenerator{
-      {24., 152}, 8u, {-M_PI, M_PI}, 88u};
+      {24., 152}, 8u, {-std::numbers::pi, std::numbers::pi}, 88u};
   PolyhedronReferenceGenerator<1u, true> rGenerator;
 
   auto indexedRing = irSurfaces(tContext, aGenerator, rGenerator);
@@ -263,7 +266,7 @@ BOOST_AUTO_TEST_CASE(RingDisc2DFineExpanded) {
 
   // Bin expansion created again more elements
   std::vector<std::size_t> reference = {38, 39};
-  GridType::point_t p = {80., M_PI * 0.49};
+  GridType::point_t p = {80., std::numbers::pi * 0.49};
   BOOST_CHECK_GT(grid.atPosition(p).size(), 2u);
 }
 
@@ -277,7 +280,7 @@ BOOST_AUTO_TEST_CASE(Cylinder2D) {
           surfaces, {}, {BinningValue::binZ, BinningValue::binPhi}, {1u, 1u}};
 
   GridAxisGenerators::EqBoundEqClosed aGenerator{
-      {-500., 500}, 28, {-M_PI, M_PI}, 52u};
+      {-500., 500}, 28, {-std::numbers::pi, std::numbers::pi}, 52u};
   PolyhedronReferenceGenerator<1u, true> rGenerator;
 
   auto indexedCylinder = icSurfaces(tContext, aGenerator, rGenerator);
@@ -298,7 +301,7 @@ BOOST_AUTO_TEST_CASE(Cylinder2D) {
 
   // Bin expansion created again more elements
   std::vector<std::size_t> reference = {676, 677, 725, 726, 727};
-  GridType::point_t p = {490., M_PI * 0.99};
+  GridType::point_t p = {490., std::numbers::pi * 0.99};
   BOOST_CHECK(grid.atPosition(p) == reference);
 }
 
diff --git a/Tests/UnitTests/Core/Detector/KdtSurfacesProviderTests.cpp b/Tests/UnitTests/Core/Detector/KdtSurfacesProviderTests.cpp
index 16a5e9f772c..b47db7fc49c 100644
--- a/Tests/UnitTests/Core/Detector/KdtSurfacesProviderTests.cpp
+++ b/Tests/UnitTests/Core/Detector/KdtSurfacesProviderTests.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2022 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include <boost/test/unit_test.hpp>
 
diff --git a/Tests/UnitTests/Core/Detector/LayerStructureBuilderTests.cpp b/Tests/UnitTests/Core/Detector/LayerStructureBuilderTests.cpp
index 2e832a29f74..bf4009335c6 100644
--- a/Tests/UnitTests/Core/Detector/LayerStructureBuilderTests.cpp
+++ b/Tests/UnitTests/Core/Detector/LayerStructureBuilderTests.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2022 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include <boost/test/unit_test.hpp>
 
@@ -24,6 +24,7 @@
 #include <cmath>
 #include <functional>
 #include <memory>
+#include <numbers>
 #include <string>
 #include <vector>
 
@@ -66,9 +67,9 @@ BOOST_AUTO_TEST_CASE(LayerStructureBuilder_creationRing) {
   Acts::Experimental::LayerStructureBuilder::Config lsConfig;
   lsConfig.auxiliary = "*** Endcap with 22 surfaces ***";
   lsConfig.surfacesProvider = endcapSurfaces;
-  lsConfig.binnings = {ProtoBinning(Acts::BinningValue::binPhi,
-                                    Acts::AxisBoundaryType::Closed, -M_PI, M_PI,
-                                    22u, 1u)};
+  lsConfig.binnings = {
+      ProtoBinning(Acts::BinningValue::binPhi, Acts::AxisBoundaryType::Closed,
+                   -std::numbers::pi, std::numbers::pi, 22u, 1u)};
 
   auto endcapBuilder = Acts::Experimental::LayerStructureBuilder(
       lsConfig, Acts::getDefaultLogger("EndcapBuilder", Logging::VERBOSE));
@@ -189,9 +190,9 @@ BOOST_AUTO_TEST_CASE(LayerStructureBuilder_creationCylinder) {
       Acts::Experimental::ProtoBinning{Acts::BinningValue::binZ,
                                        Acts::AxisBoundaryType::Bound, -480.,
                                        480., 14u, 1u},
-      Acts::Experimental::ProtoBinning(Acts::BinningValue::binPhi,
-                                       Acts::AxisBoundaryType::Closed, -M_PI,
-                                       M_PI, 32u, 1u)};
+      Acts::Experimental::ProtoBinning(
+          Acts::BinningValue::binPhi, Acts::AxisBoundaryType::Closed,
+          -std::numbers::pi, std::numbers::pi, 32u, 1u)};
 
   auto barrelBuilder = Acts::Experimental::LayerStructureBuilder(
       lsConfig, Acts::getDefaultLogger("BarrelBuilder", Logging::VERBOSE));
diff --git a/Tests/UnitTests/Core/Detector/MultiWireStructureBuilderTests.cpp b/Tests/UnitTests/Core/Detector/MultiWireStructureBuilderTests.cpp
index 7f54da797b7..471594170df 100644
--- a/Tests/UnitTests/Core/Detector/MultiWireStructureBuilderTests.cpp
+++ b/Tests/UnitTests/Core/Detector/MultiWireStructureBuilderTests.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2022-2023 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include <boost/test/unit_test.hpp>
 
@@ -22,6 +22,7 @@
 #include <algorithm>
 #include <iterator>
 #include <memory>
+#include <numbers>
 #include <utility>
 #include <vector>
 
@@ -47,7 +48,7 @@ BOOST_AUTO_TEST_CASE(Multi_Wire_Structure_Builder_StrawSurfacesCreation) {
   // The transform of the 1st surface
   Vector3 ipos = {-0.5 * nSurfacesX * 2 * radius + radius,
                   -0.5 * nSurfacesY * 2 * radius + radius, 0.};
-  AngleAxis3 rotation(M_PI / 2, Acts::Vector3(0., 1., 0.));
+  AngleAxis3 rotation(std::numbers::pi / 2., Acts::Vector3(0., 1., 0.));
 
   Vector3 pos = ipos;
 
diff --git a/Tests/UnitTests/Core/Detector/PortalGeneratorsTests.cpp b/Tests/UnitTests/Core/Detector/PortalGeneratorsTests.cpp
index 98e6a451545..ba9b2bb7e6e 100644
--- a/Tests/UnitTests/Core/Detector/PortalGeneratorsTests.cpp
+++ b/Tests/UnitTests/Core/Detector/PortalGeneratorsTests.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2022 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include <boost/test/unit_test.hpp>
 
@@ -20,6 +20,7 @@
 
 #include <cmath>
 #include <memory>
+#include <numbers>
 #include <vector>
 
 using namespace Acts::Experimental;
@@ -103,7 +104,7 @@ BOOST_AUTO_TEST_CASE(CylindricalPortalGenerator) {
   testDetectorVolumeUpdate(*cTubePortals[3], innerPos, -innerDir, nullptr);
 
   // Sectoral tube cylinder
-  Acts::ActsScalar alpha = 0.25 * M_PI;
+  Acts::ActsScalar alpha = std::numbers::pi / 4.;
   Acts::ActsScalar r = 50;
 
   Acts::Vector3 negPhiSecPos(r * std::cos(-alpha), r * std::sin(-alpha), 0.);
diff --git a/Tests/UnitTests/Core/Detector/PortalTests.cpp b/Tests/UnitTests/Core/Detector/PortalTests.cpp
index 286493bdb65..46d6b32b94c 100644
--- a/Tests/UnitTests/Core/Detector/PortalTests.cpp
+++ b/Tests/UnitTests/Core/Detector/PortalTests.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2022 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include <boost/test/unit_test.hpp>
 
diff --git a/Tests/UnitTests/Core/Detector/ProtoBinningTests.cpp b/Tests/UnitTests/Core/Detector/ProtoBinningTests.cpp
index 05c4c5946a8..e2de5cc1369 100644
--- a/Tests/UnitTests/Core/Detector/ProtoBinningTests.cpp
+++ b/Tests/UnitTests/Core/Detector/ProtoBinningTests.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2023 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include <boost/test/unit_test.hpp>
 
@@ -12,6 +12,8 @@
 #include "Acts/Tests/CommonHelpers/FloatComparisons.hpp"
 #include "Acts/Utilities/BinUtility.hpp"
 
+#include <numbers>
+
 using namespace Acts::Experimental;
 
 BOOST_AUTO_TEST_SUITE(Detector)
@@ -70,7 +72,7 @@ BOOST_AUTO_TEST_CASE(ProtoBinningVariable) {
 BOOST_AUTO_TEST_CASE(BinningDescriptionFromAndToBinUtility) {
   // A valid binning
   Acts::BinUtility bUtility(5u, 0., 10., Acts::open, Acts::BinningValue::binR);
-  std::vector<float> edges = {-M_PI, 0.1, M_PI};
+  std::vector<float> edges = {-std::numbers::pi, 0.1, std::numbers::pi};
   bUtility += Acts::BinUtility(edges, Acts::closed, Acts::BinningValue::binPhi);
 
   auto bDescription = BinningDescription::fromBinUtility(bUtility);
@@ -100,7 +102,8 @@ BOOST_AUTO_TEST_CASE(BinningDescriptionFromAndToBinUtility) {
   BOOST_CHECK_EQUAL(binUtility.binningData()[0].bins(), 5u);
   BOOST_CHECK_EQUAL(binUtility.binningData()[1].bins(), 2u);
   BOOST_CHECK_EQUAL(binUtility.binningData()[1].boundaries().size(), 3u);
-  CHECK_CLOSE_ABS(binUtility.binningData()[1].boundaries()[0], -M_PI, 1e-5);
+  CHECK_CLOSE_ABS(binUtility.binningData()[1].boundaries()[0],
+                  -std::numbers::pi, 1e-5);
   CHECK_CLOSE_ABS(binUtility.binningData()[1].boundaries()[1], 0.1, 1e-4);
 }
 
diff --git a/Tests/UnitTests/Core/Detector/ProtoDetectorTests.cpp b/Tests/UnitTests/Core/Detector/ProtoDetectorTests.cpp
index 114006c0351..27336b90196 100644
--- a/Tests/UnitTests/Core/Detector/ProtoDetectorTests.cpp
+++ b/Tests/UnitTests/Core/Detector/ProtoDetectorTests.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2020 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include <boost/test/unit_test.hpp>
 
diff --git a/Tests/UnitTests/Core/Detector/ReferenceGeneratorsTests.cpp b/Tests/UnitTests/Core/Detector/ReferenceGeneratorsTests.cpp
index a0063e5d471..662119ab3a1 100644
--- a/Tests/UnitTests/Core/Detector/ReferenceGeneratorsTests.cpp
+++ b/Tests/UnitTests/Core/Detector/ReferenceGeneratorsTests.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2023 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include <boost/test/unit_test.hpp>
 
diff --git a/Tests/UnitTests/Core/Detector/SupportSurfacesHelperTests.cpp b/Tests/UnitTests/Core/Detector/SupportSurfacesHelperTests.cpp
index 624e0987a40..cfd6bb11dcc 100644
--- a/Tests/UnitTests/Core/Detector/SupportSurfacesHelperTests.cpp
+++ b/Tests/UnitTests/Core/Detector/SupportSurfacesHelperTests.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2022 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include <boost/test/unit_test.hpp>
 
@@ -21,6 +21,7 @@
 #include <cmath>
 #include <cstddef>
 #include <memory>
+#include <numbers>
 #include <optional>
 #include <stdexcept>
 #include <vector>
@@ -97,7 +98,7 @@ BOOST_AUTO_TEST_CASE(DiscSupportCase) {
   // As a single disc
   // rmin = 100
   // rmax = 400
-  /// phi min = 0
+  // phi min = 0
   // phi max = 2pi
   Acts::Extent lExtent;
   lExtent.set(Acts::BinningValue::binR, 100., 400.);
@@ -147,7 +148,7 @@ BOOST_AUTO_TEST_CASE(DiscSupportCase) {
   dsValues = {120., 399.};
   BOOST_CHECK_THROW(cylindricalSupport(dsComponents), std::invalid_argument);
 
-  dsValues = {120., 399., M_PI, 0.};
+  dsValues = {120., 399., std::numbers::pi, 0.};
   dsType = Acts::Surface::SurfaceType::Cylinder;
   BOOST_CHECK_THROW(cylindricalSupport(dsComponents), std::invalid_argument);
 }
diff --git a/Tests/UnitTests/Core/Detector/VolumeStructureBuilderTests.cpp b/Tests/UnitTests/Core/Detector/VolumeStructureBuilderTests.cpp
index 6ff8c35a291..9d7064a52a4 100644
--- a/Tests/UnitTests/Core/Detector/VolumeStructureBuilderTests.cpp
+++ b/Tests/UnitTests/Core/Detector/VolumeStructureBuilderTests.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2023 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include <boost/test/unit_test.hpp>
 
diff --git a/Tests/UnitTests/Core/EventData/BoundTrackParametersTests.cpp b/Tests/UnitTests/Core/EventData/BoundTrackParametersTests.cpp
index 4410679256e..eaf97f24a43 100644
--- a/Tests/UnitTests/Core/EventData/BoundTrackParametersTests.cpp
+++ b/Tests/UnitTests/Core/EventData/BoundTrackParametersTests.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2017-2020 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include <boost/test/data/test_case.hpp>
 #include <boost/test/unit_test.hpp>
@@ -34,6 +34,7 @@
 #include <cmath>
 #include <limits>
 #include <memory>
+#include <numbers>
 #include <optional>
 #include <utility>
 #include <vector>
@@ -76,12 +77,20 @@ void checkParameters(const BoundTrackParameters& params, double l0, double l1,
                        eps);
   CHECK_CLOSE_OR_SMALL(params.momentum(), p * unitDir, eps, eps);
   BOOST_CHECK_EQUAL(params.charge(), q);
+
+  // reflection
+  BoundTrackParameters reflectedParams = params;
+  reflectedParams.reflectInPlace();
+  CHECK_CLOSE_OR_SMALL(params.reflect().parameters(),
+                       reflectedParams.parameters(), eps, eps);
+  CHECK_CLOSE_OR_SMALL(reflectedParams.reflect().parameters(),
+                       params.parameters(), eps, eps);
 }
 
 void runTest(const std::shared_ptr<const Surface>& surface, double l0,
              double l1, double time, double phi, double theta, double p) {
   // phi is ill-defined in forward/backward tracks
-  phi = ((0 < theta) && (theta < M_PI)) ? phi : 0.0;
+  phi = ((0 < theta) && (theta < std::numbers::pi)) ? phi : 0.;
 
   // global direction for reference
   const Vector3 dir = makeDirectionFromPhiTheta(phi, theta);
@@ -252,9 +261,9 @@ const auto perigees = bdata::make({
     Surface::makeShared<PerigeeSurface>(Vector3(0, 0, -1.5)),
 });
 const auto planes = bdata::make({
-    Surface::makeShared<PlaneSurface>(Vector3(1, 2, 3), Vector3::UnitX()),
-    Surface::makeShared<PlaneSurface>(Vector3(-2, -3, -4), Vector3::UnitY()),
-    Surface::makeShared<PlaneSurface>(Vector3(3, -4, 5), Vector3::UnitZ()),
+    CurvilinearSurface(Vector3(1, 2, 3), Vector3::UnitX()).planeSurface(),
+    CurvilinearSurface(Vector3(-2, -3, -4), Vector3::UnitY()).planeSurface(),
+    CurvilinearSurface(Vector3(3, -4, 5), Vector3::UnitZ()).planeSurface(),
 });
 const auto straws = bdata::make({
     Surface::makeShared<StrawSurface>(Transform3::Identity(), 2.0 /* radius */,
diff --git a/Tests/UnitTests/Core/EventData/CMakeLists.txt b/Tests/UnitTests/Core/EventData/CMakeLists.txt
index f6b5905d07d..1efda4cff29 100644
--- a/Tests/UnitTests/Core/EventData/CMakeLists.txt
+++ b/Tests/UnitTests/Core/EventData/CMakeLists.txt
@@ -13,5 +13,9 @@ add_unittest(SourceLink SourceLinkTests.cpp)
 add_unittest(TrackStatePropMask TrackStatePropMaskTests.cpp)
 add_unittest(ParticleHypothesis ParticleHypothesisTests.cpp)
 add_unittest(MultiTrajectoryHelpers MultiTrajectoryHelpersTests.cpp)
+add_unittest(SubspaceHelpers SubspaceHelpersTests.cpp)
+add_unittest(SeedEdm SeedEdmTests.cpp)
+add_unittest(SpacePointContainerEdm SpacePointContainerEdmTests.cpp)
+add_unittest(TrackParameterHelpers TrackParameterHelpersTests.cpp)
 
 add_non_compile_test(MultiTrajectory TrackContainerComplianceTests.cpp)
diff --git a/Tests/UnitTests/Core/EventData/ChargeTests.cpp b/Tests/UnitTests/Core/EventData/ChargeTests.cpp
index e60dc3dad41..0640482a592 100644
--- a/Tests/UnitTests/Core/EventData/ChargeTests.cpp
+++ b/Tests/UnitTests/Core/EventData/ChargeTests.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2020-2023 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include <boost/test/unit_test.hpp>
 
diff --git a/Tests/UnitTests/Core/EventData/CorrectedTransformFreeToBoundTests.cpp b/Tests/UnitTests/Core/EventData/CorrectedTransformFreeToBoundTests.cpp
index 0697c965bb2..ab1d1c1473a 100644
--- a/Tests/UnitTests/Core/EventData/CorrectedTransformFreeToBoundTests.cpp
+++ b/Tests/UnitTests/Core/EventData/CorrectedTransformFreeToBoundTests.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2022 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include <boost/test/unit_test.hpp>
 
@@ -14,6 +14,7 @@
 #include "Acts/EventData/detail/CorrectedTransformationFreeToBound.hpp"
 #include "Acts/Geometry/GeometryContext.hpp"
 #include "Acts/Surfaces/BoundaryTolerance.hpp"
+#include "Acts/Surfaces/CurvilinearSurface.hpp"
 #include "Acts/Surfaces/PlaneSurface.hpp"
 #include "Acts/Surfaces/Surface.hpp"
 #include "Acts/Tests/CommonHelpers/FloatComparisons.hpp"
@@ -23,6 +24,7 @@
 #include <algorithm>
 #include <cmath>
 #include <memory>
+#include <numbers>
 #include <optional>
 #include <ostream>
 #include <string>
@@ -41,7 +43,7 @@ BOOST_AUTO_TEST_CASE(CorrectedFreeToBoundTrackParameters) {
   const auto loc0 = 0.0;
   const auto loc1 = 0.0;
   const auto phi = 0.0;
-  const auto theta = M_PI / 4;
+  const auto theta = std::numbers::pi / 4.;
   const auto qOverP = 1 / 1_GeV;
   const auto t = 1_ns;
 
@@ -54,8 +56,8 @@ BOOST_AUTO_TEST_CASE(CorrectedFreeToBoundTrackParameters) {
 
   // construct two parallel plane surfaces with normal in x direction
   ActsScalar distance = 10_mm;
-  auto eSurface = Surface::makeShared<PlaneSurface>(Vector3(distance, 0, 0),
-                                                    Vector3::UnitX());
+  auto eSurface = CurvilinearSurface(Vector3(distance, 0, 0), Vector3::UnitX())
+                      .planeSurface();
 
   // the bound parameters at the starting plane
   BoundVector sBoundParams = BoundVector::Zero();
@@ -80,7 +82,7 @@ BOOST_AUTO_TEST_CASE(CorrectedFreeToBoundTrackParameters) {
   Vector3 tpos = intersection.position();
   auto s = intersection.pathLength();
 
-  BOOST_CHECK_EQUAL(s, distance * std::sqrt(2));
+  BOOST_CHECK_EQUAL(s, distance * std::numbers::sqrt2);
 
   // construct the free parameters vector
   FreeVector eFreeParams = FreeVector::Zero();
diff --git a/Tests/UnitTests/Core/EventData/CurvilinearTrackParametersTests.cpp b/Tests/UnitTests/Core/EventData/CurvilinearTrackParametersTests.cpp
index 49f21ff7ea3..444bf398f66 100644
--- a/Tests/UnitTests/Core/EventData/CurvilinearTrackParametersTests.cpp
+++ b/Tests/UnitTests/Core/EventData/CurvilinearTrackParametersTests.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2017-2020 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include <boost/test/unit_test.hpp>
 
@@ -24,6 +24,7 @@
 
 #include <cmath>
 #include <limits>
+#include <numbers>
 #include <optional>
 #include <utility>
 #include <vector>
@@ -59,7 +60,7 @@ void checkParameters(const CurvilinearTrackParameters& params, double phi,
                        detail::radian_sym(phi), eps, eps);
   CHECK_CLOSE_OR_SMALL(params.template get<eBoundTheta>(), theta, eps, eps);
   CHECK_CLOSE_OR_SMALL(params.template get<eBoundQOverP>(), qOverP, eps, eps);
-  // convenience accessorss
+  // convenience accessors
   CHECK_CLOSE_OR_SMALL(params.fourPosition(geoCtx), pos4, eps, eps);
   CHECK_CLOSE_OR_SMALL(params.position(geoCtx), pos, eps, eps);
   CHECK_CLOSE_OR_SMALL(params.time(), pos4[eTime], eps, eps);
@@ -72,6 +73,15 @@ void checkParameters(const CurvilinearTrackParameters& params, double phi,
   // curvilinear reference surface
   CHECK_CLOSE_OR_SMALL(referenceSurface->center(geoCtx), pos, eps, eps);
   CHECK_CLOSE_OR_SMALL(referenceSurface->normal(geoCtx), unitDir, eps, eps);
+
+  // reflection
+  CurvilinearTrackParameters reflectedParams = params;
+  reflectedParams.reflectInPlace();
+  CHECK_CLOSE_OR_SMALL(params.reflect().parameters(),
+                       reflectedParams.parameters(), eps, eps);
+  CHECK_CLOSE_OR_SMALL(reflectedParams.reflect().parameters(),
+                       params.parameters(), eps, eps);
+
   // TODO verify reference frame
 }
 
@@ -84,7 +94,7 @@ BOOST_DATA_TEST_CASE(
     posSymmetric* posSymmetric* posSymmetric* ts* phis* thetas* ps, x, y, z,
     time, phiInput, theta, p) {
   // phi is ill-defined in forward/backward tracks
-  const auto phi = ((0 < theta) && (theta < M_PI)) ? phiInput : 0.0;
+  const auto phi = ((0 < theta) && (theta < std::numbers::pi)) ? phiInput : 0.;
   const Vector4 pos4(x, y, z, time);
   const Vector3 dir = makeDirectionFromPhiTheta(phi, theta);
 
@@ -105,7 +115,7 @@ BOOST_DATA_TEST_CASE(
     posSymmetric* posSymmetric* posSymmetric* ts* phis* thetas* ps* qsNonZero,
     x, y, z, time, phiInput, theta, p, q) {
   // phi is ill-defined in forward/backward tracks
-  const auto phi = ((0 < theta) && (theta < M_PI)) ? phiInput : 0.0;
+  const auto phi = ((0 < theta) && (theta < std::numbers::pi)) ? phiInput : 0.;
   const Vector4 pos4(x, y, z, time);
   const Vector3 dir = makeDirectionFromPhiTheta(phi, theta);
 
@@ -126,7 +136,7 @@ BOOST_DATA_TEST_CASE(
     posSymmetric* posSymmetric* posSymmetric* ts* phis* thetas* ps* qsAny, x, y,
     z, time, phiInput, theta, p, q) {
   // phi is ill-defined in forward/backward tracks
-  const auto phi = ((0 < theta) && (theta < M_PI)) ? phiInput : 0.0;
+  const auto phi = ((0 < theta) && (theta < std::numbers::pi)) ? phiInput : 0.;
   const Vector4 pos4(x, y, z, time);
   const Vector3 dir = makeDirectionFromPhiTheta(phi, theta);
 
diff --git a/Tests/UnitTests/Core/EventData/FreeTrackParametersTests.cpp b/Tests/UnitTests/Core/EventData/FreeTrackParametersTests.cpp
index 0033af46bd4..fb7a11f3f68 100644
--- a/Tests/UnitTests/Core/EventData/FreeTrackParametersTests.cpp
+++ b/Tests/UnitTests/Core/EventData/FreeTrackParametersTests.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2019 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include <boost/test/data/test_case.hpp>
 #include <boost/test/unit_test.hpp>
@@ -67,6 +67,14 @@ void checkParameters(const FreeTrackParameters& params, const Vector4& pos4,
                        eps);
   CHECK_CLOSE_OR_SMALL(params.time(), params.template get<eFreeTime>(), eps,
                        eps);
+
+  // reflection
+  FreeTrackParameters reflectedParams = params;
+  reflectedParams.reflectInPlace();
+  CHECK_CLOSE_OR_SMALL(params.reflect().parameters(),
+                       reflectedParams.parameters(), eps, eps);
+  CHECK_CLOSE_OR_SMALL(reflectedParams.reflect().parameters(),
+                       params.parameters(), eps, eps);
 }
 
 }  // namespace
diff --git a/Tests/UnitTests/Core/EventData/MeasurementHelpersTests.cpp b/Tests/UnitTests/Core/EventData/MeasurementHelpersTests.cpp
index c90c3b3ed7b..4cc000e42e2 100644
--- a/Tests/UnitTests/Core/EventData/MeasurementHelpersTests.cpp
+++ b/Tests/UnitTests/Core/EventData/MeasurementHelpersTests.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2016-2020 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include <boost/test/unit_test.hpp>
 
diff --git a/Tests/UnitTests/Core/EventData/MultiComponentBoundTrackParametersTests.cpp b/Tests/UnitTests/Core/EventData/MultiComponentBoundTrackParametersTests.cpp
index 29f90c2a6de..f9be3e239ab 100644
--- a/Tests/UnitTests/Core/EventData/MultiComponentBoundTrackParametersTests.cpp
+++ b/Tests/UnitTests/Core/EventData/MultiComponentBoundTrackParametersTests.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2017-2020 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include <boost/test/unit_test.hpp>
 
@@ -14,6 +14,7 @@
 #include "Acts/EventData/GenericBoundTrackParameters.hpp"
 #include "Acts/EventData/ParticleHypothesis.hpp"
 #include "Acts/Geometry/GeometryContext.hpp"
+#include "Acts/Surfaces/CurvilinearSurface.hpp"
 #include "Acts/Surfaces/Surface.hpp"
 #include <Acts/EventData/Charge.hpp>
 #include <Acts/EventData/MultiComponentTrackParameters.hpp>
@@ -38,8 +39,9 @@ BOOST_AUTO_TEST_CASE(test_constructors) {
       b;
   b.push_back({1.0, BoundVector::Ones(), BoundSquareMatrix::Identity()});
 
-  auto surface = Acts::Surface::makeShared<Acts::PlaneSurface>(
-      Vector3::Ones(), Vector3::Ones().normalized());
+  auto surface =
+      CurvilinearSurface(Vector3::Ones(), Vector3::Ones().normalized())
+          .planeSurface();
 
   const auto ap =
       MultiComponentBoundTrackParameters(surface, a, particleHypothesis);
@@ -62,8 +64,9 @@ BOOST_AUTO_TEST_CASE(test_accessors) {
   using cov_t = std::optional<BoundSquareMatrix>;
   for (const auto &cov : {cov_t{}, cov_t{BoundSquareMatrix::Identity()},
                           cov_t{BoundSquareMatrix::Identity()}}) {
-    auto surface = Acts::Surface::makeShared<Acts::PlaneSurface>(
-        Vector3::Ones(), Vector3::Ones().normalized());
+    auto surface =
+        CurvilinearSurface(Vector3::Ones(), Vector3::Ones().normalized())
+            .planeSurface();
 
     const BoundTrackParameters single_pars(surface, BoundVector::Ones(), cov,
                                            particleHypothesis);
diff --git a/Tests/UnitTests/Core/EventData/MultiTrajectoryHelpersTests.cpp b/Tests/UnitTests/Core/EventData/MultiTrajectoryHelpersTests.cpp
index 9c2e88362f0..2979e1ce658 100644
--- a/Tests/UnitTests/Core/EventData/MultiTrajectoryHelpersTests.cpp
+++ b/Tests/UnitTests/Core/EventData/MultiTrajectoryHelpersTests.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2024 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include <boost/test/unit_test.hpp>
 
diff --git a/Tests/UnitTests/Core/EventData/MultiTrajectoryTests.cpp b/Tests/UnitTests/Core/EventData/MultiTrajectoryTests.cpp
index 6db5d05f590..6a3c1aafc3e 100644
--- a/Tests/UnitTests/Core/EventData/MultiTrajectoryTests.cpp
+++ b/Tests/UnitTests/Core/EventData/MultiTrajectoryTests.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2019-2020 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include <boost/test/data/test_case.hpp>
 #include <boost/test/tools/context.hpp>
diff --git a/Tests/UnitTests/Core/EventData/ParticleHypothesisTests.cpp b/Tests/UnitTests/Core/EventData/ParticleHypothesisTests.cpp
index 9b99f79d7a9..9fbf3f8b8ef 100644
--- a/Tests/UnitTests/Core/EventData/ParticleHypothesisTests.cpp
+++ b/Tests/UnitTests/Core/EventData/ParticleHypothesisTests.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2023 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include <boost/test/unit_test.hpp>
 
diff --git a/Tests/UnitTests/Core/EventData/SeedEdmTests.cpp b/Tests/UnitTests/Core/EventData/SeedEdmTests.cpp
new file mode 100644
index 00000000000..c5a959b21db
--- /dev/null
+++ b/Tests/UnitTests/Core/EventData/SeedEdmTests.cpp
@@ -0,0 +1,105 @@
+// This file is part of the ACTS project.
+//
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
+//
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
+
+#include <boost/test/unit_test.hpp>
+
+#include "Acts/EventData/Seed.hpp"
+
+#include <vector>
+
+namespace Acts::Test {
+
+struct SpacePoint {};
+
+BOOST_AUTO_TEST_CASE(seed_edm_constructors) {
+  std::array<Acts::Test::SpacePoint, 5> storage{};
+  Acts::Seed<Acts::Test::SpacePoint, 5> seed(storage[0], storage[1], storage[2],
+                                             storage[3], storage[4]);
+  const std::array<const Acts::Test::SpacePoint*, 5>& sps = seed.sp();
+  for (std::size_t i(0ul); i < 5ul; ++i) {
+    BOOST_CHECK_NE(sps[i], nullptr);
+    BOOST_CHECK_EQUAL(sps[i], &storage[i]);
+  }
+
+  // Copy 1
+  Acts::Seed<Acts::Test::SpacePoint, 5> seedCopy1(seed);
+  const std::array<const Acts::Test::SpacePoint*, 5>& spsCopy1 = seedCopy1.sp();
+  for (std::size_t i(0ul); i < 5ul; ++i) {
+    BOOST_CHECK_NE(spsCopy1[i], nullptr);
+    BOOST_CHECK_EQUAL(spsCopy1[i], sps[i]);
+  }
+
+  // Copy 2
+  Acts::Seed<Acts::Test::SpacePoint, 5> seedCopy2{seed};
+  const std::array<const Acts::Test::SpacePoint*, 5>& spsCopy2 = seedCopy2.sp();
+  for (std::size_t i(0ul); i < 5ul; ++i) {
+    BOOST_CHECK_NE(spsCopy2[i], nullptr);
+    BOOST_CHECK_EQUAL(spsCopy2[i], sps[i]);
+  }
+
+  // Collection
+  std::vector<Acts::Seed<Acts::Test::SpacePoint, 5>> seeds{seed};
+  // Copy 1
+  std::vector<Acts::Seed<Acts::Test::SpacePoint, 5>> seedsCopy1(seeds);
+  BOOST_CHECK_EQUAL(seedsCopy1.size(), seeds.size());
+  // Copy 2
+  std::vector<Acts::Seed<Acts::Test::SpacePoint, 5>> seedsCopy2{seeds};
+  BOOST_CHECK_EQUAL(seedsCopy2.size(), seeds.size());
+}
+
+BOOST_AUTO_TEST_CASE(seed_edm_default) {
+  std::array<Acts::Test::SpacePoint, 3> storage{};
+  Acts::Seed<Acts::Test::SpacePoint> seed(storage[0], storage[1], storage[2]);
+  const std::array<const Acts::Test::SpacePoint*, 3>& sps = seed.sp();
+  for (std::size_t i(0ul); i < 3ul; ++i) {
+    BOOST_CHECK_NE(sps[i], nullptr);
+    BOOST_CHECK_EQUAL(sps[i], &storage[i]);
+  }
+
+  seed.setVertexZ(-1.2f);
+  BOOST_CHECK_EQUAL(seed.z(), -1.2f);
+
+  seed.setQuality(345.23f);
+  BOOST_CHECK_EQUAL(seed.seedQuality(), 345.23f);
+}
+
+BOOST_AUTO_TEST_CASE(seed_edm_3d) {
+  std::array<Acts::Test::SpacePoint, 3> storage{};
+  Acts::Seed<Acts::Test::SpacePoint, 3> seed(storage[0], storage[1],
+                                             storage[2]);
+  const std::array<const Acts::Test::SpacePoint*, 3>& sps = seed.sp();
+  for (std::size_t i(0ul); i < 3ul; ++i) {
+    BOOST_CHECK_NE(sps[i], nullptr);
+    BOOST_CHECK_EQUAL(sps[i], &storage[i]);
+  }
+
+  seed.setVertexZ(-1.2f);
+  BOOST_CHECK_EQUAL(seed.z(), -1.2f);
+
+  seed.setQuality(345.23f);
+  BOOST_CHECK_EQUAL(seed.seedQuality(), 345.23f);
+}
+
+BOOST_AUTO_TEST_CASE(seed_edm_4d) {
+  std::array<Acts::Test::SpacePoint, 4> storage{};
+  Acts::Seed<Acts::Test::SpacePoint, 4> seed(storage[0], storage[1], storage[2],
+                                             storage[3]);
+  const std::array<const Acts::Test::SpacePoint*, 4>& sps = seed.sp();
+  for (std::size_t i(0ul); i < 4ul; ++i) {
+    BOOST_CHECK_NE(sps[i], nullptr);
+    BOOST_CHECK_EQUAL(sps[i], &storage[i]);
+  }
+
+  seed.setVertexZ(-1.2f);
+  BOOST_CHECK_EQUAL(seed.z(), -1.2f);
+
+  seed.setQuality(345.23f);
+  BOOST_CHECK_EQUAL(seed.seedQuality(), 345.23f);
+}
+
+}  // namespace Acts::Test
diff --git a/Tests/UnitTests/Core/EventData/SourceLinkTests.cpp b/Tests/UnitTests/Core/EventData/SourceLinkTests.cpp
index ecd59253455..58b02b509d4 100644
--- a/Tests/UnitTests/Core/EventData/SourceLinkTests.cpp
+++ b/Tests/UnitTests/Core/EventData/SourceLinkTests.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2020 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include <boost/test/unit_test.hpp>
 
diff --git a/Tests/UnitTests/Core/EventData/SpacePointContainerEdmTests.cpp b/Tests/UnitTests/Core/EventData/SpacePointContainerEdmTests.cpp
new file mode 100644
index 00000000000..7ca20985499
--- /dev/null
+++ b/Tests/UnitTests/Core/EventData/SpacePointContainerEdmTests.cpp
@@ -0,0 +1,203 @@
+// This file is part of the ACTS project.
+//
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
+//
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
+
+#include <boost/test/unit_test.hpp>
+
+#include "Acts/Definitions/Algebra.hpp"
+#include "Acts/EventData/SpacePointContainer.hpp"
+#include "Acts/Utilities/HashedString.hpp"
+#include "Acts/Utilities/Holders.hpp"
+
+#include <any>
+#include <cmath>
+#include <iterator>
+#include <ranges>
+#include <vector>
+
+namespace Acts::Test {
+
+struct SpacePoint {
+  SpacePoint() = default;
+  SpacePoint(float ix, float iy, float iz, float ivarR, float ivarZ)
+      : x(ix), y(iy), z(iz), varR(ivarR), varZ(ivarZ) {}
+  float x{};
+  float y{};
+  float z{};
+  float varR{};
+  float varZ{};
+};
+using SpacePointCollection = std::vector<SpacePoint>;
+
+class Adapter {
+ public:
+  friend Acts::SpacePointContainer<Adapter, Acts::detail::RefHolder>;
+  friend Acts::SpacePointContainer<Adapter, Acts::detail::ValueHolder>;
+  using value_type = SpacePoint;
+  using ValueType = value_type;
+
+  Adapter(SpacePointCollection&&) = delete;
+  Adapter(const SpacePointCollection& externalCollection)
+      : m_storage(&externalCollection) {}
+
+ private:
+  std::size_t size_impl() const { return storage().size(); }
+
+  float x_impl(std::size_t idx) const { return storage()[idx].x; };
+  float y_impl(std::size_t idx) const { return storage()[idx].y; };
+  float z_impl(std::size_t idx) const { return storage()[idx].z; };
+  float varianceR_impl(std::size_t idx) const { return storage()[idx].varR; }
+  float varianceZ_impl(std::size_t idx) const { return storage()[idx].varZ; }
+
+  const SpacePoint& get_impl(std::size_t idx) const { return storage()[idx]; }
+
+  std::any component_impl(Acts::HashedString key, std::size_t /*n*/) const {
+    using namespace Acts::HashedStringLiteral;
+    switch (key) {
+      case "TopStripVector"_hash:
+      case "BottomStripVector"_hash:
+      case "StripCenterDistance"_hash:
+      case "TopStripCenterPosition"_hash:
+        return Acts::Vector3(0., 0., 0.);
+      default:
+        throw std::runtime_error("no such component " + std::to_string(key));
+    }
+  }
+
+  const SpacePointCollection& storage() const { return *m_storage; }
+
+ private:
+  const SpacePointCollection* m_storage{};
+};
+
+BOOST_AUTO_TEST_CASE(spacepoint_container_edm_traits) {
+  using adapter_t = Acts::Test::Adapter;
+  using container_t =
+      Acts::SpacePointContainer<adapter_t, Acts::detail::RefHolder>;
+  using proxy_t = Acts::SpacePointProxy<container_t>;
+  using iterator_t = Acts::ContainerIndexIterator<container_t, proxy_t&, false>;
+
+  static_assert(std::ranges::range<container_t>);
+  static_assert(std::same_as<typename iterator_t::iterator_category,
+                             std::random_access_iterator_tag>);
+  static_assert(
+      std::same_as<typename std::iterator_traits<iterator_t>::iterator_category,
+                   std::random_access_iterator_tag>);
+}
+
+BOOST_AUTO_TEST_CASE(spacepoint_container_edm_constructors) {
+  std::size_t nExternalPoints = 10;
+  SpacePointCollection externalCollection(nExternalPoints);
+
+  Acts::SpacePointContainerConfig spConfig;
+  Acts::SpacePointContainerOptions spOptions;
+
+  Acts::Test::Adapter adapterForRef(externalCollection);
+  Acts::SpacePointContainer<Acts::Test::Adapter, Acts::detail::RefHolder>
+      spContainerRef(spConfig, spOptions, adapterForRef);
+
+  Acts::SpacePointContainer<Acts::Test::Adapter, Acts::detail::ValueHolder>
+      spContainerVal(spConfig, spOptions,
+                     Acts::Test::Adapter(externalCollection));
+
+  BOOST_CHECK_EQUAL(spContainerRef.size(), nExternalPoints);
+  BOOST_CHECK_EQUAL(spContainerVal.size(), nExternalPoints);
+}
+
+BOOST_AUTO_TEST_CASE(spacepoint_container_edm_functionalities) {
+  std::size_t nExternalPoints = 100;
+  SpacePointCollection externalCollection;
+  externalCollection.reserve(nExternalPoints);
+  for (std::size_t i = 0; i < nExternalPoints; ++i) {
+    externalCollection.emplace_back(1.f * i, 1.5f * i, 2.f * i, 2.5f * i,
+                                    3.f * i);
+  }
+
+  Acts::SpacePointContainerConfig spConfig;
+  spConfig.useDetailedDoubleMeasurementInfo = true;
+  Acts::SpacePointContainerOptions spOptions;
+
+  Acts::Test::Adapter adapter(externalCollection);
+  Acts::SpacePointContainer<Acts::Test::Adapter, Acts::detail::RefHolder>
+      spContainer(spConfig, spOptions, adapter);
+
+  BOOST_CHECK_EQUAL(spContainer.size(), nExternalPoints);
+  BOOST_CHECK_EQUAL(spContainer.size(), externalCollection.size());
+  BOOST_CHECK_EQUAL(spContainer.end() - spContainer.begin(), nExternalPoints);
+  BOOST_CHECK_EQUAL(std::distance(spContainer.begin(), spContainer.end()),
+                    nExternalPoints);
+  BOOST_CHECK_EQUAL(std::distance(std::ranges::begin(spContainer),
+                                  std::ranges::end(spContainer)),
+                    nExternalPoints);
+
+  using proxy_t = Acts::SpacePointProxy<
+      Acts::SpacePointContainer<Acts::Test::Adapter, Acts::detail::RefHolder>>;
+  static_assert(std::same_as<typename decltype(spContainer)::ValueType,
+                             Acts::Test::SpacePoint>);
+  static_assert(
+      std::same_as<typename decltype(spContainer)::ProxyType, proxy_t>);
+  static_assert(
+      std::same_as<typename decltype(spContainer)::value_type, proxy_t>);
+  static_assert(
+      std::same_as<typename proxy_t::ContainerType, decltype(spContainer)>);
+  static_assert(
+      std::same_as<typename proxy_t::ValueType, Acts::Test::SpacePoint>);
+
+  using iterator_t =
+      Acts::ContainerIndexIterator<decltype(spContainer), proxy_t&, false>;
+  using const_iterator_t =
+      Acts::ContainerIndexIterator<decltype(spContainer), const proxy_t&, true>;
+  static_assert(
+      std::same_as<iterator_t, typename decltype(spContainer)::iterator>);
+  static_assert(std::same_as<const_iterator_t,
+                             typename decltype(spContainer)::const_iterator>);
+  static_assert(
+      std::same_as<iterator_t, decltype(std::ranges::begin(spContainer))>);
+  static_assert(std::same_as<const_iterator_t,
+                             decltype(std::ranges::cbegin(spContainer))>);
+
+  std::size_t n = 0ul;
+  for (const proxy_t& proxy : spContainer) {
+    float refX = 1.f * n;
+    float refY = 1.5f * n;
+    float refZ = 2.f * n;
+    float refCovR = 2.5f * n;
+    float refCovZ = 3.f * n;
+    float refRadius = std::hypot(refX, refY);
+    float refPhi = std::atan2(refY, refX);
+
+    BOOST_CHECK_EQUAL(proxy.index(), n);
+    BOOST_CHECK_EQUAL(proxy.x(), refX);
+    BOOST_CHECK_EQUAL(proxy.y(), refY);
+    BOOST_CHECK_EQUAL(proxy.z(), refZ);
+    BOOST_CHECK_EQUAL(proxy.radius(), refRadius);
+    BOOST_CHECK_EQUAL(proxy.phi(), refPhi);
+    BOOST_CHECK_EQUAL(proxy.varianceR(), refCovR);
+    BOOST_CHECK_EQUAL(proxy.varianceZ(), refCovZ);
+
+    const Acts::Vector3& topStripVector = proxy.topStripVector();
+    const Acts::Vector3& bottomStripVector = proxy.bottomStripVector();
+    const Acts::Vector3& stripCenterDistance = proxy.stripCenterDistance();
+    const Acts::Vector3& topStripCenterPosition =
+        proxy.topStripCenterPosition();
+
+    for (std::size_t i = 0; i < 3; ++i) {
+      BOOST_CHECK_EQUAL(topStripVector[i], 0.);
+      BOOST_CHECK_EQUAL(bottomStripVector[i], 0.);
+      BOOST_CHECK_EQUAL(stripCenterDistance[i], 0.);
+      BOOST_CHECK_EQUAL(topStripCenterPosition[i], 0.);
+    }
+
+    const Acts::Test::SpacePoint& sp = proxy.externalSpacePoint();
+    BOOST_CHECK_EQUAL(&sp, &externalCollection[n]);
+
+    ++n;
+  }
+  BOOST_CHECK_EQUAL(n, nExternalPoints);
+}
+
+}  // namespace Acts::Test
diff --git a/Tests/UnitTests/Core/EventData/SubspaceHelpersTests.cpp b/Tests/UnitTests/Core/EventData/SubspaceHelpersTests.cpp
new file mode 100644
index 00000000000..827235191db
--- /dev/null
+++ b/Tests/UnitTests/Core/EventData/SubspaceHelpersTests.cpp
@@ -0,0 +1,24 @@
+// This file is part of the ACTS project.
+//
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
+//
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
+
+#include <boost/test/unit_test.hpp>
+
+#include "Acts/EventData/SubspaceHelpers.hpp"
+
+BOOST_AUTO_TEST_SUITE(SubspaceHelpers)
+
+BOOST_AUTO_TEST_CASE(SerializeDeserialize) {
+  Acts::SubspaceIndices<3> indices = {1, 2, 3};
+  auto serialized = Acts::serializeSubspaceIndices<3>(indices);
+  auto deserialized = Acts::deserializeSubspaceIndices<3>(serialized);
+
+  BOOST_CHECK_EQUAL_COLLECTIONS(indices.begin(), indices.end(),
+                                deserialized.begin(), deserialized.end());
+}
+
+BOOST_AUTO_TEST_SUITE_END()
diff --git a/Tests/UnitTests/Core/EventData/TrackContainerComplianceTests.cpp b/Tests/UnitTests/Core/EventData/TrackContainerComplianceTests.cpp
index e150204bc65..731f9e01a47 100644
--- a/Tests/UnitTests/Core/EventData/TrackContainerComplianceTests.cpp
+++ b/Tests/UnitTests/Core/EventData/TrackContainerComplianceTests.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2023 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include "Acts/EventData/MultiTrajectory.hpp"
 #include "Acts/EventData/ProxyAccessor.hpp"
@@ -75,6 +75,7 @@ ACTS_DOES_NOT_COMPILE_SUITE_BEGIN(BuildFromConstRef)
   (void)t;
 
   ConstProxyAccessor<unsigned int> caccNMeasuements("nMeasurements");
+  static_cast<void>(caccNMeasuements);  // suppressed unused warning
   ACTS_DOES_NOT_COMPILE_BEGIN(ConstAccessorMutate)
   caccNMeasuements(t) = 66;
   ACTS_DOES_NOT_COMPILE_END()
diff --git a/Tests/UnitTests/Core/EventData/TrackParameterHelpersTests.cpp b/Tests/UnitTests/Core/EventData/TrackParameterHelpersTests.cpp
new file mode 100644
index 00000000000..bba77ff8ef2
--- /dev/null
+++ b/Tests/UnitTests/Core/EventData/TrackParameterHelpersTests.cpp
@@ -0,0 +1,53 @@
+// This file is part of the ACTS project.
+//
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
+//
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
+
+#include <boost/test/unit_test.hpp>
+
+#include "Acts/Definitions/TrackParametrization.hpp"
+#include "Acts/EventData/TrackParameterHelpers.hpp"
+#include "Acts/Tests/CommonHelpers/FloatComparisons.hpp"
+
+BOOST_AUTO_TEST_SUITE(TrackParameterHelpers)
+
+BOOST_AUTO_TEST_CASE(isBoundVectorValid) {
+  BOOST_CHECK(!Acts::isBoundVectorValid({1, 2, 3, 4, 5, 6}, true));
+  BOOST_CHECK(Acts::isBoundVectorValid({1, 2, 1, 1, 5, 6}, true));
+}
+
+BOOST_AUTO_TEST_CASE(isFreeVectorValid) {
+  BOOST_CHECK(!Acts::isFreeVectorValid({1, 2, 3, 4, 5, 6, 7, 8}));
+  BOOST_CHECK(Acts::isFreeVectorValid({1, 2, 3, 4, 1, 0, 0, 8}));
+}
+
+BOOST_AUTO_TEST_CASE(normalizeBoundParameters) {
+  CHECK_CLOSE_OR_SMALL(Acts::normalizeBoundParameters({1, 2, 3, 4, 5, 6}),
+                       Acts::BoundVector(1, 2, -0.141593, 2.28319, 5, 6), 1e-3,
+                       1e-3);
+}
+
+BOOST_AUTO_TEST_CASE(addBoundParameters) {
+  CHECK_CLOSE_OR_SMALL(
+      Acts::addBoundParameters({1, 2, 3, 4, 5, 6}, {0, 0, 0, 0, 0, 0}),
+      Acts::normalizeBoundParameters({1, 2, 3, 4, 5, 6}), 1e-3, 1e-3);
+  CHECK_CLOSE_OR_SMALL(
+      Acts::addBoundParameters({1, 2, 3, 4, 5, 6}, {0, 0, 1, 1, 0, 0}),
+      Acts::normalizeBoundParameters({1, 2, 4, 5, 5, 6}), 1e-3, 1e-3);
+}
+
+BOOST_AUTO_TEST_CASE(subtractBoundParameters) {
+  CHECK_CLOSE_OR_SMALL(
+      Acts::subtractBoundParameters({1, 2, 3, 4, 5, 6}, {1, 2, 3, 4, 5, 6}),
+      Acts::BoundVector(0, 0, 0, 0, 0, 0), 1e-3, 1e-3);
+  CHECK_CLOSE_OR_SMALL(
+      Acts::addBoundParameters(
+          Acts::subtractBoundParameters({1, 2, 3, 4, 5, 6}, {0, 0, 1, 1, 0, 0}),
+          {0, 0, 1, 1, 0, 0}),
+      Acts::normalizeBoundParameters({1, 2, 3, 4, 5, 6}), 1e-3, 1e-3);
+}
+
+BOOST_AUTO_TEST_SUITE_END()
diff --git a/Tests/UnitTests/Core/EventData/TrackParametersDatasets.hpp b/Tests/UnitTests/Core/EventData/TrackParametersDatasets.hpp
index d7781058557..668047c6ed2 100644
--- a/Tests/UnitTests/Core/EventData/TrackParametersDatasets.hpp
+++ b/Tests/UnitTests/Core/EventData/TrackParametersDatasets.hpp
@@ -1,16 +1,17 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2020 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
 #include <boost/test/data/test_case.hpp>
 
 #include "Acts/Definitions/Units.hpp"
+#include "Acts/Surfaces/CurvilinearSurface.hpp"
 #include "Acts/Surfaces/CylinderSurface.hpp"
 #include "Acts/Surfaces/DiscSurface.hpp"
 #include "Acts/Surfaces/PerigeeSurface.hpp"
@@ -18,6 +19,7 @@
 #include "Acts/Surfaces/RegularSurface.hpp"
 
 #include <cmath>
+#include <numbers>
 #include <vector>
 
 namespace {
@@ -34,21 +36,24 @@ const auto surfaces =
             Transform3::Identity(), 10 /* radius */, 100 /* half-length z */),
         // TODO perigee roundtrip local->global->local does not seem to work
         // Surface::makeShared<PerigeeSurface>(Vector3(0, 0, -1.5)),
-        Surface::makeShared<PlaneSurface>(Vector3::Zero(), Vector3::UnitX()),
-        Surface::makeShared<PlaneSurface>(Vector3::Zero(), Vector3::UnitY()),
-        Surface::makeShared<PlaneSurface>(Vector3::Zero(), Vector3::UnitZ()),
+        CurvilinearSurface(Vector3::Zero(), Vector3::UnitX()).planeSurface(),
+        CurvilinearSurface(Vector3::Zero(), Vector3::UnitY()).planeSurface(),
+        CurvilinearSurface(Vector3::Zero(), Vector3::UnitZ()).planeSurface(),
     });
 // positions
-const auto posAngle = bdata::xrange(-M_PI, M_PI, 0.50);
+const auto posAngle = bdata::xrange(-std::numbers::pi, std::numbers::pi, 0.5);
 const auto posPositiveNonzero = bdata::xrange(0.25, 1.0, 0.25);
 const auto posPositive = bdata::make(0.0) + posPositiveNonzero;
 const auto posSymmetric = bdata::xrange(-1.0, 1.0, 0.50);
 // time
 const auto ts = bdata::make(1.0);
 // direction angles
-const auto phis = bdata::make({0.0, M_PI, -M_PI, M_PI_2, -M_PI_2});
-const auto thetasNoForwardBackward = bdata::xrange(M_PI_4, M_PI, M_PI_4);
-const auto thetas = bdata::make({0.0, M_PI}) + thetasNoForwardBackward;
+const auto phis = bdata::make({0., std::numbers::pi, -std::numbers::pi,
+                               std::numbers::pi / 2., -std::numbers::pi / 2.});
+const auto thetasNoForwardBackward = bdata::xrange(
+    std::numbers::pi / 4., std::numbers::pi, std::numbers::pi / 4.);
+const auto thetas =
+    bdata::make({0., std::numbers::pi}) + thetasNoForwardBackward;
 // absolute momenta
 const auto ps = bdata::make({1.0, 10.0});
 // charges
diff --git a/Tests/UnitTests/Core/EventData/TrackStatePropMaskTests.cpp b/Tests/UnitTests/Core/EventData/TrackStatePropMaskTests.cpp
index 3b5fabce6db..a051a9a1685 100644
--- a/Tests/UnitTests/Core/EventData/TrackStatePropMaskTests.cpp
+++ b/Tests/UnitTests/Core/EventData/TrackStatePropMaskTests.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2023 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include <boost/test/unit_test.hpp>
 
@@ -49,7 +49,7 @@ BOOST_AUTO_TEST_CASE(BitmaskOperators) {
   BOOST_CHECK(!ACTS_CHECK_BIT(bs4, PM::Filtered));
 
   auto cnv = [](auto a) -> std::bitset<8> {
-    return static_cast<std::underlying_type<PM>::type>(a);
+    return static_cast<std::underlying_type_t<PM>>(a);
   };
 
   BOOST_CHECK(cnv(PM::All).all());    // all ones
diff --git a/Tests/UnitTests/Core/EventData/TrackTests.cpp b/Tests/UnitTests/Core/EventData/TrackTests.cpp
index 698ea737d2a..432efad6447 100644
--- a/Tests/UnitTests/Core/EventData/TrackTests.cpp
+++ b/Tests/UnitTests/Core/EventData/TrackTests.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2023-2024 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include <boost/test/unit_test.hpp>
 
@@ -24,6 +24,7 @@
 #include "Acts/Utilities/HashedString.hpp"
 #include "Acts/Utilities/Holders.hpp"
 
+#include <algorithm>
 #include <cstddef>
 #include <iterator>
 #include <memory>
@@ -227,9 +228,9 @@ BOOST_AUTO_TEST_CASE(IteratorConcept) {
     BOOST_CHECK(*it == tc.getTrack(0));
     std::advance(it, 4);
     BOOST_CHECK(*it == tc.getTrack(4));
-    BOOST_CHECK(*(it[-1]) == tc.getTrack(3));
-    BOOST_CHECK(*(it[0]) == tc.getTrack(4));
-    BOOST_CHECK(*(it[1]) == tc.getTrack(5));
+    BOOST_CHECK(*(it + (-1)) == tc.getTrack(3));
+    BOOST_CHECK(*(it + 0) == tc.getTrack(4));
+    BOOST_CHECK(*(it + 1) == tc.getTrack(5));
     BOOST_CHECK(*(it - 2) == tc.getTrack(2));
   }
 
@@ -441,7 +442,7 @@ BOOST_AUTO_TEST_CASE(ForwardIteration) {
     indices.push_back(ts.index());
   }
 
-  std::reverse(indices.begin(), indices.end());
+  std::ranges::reverse(indices);
 
   std::vector<IndexType> act;
   for (auto ts : t.trackStates()) {
diff --git a/Tests/UnitTests/Core/EventData/TrackTestsExtra.cpp b/Tests/UnitTests/Core/EventData/TrackTestsExtra.cpp
index 811c3cd3770..ca444466216 100644
--- a/Tests/UnitTests/Core/EventData/TrackTestsExtra.cpp
+++ b/Tests/UnitTests/Core/EventData/TrackTestsExtra.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2023-2024 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include <boost/test/unit_test.hpp>
 
@@ -12,9 +12,11 @@
 #include "Acts/EventData/ProxyAccessor.hpp"
 #include "Acts/EventData/VectorMultiTrajectory.hpp"
 #include "Acts/EventData/VectorTrackContainer.hpp"
+#include "Acts/Surfaces/CurvilinearSurface.hpp"
 #include "Acts/Surfaces/PlaneSurface.hpp"
 #include "Acts/Utilities/Zip.hpp"
 
+#include <algorithm>
 #include <numeric>
 
 using namespace Acts;
@@ -216,8 +218,9 @@ BOOST_AUTO_TEST_CASE_TEMPLATE(Build, factory_t, holder_types) {
   t.covariance() = cov;
   BOOST_CHECK_EQUAL(t.covariance(), cov);
 
-  auto surface = Acts::Surface::makeShared<Acts::PlaneSurface>(
-      Acts::Vector3{-3_m, 0., 0.}, Acts::Vector3{1., 0., 0});
+  auto surface =
+      CurvilinearSurface(Acts::Vector3{-3_m, 0., 0.}, Acts::Vector3{1., 0., 0})
+          .planeSurface();
 
   t.setReferenceSurface(surface);
   BOOST_CHECK_EQUAL(surface.get(), &t.referenceSurface());
@@ -419,7 +422,7 @@ BOOST_AUTO_TEST_CASE(ReverseTrackStates) {
   // reverse with jacobians
   t.reverseTrackStates(true);
 
-  std::reverse(exp.begin(), exp.end());
+  std::ranges::reverse(exp);
   std::rotate(exp.rbegin(), std::next(exp.rbegin()), exp.rend());
 
   for (const auto [e, ts] : zip(exp, t.trackStates())) {
@@ -444,4 +447,24 @@ BOOST_AUTO_TEST_CASE(ReverseTrackStates) {
   }
 }
 
+BOOST_AUTO_TEST_CASE(CopyTrackProxyCalibrated) {
+  VectorTrackContainer vtc{};
+  VectorMultiTrajectory mtj{};
+  TrackContainer tc{vtc, mtj};
+
+  constexpr static std::size_t kMeasurementSize = 3;
+
+  auto track1 = tc.makeTrack();
+  auto ts = track1.appendTrackState(TrackStatePropMask::Calibrated);
+  ts.allocateCalibrated(kMeasurementSize);
+  ts.calibrated<kMeasurementSize>() = Vector3::Ones();
+  ts.calibratedCovariance<kMeasurementSize>() = SquareMatrix3::Identity();
+  ts.setSubspaceIndices(BoundSubspaceIndices{});
+
+  auto tsCopy = track1.appendTrackState(TrackStatePropMask::Calibrated);
+  tsCopy.copyFrom(ts, TrackStatePropMask::Calibrated, false);
+
+  BOOST_CHECK_EQUAL(ts.calibratedSize(), tsCopy.calibratedSize());
+}
+
 BOOST_AUTO_TEST_SUITE_END()
diff --git a/Tests/UnitTests/Core/EventData/TransformHelpersTests.cpp b/Tests/UnitTests/Core/EventData/TransformHelpersTests.cpp
index 57b675ae317..2d3bcb3ce70 100644
--- a/Tests/UnitTests/Core/EventData/TransformHelpersTests.cpp
+++ b/Tests/UnitTests/Core/EventData/TransformHelpersTests.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2020 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include <boost/test/data/test_case.hpp>
 #include <boost/test/unit_test.hpp>
@@ -19,6 +19,7 @@
 
 #include <algorithm>
 #include <limits>
+#include <numbers>
 #include <utility>
 #include <vector>
 
@@ -74,7 +75,7 @@ BOOST_DATA_TEST_CASE(
     surfaces* posSymmetric* posSymmetric* ts* phis* thetas* ps* qsNonZero,
     surface, l0, l1, time, phiInput, theta, p, q) {
   // phi is ill-defined in forward/backward tracks
-  const auto phi = ((0 < theta) && (theta < M_PI)) ? phiInput : 0.0;
+  const auto phi = ((0 < theta) && (theta < std::numbers::pi)) ? phiInput : 0.;
   const auto qOverP = q / p;
 
   GeometryContext geoCtx;
@@ -158,7 +159,7 @@ BOOST_DATA_TEST_CASE(GlobalToCurvilinearParameters,
                      ts* phis* thetas* ps* qsNonZero, time, phiInput, theta, p,
                      q) {
   // phi is ill-defined in forward/backward tracks
-  const auto phi = ((0 < theta) && (theta < M_PI)) ? phiInput : 0.0;
+  const auto phi = ((0 < theta) && (theta < std::numbers::pi)) ? phiInput : 0.;
   const auto qOverP = q / p;
 
   GeometryContext geoCtx;
diff --git a/Tests/UnitTests/Core/Geometry/AlignmentContextTests.cpp b/Tests/UnitTests/Core/Geometry/AlignmentContextTests.cpp
index 929f746377b..382bb8a0075 100644
--- a/Tests/UnitTests/Core/Geometry/AlignmentContextTests.cpp
+++ b/Tests/UnitTests/Core/Geometry/AlignmentContextTests.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2017-2019 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include <boost/test/unit_test.hpp>
 
diff --git a/Tests/UnitTests/Core/Geometry/CMakeLists.txt b/Tests/UnitTests/Core/Geometry/CMakeLists.txt
index 00ee68e3c80..0226e46d7d0 100644
--- a/Tests/UnitTests/Core/Geometry/CMakeLists.txt
+++ b/Tests/UnitTests/Core/Geometry/CMakeLists.txt
@@ -32,3 +32,6 @@ add_unittest(TrapezoidVolumeBounds TrapezoidVolumeBoundsTests.cpp)
 add_unittest(VolumeBounds VolumeBoundsTests.cpp)
 add_unittest(Volume VolumeTests.cpp)
 add_unittest(CylinderVolumeStack CylinderVolumeStackTests.cpp)
+add_unittest(PortalLink PortalLinkTests.cpp)
+add_unittest(Portal PortalTests.cpp)
+add_unittest(PortalShell PortalShellTests.cpp)
diff --git a/Tests/UnitTests/Core/Geometry/ConeLayerTests.cpp b/Tests/UnitTests/Core/Geometry/ConeLayerTests.cpp
index 7bfbdcab179..e10cac3073d 100644
--- a/Tests/UnitTests/Core/Geometry/ConeLayerTests.cpp
+++ b/Tests/UnitTests/Core/Geometry/ConeLayerTests.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2017-2018 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include <boost/test/unit_test.hpp>
 
@@ -21,6 +21,7 @@
 
 #include <cmath>
 #include <memory>
+#include <numbers>
 #include <utility>
 #include <vector>
 
@@ -35,8 +36,8 @@ BOOST_AUTO_TEST_CASE(ConeLayerConstruction) {
   // ConeBounds) to construct
   Translation3 translation{0., 1., 2.};
   auto pTransform = Transform3(translation);
-  double alpha(M_PI / 8.0);
-  const bool symmetric(false);
+  const double alpha = std::numbers::pi / 8.;
+  const bool symmetric = false;
   auto pCone = std::make_shared<const ConeBounds>(alpha, symmetric);
   // for some reason, this one doesn't exist
   // auto         pConeLayer = ConeLayer::create(pTransform, pCone);
@@ -48,7 +49,7 @@ BOOST_AUTO_TEST_CASE(ConeLayerConstruction) {
   const std::vector<std::shared_ptr<const Surface>> aSurfaces{
       Surface::makeShared<PlaneSurface>(Transform3::Identity(), rBounds),
       Surface::makeShared<PlaneSurface>(Transform3::Identity(), rBounds)};
-  const double thickness(1.0);
+  const double thickness = 1.;
   auto pConeLayerFromSurfaces = ConeLayer::create(pTransform, pCone, nullptr);
   BOOST_CHECK_EQUAL(pConeLayerFromSurfaces->layerType(), LayerType::active);
   // construct with thickness:
diff --git a/Tests/UnitTests/Core/Geometry/ConeVolumeBoundsTests.cpp b/Tests/UnitTests/Core/Geometry/ConeVolumeBoundsTests.cpp
index d5040173f44..f65937b386b 100644
--- a/Tests/UnitTests/Core/Geometry/ConeVolumeBoundsTests.cpp
+++ b/Tests/UnitTests/Core/Geometry/ConeVolumeBoundsTests.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2020 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include <boost/test/unit_test.hpp>
 
@@ -16,6 +16,7 @@
 
 #include <cmath>
 #include <memory>
+#include <numbers>
 #include <utility>
 #include <vector>
 
@@ -27,7 +28,7 @@ BOOST_AUTO_TEST_SUITE(VolumeBounds)
 
 BOOST_AUTO_TEST_CASE(ConeVolumeBoundsTests) {
   // Single solid Cone
-  ConeVolumeBounds solidCone(0., 0., 0.45, 50_mm, 50_mm, 0., M_PI);
+  ConeVolumeBounds solidCone(0., 0., 0.45, 50_mm, 50_mm, 0., std::numbers::pi);
 
   // Test correct parameter return
   BOOST_CHECK_EQUAL(solidCone.get(ConeVolumeBounds::eInnerAlpha), 0.);
@@ -36,7 +37,8 @@ BOOST_AUTO_TEST_CASE(ConeVolumeBoundsTests) {
   BOOST_CHECK_EQUAL(solidCone.get(ConeVolumeBounds::eOuterOffsetZ), 50.);
   BOOST_CHECK_EQUAL(solidCone.get(ConeVolumeBounds::eHalfLengthZ), 50.);
   BOOST_CHECK_EQUAL(solidCone.get(ConeVolumeBounds::eAveragePhi), 0.);
-  BOOST_CHECK_EQUAL(solidCone.get(ConeVolumeBounds::eHalfPhiSector), M_PI);
+  BOOST_CHECK_EQUAL(solidCone.get(ConeVolumeBounds::eHalfPhiSector),
+                    std::numbers::pi);
   // Derived quantities
   BOOST_CHECK_EQUAL(solidCone.innerTanAlpha(), 0.);
   BOOST_CHECK_EQUAL(solidCone.innerRmin(), 0.);
@@ -51,12 +53,13 @@ BOOST_AUTO_TEST_CASE(ConeVolumeBoundsTests) {
   BOOST_CHECK_EQUAL(solidConeSurfaces.size(), 2);
 
   // Single solid Cone - with cut off
-  ConeVolumeBounds cutOffCone(0., 0., 0.45, 80_mm, 50_mm, 0., M_PI);
+  ConeVolumeBounds cutOffCone(0., 0., 0.45, 80_mm, 50_mm, 0., std::numbers::pi);
   auto cutOffConeSurfaces = cutOffCone.orientedSurfaces();
   BOOST_CHECK_EQUAL(cutOffConeSurfaces.size(), 3);
 
   // Cone - Cone inlay
-  ConeVolumeBounds cutOffHollowCone(0.35, 70_mm, 0.45, 80_mm, 50_mm, 0., M_PI);
+  ConeVolumeBounds cutOffHollowCone(0.35, 70_mm, 0.45, 80_mm, 50_mm, 0.,
+                                    std::numbers::pi);
   auto cutOffHollowConeSurfaces = cutOffHollowCone.orientedSurfaces();
   BOOST_CHECK_EQUAL(cutOffHollowConeSurfaces.size(), 4);
 
@@ -68,18 +71,20 @@ BOOST_AUTO_TEST_CASE(ConeVolumeBoundsTests) {
   BOOST_CHECK_EQUAL(cutOffHollowSectoralConeSurfaces.size(), 6);
 
   // Sectoral Cone - Hollow Cone
-  ConeVolumeBounds cutOffHollowCylCone(10_mm, 0.45, 80_mm, 50_mm, 0., M_PI);
+  ConeVolumeBounds cutOffHollowCylCone(10_mm, 0.45, 80_mm, 50_mm, 0.,
+                                       std::numbers::pi);
   auto cutOffHollowCylConeSurfaces = cutOffHollowCylCone.orientedSurfaces();
   BOOST_CHECK_EQUAL(cutOffHollowCylConeSurfaces.size(), 4);
 
   // Single Hollow Cylinder - Cone inlay
-  ConeVolumeBounds cutOffHollowConeCyl(120_mm, 0.35, 70_mm, 50_mm, 0., M_PI);
+  ConeVolumeBounds cutOffHollowConeCyl(120_mm, 0.35, 70_mm, 50_mm, 0.,
+                                       std::numbers::pi);
   auto cutOffHollowConeCylSurfaces = cutOffHollowConeCyl.orientedSurfaces();
   BOOST_CHECK_EQUAL(cutOffHollowConeCylSurfaces.size(), 4);
 }
 
 BOOST_AUTO_TEST_CASE(ConeVolumeBoundsSurfaceOrientation) {
-  ConeVolumeBounds hcone(10_mm, 0.45, 80_mm, 50_mm, 0., M_PI);
+  ConeVolumeBounds hcone(10_mm, 0.45, 80_mm, 50_mm, 0., std::numbers::pi);
 
   auto cvbOrientedSurfaces = hcone.orientedSurfaces(Transform3::Identity());
   BOOST_CHECK_EQUAL(cvbOrientedSurfaces.size(), 4);
diff --git a/Tests/UnitTests/Core/Geometry/CuboidVolumeBoundsTests.cpp b/Tests/UnitTests/Core/Geometry/CuboidVolumeBoundsTests.cpp
index dac15d46ba5..c3cf71a351b 100644
--- a/Tests/UnitTests/Core/Geometry/CuboidVolumeBoundsTests.cpp
+++ b/Tests/UnitTests/Core/Geometry/CuboidVolumeBoundsTests.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2019 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include <boost/test/unit_test.hpp>
 
diff --git a/Tests/UnitTests/Core/Geometry/CuboidVolumeBuilderTests.cpp b/Tests/UnitTests/Core/Geometry/CuboidVolumeBuilderTests.cpp
index 746e140483b..f20628b809e 100644
--- a/Tests/UnitTests/Core/Geometry/CuboidVolumeBuilderTests.cpp
+++ b/Tests/UnitTests/Core/Geometry/CuboidVolumeBuilderTests.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2018 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include <boost/test/unit_test.hpp>
 
@@ -30,6 +30,7 @@
 #include <cmath>
 #include <functional>
 #include <memory>
+#include <numbers>
 #include <string>
 #include <vector>
 
@@ -52,7 +53,7 @@ BOOST_AUTO_TEST_CASE(CuboidVolumeBuilderTest) {
     cfg.position = {i * UnitConstants::m, 0., 0.};
 
     // Rotation of the surfaces
-    double rotationAngle = M_PI * 0.5;
+    double rotationAngle = std::numbers::pi / 2.;
     Vector3 xPos(cos(rotationAngle), 0., sin(rotationAngle));
     Vector3 yPos(0., 1., 0.);
     Vector3 zPos(-sin(rotationAngle), 0., cos(rotationAngle));
@@ -177,7 +178,7 @@ BOOST_AUTO_TEST_CASE(CuboidVolumeBuilderTest) {
     cfg.position = {-i * UnitConstants::m, 0., 0.};
 
     // Rotation of the surfaces
-    double rotationAngle = M_PI * 0.5;
+    double rotationAngle = std::numbers::pi / 2.;
     Vector3 xPos(cos(rotationAngle), 0., sin(rotationAngle));
     Vector3 yPos(0., 1., 0.);
     Vector3 zPos(-sin(rotationAngle), 0., cos(rotationAngle));
@@ -226,13 +227,16 @@ BOOST_AUTO_TEST_CASE(CuboidVolumeBuilderTest) {
   std::unique_ptr<const TrackingGeometry> detector =
       tgb.trackingGeometry(tgContext);
   BOOST_CHECK_EQUAL(
-      detector->lowestTrackingVolume(tgContext, Vector3(1., 0., 0.))
+      detector->lowestTrackingVolume(tgContext, Vector3(1_mm, 0_mm, 0_mm))
           ->volumeName(),
       volumeConfig.name);
   BOOST_CHECK_EQUAL(
-      detector->lowestTrackingVolume(tgContext, Vector3(-1., 0., 0.))
+      detector->lowestTrackingVolume(tgContext, Vector3(-1_mm, 0_mm, 0_mm))
           ->volumeName(),
       volumeConfig2.name);
+  BOOST_CHECK_EQUAL(
+      detector->lowestTrackingVolume(tgContext, Vector3(1000_m, 0_m, 0_m)),
+      nullptr);
 }
 
 }  // namespace Acts::Test
diff --git a/Tests/UnitTests/Core/Geometry/CutoutCylinderVolumeBoundsTests.cpp b/Tests/UnitTests/Core/Geometry/CutoutCylinderVolumeBoundsTests.cpp
index 2cac47c5415..7518ad5489a 100644
--- a/Tests/UnitTests/Core/Geometry/CutoutCylinderVolumeBoundsTests.cpp
+++ b/Tests/UnitTests/Core/Geometry/CutoutCylinderVolumeBoundsTests.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2019 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include <boost/test/unit_test.hpp>
 
diff --git a/Tests/UnitTests/Core/Geometry/CylinderLayerTests.cpp b/Tests/UnitTests/Core/Geometry/CylinderLayerTests.cpp
index bf172e8f6a5..616292486e6 100644
--- a/Tests/UnitTests/Core/Geometry/CylinderLayerTests.cpp
+++ b/Tests/UnitTests/Core/Geometry/CylinderLayerTests.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2017-2018 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include <boost/test/unit_test.hpp>
 
diff --git a/Tests/UnitTests/Core/Geometry/CylinderVolumeBoundsTests.cpp b/Tests/UnitTests/Core/Geometry/CylinderVolumeBoundsTests.cpp
index 585f4503093..9de254dfb68 100644
--- a/Tests/UnitTests/Core/Geometry/CylinderVolumeBoundsTests.cpp
+++ b/Tests/UnitTests/Core/Geometry/CylinderVolumeBoundsTests.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2017-2018 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include <boost/test/data/test_case.hpp>
 #include <boost/test/unit_test.hpp>
@@ -24,6 +24,7 @@
 #include <array>
 #include <cmath>
 #include <memory>
+#include <numbers>
 #include <stdexcept>
 #include <vector>
 
@@ -34,7 +35,8 @@ namespace Acts::Test {
 BOOST_AUTO_TEST_SUITE(Geometry)
 
 BOOST_AUTO_TEST_CASE(CylinderVolumeBoundsConstruction) {
-  double rmin{10.}, rmax{20.}, halfz{30.}, halfphi{M_PI / 4}, avgphi{0.};
+  double rmin{10.}, rmax{20.}, halfz{30.}, halfphi{std::numbers::pi / 4.},
+      avgphi{0.};
 
   // Test different construction modes: solid
   CylinderVolumeBounds solidCylinder(0., rmax, halfz);
@@ -76,7 +78,8 @@ BOOST_AUTO_TEST_CASE(CylinderVolumeBoundsConstruction) {
 }
 
 BOOST_AUTO_TEST_CASE(CylinderVolumeBoundsRecreation) {
-  double rmin{10.}, rmax{20.}, halfz{30.}, halfphi{M_PI / 4}, avgphi{0.};
+  double rmin{10.}, rmax{20.}, halfz{30.}, halfphi{std::numbers::pi / 4.},
+      avgphi{0.};
 
   CylinderVolumeBounds original(rmin, rmax, halfz, halfphi, avgphi);
   std::array<double, CylinderVolumeBounds::eSize> values{};
@@ -87,7 +90,8 @@ BOOST_AUTO_TEST_CASE(CylinderVolumeBoundsRecreation) {
 }
 
 BOOST_AUTO_TEST_CASE(CylinderVolumeBoundsExceptions) {
-  double rmin{10.}, rmax{20.}, halfz{30.}, halfphi{M_PI / 4}, avgphi{0.};
+  double rmin{10.}, rmax{20.}, halfz{30.}, halfphi{std::numbers::pi / 4.},
+      avgphi{0.};
 
   // Negative inner radius
   BOOST_CHECK_THROW(CylinderVolumeBounds(-rmin, rmax, halfz, halfphi, avgphi),
@@ -133,7 +137,8 @@ BOOST_AUTO_TEST_CASE(CylinderVolumeBoundsExceptions) {
 }
 
 BOOST_AUTO_TEST_CASE(CylinderVolumeBoundsAccess) {
-  double rmin{10.}, rmax{20.}, halfz{30.}, halfphi{M_PI / 4}, avgphi{0.};
+  double rmin{10.}, rmax{20.}, halfz{30.}, halfphi{std::numbers::pi / 4.},
+      avgphi{0.};
   CylinderVolumeBounds cvBounds(rmin, rmax, halfz, halfphi, avgphi);
 
   // Test the accessors
@@ -149,16 +154,16 @@ BOOST_AUTO_TEST_CASE(CylinderVolumeBoundsAccess) {
 BOOST_DATA_TEST_CASE(
     CylinderVolumeBoundsOrientedSurfaces,
     bdata::random((bdata::engine = std::mt19937(), bdata::seed = 1,
-                   bdata::distribution =
-                       std::uniform_real_distribution<double>(-M_PI, M_PI))) ^
-        bdata::random((bdata::engine = std::mt19937(), bdata::seed = 2,
-                       bdata::distribution =
-                           std::uniform_real_distribution<double>(-M_PI,
-                                                                  M_PI))) ^
-        bdata::random((bdata::engine = std::mt19937(), bdata::seed = 3,
-                       bdata::distribution =
-                           std::uniform_real_distribution<double>(-M_PI,
-                                                                  M_PI))) ^
+                   bdata::distribution = std::uniform_real_distribution<double>(
+                       -std::numbers::pi, std::numbers::pi))) ^
+        bdata::random(
+            (bdata::engine = std::mt19937(), bdata::seed = 2,
+             bdata::distribution = std::uniform_real_distribution<double>(
+                 -std::numbers::pi, std::numbers::pi))) ^
+        bdata::random(
+            (bdata::engine = std::mt19937(), bdata::seed = 3,
+             bdata::distribution = std::uniform_real_distribution<double>(
+                 -std::numbers::pi, std::numbers::pi))) ^
         bdata::random((bdata::engine = std::mt19937(), bdata::seed = 4,
                        bdata::distribution =
                            std::uniform_real_distribution<double>(-10., 10.))) ^
@@ -253,7 +258,7 @@ BOOST_AUTO_TEST_CASE(CylinderVolumeBoundsBoundingBox) {
   auto bb = cvb.boundingBox();
 
   Transform3 rot;
-  rot = AngleAxis3(M_PI / 2., Vector3::UnitX());
+  rot = AngleAxis3(std::numbers::pi / 2., Vector3::UnitX());
 
   BOOST_CHECK_EQUAL(bb.entity(), nullptr);
   BOOST_CHECK_EQUAL(bb.max(), Vector3(5, 5, 10));
@@ -270,7 +275,7 @@ BOOST_AUTO_TEST_CASE(CylinderVolumeBoundsBoundingBox) {
   BOOST_CHECK_EQUAL(bb.max(), Vector3(8, 8, 12));
   BOOST_CHECK_EQUAL(bb.min(), Vector3(-8, -8, -12));
 
-  double angle = M_PI / 8.;
+  double angle = std::numbers::pi / 8.;
   cvb = CylinderVolumeBounds(5, 8, 13, angle);
   bb = cvb.boundingBox();
   BOOST_CHECK_EQUAL(bb.entity(), nullptr);
@@ -278,14 +283,14 @@ BOOST_AUTO_TEST_CASE(CylinderVolumeBoundsBoundingBox) {
   CHECK_CLOSE_ABS(bb.min(),
                   Vector3(5 * std::cos(angle), -8 * std::sin(angle), -13), tol);
 
-  rot = AngleAxis3(M_PI / 2., Vector3::UnitZ());
+  rot = AngleAxis3(std::numbers::pi / 2., Vector3::UnitZ());
   bb = cvb.boundingBox(&rot);
   BOOST_CHECK_EQUAL(bb.entity(), nullptr);
   CHECK_CLOSE_ABS(bb.max(), Vector3(8 * std::sin(angle), 8, 13), tol);
   CHECK_CLOSE_ABS(bb.min(),
                   Vector3(-8 * std::sin(angle), 5 * std::cos(angle), -13), tol);
 
-  rot = AngleAxis3(M_PI / 2., Vector3(-2, 4, 5).normalized());
+  rot = AngleAxis3(std::numbers::pi / 2., Vector3(-2, 4, 5).normalized());
   bb = cvb.boundingBox(&rot);
   BOOST_CHECK_EQUAL(bb.entity(), nullptr);
   CHECK_CLOSE_ABS(bb.max(), Vector3(8.40007, 15.2828, 3.88911), tol);
@@ -352,30 +357,37 @@ BOOST_AUTO_TEST_CASE(CylinderVolumeBoundsSetValues) {
   cyl.set(CylinderVolumeBounds::eHalfLengthZ, 150);
   BOOST_CHECK_EQUAL(cyl.get(CylinderVolumeBounds::eHalfLengthZ), 150);
 
-  BOOST_CHECK_THROW(cyl.set(CylinderVolumeBounds::eHalfPhiSector, -M_PI),
-                    std::invalid_argument);
-  BOOST_CHECK_EQUAL(cyl.get(CylinderVolumeBounds::eHalfPhiSector), M_PI);
+  BOOST_CHECK_THROW(
+      cyl.set(CylinderVolumeBounds::eHalfPhiSector, -std::numbers::pi),
+      std::invalid_argument);
+  BOOST_CHECK_EQUAL(cyl.get(CylinderVolumeBounds::eHalfPhiSector),
+                    std::numbers::pi);
 
-  BOOST_CHECK_THROW(cyl.set(CylinderVolumeBounds::eHalfPhiSector, 1.5 * M_PI),
-                    std::invalid_argument);
-  BOOST_CHECK_EQUAL(cyl.get(CylinderVolumeBounds::eHalfPhiSector), M_PI);
+  BOOST_CHECK_THROW(
+      cyl.set(CylinderVolumeBounds::eHalfPhiSector, 1.5 * std::numbers::pi),
+      std::invalid_argument);
+  BOOST_CHECK_EQUAL(cyl.get(CylinderVolumeBounds::eHalfPhiSector),
+                    std::numbers::pi);
 
-  cyl.set(CylinderVolumeBounds::eHalfPhiSector, M_PI / 2);
-  BOOST_CHECK_EQUAL(cyl.get(CylinderVolumeBounds::eHalfPhiSector), M_PI / 2);
+  cyl.set(CylinderVolumeBounds::eHalfPhiSector, std::numbers::pi / 2.);
+  BOOST_CHECK_EQUAL(cyl.get(CylinderVolumeBounds::eHalfPhiSector),
+                    std::numbers::pi / 2.);
 
   for (auto bValue :
        {CylinderVolumeBounds::eAveragePhi, CylinderVolumeBounds::eBevelMaxZ,
         CylinderVolumeBounds::eBevelMinZ}) {
-    BOOST_CHECK_THROW(cyl.set(bValue, -1.5 * M_PI), std::invalid_argument);
+    BOOST_CHECK_THROW(cyl.set(bValue, -1.5 * std::numbers::pi),
+                      std::invalid_argument);
     BOOST_CHECK_EQUAL(cyl.get(bValue), 0);
 
-    BOOST_CHECK_THROW(cyl.set(bValue, 1.5 * M_PI), std::invalid_argument);
+    BOOST_CHECK_THROW(cyl.set(bValue, 1.5 * std::numbers::pi),
+                      std::invalid_argument);
     BOOST_CHECK_EQUAL(cyl.get(bValue), 0);
 
-    cyl.set(bValue, 0.5 * M_PI);
-    BOOST_CHECK_EQUAL(cyl.get(bValue), 0.5 * M_PI);
-    cyl.set(bValue, -0.5 * M_PI);
-    BOOST_CHECK_EQUAL(cyl.get(bValue), -0.5 * M_PI);
+    cyl.set(bValue, std::numbers::pi / 2.);
+    BOOST_CHECK_EQUAL(cyl.get(bValue), std::numbers::pi / 2.);
+    cyl.set(bValue, -std::numbers::pi / 2.);
+    BOOST_CHECK_EQUAL(cyl.get(bValue), -std::numbers::pi / 2.);
   }
 
   cyl = CylinderVolumeBounds(100, 300, 200);
@@ -400,7 +412,8 @@ BOOST_AUTO_TEST_CASE(CylinderVolumeBoundsSetValues) {
   BOOST_CHECK_EQUAL(cyl.get(CylinderVolumeBounds::eMinR), 50);
   BOOST_CHECK_EQUAL(cyl.get(CylinderVolumeBounds::eMaxR), 200);
   BOOST_CHECK_EQUAL(cyl.get(CylinderVolumeBounds::eHalfLengthZ), 150);
-  BOOST_CHECK_EQUAL(cyl.get(CylinderVolumeBounds::eHalfPhiSector), M_PI);
+  BOOST_CHECK_EQUAL(cyl.get(CylinderVolumeBounds::eHalfPhiSector),
+                    std::numbers::pi);
   BOOST_CHECK_EQUAL(cyl.get(CylinderVolumeBounds::eAveragePhi), 0);
   BOOST_CHECK_EQUAL(cyl.get(CylinderVolumeBounds::eBevelMinZ), 0);
   BOOST_CHECK_EQUAL(cyl.get(CylinderVolumeBounds::eBevelMaxZ), 0);
diff --git a/Tests/UnitTests/Core/Geometry/CylinderVolumeBuilderTests.cpp b/Tests/UnitTests/Core/Geometry/CylinderVolumeBuilderTests.cpp
index 0dd4df5cf52..e7a96099bb0 100644
--- a/Tests/UnitTests/Core/Geometry/CylinderVolumeBuilderTests.cpp
+++ b/Tests/UnitTests/Core/Geometry/CylinderVolumeBuilderTests.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2017-2018 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include <boost/test/data/test_case.hpp>
 #include <boost/test/unit_test.hpp>
diff --git a/Tests/UnitTests/Core/Geometry/CylinderVolumeStackTests.cpp b/Tests/UnitTests/Core/Geometry/CylinderVolumeStackTests.cpp
index fcdd21b931c..3f9b2649bb7 100644
--- a/Tests/UnitTests/Core/Geometry/CylinderVolumeStackTests.cpp
+++ b/Tests/UnitTests/Core/Geometry/CylinderVolumeStackTests.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2024 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include <boost/test/data/test_case.hpp>
 #include <boost/test/detail/log_level.hpp>
@@ -24,6 +24,8 @@
 #include "Acts/Utilities/Logger.hpp"
 #include "Acts/Utilities/Zip.hpp"
 
+#include <numbers>
+
 using namespace Acts::UnitLiterals;
 
 namespace Acts::Test {
@@ -813,6 +815,165 @@ BOOST_DATA_TEST_CASE(
   }
 }
 
+BOOST_AUTO_TEST_CASE(ResizeReproduction1) {
+  Transform3 trf1 =
+      Transform3::Identity() * Translation3{Vector3::UnitZ() * -2000};
+  auto bounds1 = std::make_shared<CylinderVolumeBounds>(70, 100, 100.0);
+  Volume vol1{trf1, bounds1};
+
+  std::vector<Volume*> volumes = {&vol1};
+  CylinderVolumeStack stack(volumes, BinningValue::binZ,
+                            CylinderVolumeStack::AttachmentStrategy::Gap,
+                            CylinderVolumeStack::ResizeStrategy::Gap, *logger);
+
+  Transform3 trf2 =
+      Transform3::Identity() * Translation3{Vector3::UnitZ() * -1500};
+  stack.update(std::make_shared<CylinderVolumeBounds>(30.0, 100, 600), trf2,
+               *logger);
+
+  std::cout << stack.volumeBounds() << std::endl;
+  std::cout << stack.transform().matrix() << std::endl;
+
+  Transform3 trf3 =
+      Transform3::Identity() * Translation3{Vector3::UnitZ() * -1600};
+  stack.update(std::make_shared<CylinderVolumeBounds>(30.0, 100, 700), trf3,
+               *logger);
+}
+
+BOOST_AUTO_TEST_CASE(ResizeReproduction2) {
+  // The numbers are tuned a bit to reproduce the faulty behavior
+  Transform3 trf1 =
+      Transform3::Identity() * Translation3{Vector3::UnitZ() * 263};
+  auto bounds1 = std::make_shared<CylinderVolumeBounds>(30, 100, 4.075);
+  Volume vol1{trf1, bounds1};
+
+  std::vector<Volume*> volumes = {&vol1};
+  CylinderVolumeStack stack(volumes, BinningValue::binZ,
+                            CylinderVolumeStack::AttachmentStrategy::Gap,
+                            CylinderVolumeStack::ResizeStrategy::Gap, *logger);
+
+  Transform3 trf2 =
+      Transform3::Identity() * Translation3{Vector3::UnitZ() * 260.843};
+  stack.update(std::make_shared<CylinderVolumeBounds>(30.0, 100, 6.232), trf2,
+               *logger);
+
+  std::cout << stack.volumeBounds() << std::endl;
+  std::cout << stack.transform().matrix() << std::endl;
+
+  Transform3 trf3 =
+      Transform3::Identity() * Translation3{Vector3::UnitZ() * 1627.31};
+  stack.update(std::make_shared<CylinderVolumeBounds>(30.0, 100, 1372.699),
+               trf3, *logger);
+}
+
+//   original size
+// <--------------->
+// +---------------+
+// |               |
+// |               |
+// |   Volume 1    |
+// |               |
+// |               |
+// +---------------+
+//         first resize
+// <-------------------------->
+// +---------------+----------+
+// |               |          |
+// |               |          |
+// |   Volume 1    |   Gap    |
+// |               |          |      Gap is
+// |               |          |      reused!--+
+// +---------------+----------+               |
+//             second resize                  |
+// <----------------------------------->      |
+// +---------------+-------------------+      |
+// |               |                   |      |
+// |               |                   |      |
+// |   Volume 1    |        Gap        |<-----+
+// |               |                   |
+// |               |                   |
+// +---------------+-------------------+
+//
+BOOST_AUTO_TEST_CASE(ResizeGapMultiple) {
+  Transform3 trf = Transform3::Identity();
+  auto bounds = std::make_shared<CylinderVolumeBounds>(70, 100, 100.0);
+  Volume vol{trf, bounds};
+
+  BOOST_TEST_CONTEXT("Positive") {
+    std::vector<Volume*> volumes = {&vol};
+    CylinderVolumeStack stack(volumes, BinningValue::binZ,
+                              CylinderVolumeStack::AttachmentStrategy::Gap,
+                              CylinderVolumeStack::ResizeStrategy::Gap,
+                              *logger);
+
+    BOOST_CHECK_EQUAL(volumes.size(), 1);
+    BOOST_CHECK(stack.gaps().empty());
+
+    stack.update(std::make_shared<CylinderVolumeBounds>(30.0, 100, 200),
+                 trf * Translation3{Vector3::UnitZ() * 100}, *logger);
+    BOOST_CHECK_EQUAL(volumes.size(), 2);
+    BOOST_CHECK_EQUAL(stack.gaps().size(), 1);
+
+    BOOST_CHECK_EQUAL(stack.gaps().front()->center()[eZ], 200.0);
+    const auto* cylBounds = dynamic_cast<const CylinderVolumeBounds*>(
+        &stack.gaps().front()->volumeBounds());
+    BOOST_REQUIRE_NE(cylBounds, nullptr);
+    BOOST_CHECK_EQUAL(cylBounds->get(CylinderVolumeBounds::eHalfLengthZ),
+                      100.0);
+
+    stack.update(std::make_shared<CylinderVolumeBounds>(30.0, 100, 300),
+                 trf * Translation3{Vector3::UnitZ() * 200}, *logger);
+
+    BOOST_CHECK_EQUAL(volumes.size(), 2);
+    // No additional gap volume was added!
+    BOOST_CHECK_EQUAL(stack.gaps().size(), 1);
+
+    BOOST_CHECK_EQUAL(stack.gaps().front()->center()[eZ], 300.0);
+    cylBounds = dynamic_cast<const CylinderVolumeBounds*>(
+        &stack.gaps().front()->volumeBounds());
+    BOOST_REQUIRE_NE(cylBounds, nullptr);
+    BOOST_CHECK_EQUAL(cylBounds->get(CylinderVolumeBounds::eHalfLengthZ),
+                      200.0);
+  }
+
+  BOOST_TEST_CONTEXT("Negative") {
+    std::vector<Volume*> volumes = {&vol};
+    CylinderVolumeStack stack(volumes, BinningValue::binZ,
+                              CylinderVolumeStack::AttachmentStrategy::Gap,
+                              CylinderVolumeStack::ResizeStrategy::Gap,
+                              *logger);
+
+    BOOST_CHECK_EQUAL(volumes.size(), 1);
+    BOOST_CHECK(stack.gaps().empty());
+
+    stack.update(std::make_shared<CylinderVolumeBounds>(30.0, 100, 200),
+                 trf * Translation3{Vector3::UnitZ() * -100}, *logger);
+    BOOST_CHECK_EQUAL(volumes.size(), 2);
+    BOOST_CHECK_EQUAL(stack.gaps().size(), 1);
+
+    BOOST_CHECK_EQUAL(stack.gaps().front()->center()[eZ], -200.0);
+    const auto* cylBounds = dynamic_cast<const CylinderVolumeBounds*>(
+        &stack.gaps().front()->volumeBounds());
+    BOOST_REQUIRE_NE(cylBounds, nullptr);
+    BOOST_CHECK_EQUAL(cylBounds->get(CylinderVolumeBounds::eHalfLengthZ),
+                      100.0);
+
+    stack.update(std::make_shared<CylinderVolumeBounds>(30.0, 100, 300),
+                 trf * Translation3{Vector3::UnitZ() * -200}, *logger);
+
+    BOOST_CHECK_EQUAL(volumes.size(), 2);
+    // No additional gap volume was added!
+    BOOST_CHECK_EQUAL(stack.gaps().size(), 1);
+
+    BOOST_CHECK_EQUAL(stack.gaps().front()->center()[eZ], -300.0);
+    cylBounds = dynamic_cast<const CylinderVolumeBounds*>(
+        &stack.gaps().front()->volumeBounds());
+    BOOST_REQUIRE_NE(cylBounds, nullptr);
+    BOOST_CHECK_EQUAL(cylBounds->get(CylinderVolumeBounds::eHalfLengthZ),
+                      200.0);
+  }
+}
+
 BOOST_AUTO_TEST_SUITE_END()
 
 BOOST_AUTO_TEST_SUITE(RDirection)
@@ -1503,6 +1664,82 @@ BOOST_DATA_TEST_CASE(
   }
 }
 
+BOOST_AUTO_TEST_CASE(ResizeGapMultiple) {
+  Transform3 trf = Transform3::Identity();
+  auto bounds = std::make_shared<CylinderVolumeBounds>(100, 200, 100);
+  Volume vol{trf, bounds};
+
+  BOOST_TEST_CONTEXT("Outer") {
+    std::vector<Volume*> volumes = {&vol};
+    CylinderVolumeStack stack(volumes, BinningValue::binR,
+                              CylinderVolumeStack::AttachmentStrategy::Gap,
+                              CylinderVolumeStack::ResizeStrategy::Gap,
+                              *logger);
+
+    BOOST_CHECK_EQUAL(volumes.size(), 1);
+    BOOST_CHECK(stack.gaps().empty());
+
+    stack.update(std::make_shared<CylinderVolumeBounds>(100, 250, 100), trf,
+                 *logger);
+    BOOST_CHECK_EQUAL(volumes.size(), 2);
+    BOOST_CHECK_EQUAL(stack.gaps().size(), 1);
+
+    const auto* cylBounds = dynamic_cast<const CylinderVolumeBounds*>(
+        &stack.gaps().front()->volumeBounds());
+    BOOST_REQUIRE_NE(cylBounds, nullptr);
+    BOOST_CHECK_EQUAL(cylBounds->get(CylinderVolumeBounds::eMinR), 200);
+    BOOST_CHECK_EQUAL(cylBounds->get(CylinderVolumeBounds::eMaxR), 250);
+
+    stack.update(std::make_shared<CylinderVolumeBounds>(100, 300, 100), trf,
+                 *logger);
+
+    BOOST_CHECK_EQUAL(volumes.size(), 2);
+    // No additional gap volume was added!
+    BOOST_CHECK_EQUAL(stack.gaps().size(), 1);
+
+    cylBounds = dynamic_cast<const CylinderVolumeBounds*>(
+        &stack.gaps().front()->volumeBounds());
+    BOOST_REQUIRE_NE(cylBounds, nullptr);
+    BOOST_CHECK_EQUAL(cylBounds->get(CylinderVolumeBounds::eMinR), 200);
+    BOOST_CHECK_EQUAL(cylBounds->get(CylinderVolumeBounds::eMaxR), 300);
+  }
+
+  BOOST_TEST_CONTEXT("Inner") {
+    std::vector<Volume*> volumes = {&vol};
+    CylinderVolumeStack stack(volumes, BinningValue::binR,
+                              CylinderVolumeStack::AttachmentStrategy::Gap,
+                              CylinderVolumeStack::ResizeStrategy::Gap,
+                              *logger);
+
+    BOOST_CHECK_EQUAL(volumes.size(), 1);
+    BOOST_CHECK(stack.gaps().empty());
+
+    stack.update(std::make_shared<CylinderVolumeBounds>(50, 200, 100), trf,
+                 *logger);
+    BOOST_CHECK_EQUAL(volumes.size(), 2);
+    BOOST_CHECK_EQUAL(stack.gaps().size(), 1);
+
+    const auto* cylBounds = dynamic_cast<const CylinderVolumeBounds*>(
+        &stack.gaps().front()->volumeBounds());
+    BOOST_REQUIRE_NE(cylBounds, nullptr);
+    BOOST_CHECK_EQUAL(cylBounds->get(CylinderVolumeBounds::eMinR), 50);
+    BOOST_CHECK_EQUAL(cylBounds->get(CylinderVolumeBounds::eMaxR), 100);
+
+    stack.update(std::make_shared<CylinderVolumeBounds>(0, 200, 100), trf,
+                 *logger);
+
+    BOOST_CHECK_EQUAL(volumes.size(), 2);
+    // No additional gap volume was added!
+    BOOST_CHECK_EQUAL(stack.gaps().size(), 1);
+
+    cylBounds = dynamic_cast<const CylinderVolumeBounds*>(
+        &stack.gaps().front()->volumeBounds());
+    BOOST_REQUIRE_NE(cylBounds, nullptr);
+    BOOST_CHECK_EQUAL(cylBounds->get(CylinderVolumeBounds::eMinR), 0);
+    BOOST_CHECK_EQUAL(cylBounds->get(CylinderVolumeBounds::eMaxR), 100);
+  }
+}
+
 BOOST_AUTO_TEST_SUITE_END()
 
 BOOST_AUTO_TEST_SUITE(Common)
@@ -1586,15 +1823,17 @@ BOOST_DATA_TEST_CASE(JoinCylinderVolumesInvalidInput,
   BOOST_TEST_CONTEXT("Volume has phi values or bevel values") {
     std::vector<std::shared_ptr<CylinderVolumeBounds>> invalidVolumeBounds = {
         std::make_shared<CylinderVolumeBounds>(100_mm, 400_mm, 400_mm,
-                                               0.2 * M_PI),
+                                               0.2 * std::numbers::pi),
 
-        std::make_shared<CylinderVolumeBounds>(100_mm, 400_mm, 400_mm, M_PI,
-                                               0.3 * M_PI),
+        std::make_shared<CylinderVolumeBounds>(
+            100_mm, 400_mm, 400_mm, std::numbers::pi, 0.3 * std::numbers::pi),
 
-        std::make_shared<CylinderVolumeBounds>(100_mm, 400_mm, 400_mm, M_PI,
-                                               0.0, 0.3 * M_PI),
-        std::make_shared<CylinderVolumeBounds>(100_mm, 400_mm, 400_mm, M_PI,
-                                               0.0, 0.0, 0.3 * M_PI),
+        std::make_shared<CylinderVolumeBounds>(100_mm, 400_mm, 400_mm,
+                                               std::numbers::pi, 0.,
+                                               0.3 * std::numbers::pi),
+        std::make_shared<CylinderVolumeBounds>(100_mm, 400_mm, 400_mm,
+                                               std::numbers::pi, 0., 0.,
+                                               0.3 * std::numbers::pi),
     };
 
     for (const auto& invalid : invalidVolumeBounds) {
diff --git a/Tests/UnitTests/Core/Geometry/DiscLayerTests.cpp b/Tests/UnitTests/Core/Geometry/DiscLayerTests.cpp
index 11837801ebf..6a5f5770d48 100644
--- a/Tests/UnitTests/Core/Geometry/DiscLayerTests.cpp
+++ b/Tests/UnitTests/Core/Geometry/DiscLayerTests.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2017-2018 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include <boost/test/unit_test.hpp>
 
diff --git a/Tests/UnitTests/Core/Geometry/ExtentTests.cpp b/Tests/UnitTests/Core/Geometry/ExtentTests.cpp
index 5d987935a28..e0913e273eb 100644
--- a/Tests/UnitTests/Core/Geometry/ExtentTests.cpp
+++ b/Tests/UnitTests/Core/Geometry/ExtentTests.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2022 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include <boost/test/unit_test.hpp>
 
@@ -176,6 +176,17 @@ BOOST_AUTO_TEST_CASE(ProtoSupportCaseTests) {
   BOOST_CHECK(volumeExtent.constrains(BinningValue::binR));
 }
 
+BOOST_AUTO_TEST_CASE(DesignatedInitializers) {
+  using enum BinningValue;
+  ExtentEnvelope exp;
+  exp[binX] = {1., 2.};
+  exp[binEta] = {-1., 1.};
+
+  ExtentEnvelope act{{.x = {1., 2.}, .eta = {-1., 1.}}};
+
+  BOOST_CHECK(exp == act);
+}
+
 BOOST_AUTO_TEST_SUITE_END()
 
 }  // namespace Acts::Test
diff --git a/Tests/UnitTests/Core/Geometry/GenericApproachDescriptorTests.cpp b/Tests/UnitTests/Core/Geometry/GenericApproachDescriptorTests.cpp
index 5b968db327c..9c84e3635bf 100644
--- a/Tests/UnitTests/Core/Geometry/GenericApproachDescriptorTests.cpp
+++ b/Tests/UnitTests/Core/Geometry/GenericApproachDescriptorTests.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2017-2020 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include <boost/test/unit_test.hpp>
 
diff --git a/Tests/UnitTests/Core/Geometry/GenericCuboidVolumeBoundsTests.cpp b/Tests/UnitTests/Core/Geometry/GenericCuboidVolumeBoundsTests.cpp
index 2fc5a25ca85..62f94975a48 100644
--- a/Tests/UnitTests/Core/Geometry/GenericCuboidVolumeBoundsTests.cpp
+++ b/Tests/UnitTests/Core/Geometry/GenericCuboidVolumeBoundsTests.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2019 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include <boost/test/unit_test.hpp>
 
@@ -26,6 +26,7 @@
 #include <cmath>
 #include <fstream>
 #include <memory>
+#include <numbers>
 #include <utility>
 #include <vector>
 
@@ -112,7 +113,7 @@ BOOST_AUTO_TEST_CASE(GenericCuboidBoundsOrientedSurfaces) {
 
   Transform3 trf;
   trf = Translation3(Vector3(0, 8, -5)) *
-        AngleAxis3(M_PI / 3., Vector3(1, -3, 9).normalized());
+        AngleAxis3(std::numbers::pi / 3., Vector3(1, -3, 9).normalized());
 
   surfaces = cubo.orientedSurfaces(trf);
   for (const auto& srf : surfaces) {
@@ -160,7 +161,7 @@ BOOST_AUTO_TEST_CASE(bounding_box_creation) {
   auto bb = gcvb.boundingBox();
 
   Transform3 rot;
-  rot = AngleAxis3(M_PI / 2., Vector3::UnitX());
+  rot = AngleAxis3(std::numbers::pi / 2., Vector3::UnitX());
 
   BOOST_CHECK_EQUAL(bb.entity(), nullptr);
   BOOST_CHECK_EQUAL(bb.max(), Vector3(2, 1, 1));
@@ -172,14 +173,14 @@ BOOST_AUTO_TEST_CASE(bounding_box_creation) {
   CHECK_CLOSE_ABS(bb.max(), Vector3(2, 0, 1), tol);
   BOOST_CHECK_EQUAL(bb.min(), Vector3(0, -1, 0));
 
-  rot = AngleAxis3(M_PI / 2., Vector3::UnitZ());
+  rot = AngleAxis3(std::numbers::pi / 2., Vector3::UnitZ());
   bb = gcvb.boundingBox(&rot);
   BOOST_CHECK_EQUAL(bb.entity(), nullptr);
   CHECK_CLOSE_ABS(bb.max(), Vector3(0, 2, 1), tol);
   CHECK_CLOSE_ABS(bb.min(), Vector3(-1, 0., 0.), tol);
 
   rot = AngleAxis3(0.542, Vector3::UnitZ()) *
-        AngleAxis3(M_PI / 5., Vector3(1, 3, 6).normalized());
+        AngleAxis3(std::numbers::pi / 5., Vector3(1, 3, 6).normalized());
 
   bb = gcvb.boundingBox(&rot);
   BOOST_CHECK_EQUAL(bb.entity(), nullptr);
@@ -191,14 +192,14 @@ BOOST_AUTO_TEST_CASE(bounding_box_creation) {
   BOOST_CHECK_EQUAL(boundValues.size(), 24u);
 
   auto bValueArrray =
-      to_array<GenericCuboidVolumeBounds::BoundValues::eSize, ActsScalar>(
+      toArray<GenericCuboidVolumeBounds::BoundValues::eSize, ActsScalar>(
           boundValues);
   GenericCuboidVolumeBounds gcvbCopy(bValueArrray);
   BOOST_CHECK_EQUAL(gcvbCopy.values().size(), 24u);
 
   // Redo the check from above
   rot = AngleAxis3(0.542, Vector3::UnitZ()) *
-        AngleAxis3(M_PI / 5., Vector3(1, 3, 6).normalized());
+        AngleAxis3(std::numbers::pi / 5., Vector3(1, 3, 6).normalized());
 
   bb = gcvbCopy.boundingBox(&rot);
   BOOST_CHECK_EQUAL(bb.entity(), nullptr);
diff --git a/Tests/UnitTests/Core/Geometry/GeometryHierarchyMapTests.cpp b/Tests/UnitTests/Core/Geometry/GeometryHierarchyMapTests.cpp
index dce0e813c59..a151e932d94 100644
--- a/Tests/UnitTests/Core/Geometry/GeometryHierarchyMapTests.cpp
+++ b/Tests/UnitTests/Core/Geometry/GeometryHierarchyMapTests.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2020 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include <boost/test/unit_test.hpp>
 
diff --git a/Tests/UnitTests/Core/Geometry/GeometryIdentifierTests.cpp b/Tests/UnitTests/Core/Geometry/GeometryIdentifierTests.cpp
index fe6e4224ffe..b7e7a163d50 100644
--- a/Tests/UnitTests/Core/Geometry/GeometryIdentifierTests.cpp
+++ b/Tests/UnitTests/Core/Geometry/GeometryIdentifierTests.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2017-2018 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include <boost/test/unit_test.hpp>
 
diff --git a/Tests/UnitTests/Core/Geometry/KDTreeTrackingGeometryBuilderTests.cpp b/Tests/UnitTests/Core/Geometry/KDTreeTrackingGeometryBuilderTests.cpp
index ea6caa240ae..329dde4e83c 100644
--- a/Tests/UnitTests/Core/Geometry/KDTreeTrackingGeometryBuilderTests.cpp
+++ b/Tests/UnitTests/Core/Geometry/KDTreeTrackingGeometryBuilderTests.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2022 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include <boost/test/unit_test.hpp>
 
diff --git a/Tests/UnitTests/Core/Geometry/LayerCreatorTests.cpp b/Tests/UnitTests/Core/Geometry/LayerCreatorTests.cpp
index fcf862ef126..13aec3ff545 100644
--- a/Tests/UnitTests/Core/Geometry/LayerCreatorTests.cpp
+++ b/Tests/UnitTests/Core/Geometry/LayerCreatorTests.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2017-2018 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include <boost/test/unit_test.hpp>
 
@@ -33,9 +33,11 @@
 #include <array>
 #include <cmath>
 #include <cstddef>
+#include <fstream>
 #include <iomanip>
 #include <iostream>
 #include <memory>
+#include <numbers>
 #include <set>
 #include <string>
 #include <utility>
@@ -123,7 +125,7 @@ struct LayerCreatorFixture {
                                double zbase = 0, double r = 10) {
     SrfVec res;
 
-    double phiStep = 2 * M_PI / n;
+    double phiStep = 2 * std::numbers::pi / n;
     for (std::size_t i = 0; i < n; ++i) {
       double z = zbase + ((i % 2 == 0) ? 1 : -1) * 0.2;
 
@@ -145,11 +147,11 @@ struct LayerCreatorFixture {
   }
 
   SrfVec fullPhiTestSurfacesBRL(int n = 10, double shift = 0, double zbase = 0,
-                                double incl = M_PI / 9., double w = 2,
-                                double h = 1.5) {
+                                double incl = std::numbers::pi / 9.,
+                                double w = 2, double h = 1.5) {
     SrfVec res;
 
-    double phiStep = 2 * M_PI / n;
+    double phiStep = 2 * std::numbers::pi / n;
     for (int i = 0; i < n; ++i) {
       double z = zbase;
 
@@ -158,7 +160,7 @@ struct LayerCreatorFixture {
       trans.rotate(Eigen::AngleAxisd(i * phiStep + shift, Vector3(0, 0, 1)));
       trans.translate(Vector3(10, 0, z));
       trans.rotate(Eigen::AngleAxisd(incl, Vector3(0, 0, 1)));
-      trans.rotate(Eigen::AngleAxisd(M_PI / 2., Vector3(0, 1, 0)));
+      trans.rotate(Eigen::AngleAxisd(std::numbers::pi / 2., Vector3(0, 1, 0)));
 
       auto bounds = std::make_shared<const RectangleBounds>(w, h);
       std::shared_ptr<PlaneSurface> srf =
@@ -179,7 +181,8 @@ struct LayerCreatorFixture {
     for (int i = 0; i < nZ; i++) {
       double z = i * w * 2 + z0;
       std::cout << "z=" << z << std::endl;
-      SrfVec ring = fullPhiTestSurfacesBRL(nPhi, 0, z, M_PI / 9., w, h);
+      SrfVec ring =
+          fullPhiTestSurfacesBRL(nPhi, 0, z, std::numbers::pi / 9., w, h);
       res.insert(res.end(), ring.begin(), ring.end());
     }
 
@@ -187,8 +190,9 @@ struct LayerCreatorFixture {
   }
 
   std::pair<SrfVec, std::vector<std::pair<const Surface*, const Surface*>>>
-  makeBarrelStagger(int nPhi, int nZ, double shift = 0, double incl = M_PI / 9.,
-                    double w = 2, double h = 1.5) {
+  makeBarrelStagger(int nPhi, int nZ, double shift = 0,
+                    double incl = std::numbers::pi / 9., double w = 2,
+                    double h = 1.5) {
     double z0 = -(nZ - 1) * w;
     SrfVec res;
 
@@ -197,14 +201,15 @@ struct LayerCreatorFixture {
     for (int i = 0; i < nZ; i++) {
       double z = i * w * 2 + z0;
 
-      double phiStep = 2 * M_PI / nPhi;
+      double phiStep = 2 * std::numbers::pi / nPhi;
       for (int j = 0; j < nPhi; ++j) {
         Transform3 trans;
         trans.setIdentity();
         trans.rotate(Eigen::AngleAxisd(j * phiStep + shift, Vector3(0, 0, 1)));
         trans.translate(Vector3(10, 0, z));
         trans.rotate(Eigen::AngleAxisd(incl, Vector3(0, 0, 1)));
-        trans.rotate(Eigen::AngleAxisd(M_PI / 2., Vector3(0, 1, 0)));
+        trans.rotate(
+            Eigen::AngleAxisd(std::numbers::pi / 2., Vector3(0, 1, 0)));
 
         auto bounds = std::make_shared<const RectangleBounds>(w, h);
         std::shared_ptr<PlaneSurface> srfA =
@@ -257,8 +262,8 @@ BOOST_FIXTURE_TEST_CASE(LayerCreator_createCylinderLayer, LayerCreatorFixture) {
   auto axes = layer->surfaceArray()->getAxes();
   BOOST_CHECK_EQUAL(axes.at(0)->getNBins(), 30u);
   BOOST_CHECK_EQUAL(axes.at(1)->getNBins(), 7u);
-  CHECK_CLOSE_REL(axes.at(0)->getMin(), -M_PI, 1e-3);
-  CHECK_CLOSE_REL(axes.at(0)->getMax(), M_PI, 1e-3);
+  CHECK_CLOSE_REL(axes.at(0)->getMin(), -std::numbers::pi, 1e-3);
+  CHECK_CLOSE_REL(axes.at(0)->getMax(), std::numbers::pi, 1e-3);
   CHECK_CLOSE_REL(axes.at(1)->getMin(), -14, 1e-3);
   CHECK_CLOSE_REL(axes.at(1)->getMax(), 14, 1e-3);
 
@@ -277,8 +282,8 @@ BOOST_FIXTURE_TEST_CASE(LayerCreator_createCylinderLayer, LayerCreatorFixture) {
   axes = layer->surfaceArray()->getAxes();
   BOOST_CHECK_EQUAL(axes.at(0)->getNBins(), 30u);
   BOOST_CHECK_EQUAL(axes.at(1)->getNBins(), 7u);
-  CHECK_CLOSE_REL(axes.at(0)->getMin(), -M_PI, 1e-3);
-  CHECK_CLOSE_REL(axes.at(0)->getMax(), M_PI, 1e-3);
+  CHECK_CLOSE_REL(axes.at(0)->getMin(), -std::numbers::pi, 1e-3);
+  CHECK_CLOSE_REL(axes.at(0)->getMax(), std::numbers::pi, 1e-3);
   CHECK_CLOSE_REL(axes.at(1)->getMin(), -14, 1e-3);
   CHECK_CLOSE_REL(axes.at(1)->getMax(), 14, 1e-3);
 
@@ -294,8 +299,8 @@ BOOST_FIXTURE_TEST_CASE(LayerCreator_createCylinderLayer, LayerCreatorFixture) {
   axes = layer->surfaceArray()->getAxes();
   BOOST_CHECK_EQUAL(axes.at(0)->getNBins(), 13u);
   BOOST_CHECK_EQUAL(axes.at(1)->getNBins(), 3u);
-  CHECK_CLOSE_REL(axes.at(0)->getMin(), -M_PI, 1e-3);
-  CHECK_CLOSE_REL(axes.at(0)->getMax(), M_PI, 1e-3);
+  CHECK_CLOSE_REL(axes.at(0)->getMin(), -std::numbers::pi, 1e-3);
+  CHECK_CLOSE_REL(axes.at(0)->getMax(), std::numbers::pi, 1e-3);
   CHECK_CLOSE_REL(axes.at(1)->getMin(), -14, 1e-3);
   CHECK_CLOSE_REL(axes.at(1)->getMax(), 14, 1e-3);
 
@@ -318,8 +323,8 @@ BOOST_FIXTURE_TEST_CASE(LayerCreator_createCylinderLayer, LayerCreatorFixture) {
   axes = layer->surfaceArray()->getAxes();
   BOOST_CHECK_EQUAL(axes.at(0)->getNBins(), 30u);
   BOOST_CHECK_EQUAL(axes.at(1)->getNBins(), 7u);
-  CHECK_CLOSE_REL(axes.at(0)->getMin(), -M_PI, 1e-3);
-  CHECK_CLOSE_REL(axes.at(0)->getMax(), M_PI, 1e-3);
+  CHECK_CLOSE_REL(axes.at(0)->getMin(), -std::numbers::pi, 1e-3);
+  CHECK_CLOSE_REL(axes.at(0)->getMax(), std::numbers::pi, 1e-3);
   CHECK_CLOSE_REL(axes.at(1)->getMin(), -25, 1e-3);
   CHECK_CLOSE_REL(axes.at(1)->getMax(), 25, 1e-3);
 }
@@ -350,14 +355,14 @@ BOOST_FIXTURE_TEST_CASE(LayerCreator_createDiscLayer, LayerCreatorFixture) {
   BOOST_CHECK_EQUAL(axes.at(1)->getNBins(), 30u);
   CHECK_CLOSE_REL(axes.at(0)->getMin(), 5, 1e-3);
   CHECK_CLOSE_REL(axes.at(0)->getMax(), 25, 1e-3);
-  CHECK_CLOSE_REL(axes.at(1)->getMin(), -M_PI, 1e-3);
-  CHECK_CLOSE_REL(axes.at(1)->getMax(), M_PI, 1e-3);
+  CHECK_CLOSE_REL(axes.at(1)->getMin(), -std::numbers::pi, 1e-3);
+  CHECK_CLOSE_REL(axes.at(1)->getMax(), std::numbers::pi, 1e-3);
   checkBinContentSize(layer->surfaceArray(), 1);
 
   // check that it's applying a rotation transform to improve phi binning
   // BOOST_CHECK_NE(bu->transform(), nullptr);
   // double actAngle = ((*bu->transform()) * Vector3(1, 0, 0)).phi();
-  // double expAngle = -2 * M_PI / 30 / 2.;
+  // double expAngle = -2 * std::numbers::pi / 30 / 2.;
   // CHECK_CLOSE_REL(actAngle, expAngle, 1e-3);
 
   double envMinR = 1, envMaxR = 1, envZ = 5;
@@ -379,14 +384,14 @@ BOOST_FIXTURE_TEST_CASE(LayerCreator_createDiscLayer, LayerCreatorFixture) {
   BOOST_CHECK_EQUAL(axes.at(1)->getNBins(), nBinsPhi);
   CHECK_CLOSE_REL(axes.at(0)->getMin(), rMin, 1e-3);
   CHECK_CLOSE_REL(axes.at(0)->getMax(), rMax, 1e-3);
-  CHECK_CLOSE_REL(axes.at(1)->getMin(), -M_PI, 1e-3);
-  CHECK_CLOSE_REL(axes.at(1)->getMax(), M_PI, 1e-3);
+  CHECK_CLOSE_REL(axes.at(1)->getMin(), -std::numbers::pi, 1e-3);
+  CHECK_CLOSE_REL(axes.at(1)->getMax(), std::numbers::pi, 1e-3);
   checkBinContentSize(layer->surfaceArray(), 1);
 
   // check that it's applying a rotation transform to improve phi binning
   // BOOST_CHECK_NE(bu->transform(), nullptr);
   // actAngle = ((*bu->transform()) * Vector3(1, 0, 0)).phi();
-  // expAngle = -2 * M_PI / 30 / 2.;
+  // expAngle = -2 * std::numbers::pi / 30 / 2.;
   // CHECK_CLOSE_REL(actAngle, expAngle, 1e-3);
 
   layer = std::dynamic_pointer_cast<DiscLayer>(
@@ -401,19 +406,19 @@ BOOST_FIXTURE_TEST_CASE(LayerCreator_createDiscLayer, LayerCreatorFixture) {
   BOOST_CHECK_EQUAL(axes.at(1)->getNBins(), nBinsPhi);
   CHECK_CLOSE_REL(axes.at(0)->getMin(), rMin, 1e-3);
   CHECK_CLOSE_REL(axes.at(0)->getMax(), rMax, 1e-3);
-  CHECK_CLOSE_REL(axes.at(1)->getMin(), -M_PI, 1e-3);
-  CHECK_CLOSE_REL(axes.at(1)->getMax(), M_PI, 1e-3);
+  CHECK_CLOSE_REL(axes.at(1)->getMin(), -std::numbers::pi, 1e-3);
+  CHECK_CLOSE_REL(axes.at(1)->getMax(), std::numbers::pi, 1e-3);
   checkBinContentSize(layer->surfaceArray(), 1);
 
   // check that it's applying a rotation transform to improve phi binning
   // BOOST_CHECK_NE(bu->transform(), nullptr);
   // actAngle = ((*bu->transform()) * Vector3(1, 0, 0)).phi();
-  // expAngle = -2 * M_PI / 30 / 2.;
+  // expAngle = -2 * std::numbers::pi / 30 / 2.;
   // CHECK_CLOSE_REL(actAngle, expAngle, 1e-3);
 }
 
 BOOST_FIXTURE_TEST_CASE(LayerCreator_barrelStagger, LayerCreatorFixture) {
-  auto barrel = makeBarrelStagger(30, 7, 0, M_PI / 9.);
+  auto barrel = makeBarrelStagger(30, 7, 0, std::numbers::pi / 9.);
   auto brl = barrel.first;
   draw_surfaces(brl, "LayerCreator_barrelStagger.obj");
 
diff --git a/Tests/UnitTests/Core/Geometry/LayerStub.hpp b/Tests/UnitTests/Core/Geometry/LayerStub.hpp
index 3ccd635f3d2..a6eb0dbca1b 100644
--- a/Tests/UnitTests/Core/Geometry/LayerStub.hpp
+++ b/Tests/UnitTests/Core/Geometry/LayerStub.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2017-2018 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
diff --git a/Tests/UnitTests/Core/Geometry/LayerTests.cpp b/Tests/UnitTests/Core/Geometry/LayerTests.cpp
index fe142338f25..df0fa0d8f0a 100644
--- a/Tests/UnitTests/Core/Geometry/LayerTests.cpp
+++ b/Tests/UnitTests/Core/Geometry/LayerTests.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2017-2018 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include <boost/test/unit_test.hpp>
 
diff --git a/Tests/UnitTests/Core/Geometry/NavigationLayerTests.cpp b/Tests/UnitTests/Core/Geometry/NavigationLayerTests.cpp
index 23868f88b26..32406c3a288 100644
--- a/Tests/UnitTests/Core/Geometry/NavigationLayerTests.cpp
+++ b/Tests/UnitTests/Core/Geometry/NavigationLayerTests.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2017-2018 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include <boost/test/unit_test.hpp>
 
diff --git a/Tests/UnitTests/Core/Geometry/PlaneLayerTests.cpp b/Tests/UnitTests/Core/Geometry/PlaneLayerTests.cpp
index a97fca3ee1a..b3d96a56943 100644
--- a/Tests/UnitTests/Core/Geometry/PlaneLayerTests.cpp
+++ b/Tests/UnitTests/Core/Geometry/PlaneLayerTests.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2017-2018 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include <boost/test/unit_test.hpp>
 
diff --git a/Tests/UnitTests/Core/Geometry/PolyhedronTests.cpp b/Tests/UnitTests/Core/Geometry/PolyhedronTests.cpp
index 0d92383745f..d087c6485cf 100644
--- a/Tests/UnitTests/Core/Geometry/PolyhedronTests.cpp
+++ b/Tests/UnitTests/Core/Geometry/PolyhedronTests.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2017-2018 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include <boost/test/unit_test.hpp>
 
diff --git a/Tests/UnitTests/Core/Geometry/PortalLinkTests.cpp b/Tests/UnitTests/Core/Geometry/PortalLinkTests.cpp
new file mode 100644
index 00000000000..d44df588af5
--- /dev/null
+++ b/Tests/UnitTests/Core/Geometry/PortalLinkTests.cpp
@@ -0,0 +1,2440 @@
+// This file is part of the ACTS project.
+//
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
+//
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
+
+#include <boost/test/data/test_case.hpp>
+#include <boost/test/tools/context.hpp>
+#include <boost/test/tools/old/interface.hpp>
+#include <boost/test/unit_test.hpp>
+#include <boost/test/unit_test_suite.hpp>
+
+#include "Acts/Definitions/Algebra.hpp"
+#include "Acts/Definitions/Units.hpp"
+#include "Acts/Geometry/CompositePortalLink.hpp"
+#include "Acts/Geometry/CylinderVolumeBounds.hpp"
+#include "Acts/Geometry/GridPortalLink.hpp"
+#include "Acts/Geometry/TrackingVolume.hpp"
+#include "Acts/Geometry/TrivialPortalLink.hpp"
+#include "Acts/Surfaces/CylinderSurface.hpp"
+#include "Acts/Surfaces/RadialBounds.hpp"
+#include "Acts/Surfaces/SurfaceMergingException.hpp"
+#include "Acts/Tests/CommonHelpers/FloatComparisons.hpp"
+#include "Acts/Utilities/AxisFwd.hpp"
+#include "Acts/Utilities/ThrowAssert.hpp"
+
+#include <cstdio>
+#include <iostream>
+#include <memory>
+#include <numbers>
+#include <stdexcept>
+
+using namespace Acts::UnitLiterals;
+
+namespace Acts::Test {
+
+auto logger = Acts::getDefaultLogger("UnitTests", Acts::Logging::VERBOSE);
+
+struct Fixture {
+  Logging::Level m_level;
+  Fixture() {
+    m_level = Acts::Logging::getFailureThreshold();
+    Acts::Logging::setFailureThreshold(Acts::Logging::FATAL);
+  }
+
+  ~Fixture() { Acts::Logging::setFailureThreshold(m_level); }
+};
+
+std::shared_ptr<TrackingVolume> makeDummyVolume() {
+  return std::make_shared<TrackingVolume>(
+      Transform3::Identity(),
+      std::make_shared<CylinderVolumeBounds>(30_mm, 40_mm, 100_mm));
+}
+
+GeometryContext gctx;
+
+template <typename T>
+std::unique_ptr<T> copy(const std::unique_ptr<T>& p) {
+  return std::make_unique<T>(*p);
+}
+
+template <typename link_t>
+void visitBins(const link_t& link,
+               const std::function<void(const TrackingVolume*)>& func) {
+  auto& grid = link.grid();
+  auto loc = grid.numLocalBins();
+  if constexpr (std::decay_t<decltype(grid)>::DIM == 1) {
+    for (std::size_t i = 1; i <= loc[0]; i++) {
+      func(grid.atLocalBins({i}));
+    }
+  } else {
+    for (std::size_t i = 1; i <= loc[0]; i++) {
+      for (std::size_t j = 1; j <= loc[1]; j++) {
+        func(grid.atLocalBins({i, j}));
+      }
+    }
+  }
+}
+
+BOOST_FIXTURE_TEST_SUITE(Geometry, Fixture)
+
+BOOST_AUTO_TEST_SUITE(GridConstruction)
+
+BOOST_AUTO_TEST_CASE(Cylinder) {
+  BOOST_TEST_CONTEXT("1D") {
+    auto cyl = Surface::makeShared<CylinderSurface>(Transform3::Identity(),
+                                                    30_mm, 100_mm);
+
+    // Volume for bin testing
+    auto vol = std::make_shared<TrackingVolume>(
+        Transform3::Identity(),
+        std::make_shared<CylinderVolumeBounds>(30_mm, 40_mm, 100_mm));
+
+    // Incompatible binning
+    BOOST_CHECK_THROW(
+        GridPortalLink::make(cyl, BinningValue::binZ, Axis{AxisBound, 0, 5, 5}),
+        std::invalid_argument);
+
+    auto grid1dCyl = GridPortalLink::make(cyl, BinningValue::binZ,
+                                          Axis{AxisBound, -100_mm, 100_mm, 10});
+    BOOST_REQUIRE(grid1dCyl);
+    grid1dCyl->setVolume(vol.get());
+
+    // Throws because non-closed axis
+    BOOST_CHECK_THROW(GridPortalLink::make(cyl, BinningValue::binRPhi,
+                                           Axis{AxisBound, -180_degree * 30_mm,
+                                                180_degree * 30_mm, 10}),
+                      std::invalid_argument);
+
+    auto grid1dCylRPhi = GridPortalLink::make(
+        cyl, BinningValue::binRPhi,
+        Axis{AxisClosed, -180_degree * 30_mm, 180_degree * 30_mm, 10});
+    BOOST_REQUIRE_NE(grid1dCylRPhi, nullptr);
+    grid1dCylRPhi->setVolume(vol.get());
+
+    Axis axisExpected{AxisClosed, -180_degree * 30_mm, 180_degree * 30_mm, 10};
+    BOOST_CHECK_EQUAL(grid1dCylRPhi->grid().axes().size(), 1);
+    const auto& axis = *grid1dCylRPhi->grid().axes().front();
+    BOOST_CHECK_EQUAL(axis, axisExpected);
+
+    // Another cylinder, shifted in z
+    auto cyl2 = Surface::makeShared<CylinderSurface>(
+        Transform3{Translation3{Vector3::UnitZ() * 150_mm}}, 30_mm, 50_mm);
+
+    auto grid1dCyl2 = GridPortalLink::make(cyl2, BinningValue::binZ,
+                                           Axis{AxisBound, -50_mm, 50_mm, 5});
+
+    // Test exception on cylinder with non-zero average phi
+    auto cylNonZeroAverage = Surface::makeShared<CylinderSurface>(
+        Transform3::Identity(), 30_mm, 100_mm, 20_degree, 45_degree);
+    BOOST_CHECK_THROW(
+        GridPortalLink::make(cylNonZeroAverage, BinningValue::binZ,
+                             Axis{AxisBound, -100_mm, 100_mm, 10}),
+        std::invalid_argument);
+
+    auto checkAllBins = [&](const auto& link) {
+      visitBins(link, [&](const TrackingVolume* content) {
+        BOOST_CHECK_EQUAL(content, vol.get());
+      });
+    };
+
+    checkAllBins(*grid1dCyl);
+    checkAllBins(*grid1dCylRPhi);
+
+    // Extend to a 2D grid with auto phi binning
+
+    auto grid2dCyl1 = grid1dCyl->extendTo2d(nullptr);
+    BOOST_REQUIRE(grid2dCyl1);
+    BOOST_CHECK_EQUAL(grid2dCyl1->grid().axes().size(), 2);
+    BOOST_CHECK_EQUAL(grid2dCyl1->surface().bounds(), cyl->bounds());
+    const auto* axis1 = grid2dCyl1->grid().axes().front();
+    const auto* axis2 = grid2dCyl1->grid().axes().back();
+
+    Axis axis1Expected{AxisClosed, -std::numbers::pi * 30_mm,
+                       std::numbers::pi * 30_mm, 1};
+    BOOST_CHECK_EQUAL(*axis1, axis1Expected);
+    Axis axis2Expected{AxisBound, -100_mm, 100_mm, 10};
+    BOOST_CHECK_EQUAL(*axis2, axis2Expected);
+
+    auto& concrete = dynamic_cast<
+        GridPortalLinkT<decltype(axis1Expected), decltype(axis2Expected)>&>(
+        *grid2dCyl1);
+
+    checkAllBins(concrete);
+
+    Axis axis1Explicit{AxisClosed, -std::numbers::pi * 30_mm,
+                       std::numbers::pi * 30_mm, 13};
+    auto grid2dCyl1Explicit = grid1dCyl->extendTo2d(&axis1Explicit);
+    BOOST_REQUIRE(grid2dCyl1Explicit);
+    BOOST_CHECK_EQUAL(grid2dCyl1Explicit->grid().axes().size(), 2);
+    axis1 = grid2dCyl1Explicit->grid().axes().front();
+    axis2 = grid2dCyl1Explicit->grid().axes().back();
+
+    BOOST_CHECK_EQUAL(*axis1, axis1Explicit);
+    BOOST_CHECK_EQUAL(*axis2, axis2Expected);
+
+    auto& concrete2 = dynamic_cast<
+        GridPortalLinkT<decltype(axis1Explicit), decltype(axis2Expected)>&>(
+        *grid2dCyl1Explicit);
+
+    checkAllBins(concrete2);
+
+    auto cylPhi = Surface::makeShared<CylinderSurface>(
+        Transform3::Identity(), 30_mm, 100_mm, 45_degree);
+    std::unique_ptr<GridPortalLink> grid1dCylPhi = GridPortalLink::make(
+        cylPhi, BinningValue::binZ, Axis{AxisBound, -100_mm, 100_mm, 10});
+
+    grid1dCylPhi->setVolume(vol.get());
+
+    // Check that phi sector portal does not accept closed axis
+    BOOST_CHECK_THROW(GridPortalLink::make(cylPhi, BinningValue::binRPhi,
+                                           Axis{AxisClosed, -45_degree * 30_mm,
+                                                45_degree * 30_mm, 10}),
+                      std::invalid_argument);
+
+    auto grid2dCylPhi = grid1dCylPhi->extendTo2d(nullptr);
+    BOOST_CHECK_EQUAL(grid2dCylPhi->grid().axes().size(), 2);
+    BOOST_CHECK_EQUAL(grid2dCylPhi->surface().bounds(), cylPhi->bounds());
+    const auto* axis1Phi = grid2dCylPhi->grid().axes().front();
+    const auto* axis2Phi = grid2dCylPhi->grid().axes().back();
+
+    Axis axis1PhiExpected{AxisBound, -45_degree * 30_mm, 45_degree * 30_mm, 1};
+    BOOST_CHECK_EQUAL(*axis1Phi, axis1PhiExpected);
+    Axis axis2PhiExpected{AxisBound, -100_mm, 100_mm, 10};
+    BOOST_CHECK_EQUAL(*axis2Phi, axis2PhiExpected);
+
+    auto& concrete3 =
+        dynamic_cast<GridPortalLinkT<decltype(axis1PhiExpected),
+                                     decltype(axis2PhiExpected)>&>(
+            *grid2dCylPhi);
+
+    checkAllBins(concrete3);
+
+    Axis axis1PhiExplicit{AxisBound, -45_degree * 30_mm, 45_degree * 30_mm, 13};
+    auto grid2dCylPhiExplicit = grid1dCylPhi->extendTo2d(&axis1PhiExplicit);
+    BOOST_REQUIRE(grid2dCylPhiExplicit);
+    BOOST_CHECK_EQUAL(grid2dCylPhiExplicit->grid().axes().size(), 2);
+    axis1Phi = grid2dCylPhiExplicit->grid().axes().front();
+    axis2Phi = grid2dCylPhiExplicit->grid().axes().back();
+    BOOST_CHECK_EQUAL(*axis1Phi, axis1PhiExplicit);
+    BOOST_CHECK_EQUAL(*axis2Phi, axis2PhiExpected);
+
+    auto& concrete4 =
+        dynamic_cast<GridPortalLinkT<decltype(axis1PhiExplicit),
+                                     decltype(axis2PhiExpected)>&>(
+            *grid2dCylPhiExplicit);
+
+    checkAllBins(concrete4);
+  }
+
+  BOOST_TEST_CONTEXT("2D") {
+    auto cyl = Surface::makeShared<CylinderSurface>(Transform3::Identity(),
+                                                    30_mm, 100_mm, 45_degree);
+
+    // z bad, rphi bad
+    BOOST_CHECK_THROW(GridPortalLink::make(cyl, Axis{AxisBound, 1, 2, 5},
+                                           Axis{AxisBound, 3_mm, 4_mm, 5}),
+                      std::invalid_argument);
+
+    // z good, rphi bad
+    BOOST_CHECK_THROW(GridPortalLink::make(cyl, Axis{AxisBound, 3_mm, 4_mm, 5},
+                                           Axis{AxisBound, -100_mm, 100_m, 5}),
+                      std::invalid_argument);
+
+    // z bad, rphi good
+    BOOST_CHECK_THROW(
+        GridPortalLink::make(
+            cyl, Axis{AxisBound, -45_degree * 30_mm, 45_degree * 30_mm, 5},
+            Axis{AxisBound, -80_mm, 100_mm, 5}),
+        std::invalid_argument);
+
+    auto grid1 = GridPortalLink::make(
+        cyl, Axis{AxisBound, -45_degree * 30_mm, 45_degree * 30_mm, 5},
+        Axis{AxisBound, -100_mm, 100_mm, 5});
+
+    auto cylFull = Surface::makeShared<CylinderSurface>(Transform3::Identity(),
+                                                        30_mm, 100_mm);
+
+    // Throws because non-closed axis
+    BOOST_CHECK_THROW(GridPortalLink::make(cylFull,
+                                           Axis{AxisBound, -180_degree * 30_mm,
+                                                180_degree * 30_mm, 5},
+                                           Axis{AxisBound, -100_mm, 100_mm, 5}),
+                      std::invalid_argument);
+
+    auto gridFull = GridPortalLink::make(
+        cylFull, Axis{AxisClosed, -180_degree * 30_mm, 180_degree * 30_mm, 5},
+        Axis{AxisBound, -100_mm, 100_mm, 5});
+
+    BOOST_CHECK_EQUAL(gridFull->grid().axes().size(), 2);
+    BOOST_CHECK_EQUAL(gridFull->grid().axes().size(), 2);
+    Axis axisFullExpected{AxisClosed, -180_degree * 30_mm, 180_degree * 30_mm,
+                          5};
+    const auto& axisFull = *gridFull->grid().axes().front();
+    BOOST_CHECK_EQUAL(axisFull, axisFullExpected);
+  }
+}
+
+BOOST_AUTO_TEST_CASE(Disc) {
+  using enum AxisType;
+  using enum AxisBoundaryType;
+  BOOST_TEST_CONTEXT("1D") {
+    auto disc1 =
+        Surface::makeShared<DiscSurface>(Transform3::Identity(), 30_mm, 100_mm);
+
+    // Volume for bin testing
+    auto vol = std::make_shared<TrackingVolume>(
+        Transform3::Identity(),
+        std::make_shared<CylinderVolumeBounds>(30_mm, 40_mm, 100_mm));
+
+    BOOST_CHECK_THROW(GridPortalLink::make(disc1, BinningValue::binZ,
+                                           Axis{AxisBound, 30_mm, 100_mm, 3}),
+                      std::invalid_argument);
+
+    // Check exception for full disc and non-closed phi axis
+    BOOST_CHECK_THROW(
+        GridPortalLink::make(disc1, BinningValue::binPhi,
+                             Axis{AxisBound, -180_degree, 180_degree, 3}),
+        std::invalid_argument);
+
+    auto grid1 = GridPortalLink::make(disc1, BinningValue::binR,
+                                      Axis{AxisBound, 30_mm, 100_mm, 3});
+    BOOST_REQUIRE_NE(grid1, nullptr);
+    BOOST_CHECK_EQUAL(grid1->grid().axes().size(), 1);
+    const auto& axis = *grid1->grid().axes().front();
+    Axis axis1Expected{AxisBound, 30_mm, 100_mm, 3};
+    BOOST_CHECK_EQUAL(axis, axis1Expected);
+
+    grid1->setVolume(vol.get());
+
+    auto discPhi = Surface::makeShared<DiscSurface>(Transform3::Identity(),
+                                                    30_mm, 100_mm, 45_degree);
+
+    // Check thet disc with phi sector does not accept closed axis
+    BOOST_CHECK_THROW(
+        GridPortalLink::make(discPhi, BinningValue::binPhi,
+                             Axis{AxisClosed, -45_degree, 45_degree, 3}),
+        std::invalid_argument);
+
+    auto gridPhi =
+        GridPortalLink::make(discPhi, BinningValue::binPhi,
+                             Axis{AxisBound, -45_degree, 45_degree, 3});
+    BOOST_REQUIRE_NE(gridPhi, nullptr);
+    gridPhi->setVolume(vol.get());
+
+    // Test exception on disc with non-zero average phi
+    auto discNonZeroAverage = Surface::makeShared<DiscSurface>(
+        Transform3::Identity(),
+        std::make_shared<RadialBounds>(30_mm, 100_mm, 45_degree, 75_degree));
+    BOOST_CHECK_THROW(
+        GridPortalLink::make(discNonZeroAverage, BinningValue::binR,
+                             Axis{AxisBound, 30_mm, 100_mm, 3}),
+        std::invalid_argument);
+
+    BOOST_CHECK_EQUAL(gridPhi->grid().axes().size(), 1);
+    const auto& axisPhi = *gridPhi->grid().axes().front();
+    Axis axisPhi1Expected{AxisBound, -45_degree, 45_degree, 3};
+    BOOST_CHECK_EQUAL(axisPhi, axisPhi1Expected);
+
+    auto checkAllBins = [&](const auto& grid) {
+      visitBins(grid, [&](const TrackingVolume* content) {
+        BOOST_CHECK_EQUAL(content, vol.get());
+      });
+    };
+
+    checkAllBins(*grid1);
+    checkAllBins(*gridPhi);
+
+    // Test making 2D grids from the 1D ones
+    auto grid2d = grid1->extendTo2d(nullptr);
+    BOOST_REQUIRE(grid2d);
+    BOOST_CHECK_EQUAL(grid2d->grid().axes().size(), 2);
+    const auto* axis1 = grid2d->grid().axes().front();
+    BOOST_CHECK_EQUAL(*axis1, axis1Expected);
+    const auto* axis2 = grid2d->grid().axes().back();
+    BOOST_CHECK_CLOSE(axis2->getMin(), -180_degree, 1e-6);
+    BOOST_CHECK_CLOSE(axis2->getMax(), 180_degree, 1e-6);
+    BOOST_CHECK_EQUAL(axis2->getNBins(), 1);
+    BOOST_CHECK_EQUAL(axis2->getType(), AxisType::Equidistant);
+    BOOST_CHECK_EQUAL(axis2->getBoundaryType(), AxisBoundaryType::Closed);
+
+    checkAllBins(
+        dynamic_cast<GridPortalLinkT<decltype(axisPhi1Expected),
+                                     Axis<Equidistant, Closed>>&>(*grid2d));
+
+    Axis axis2Explicit{AxisClosed, -180_degree, 180_degree, 3};
+    auto grid2dExplicit = grid1->extendTo2d(&axis2Explicit);
+    BOOST_REQUIRE(grid2dExplicit);
+    BOOST_CHECK_EQUAL(grid2dExplicit->grid().axes().size(), 2);
+    axis1 = grid2dExplicit->grid().axes().front();
+    axis2 = grid2dExplicit->grid().axes().back();
+    BOOST_CHECK_EQUAL(*axis1, axis1Expected);
+    BOOST_CHECK_EQUAL(*axis2, axis2Explicit);
+
+    checkAllBins(dynamic_cast<GridPortalLinkT<decltype(axisPhi1Expected),
+                                              decltype(axis2Explicit)>&>(
+        *grid2dExplicit));
+
+    auto gridPhiBinnedInR = GridPortalLink::make(
+        discPhi, BinningValue::binR, Axis{AxisBound, 30_mm, 100_mm, 3});
+    gridPhiBinnedInR->setVolume(vol.get());
+    auto grid2dPhiNonClosed = gridPhiBinnedInR->extendTo2d(nullptr);
+    BOOST_REQUIRE(grid2dPhiNonClosed);
+    BOOST_CHECK_EQUAL(grid2dPhiNonClosed->grid().axes().size(), 2);
+    Axis gridPhiBinnedInRExpected{AxisBound, 30_mm, 100_mm, 3};
+    BOOST_CHECK_EQUAL(*grid2dPhiNonClosed->grid().axes().front(),
+                      gridPhiBinnedInRExpected);
+    const auto* axisPhiNonClosed = grid2dPhiNonClosed->grid().axes().back();
+    BOOST_CHECK_CLOSE(axisPhiNonClosed->getMin(), -45_degree, 1e-6);
+    BOOST_CHECK_CLOSE(axisPhiNonClosed->getMax(), 45_degree, 1e-6);
+    BOOST_CHECK_EQUAL(axisPhiNonClosed->getNBins(), 1);
+    BOOST_CHECK_EQUAL(axisPhiNonClosed->getType(), AxisType::Equidistant);
+    BOOST_CHECK_EQUAL(axisPhiNonClosed->getBoundaryType(),
+                      AxisBoundaryType::Bound);
+
+    checkAllBins(
+        dynamic_cast<GridPortalLinkT<decltype(gridPhiBinnedInRExpected),
+                                     Axis<Equidistant, Bound>>&>(
+            *grid2dPhiNonClosed));
+
+    Axis axisPhiNonClosedExplicit{AxisBound, -45_degree, 45_degree, 3};
+    auto grid2dPhiNonClosedExplicit =
+        gridPhiBinnedInR->extendTo2d(&axisPhiNonClosedExplicit);
+    BOOST_REQUIRE(grid2dPhiNonClosedExplicit);
+    BOOST_CHECK_EQUAL(grid2dPhiNonClosedExplicit->grid().axes().size(), 2);
+    axisPhiNonClosed = grid2dPhiNonClosedExplicit->grid().axes().back();
+    BOOST_CHECK_EQUAL(*axisPhiNonClosed, axisPhiNonClosedExplicit);
+    BOOST_CHECK_EQUAL(*grid2dPhiNonClosedExplicit->grid().axes().front(),
+                      gridPhiBinnedInRExpected);
+
+    checkAllBins(
+        dynamic_cast<GridPortalLinkT<decltype(gridPhiBinnedInRExpected),
+                                     decltype(axisPhiNonClosedExplicit)>&>(
+            *grid2dPhiNonClosedExplicit));
+
+    auto grid2dPhi = gridPhi->extendTo2d(nullptr);
+    BOOST_REQUIRE(grid2dPhi);
+    BOOST_CHECK_EQUAL(grid2dPhi->grid().axes().size(), 2);
+    Axis axis2dPhiExpected{AxisBound, 30_mm, 100_mm, 1};
+    BOOST_CHECK_EQUAL(*grid2dPhi->grid().axes().front(), axis2dPhiExpected);
+    BOOST_CHECK_EQUAL(*grid2dPhi->grid().axes().back(), axisPhi1Expected);
+
+    checkAllBins(
+        dynamic_cast<GridPortalLinkT<decltype(axis2dPhiExpected),
+                                     decltype(axisPhi1Expected)>&>(*grid2dPhi));
+
+    Axis axis2dPhiExplicit{AxisBound, 30_mm, 100_mm, 3};
+    auto grid2dPhiExplicit = gridPhi->extendTo2d(&axis2dPhiExplicit);
+    BOOST_REQUIRE(grid2dPhiExplicit);
+    BOOST_CHECK_EQUAL(grid2dPhiExplicit->grid().axes().size(), 2);
+    BOOST_CHECK_EQUAL(*grid2dPhiExplicit->grid().axes().front(),
+                      axis2dPhiExplicit);
+    BOOST_CHECK_EQUAL(*grid2dPhiExplicit->grid().axes().back(),
+                      axisPhi1Expected);
+
+    checkAllBins(dynamic_cast<GridPortalLinkT<decltype(axisPhi1Expected),
+                                              decltype(axis2dPhiExplicit)>&>(
+        *grid2dPhiExplicit));
+  }
+
+  BOOST_TEST_CONTEXT("2D") {
+    auto discPhi = Surface::makeShared<DiscSurface>(Transform3::Identity(),
+                                                    30_mm, 100_mm, 45_degree);
+
+    Axis rBad{AxisBound, 1, 2, 5};
+    Axis rGood{AxisBound, 30_mm, 100_mm, 5};
+    Axis phiBad{AxisBound, 1, 2, 5};
+    Axis phiGood{AxisBound, -45_degree, 45_degree, 5};
+
+    // r bad, phi bad
+    BOOST_CHECK_THROW(GridPortalLink::make(discPhi, rBad, phiBad),
+                      std::invalid_argument);
+    // r bad, phi good
+    BOOST_CHECK_THROW(GridPortalLink::make(discPhi, rBad, phiGood),
+                      std::invalid_argument);
+    // r good, phi bad
+    BOOST_CHECK_THROW(GridPortalLink::make(discPhi, rGood, phiBad),
+                      std::invalid_argument);
+    // r good phi good
+    auto grid = GridPortalLink::make(discPhi, rGood, phiGood);
+    BOOST_REQUIRE_NE(grid, nullptr);
+  }
+}
+
+BOOST_AUTO_TEST_CASE(Plane) {
+  // @TODO: Add plane tests
+}
+
+BOOST_AUTO_TEST_CASE(FromTrivial) {
+  BOOST_TEST_CONTEXT("Cylinder") {
+    auto cyl = Surface::makeShared<CylinderSurface>(Transform3::Identity(),
+                                                    30_mm, 100_mm);
+
+    auto vol = std::make_shared<TrackingVolume>(
+        Transform3::Identity(),
+        std::make_shared<CylinderVolumeBounds>(30_mm, 40_mm, 100_mm));
+
+    auto trivial = std::make_unique<TrivialPortalLink>(cyl, *vol);
+    BOOST_REQUIRE(trivial);
+
+    BOOST_CHECK_EQUAL(trivial->resolveVolume(gctx, Vector2{1, 2}).value(),
+                      vol.get());
+
+    auto gridZ = trivial->makeGrid(BinningValue::binZ);
+    BOOST_REQUIRE(gridZ);
+
+    BOOST_CHECK_EQUAL(gridZ->grid().axes().size(), 1);
+    BOOST_CHECK_EQUAL(gridZ->surface().bounds(), cyl->bounds());
+    Axis axisZExpected{AxisBound, -100_mm, 100_mm, 1};
+    BOOST_CHECK_EQUAL(*gridZ->grid().axes().front(), axisZExpected);
+
+    BOOST_CHECK_EQUAL(
+        gridZ->resolveVolume(gctx, Vector2{20_degree * 30_mm, 90_mm}).value(),
+        vol.get());
+
+    auto gridRPhi = trivial->makeGrid(BinningValue::binRPhi);
+    BOOST_REQUIRE(gridRPhi);
+
+    BOOST_CHECK_EQUAL(gridRPhi->grid().axes().size(), 1);
+    BOOST_CHECK_EQUAL(gridRPhi->surface().bounds(), cyl->bounds());
+    Axis axisRPhiExpected{AxisClosed, -std::numbers::pi * 30_mm,
+                          std::numbers::pi * 30_mm, 1};
+    BOOST_CHECK_EQUAL(*gridRPhi->grid().axes().front(), axisRPhiExpected);
+
+    auto cylPhi = Surface::makeShared<CylinderSurface>(
+        Transform3::Identity(), 30_mm, 100_mm, 30_degree);
+
+    auto trivialPhi = std::make_unique<TrivialPortalLink>(cylPhi, *vol);
+    BOOST_REQUIRE(trivialPhi);
+
+    BOOST_CHECK_EQUAL(trivialPhi->resolveVolume(gctx, Vector2{1, 2}).value(),
+                      vol.get());
+
+    auto gridRPhiSector = trivialPhi->makeGrid(BinningValue::binRPhi);
+    BOOST_REQUIRE(gridRPhiSector);
+
+    BOOST_CHECK_EQUAL(
+        gridRPhiSector->resolveVolume(gctx, Vector2{20_degree * 30_mm, 90_mm})
+            .value(),
+        vol.get());
+
+    BOOST_CHECK_EQUAL(gridRPhiSector->grid().axes().size(), 1);
+    Axis axisRPhiSectorExpected{AxisBound, -30_degree * 30_mm,
+                                30_degree * 30_mm, 1};
+    BOOST_CHECK_EQUAL(*gridRPhiSector->grid().axes().front(),
+                      axisRPhiSectorExpected);
+  }
+
+  BOOST_TEST_CONTEXT("Disc") {
+    auto disc =
+        Surface::makeShared<DiscSurface>(Transform3::Identity(), 30_mm, 100_mm);
+
+    auto vol = std::make_shared<TrackingVolume>(
+        Transform3::Identity(),
+        std::make_shared<CylinderVolumeBounds>(30_mm, 40_mm, 100_mm));
+
+    auto trivial = std::make_unique<TrivialPortalLink>(disc, *vol);
+    BOOST_REQUIRE(trivial);
+
+    // Doesn't matter which position
+    BOOST_CHECK_EQUAL(trivial->resolveVolume(gctx, Vector2{1, 2}).value(),
+                      vol.get());
+
+    auto gridR = trivial->makeGrid(BinningValue::binR);
+    BOOST_REQUIRE(gridR);
+
+    BOOST_CHECK_EQUAL(gridR->grid().axes().size(), 1);
+    BOOST_CHECK_EQUAL(gridR->surface().bounds(), disc->bounds());
+    Axis axisRExpected{AxisBound, 30_mm, 100_mm, 1};
+    BOOST_CHECK_EQUAL(*gridR->grid().axes().front(), axisRExpected);
+
+    BOOST_CHECK_EQUAL(
+        gridR->resolveVolume(gctx, Vector2{90_mm, 10_degree}).value(),
+        vol.get());
+
+    auto gridPhi = trivial->makeGrid(BinningValue::binPhi);
+    BOOST_REQUIRE(gridPhi);
+
+    BOOST_CHECK_EQUAL(gridPhi->grid().axes().size(), 1);
+    BOOST_CHECK_EQUAL(gridPhi->surface().bounds(), disc->bounds());
+    Axis axisPhiExpected{AxisClosed, -std::numbers::pi, std::numbers::pi, 1};
+    BOOST_CHECK_EQUAL(*gridPhi->grid().axes().front(), axisPhiExpected);
+
+    BOOST_CHECK_EQUAL(
+        gridPhi->resolveVolume(gctx, Vector2{90_mm, 10_degree}).value(),
+        vol.get());
+  }
+}
+
+BOOST_AUTO_TEST_SUITE_END()  // GridConstruction
+
+BOOST_AUTO_TEST_SUITE(GridMerging)
+
+BOOST_AUTO_TEST_SUITE(Merging1dCylinder)
+
+BOOST_AUTO_TEST_SUITE(ZDirection)
+
+BOOST_AUTO_TEST_CASE(ColinearMerge) {
+  auto vol1 = makeDummyVolume();
+  auto vol2 = makeDummyVolume();
+
+  auto cyl = Surface::makeShared<CylinderSurface>(Transform3::Identity(), 30_mm,
+                                                  100_mm);
+
+  auto grid1dCyl = GridPortalLink::make(cyl, BinningValue::binZ,
+                                        Axis{AxisBound, -100_mm, 100_mm, 10});
+  grid1dCyl->setVolume(vol1.get());
+
+  // Another cylinder, shifted in z
+  auto cyl2 = Surface::makeShared<CylinderSurface>(
+      Transform3{Translation3{Vector3::UnitZ() * 150_mm}}, 30_mm, 50_mm);
+
+  auto grid1dCyl2 = GridPortalLink::make(cyl2, BinningValue::binZ,
+                                         Axis{AxisBound, -50_mm, 50_mm, 5});
+
+  grid1dCyl2->setVolume(vol2.get());
+
+  // Completely invalid
+  BOOST_CHECK_THROW(GridPortalLink::merge(*grid1dCyl, *grid1dCyl2,
+                                          BinningValue::binPhi, *logger),
+                    AssertionFailureException);
+  // Invalid direction, as the cylinders are shifted in z, and can't be merged
+  // in r x phi
+  BOOST_CHECK_THROW(GridPortalLink::merge(*grid1dCyl, *grid1dCyl2,
+                                          BinningValue::binRPhi, *logger),
+                    SurfaceMergingException);
+
+  BOOST_TEST_CONTEXT("Consistent equidistant") {
+    auto mergedPtr = GridPortalLink::merge(*grid1dCyl, *grid1dCyl2,
+                                           BinningValue::binZ, *logger);
+    BOOST_REQUIRE_NE(mergedPtr, nullptr);
+    const auto* merged = dynamic_cast<const GridPortalLink*>(mergedPtr.get());
+    BOOST_REQUIRE_NE(merged, nullptr);
+    BOOST_CHECK_EQUAL(merged->grid().axes().size(), 1);
+    const auto& axis = *merged->grid().axes().front();
+    BOOST_CHECK_EQUAL(axis.getMin(), -150_mm);
+    BOOST_CHECK_EQUAL(axis.getMax(), 150_mm);
+    BOOST_CHECK_EQUAL(axis.getNBins(), 15);
+    BOOST_CHECK_EQUAL(axis.getType(), AxisType::Equidistant);
+    BOOST_CHECK_EQUAL(axis.getBoundaryType(), AxisBoundaryType::Bound);
+  }
+
+  BOOST_TEST_CONTEXT("Inconsistent equidistant") {
+    auto grid1dCyl2BinWidthChanged = GridPortalLink::make(
+        cyl2, BinningValue::binZ, Axis{AxisBound, -50_mm, 50_mm, 6});
+
+    auto mergedPtr = GridPortalLink::merge(
+        *grid1dCyl, *grid1dCyl2BinWidthChanged, BinningValue::binZ, *logger);
+    BOOST_REQUIRE_NE(mergedPtr, nullptr);
+    const auto* merged = dynamic_cast<const GridPortalLink*>(mergedPtr.get());
+    BOOST_REQUIRE_NE(merged, nullptr);
+    BOOST_CHECK_EQUAL(merged->grid().axes().size(), 1);
+    const auto& axis = *merged->grid().axes().front();
+    BOOST_CHECK_EQUAL(axis.getMin(), -150_mm);
+    BOOST_CHECK_EQUAL(axis.getMax(), 150_mm);
+    BOOST_CHECK_EQUAL(axis.getNBins(), 16);
+    BOOST_CHECK_EQUAL(axis.getType(), AxisType::Variable);
+    BOOST_CHECK_EQUAL(axis.getBoundaryType(), AxisBoundaryType::Bound);
+  }
+
+  BOOST_TEST_CONTEXT("Right Variable") {
+    auto gridLeft = GridPortalLink::make(cyl, BinningValue::binZ,
+                                         Axis{AxisBound, -100_mm, 100_mm, 10});
+
+    auto gridRight =
+        GridPortalLink::make(cyl2, BinningValue::binZ,
+                             Axis{AxisBound, {-50_mm, -10_mm, 10_mm, 50_mm}});
+
+    auto mergedPtr = GridPortalLink::merge(*gridLeft, *gridRight,
+                                           BinningValue::binZ, *logger);
+    BOOST_REQUIRE_NE(mergedPtr, nullptr);
+    const auto* merged = dynamic_cast<const GridPortalLink*>(mergedPtr.get());
+    BOOST_REQUIRE_NE(merged, nullptr);
+    BOOST_CHECK_EQUAL(merged->grid().axes().size(), 1);
+    const auto& axis = *merged->grid().axes().front();
+    BOOST_CHECK_EQUAL(axis.getMin(), -150_mm);
+    BOOST_CHECK_EQUAL(axis.getMax(), 150_mm);
+    BOOST_CHECK_EQUAL(axis.getNBins(), 13);
+    BOOST_CHECK_EQUAL(axis.getType(), AxisType::Variable);
+    BOOST_CHECK_EQUAL(axis.getBoundaryType(), AxisBoundaryType::Bound);
+  }
+
+  BOOST_TEST_CONTEXT("Left Variable") {
+    auto gridLeft =
+        GridPortalLink::make(cyl, BinningValue::binZ,
+                             Axis{AxisBound, {-100_mm, -80_mm, 10_mm, 100_mm}});
+
+    auto gridRight = GridPortalLink::make(cyl2, BinningValue::binZ,
+                                          Axis{AxisBound, -50_mm, 50_mm, 8});
+
+    auto mergedPtr = GridPortalLink::merge(*gridLeft, *gridRight,
+                                           BinningValue::binZ, *logger);
+    BOOST_REQUIRE_NE(mergedPtr, nullptr);
+    const auto* merged = dynamic_cast<const GridPortalLink*>(mergedPtr.get());
+    BOOST_REQUIRE_NE(merged, nullptr);
+    BOOST_CHECK_EQUAL(merged->grid().axes().size(), 1);
+    const auto& axis = *merged->grid().axes().front();
+    BOOST_CHECK_EQUAL(axis.getMin(), -150_mm);
+    BOOST_CHECK_EQUAL(axis.getMax(), 150_mm);
+    BOOST_CHECK_EQUAL(axis.getNBins(), 11);
+    BOOST_CHECK_EQUAL(axis.getType(), AxisType::Variable);
+    BOOST_CHECK_EQUAL(axis.getBoundaryType(), AxisBoundaryType::Bound);
+  }
+
+  BOOST_TEST_CONTEXT("Both Variable") {
+    auto gridLeft =
+        GridPortalLink::make(cyl, BinningValue::binZ,
+                             Axis{AxisBound, {-100_mm, -80_mm, 10_mm, 100_mm}});
+
+    auto gridRight =
+        GridPortalLink::make(cyl2, BinningValue::binZ,
+                             Axis{AxisBound, {-50_mm, -10_mm, 10_mm, 50_mm}});
+
+    auto mergedPtr = GridPortalLink::merge(*gridLeft, *gridRight,
+                                           BinningValue::binZ, *logger);
+    BOOST_REQUIRE_NE(mergedPtr, nullptr);
+    const auto* merged = dynamic_cast<const GridPortalLink*>(mergedPtr.get());
+    BOOST_REQUIRE_NE(merged, nullptr);
+    BOOST_CHECK_EQUAL(merged->grid().axes().size(), 1);
+    const auto& axis = *merged->grid().axes().front();
+    BOOST_CHECK_EQUAL(axis.getMin(), -150_mm);
+    BOOST_CHECK_EQUAL(axis.getMax(), 150_mm);
+    BOOST_CHECK_EQUAL(axis.getNBins(), 6);
+    BOOST_CHECK_EQUAL(axis.getType(), AxisType::Variable);
+    BOOST_CHECK_EQUAL(axis.getBoundaryType(), AxisBoundaryType::Bound);
+  }
+
+  BOOST_TEST_CONTEXT("Non bound axis") {
+    std::unique_ptr gridLeft =
+        GridPortalLink::make(cyl, BinningValue::binZ,
+                             Axis{AxisBound, {-100_mm, -80_mm, 10_mm, 100_mm}});
+    std::unique_ptr gridRightClosed =
+        GridPortalLink::make(cyl2, BinningValue::binZ,
+                             Axis{AxisClosed, {-50_mm, -10_mm, 10_mm, 50_mm}});
+    std::unique_ptr gridRightOpen =
+        GridPortalLink::make(cyl2, BinningValue::binZ,
+                             Axis{AxisOpen, {-50_mm, -10_mm, 10_mm, 50_mm}});
+
+    auto compositeLR = PortalLinkBase::merge(
+        copy(gridLeft), copy(gridRightClosed), BinningValue::binZ, *logger);
+    BOOST_CHECK_NE(dynamic_cast<const CompositePortalLink*>(compositeLR.get()),
+                   nullptr);
+    auto compositeRL = PortalLinkBase::merge(
+        copy(gridLeft), copy(gridRightOpen), BinningValue::binZ, *logger);
+    BOOST_CHECK_NE(dynamic_cast<const CompositePortalLink*>(compositeRL.get()),
+                   nullptr);
+  }
+}
+
+BOOST_AUTO_TEST_CASE(ParallelMerge) {
+  // Merge in z direction with phi sectors
+  auto cyl1 = Surface::makeShared<CylinderSurface>(Transform3::Identity(),
+                                                   30_mm, 100_mm, 35_degree);
+
+  auto grid1 = GridPortalLink::make(
+      cyl1, BinningValue::binRPhi,
+
+      Axis{AxisBound, -35_degree * 30_mm, 35_degree * 30_mm, 3});
+  auto cyl2 = Surface::makeShared<CylinderSurface>(
+      Transform3{Translation3{Vector3::UnitZ() * 150_mm}}, 30_mm, 50_mm,
+      35_degree);
+
+  auto grid2 = GridPortalLink::make(
+      cyl2, BinningValue::binRPhi,
+      Axis{AxisBound, -35_degree * 30_mm, 35_degree * 30_mm, 3});
+
+  auto merged12Ptr =
+      GridPortalLink::merge(*grid1, *grid2, BinningValue::binZ, *logger);
+  BOOST_REQUIRE_NE(merged12Ptr, nullptr);
+  auto merged12 = dynamic_cast<const GridPortalLink*>(merged12Ptr.get());
+  BOOST_REQUIRE_NE(merged12, nullptr);
+
+  BOOST_REQUIRE_EQUAL(merged12->grid().axes().size(), 2);
+
+  const auto& axis1 = *merged12->grid().axes().front();
+  const auto& axis2 = *merged12->grid().axes().back();
+  Axis axis1Expected{AxisBound, -35_degree * 30_mm, 35_degree * 30_mm, 3};
+  BOOST_CHECK_EQUAL(axis1, axis1Expected);
+  Axis axis2Expected{AxisBound, {-150_mm, 50_mm, 150_mm}};
+  BOOST_CHECK_EQUAL(axis2, axis2Expected);
+}
+
+BOOST_AUTO_TEST_SUITE_END()  // ZDirection
+
+BOOST_AUTO_TEST_SUITE(RPhiDirection)
+
+BOOST_AUTO_TEST_CASE(ColinearMerge) {
+  auto cyl = Surface::makeShared<CylinderSurface>(Transform3::Identity(), 30_mm,
+                                                  100_mm);
+  BOOST_CHECK_THROW(GridPortalLink::make(cyl, BinningValue::binRPhi,
+                                         Axis{AxisBound, 0, 5, 5}),
+                    std::invalid_argument);
+
+  auto cylNonZeroAverage = Surface::makeShared<CylinderSurface>(
+      Transform3::Identity(), 30_mm, 100_mm, 20_degree, 45_degree);
+
+  BOOST_CHECK_THROW(
+      GridPortalLink::make(
+          cylNonZeroAverage, BinningValue::binRPhi,
+          Axis{AxisBound, -20_degree * 30_mm, 20_degree * 30_mm, 5}),
+      std::invalid_argument);
+
+  BOOST_TEST_CONTEXT("Colinear merge in rPhi") {
+    auto cylPhi1 = Surface::makeShared<CylinderSurface>(
+        Transform3::Identity() * AngleAxis3(45_degree, Vector3::UnitZ()), 30_mm,
+        100_mm, 20_degree, 0_degree);
+
+    auto cylPhi2 = Surface::makeShared<CylinderSurface>(
+        Transform3::Identity() * AngleAxis3(105_degree, Vector3::UnitZ()),
+        30_mm, 100_mm, 40_degree, 0_degree);
+
+    auto portalPhi1 = GridPortalLink::make(
+        cylPhi1, BinningValue::binRPhi,
+        Axis{AxisBound, -20_degree * 30_mm, 20_degree * 30_mm, 5});
+
+    auto portalPhi2 = GridPortalLink::make(
+        cylPhi2, BinningValue::binRPhi,
+        Axis{AxisBound, -40_degree * 30_mm, 40_degree * 30_mm, 10});
+
+    auto cylPhi3 = Surface::makeShared<CylinderSurface>(
+        Transform3::Identity() * AngleAxis3(45_degree, Vector3::UnitZ()), 30_mm,
+        100_mm, 90_degree, 0_degree);
+
+    auto cylPhi4 = Surface::makeShared<CylinderSurface>(
+        Transform3::Identity() * AngleAxis3(-135_degree, Vector3::UnitZ()),
+        30_mm, 100_mm, 90_degree, 0_degree);
+
+    auto portalPhi3 = GridPortalLink::make(
+        cylPhi3, BinningValue::binRPhi,
+        Axis{AxisBound, -90_degree * 30_mm, 90_degree * 30_mm, 2});
+
+    auto portalPhi4 = GridPortalLink::make(
+        cylPhi4, BinningValue::binRPhi,
+        Axis{AxisBound, -90_degree * 30_mm, 90_degree * 30_mm, 2});
+
+    BOOST_TEST_CONTEXT("Consistent equidistant") {
+      auto portalMerged = GridPortalLink::merge(*portalPhi1, *portalPhi2,
+                                                BinningValue::binRPhi, *logger);
+      BOOST_REQUIRE_NE(portalMerged, nullptr);
+
+      const auto* merged =
+          dynamic_cast<const GridPortalLink*>(portalMerged.get());
+      BOOST_REQUIRE_NE(merged, nullptr);
+      BOOST_CHECK_EQUAL(merged->grid().axes().size(), 1);
+      const auto& axis = *merged->grid().axes().front();
+      BOOST_CHECK_CLOSE(axis.getMin(), -60_degree * 30_mm, 1e-9);
+      BOOST_CHECK_CLOSE(axis.getMax(), 60_degree * 30_mm, 1e-9);
+      BOOST_CHECK_EQUAL(axis.getNBins(), 15);
+      BOOST_CHECK_EQUAL(axis.getType(), AxisType::Equidistant);
+      BOOST_CHECK_EQUAL(axis.getBoundaryType(), AxisBoundaryType::Bound);
+
+      // Test that if you merge half-circles, we get a closed axis
+      auto portalMerged34 = GridPortalLink::merge(
+          *portalPhi3, *portalPhi4, BinningValue::binRPhi, *logger);
+      BOOST_REQUIRE_NE(portalMerged34, nullptr);
+
+      const auto* merged34 =
+          dynamic_cast<const GridPortalLink*>(portalMerged34.get());
+      BOOST_REQUIRE_NE(merged34, nullptr);
+      BOOST_CHECK_EQUAL(merged34->grid().axes().size(), 1);
+      const auto& axis34 = *merged34->grid().axes().front();
+      BOOST_CHECK_CLOSE(axis34.getMin(), -180_degree * 30_mm, 1e-9);
+      BOOST_CHECK_CLOSE(axis34.getMax(), 180_degree * 30_mm, 1e-9);
+      BOOST_CHECK_EQUAL(axis34.getNBins(), 4);
+      BOOST_CHECK_EQUAL(axis34.getType(), AxisType::Equidistant);
+      BOOST_CHECK_EQUAL(axis34.getBoundaryType(), AxisBoundaryType::Closed);
+    }
+
+    BOOST_TEST_CONTEXT("Inconsistent equidistant") {
+      auto portalPhi2Mod = GridPortalLink::make(
+          cylPhi2, BinningValue::binRPhi,
+          Axis{AxisBound, -40_degree * 30_mm, 40_degree * 30_mm, 3});
+
+      auto portalMergedMod = GridPortalLink::merge(
+          *portalPhi1, *portalPhi2Mod, BinningValue::binRPhi, *logger);
+      BOOST_REQUIRE_NE(portalMergedMod, nullptr);
+
+      const auto* merged12 =
+          dynamic_cast<const GridPortalLink*>(portalMergedMod.get());
+      BOOST_REQUIRE_NE(merged12, nullptr);
+      BOOST_CHECK_EQUAL(merged12->grid().axes().size(), 1);
+      const auto& axis12 = *merged12->grid().axes().front();
+      BOOST_CHECK_CLOSE(axis12.getMin(), -60_degree * 30_mm, 1e-9);
+      BOOST_CHECK_CLOSE(axis12.getMax(), 60_degree * 30_mm, 1e-9);
+      BOOST_CHECK_EQUAL(axis12.getNBins(), 8);
+      BOOST_CHECK_EQUAL(axis12.getType(), AxisType::Variable);
+      BOOST_CHECK_EQUAL(axis12.getBoundaryType(), AxisBoundaryType::Bound);
+
+      std::vector<ActsScalar> expected12 = {-31.4159, -17.4533, -3.49066,
+                                            10.472,   14.6608,  18.8496,
+                                            23.0383,  27.2271,  31.4159};
+      CHECK_CLOSE_OR_SMALL(axis12.getBinEdges(), expected12, 1e-4, 10e-10);
+
+      auto portalPhi4Mod = GridPortalLink::make(
+          cylPhi4, BinningValue::binRPhi,
+          Axis{AxisBound, -90_degree * 30_mm, 90_degree * 30_mm, 1});
+
+      auto portalMerged34 = GridPortalLink::merge(
+          *portalPhi3, *portalPhi4Mod, BinningValue::binRPhi, *logger);
+      BOOST_REQUIRE_NE(portalMerged34, nullptr);
+
+      const auto* merged34 =
+          dynamic_cast<const GridPortalLink*>(portalMerged34.get());
+      BOOST_REQUIRE_NE(merged34, nullptr);
+      BOOST_CHECK_EQUAL(merged34->grid().axes().size(), 1);
+      const auto& axis34 = *merged34->grid().axes().front();
+      BOOST_CHECK_CLOSE(axis34.getMin(), -180_degree * 30_mm, 1e-9);
+      BOOST_CHECK_CLOSE(axis34.getMax(), 180_degree * 30_mm, 1e-9);
+      BOOST_CHECK_EQUAL(axis34.getNBins(), 3);
+      BOOST_CHECK_EQUAL(axis34.getType(), AxisType::Variable);
+      BOOST_CHECK_EQUAL(axis34.getBoundaryType(), AxisBoundaryType::Closed);
+
+      // Caution: for full-azimuth cases, the ordering is preserved, you get
+      // in what you get out. -> this can flip
+      std::vector<ActsScalar> expected34 = {-94.2478, -47.1239, 0, 94.2478};
+      CHECK_CLOSE_OR_SMALL(axis34.getBinEdges(), expected34, 1e-4, 10e-10);
+    }
+
+    BOOST_TEST_CONTEXT("Left variable") {
+      BOOST_TEST_CONTEXT("Non-closed") {
+        auto gridLeft =
+            GridPortalLink::make(cylPhi1, BinningValue::binRPhi,
+                                 Axis{AxisBound,
+                                      {-20_degree * 30_mm, -10_degree * 30_mm,
+                                       10_degree * 30_mm, 20_degree * 30_mm}});
+        auto gridRight = GridPortalLink::make(
+            cylPhi2, BinningValue::binRPhi,
+            Axis{AxisBound, -40_degree * 30_mm, 40_degree * 30_mm, 3});
+
+        auto mergedPtr = GridPortalLink::merge(*gridLeft, *gridRight,
+                                               BinningValue::binRPhi, *logger);
+        BOOST_REQUIRE_NE(mergedPtr, nullptr);
+
+        const auto* merged =
+            dynamic_cast<const GridPortalLink*>(mergedPtr.get());
+        BOOST_REQUIRE_NE(merged, nullptr);
+        const auto& axis = *merged->grid().axes().front();
+        BOOST_CHECK_EQUAL(merged->grid().axes().size(), 1);
+        BOOST_CHECK_CLOSE(axis.getMin(), -60_degree * 30_mm, 1e-9);
+        BOOST_CHECK_CLOSE(axis.getMax(), 60_degree * 30_mm, 1e-9);
+        BOOST_CHECK_EQUAL(axis.getNBins(), 6);
+        BOOST_CHECK_EQUAL(axis.getType(), AxisType::Variable);
+        BOOST_CHECK_EQUAL(axis.getBoundaryType(), AxisBoundaryType::Bound);
+
+        std::vector<ActsScalar> expected = {
+            -31.4159, -17.4533, -3.49066, 10.472, 15.708, 26.1799, 31.4159};
+        CHECK_CLOSE_OR_SMALL(axis.getBinEdges(), expected, 1e-4, 10e-10);
+      }
+
+      BOOST_TEST_CONTEXT("Closed") {
+        auto gridLeft = GridPortalLink::make(
+            cylPhi4, BinningValue::binRPhi,
+            Axis{AxisBound,
+                 {-90_degree * 30_mm, 25_degree * 30_mm, 90_degree * 30_mm}});
+
+        auto gridRight = GridPortalLink::make(
+            cylPhi3, BinningValue::binRPhi,
+            Axis{AxisBound, -90_degree * 30_mm, 90_degree * 30_mm, 3});
+
+        auto mergedPtr = GridPortalLink::merge(*gridLeft, *gridRight,
+                                               BinningValue::binRPhi, *logger);
+        BOOST_REQUIRE_NE(mergedPtr, nullptr);
+
+        const auto* merged =
+            dynamic_cast<const GridPortalLink*>(mergedPtr.get());
+        BOOST_REQUIRE_NE(merged, nullptr);
+        BOOST_CHECK_EQUAL(merged->grid().axes().size(), 1);
+        const auto& axis = *merged->grid().axes().front();
+        BOOST_CHECK_CLOSE(axis.getMin(), -180_degree * 30_mm, 1e-9);
+        BOOST_CHECK_CLOSE(axis.getMax(), 180_degree * 30_mm, 1e-9);
+        BOOST_CHECK_EQUAL(axis.getNBins(), 5);
+        BOOST_CHECK_EQUAL(axis.getType(), AxisType::Variable);
+        BOOST_CHECK_EQUAL(axis.getBoundaryType(), AxisBoundaryType::Closed);
+
+        // Caution: for full-azimuth cases, the ordering is preserved, you get
+        // in what you get out. -> this can flip
+        std::vector<ActsScalar> expected = {-94.2478, -34.0339, 0,
+                                            31.4159,  62.8319,  94.2478};
+        CHECK_CLOSE_OR_SMALL(axis.getBinEdges(), expected, 1e-4, 10e-10);
+      }
+    }
+
+    BOOST_TEST_CONTEXT("Right variable") {
+      BOOST_TEST_CONTEXT("Non-closed") {
+        auto gridLeft = GridPortalLink::make(
+            cylPhi1, BinningValue::binRPhi,
+            Axis{AxisBound, -20_degree * 30_mm, 20_degree * 30_mm, 3});
+        auto gridRight =
+            GridPortalLink::make(cylPhi2, BinningValue::binRPhi,
+                                 Axis{AxisBound,
+                                      {-40_degree * 30_mm, -10_degree * 30_mm,
+                                       10_degree * 30_mm, 40_degree * 30_mm}});
+
+        auto mergedPtr = GridPortalLink::merge(*gridLeft, *gridRight,
+                                               BinningValue::binRPhi, *logger);
+        BOOST_REQUIRE_NE(mergedPtr, nullptr);
+
+        const auto* merged =
+            dynamic_cast<const GridPortalLink*>(mergedPtr.get());
+        BOOST_REQUIRE_NE(merged, nullptr);
+        const auto& axis = *merged->grid().axes().front();
+        BOOST_CHECK_EQUAL(merged->grid().axes().size(), 1);
+        BOOST_CHECK_CLOSE(axis.getMin(), -60_degree * 30_mm, 1e-9);
+        BOOST_CHECK_CLOSE(axis.getMax(), 60_degree * 30_mm, 1e-9);
+        BOOST_CHECK_EQUAL(axis.getNBins(), 6);
+        BOOST_CHECK_EQUAL(axis.getType(), AxisType::Variable);
+        BOOST_CHECK_EQUAL(axis.getBoundaryType(), AxisBoundaryType::Bound);
+
+        std::vector<ActsScalar> expected = {-31.4159, -15.708, -5.23599, 10.472,
+                                            17.4533,  24.4346, 31.4159};
+        CHECK_CLOSE_OR_SMALL(axis.getBinEdges(), expected, 1e-4, 10e-10);
+      }
+
+      BOOST_TEST_CONTEXT("Closed") {
+        auto gridLeft = GridPortalLink::make(
+            cylPhi4, BinningValue::binRPhi,
+            Axis{AxisBound, -90_degree * 30_mm, 90_degree * 30_mm, 3});
+
+        auto gridRight = GridPortalLink::make(
+            cylPhi3, BinningValue::binRPhi,
+            Axis{AxisBound,
+                 {-90_degree * 30_mm, 25_degree * 30_mm, 90_degree * 30_mm}});
+
+        auto mergedPtr = GridPortalLink::merge(*gridLeft, *gridRight,
+                                               BinningValue::binRPhi, *logger);
+        BOOST_REQUIRE_NE(mergedPtr, nullptr);
+
+        const auto* merged =
+            dynamic_cast<const GridPortalLink*>(mergedPtr.get());
+        BOOST_REQUIRE_NE(merged, nullptr);
+        BOOST_CHECK_EQUAL(merged->grid().axes().size(), 1);
+        const auto& axis = *merged->grid().axes().front();
+        BOOST_CHECK_CLOSE(axis.getMin(), -180_degree * 30_mm, 1e-9);
+        BOOST_CHECK_CLOSE(axis.getMax(), 180_degree * 30_mm, 1e-9);
+        BOOST_CHECK_EQUAL(axis.getNBins(), 5);
+        BOOST_CHECK_EQUAL(axis.getType(), AxisType::Variable);
+        BOOST_CHECK_EQUAL(axis.getBoundaryType(), AxisBoundaryType::Closed);
+
+        // Caution: for full-azimuth cases, the ordering is preserved, you get
+        // in what you get out. -> this can flip
+        std::vector<ActsScalar> expected = {-94.2478, -62.8319, -31.4159,
+                                            0,        60.2139,  94.2478};
+        CHECK_CLOSE_OR_SMALL(axis.getBinEdges(), expected, 1e-4, 10e-10);
+      }
+    }
+
+    BOOST_TEST_CONTEXT("Both variable") {
+      BOOST_TEST_CONTEXT("Non-closed") {
+        auto gridLeft =
+            GridPortalLink::make(cylPhi1, BinningValue::binRPhi,
+                                 Axis{AxisBound,
+                                      {-20_degree * 30_mm, -10_degree * 30_mm,
+                                       10_degree * 30_mm, 20_degree * 30_mm}});
+        auto gridRight = GridPortalLink::make(
+            cylPhi2, BinningValue::binRPhi,
+            Axis{AxisBound,
+                 {-40_degree * 30_mm, -5_degree * 30_mm, 40_degree * 30_mm}});
+
+        auto mergedPtr = GridPortalLink::merge(*gridLeft, *gridRight,
+                                               BinningValue::binRPhi, *logger);
+        BOOST_REQUIRE_NE(mergedPtr, nullptr);
+
+        const auto* merged =
+            dynamic_cast<const GridPortalLink*>(mergedPtr.get());
+        BOOST_REQUIRE_NE(merged, nullptr);
+        const auto& axis = *merged->grid().axes().front();
+        BOOST_CHECK_EQUAL(merged->grid().axes().size(), 1);
+        BOOST_CHECK_CLOSE(axis.getMin(), -60_degree * 30_mm, 1e-9);
+        BOOST_CHECK_CLOSE(axis.getMax(), 60_degree * 30_mm, 1e-9);
+        BOOST_CHECK_EQUAL(axis.getNBins(), 5);
+        BOOST_CHECK_EQUAL(axis.getType(), AxisType::Variable);
+        BOOST_CHECK_EQUAL(axis.getBoundaryType(), AxisBoundaryType::Bound);
+
+        std::vector<ActsScalar> expected = {-31.4159, -13.09,  10.472,
+                                            15.708,   26.1799, 31.4159};
+        CHECK_CLOSE_OR_SMALL(axis.getBinEdges(), expected, 1e-4, 10e-10);
+      }
+
+      BOOST_TEST_CONTEXT("Closed") {
+        auto gridLeft = GridPortalLink::make(
+            cylPhi4, BinningValue::binRPhi,
+            Axis{AxisBound,
+                 {-90_degree * 30_mm, 25_degree * 30_mm, 90_degree * 30_mm}});
+
+        auto gridRight =
+            GridPortalLink::make(cylPhi3, BinningValue::binRPhi,
+                                 Axis{AxisBound,
+                                      {-90_degree * 30_mm, -10_degree * 30_mm,
+                                       10_degree * 30_mm, 90_degree * 30_mm}});
+
+        auto mergedPtr = GridPortalLink::merge(*gridLeft, *gridRight,
+                                               BinningValue::binRPhi, *logger);
+        BOOST_REQUIRE_NE(mergedPtr, nullptr);
+
+        const auto* merged =
+            dynamic_cast<const GridPortalLink*>(mergedPtr.get());
+        BOOST_REQUIRE_NE(merged, nullptr);
+        BOOST_CHECK_EQUAL(merged->grid().axes().size(), 1);
+        const auto& axis = *merged->grid().axes().front();
+        BOOST_CHECK_CLOSE(axis.getMin(), -180_degree * 30_mm, 1e-9);
+        BOOST_CHECK_CLOSE(axis.getMax(), 180_degree * 30_mm, 1e-9);
+        BOOST_CHECK_EQUAL(axis.getNBins(), 5);
+        BOOST_CHECK_EQUAL(axis.getType(), AxisType::Variable);
+        BOOST_CHECK_EQUAL(axis.getBoundaryType(), AxisBoundaryType::Closed);
+
+        // Caution: for full-azimuth cases, the ordering is preserved, you get
+        // in what you get out. -> this can flip
+        std::vector<ActsScalar> expected = {-94.2478, -34.0339, 0,
+                                            41.8879,  52.3599,  94.2478};
+        CHECK_CLOSE_OR_SMALL(axis.getBinEdges(), expected, 1e-4, 10e-10);
+      }
+    }
+  }
+}
+
+BOOST_AUTO_TEST_CASE(ParallelMerge) {
+  // Merge in phi direction with z binning
+  auto cylPhi1 = Surface::makeShared<CylinderSurface>(
+      Transform3::Identity() * AngleAxis3(45_degree, Vector3::UnitZ()), 30_mm,
+      100_mm, 20_degree, 0_degree);
+
+  auto cylPhi2 = Surface::makeShared<CylinderSurface>(
+      Transform3::Identity() * AngleAxis3(85_degree, Vector3::UnitZ()), 30_mm,
+      100_mm, 20_degree, 0_degree);
+
+  auto portalPhi1 = GridPortalLink::make(cylPhi1, BinningValue::binZ,
+                                         Axis{AxisBound, -100_mm, 100_mm, 5});
+
+  auto portalPhi2 = GridPortalLink::make(cylPhi2, BinningValue::binZ,
+                                         Axis{AxisBound, -100_mm, 100_mm, 5});
+
+  auto merged12Ptr = GridPortalLink::merge(*portalPhi1, *portalPhi2,
+                                           BinningValue::binRPhi, *logger);
+  BOOST_REQUIRE_NE(merged12Ptr, nullptr);
+  auto merged12 = dynamic_cast<const GridPortalLink*>(merged12Ptr.get());
+  BOOST_REQUIRE_NE(merged12, nullptr);
+
+  const auto& axis1 = *merged12->grid().axes().front();
+  const auto& axis2 = *merged12->grid().axes().back();
+  // Phi sectors were same size, should give equidistant binning
+  Axis axis1Expected{AxisBound, -40_degree * 30_mm, 40_degree * 30_mm, 2};
+  BOOST_CHECK_EQUAL(axis1, axis1Expected);
+  Axis axis2Expected{AxisBound, -100_mm, 100_mm, 5};
+  BOOST_CHECK_EQUAL(axis2, axis2Expected);
+}
+
+BOOST_AUTO_TEST_SUITE_END()  // RPhiDirection
+
+BOOST_AUTO_TEST_SUITE_END()  // Merging1dCylinder
+
+BOOST_AUTO_TEST_SUITE(Merging2dCylinder)
+
+BOOST_AUTO_TEST_CASE(ZDirection) {
+  BOOST_TEST_CONTEXT("Phi sector") {
+    auto cyl1 = Surface::makeShared<CylinderSurface>(Transform3::Identity(),
+                                                     30_mm, 100_mm, 45_degree);
+
+    // z good, rphi good
+    auto grid1 = GridPortalLink::make(
+        cyl1, Axis{AxisBound, -45_degree * 30_mm, 45_degree * 30_mm, 5},
+        Axis{AxisBound, -100_mm, 100_mm, 5});
+
+    auto trf2 = Transform3{Translation3{Vector3::UnitZ() * 150_mm}};
+    auto cyl2 =
+        Surface::makeShared<CylinderSurface>(trf2, 30_mm, 50_mm, 45_degree);
+
+    // Second grid portal with compatible phi binning
+    auto grid2 = GridPortalLink::make(
+        cyl2, Axis{AxisBound, -45_degree * 30_mm, 45_degree * 30_mm, 5},
+        Axis{AxisBound, -50_mm, 50_mm, 5});
+
+    // We're merging in z direction, so the phi binnings need to be the same
+
+    auto mergedPtr =
+        GridPortalLink::merge(*grid1, *grid2, BinningValue::binZ, *logger);
+    const auto* merged = dynamic_cast<const GridPortalLink*>(mergedPtr.get());
+    BOOST_REQUIRE_NE(mergedPtr, nullptr);
+
+    const auto& axis1 = *merged->grid().axes().front();
+    const auto& axis2 = *merged->grid().axes().back();
+
+    BOOST_CHECK_EQUAL(axis1.getMin(), -45_degree * 30_mm);
+    BOOST_CHECK_EQUAL(axis1.getMax(), 45_degree * 30_mm);
+    BOOST_CHECK_EQUAL(axis1.getNBins(), 5);
+    BOOST_CHECK_EQUAL(axis1.getType(), AxisType::Equidistant);
+    BOOST_CHECK_EQUAL(axis1.getBoundaryType(), AxisBoundaryType::Bound);
+
+    BOOST_CHECK_EQUAL(axis2.getMin(), -150_mm);
+    BOOST_CHECK_EQUAL(axis2.getMax(), 150_mm);
+    BOOST_CHECK_EQUAL(axis2.getNBins(), 10);
+    BOOST_CHECK_EQUAL(axis2.getType(), AxisType::Variable);
+    BOOST_CHECK_EQUAL(axis2.getBoundaryType(), AxisBoundaryType::Bound);
+
+    auto grid3 = GridPortalLink::make(
+        cyl2, Axis{AxisBound, -45_degree * 30_mm, 45_degree * 30_mm, 3},
+        Axis{AxisBound, -50_mm, 50_mm, 5});
+
+    auto composite = PortalLinkBase::merge(copy(grid1), copy(grid3),
+                                           BinningValue::binZ, *logger);
+    BOOST_CHECK_NE(dynamic_cast<const CompositePortalLink*>(composite.get()),
+                   nullptr);
+  }
+
+  BOOST_TEST_CONTEXT("Check wraparound for full circle in phi") {
+    auto cyl1 = Surface::makeShared<CylinderSurface>(Transform3::Identity(),
+                                                     30_mm, 100_mm, 180_degree);
+
+    // z good, rphi good
+    auto grid1 = GridPortalLink::make(
+        cyl1, Axis{AxisClosed, -180_degree * 30_mm, 180_degree * 30_mm, 5},
+        Axis{AxisBound, -100_mm, 100_mm, 5});
+
+    auto trf2 = Transform3{Translation3{Vector3::UnitZ() * 150_mm}};
+    auto cyl2 =
+        Surface::makeShared<CylinderSurface>(trf2, 30_mm, 50_mm, 180_degree);
+
+    // Second grid portal with compatible phi binning
+    auto grid2 = GridPortalLink::make(
+        cyl2, Axis{AxisClosed, -180_degree * 30_mm, 180_degree * 30_mm, 5},
+        Axis{AxisBound, -50_mm, 50_mm, 5});
+
+    auto mergedPtr =
+        GridPortalLink::merge(*grid1, *grid2, BinningValue::binZ, *logger);
+    const auto* merged = dynamic_cast<const GridPortalLink*>(mergedPtr.get());
+    BOOST_REQUIRE_NE(mergedPtr, nullptr);
+
+    const auto& axis1 = *merged->grid().axes().front();
+    const auto& axis2 = *merged->grid().axes().back();
+
+    Axis axis1Expected{AxisClosed, -180_degree * 30_mm, 180_degree * 30_mm, 5};
+    BOOST_CHECK_EQUAL(axis1, axis1Expected);
+    Axis axis2Expected{AxisBound,
+                       {-150, -110, -70, -30, 10, 50, 70, 90, 110, 130, 150}};
+    BOOST_CHECK_EQUAL(axis2, axis2Expected);
+  }
+}
+
+BOOST_AUTO_TEST_CASE(RPhiDirection) {
+  auto cyl1 = Surface::makeShared<CylinderSurface>(Transform3::Identity(),
+                                                   30_mm, 100_mm, 45_degree);
+
+  // z good, rphi good
+  auto grid1 = GridPortalLink::make(
+      cyl1, Axis{AxisBound, -45_degree * 30_mm, 45_degree * 30_mm, 5},
+      Axis{AxisBound, -100_mm, 100_mm, 5});
+  BOOST_REQUIRE_NE(grid1, nullptr);
+
+  auto trf2 = Transform3{AngleAxis3{90_degree, Vector3::UnitZ()}};
+  auto cyl2 =
+      Surface::makeShared<CylinderSurface>(trf2, 30_mm, 100_mm, 45_degree);
+
+  // Second grid portal with compatible phi binning
+  auto grid2 = GridPortalLink::make(
+      cyl2, Axis{AxisBound, -45_degree * 30_mm, 45_degree * 30_mm, 5},
+      Axis{AxisBound, -100_mm, 100_mm, 5});
+  BOOST_REQUIRE_NE(grid2, nullptr);
+
+  // We're merging in z direction, so the phi binnings need to be the same
+
+  auto mergedPtr =
+      GridPortalLink::merge(*grid1, *grid2, BinningValue::binRPhi, *logger);
+  const auto* merged = dynamic_cast<const GridPortalLink*>(mergedPtr.get());
+  BOOST_REQUIRE_NE(mergedPtr, nullptr);
+
+  const auto& axis1 = *merged->grid().axes().front();
+  const auto& axis2 = *merged->grid().axes().back();
+  BOOST_CHECK_CLOSE(axis1.getMin(), -90_degree * 30_mm, 1e-8);
+  BOOST_CHECK_CLOSE(axis1.getMax(), 90_degree * 30_mm, 1e-8);
+  BOOST_CHECK_EQUAL(axis1.getNBins(), 10);
+  BOOST_CHECK_EQUAL(axis1.getType(), AxisType::Equidistant);
+  BOOST_CHECK_EQUAL(axis1.getBoundaryType(), AxisBoundaryType::Bound);
+  Axis axis2Expected{AxisBound, -100_mm, 100_mm, 5};
+  BOOST_CHECK_EQUAL(axis2, axis2Expected);
+}
+
+BOOST_AUTO_TEST_SUITE_END()  // Merging2dCylinder
+
+BOOST_AUTO_TEST_SUITE(Merging1dDisc)
+
+BOOST_AUTO_TEST_SUITE(RDirection)
+
+BOOST_AUTO_TEST_CASE(ColinearMerge) {
+  // Without phi sector
+  auto disc1 =
+      Surface::makeShared<DiscSurface>(Transform3::Identity(), 30_mm, 100_mm);
+
+  auto grid1 = GridPortalLink::make(disc1, BinningValue::binR,
+                                    Axis{AxisBound, 30_mm, 100_mm, 7});
+
+  auto disc2 =
+      Surface::makeShared<DiscSurface>(Transform3::Identity(), 100_mm, 150_mm);
+
+  auto grid2 = GridPortalLink::make(disc2, BinningValue::binR,
+                                    Axis{AxisBound, 100_mm, 150_mm, 5});
+
+  auto mergedPtr =
+      GridPortalLink::merge(*grid1, *grid2, BinningValue::binR, *logger);
+  BOOST_REQUIRE(mergedPtr);
+  const auto* merged = dynamic_cast<const GridPortalLink*>(mergedPtr.get());
+  BOOST_REQUIRE_NE(merged, nullptr);
+
+  BOOST_CHECK_EQUAL(merged->grid().axes().size(), 1);
+  Axis axisExpected{AxisBound, 30_mm, 150_mm, 12};
+  BOOST_CHECK_EQUAL(*merged->grid().axes().front(), axisExpected);
+
+  // With phi sector
+  auto discPhi1 = Surface::makeShared<DiscSurface>(Transform3::Identity(),
+                                                   30_mm, 100_mm, 30_degree);
+
+  auto discPhiGrid1 = GridPortalLink::make(discPhi1, BinningValue::binR,
+                                           Axis{AxisBound, 30_mm, 100_mm, 7});
+
+  auto discPhi2 = Surface::makeShared<DiscSurface>(Transform3::Identity(),
+                                                   100_mm, 150_mm, 30_degree);
+
+  auto discPhiGrid2 = GridPortalLink::make(discPhi2, BinningValue::binR,
+                                           Axis{AxisBound, 100_mm, 150_mm, 5});
+
+  auto mergedPhiPtr = GridPortalLink::merge(*discPhiGrid1, *discPhiGrid2,
+                                            BinningValue::binR, *logger);
+  BOOST_REQUIRE(mergedPhiPtr);
+  const auto* mergedPhi =
+      dynamic_cast<const GridPortalLink*>(mergedPhiPtr.get());
+  BOOST_REQUIRE_NE(mergedPhi, nullptr);
+
+  BOOST_CHECK_EQUAL(mergedPhi->grid().axes().size(), 1);
+  BOOST_CHECK_EQUAL(*mergedPhi->grid().axes().front(), axisExpected);
+}
+
+BOOST_AUTO_TEST_CASE(ParallelMerge) {
+  auto disc1 =
+      Surface::makeShared<DiscSurface>(Transform3::Identity(), 30_mm, 100_mm);
+
+  auto grid1 =
+      GridPortalLink::make(disc1, BinningValue::binPhi,
+                           Axis{AxisClosed, -180_degree, 180_degree, 5});
+
+  auto disc2 =
+      Surface::makeShared<DiscSurface>(Transform3::Identity(), 100_mm, 150_mm);
+
+  auto grid2 =
+      GridPortalLink::make(disc2, BinningValue::binPhi,
+                           Axis{AxisClosed, -180_degree, 180_degree, 5});
+
+  auto mergedPtr =
+      GridPortalLink::merge(*grid1, *grid2, BinningValue::binR, *logger);
+  BOOST_REQUIRE(mergedPtr);
+  const auto* merged = dynamic_cast<const GridPortalLink*>(mergedPtr.get());
+  BOOST_REQUIRE_NE(merged, nullptr);
+
+  BOOST_CHECK_EQUAL(merged->grid().axes().size(), 2);
+  const auto& axis1 = *merged->grid().axes().front();
+  const auto& axis2 = *merged->grid().axes().back();
+  Axis axis1Expected{AxisBound, {30_mm, 100_mm, 150_mm}};
+  BOOST_CHECK_EQUAL(axis1, axis1Expected);
+  Axis axis2Expected{AxisClosed, -180_degree, 180_degree, 5};
+  BOOST_CHECK_EQUAL(axis2, axis2Expected);
+}
+
+BOOST_AUTO_TEST_SUITE_END()  // RDirection
+
+BOOST_AUTO_TEST_SUITE(PhiDirection)
+
+BOOST_AUTO_TEST_CASE(ColinearMerge) {
+  auto disc1 = Surface::makeShared<DiscSurface>(Transform3::Identity(), 30_mm,
+                                                100_mm, 30_degree);
+
+  auto grid1 = GridPortalLink::make(disc1, BinningValue::binPhi,
+                                    Axis{AxisBound, -30_degree, 30_degree, 3});
+
+  auto disc2 = Surface::makeShared<DiscSurface>(
+      Transform3{AngleAxis3{90_degree, Vector3::UnitZ()}}, 30_mm, 100_mm,
+      60_degree);
+
+  auto grid2 = GridPortalLink::make(disc2, BinningValue::binPhi,
+                                    Axis{AxisBound, -60_degree, 60_degree, 6});
+
+  auto mergedPtr =
+      GridPortalLink::merge(*grid1, *grid2, BinningValue::binPhi, *logger);
+  BOOST_REQUIRE(mergedPtr);
+  const auto* merged = dynamic_cast<const GridPortalLink*>(mergedPtr.get());
+  BOOST_REQUIRE_NE(merged, nullptr);
+
+  BOOST_CHECK_EQUAL(merged->grid().axes().size(), 1);
+  const auto& axis = *merged->grid().axes().front();
+  BOOST_CHECK_CLOSE(axis.getMin(), -90_degree, 1e-6);
+  BOOST_CHECK_CLOSE(axis.getMax(), 90_degree, 1e-6);
+  BOOST_CHECK_EQUAL(axis.getNBins(), 9);
+
+  // Check wrapping
+
+  auto disc1Half = Surface::makeShared<DiscSurface>(
+      Transform3{AngleAxis3{15_degree, Vector3::UnitZ()}}, 30_mm, 100_mm,
+      90_degree);
+
+  auto grid1Half =
+      GridPortalLink::make(disc1Half, BinningValue::binPhi,
+                           Axis{AxisBound, -90_degree, 90_degree, 3});
+
+  auto disc2Half = Surface::makeShared<DiscSurface>(
+      Transform3{AngleAxis3{-165_degree, Vector3::UnitZ()}}, 30_mm, 100_mm,
+      90_degree);
+
+  auto grid2Half =
+      GridPortalLink::make(disc2Half, BinningValue::binPhi,
+                           Axis{AxisBound, -90_degree, 90_degree, 3});
+
+  auto mergedHalfPtr = GridPortalLink::merge(*grid1Half, *grid2Half,
+                                             BinningValue::binPhi, *logger);
+  BOOST_REQUIRE(mergedHalfPtr);
+  const auto* mergedHalf =
+      dynamic_cast<const GridPortalLink*>(mergedHalfPtr.get());
+  BOOST_REQUIRE_NE(mergedHalf, nullptr);
+
+  BOOST_CHECK_EQUAL(mergedHalf->grid().axes().size(), 1);
+  Axis axisHalfExpected{AxisClosed, -180_degree, 180_degree, 6};
+  BOOST_CHECK_EQUAL(axisHalfExpected, *mergedHalf->grid().axes().front());
+}
+
+BOOST_AUTO_TEST_CASE(ParallelMerge) {
+  auto disc1 = Surface::makeShared<DiscSurface>(Transform3::Identity(), 30_mm,
+                                                100_mm, 30_degree);
+
+  auto grid1 = GridPortalLink::make(disc1, BinningValue::binR,
+                                    Axis{AxisBound, 30_mm, 100_mm, 3});
+
+  auto disc2 = Surface::makeShared<DiscSurface>(
+      Transform3{AngleAxis3{90_degree, Vector3::UnitZ()}}, 30_mm, 100_mm,
+      60_degree);
+
+  auto grid2 = GridPortalLink::make(disc2, BinningValue::binR,
+                                    Axis{AxisBound, 30_mm, 100_mm, 3});
+
+  auto mergedPtr =
+      GridPortalLink::merge(*grid1, *grid2, BinningValue::binPhi, *logger);
+  BOOST_REQUIRE(mergedPtr);
+  const auto* merged = dynamic_cast<const GridPortalLink*>(mergedPtr.get());
+  BOOST_REQUIRE_NE(merged, nullptr);
+
+  BOOST_CHECK_EQUAL(merged->grid().axes().size(), 2);
+  const auto& axis1 = *merged->grid().axes().front();
+  const auto& axis2 = *merged->grid().axes().back();
+
+  Axis axis1Expected{AxisBound, 30_mm, 100_mm, 3};
+  BOOST_CHECK_EQUAL(axis1, axis1Expected);
+
+  BOOST_CHECK_CLOSE(axis2.getMin(), -90_degree, 1e-6);
+  BOOST_CHECK_CLOSE(axis2.getMax(), 90_degree, 1e-6);
+  BOOST_CHECK_EQUAL(axis2.getNBins(), 2);
+  BOOST_CHECK_CLOSE(axis2.getBinEdges().at(1), 30_degree, 1e-6);
+  BOOST_CHECK_EQUAL(axis2.getType(), AxisType::Variable);
+  BOOST_CHECK_EQUAL(axis2.getBoundaryType(), AxisBoundaryType::Bound);
+}
+
+BOOST_AUTO_TEST_SUITE_END()  // PhiDirection
+
+BOOST_AUTO_TEST_CASE(BinFilling) {
+  // Volumes for bin content checking
+
+  auto vol1 = makeDummyVolume();
+  auto vol2 = makeDummyVolume();
+
+  BOOST_TEST_CONTEXT("RDirection") {
+    auto disc1 = Surface::makeShared<DiscSurface>(Transform3::Identity(), 30_mm,
+                                                  60_mm, 30_degree);
+
+    auto grid1 = GridPortalLink::make(disc1, BinningValue::binR,
+                                      Axis{AxisBound, 30_mm, 60_mm, 2});
+
+    grid1->setVolume(vol1.get());
+
+    auto disc2 = Surface::makeShared<DiscSurface>(Transform3::Identity(), 60_mm,
+                                                  90_mm, 30_degree);
+
+    auto grid2 = GridPortalLink::make(disc2, BinningValue::binR,
+                                      Axis{AxisBound, 60_mm, 90_mm, 2});
+
+    grid2->setVolume(vol2.get());
+
+    auto mergedPtr =
+        GridPortalLink::merge(*grid1, *grid2, BinningValue::binR, *logger);
+
+    using merged_type =
+        GridPortalLinkT<Axis<AxisType::Equidistant, AxisBoundaryType::Bound>>;
+
+    const auto* merged = dynamic_cast<const merged_type*>(mergedPtr.get());
+    BOOST_REQUIRE(merged);
+
+    grid1->printContents(std::cout);
+    grid2->printContents(std::cout);
+    merged->printContents(std::cout);
+
+    BOOST_CHECK_EQUAL(merged->grid().atLocalBins({1}), vol1.get());
+    BOOST_CHECK_EQUAL(merged->grid().atLocalBins({2}), vol1.get());
+    BOOST_CHECK_EQUAL(merged->grid().atLocalBins({3}), vol2.get());
+    BOOST_CHECK_EQUAL(merged->grid().atLocalBins({4}), vol2.get());
+  }
+
+  BOOST_TEST_CONTEXT("PhiDirection") {
+    auto disc1 = Surface::makeShared<DiscSurface>(Transform3::Identity(), 30_mm,
+                                                  100_mm, 30_degree);
+
+    auto grid1 = GridPortalLink::make(
+        disc1, BinningValue::binPhi, Axis{AxisBound, -30_degree, 30_degree, 2});
+
+    grid1->setVolume(vol1.get());
+
+    auto disc2 = Surface::makeShared<DiscSurface>(
+        Transform3{AngleAxis3{60_degree, Vector3::UnitZ()}}, 30_mm, 100_mm,
+        30_degree);
+
+    auto grid2 = GridPortalLink::make(
+        disc2, BinningValue::binPhi, Axis{AxisBound, -30_degree, 30_degree, 2});
+
+    grid2->setVolume(vol2.get());
+
+    auto mergedPtr =
+        GridPortalLink::merge(*grid1, *grid2, BinningValue::binPhi, *logger);
+    BOOST_REQUIRE(mergedPtr);
+
+    using merged_type =
+        GridPortalLinkT<Axis<AxisType::Equidistant, AxisBoundaryType::Bound>>;
+
+    const auto* merged = dynamic_cast<const merged_type*>(mergedPtr.get());
+    BOOST_REQUIRE(merged);
+
+    grid1->printContents(std::cout);
+    grid2->printContents(std::cout);
+    merged->printContents(std::cout);
+
+    BOOST_CHECK_EQUAL(merged->grid().atLocalBins({1}), vol2.get());
+    BOOST_CHECK_EQUAL(merged->grid().atLocalBins({2}), vol2.get());
+    BOOST_CHECK_EQUAL(merged->grid().atLocalBins({3}), vol1.get());
+    BOOST_CHECK_EQUAL(merged->grid().atLocalBins({4}), vol1.get());
+  }
+}
+
+BOOST_AUTO_TEST_SUITE_END()  // Merging1dDisc
+
+BOOST_AUTO_TEST_SUITE(Merging2dDisc)
+
+BOOST_AUTO_TEST_CASE(RDirection) {
+  // Basic, because the parallel 1D case already tests this to some degree
+  auto discPhi1 = Surface::makeShared<DiscSurface>(Transform3::Identity(),
+                                                   30_mm, 100_mm, 30_degree);
+
+  auto discPhiGrid1 =
+      GridPortalLink::make(discPhi1, Axis{AxisBound, 30_mm, 100_mm, 7},
+                           Axis{AxisBound, -30_degree, 30_degree, 3});
+
+  auto discPhi2 = Surface::makeShared<DiscSurface>(Transform3::Identity(),
+                                                   100_mm, 150_mm, 30_degree);
+
+  auto discPhiGrid2 =
+      GridPortalLink::make(discPhi2, Axis{AxisBound, 100_mm, 150_mm, 5},
+                           Axis{AxisBound, -30_degree, 30_degree, 3});
+
+  auto mergedPtr = GridPortalLink::merge(*discPhiGrid1, *discPhiGrid2,
+                                         BinningValue::binR, *logger);
+  BOOST_REQUIRE(mergedPtr);
+  const auto* merged = dynamic_cast<const GridPortalLink*>(mergedPtr.get());
+  BOOST_REQUIRE_NE(merged, nullptr);
+  BOOST_CHECK_EQUAL(merged->grid().axes().size(), 2);
+  const auto& axis1 = *merged->grid().axes().front();
+  const auto& axis2 = *merged->grid().axes().back();
+
+  BOOST_CHECK_EQUAL(axis1.getMin(), 30_mm);
+  BOOST_CHECK_EQUAL(axis1.getMax(), 150_mm);
+  BOOST_CHECK_EQUAL(axis1.getNBins(), 12);
+  BOOST_CHECK_EQUAL(axis1.getType(), AxisType::Equidistant);
+  BOOST_CHECK_EQUAL(axis1.getBoundaryType(), AxisBoundaryType::Bound);
+  BOOST_CHECK_EQUAL(axis2.getMin(), -30_degree);
+  BOOST_CHECK_EQUAL(axis2.getMax(), 30_degree);
+  BOOST_CHECK_EQUAL(axis2.getNBins(), 3);
+  BOOST_CHECK_EQUAL(axis2.getType(), AxisType::Equidistant);
+}
+
+BOOST_AUTO_TEST_CASE(PhiDirection) {
+  // Basic, because the parallel 1D case already tests this to some degree
+  auto disc1 = Surface::makeShared<DiscSurface>(Transform3::Identity(), 30_mm,
+                                                100_mm, 30_degree);
+
+  auto grid1 = GridPortalLink::make(disc1, Axis{AxisBound, 30_mm, 100_mm, 3},
+                                    Axis{AxisBound, -30_degree, 30_degree, 3});
+
+  auto disc2 = Surface::makeShared<DiscSurface>(
+      Transform3{AngleAxis3{90_degree, Vector3::UnitZ()}}, 30_mm, 100_mm,
+      60_degree);
+
+  auto grid2 = GridPortalLink::make(disc2, Axis{AxisBound, 30_mm, 100_mm, 3},
+                                    Axis{AxisBound, -60_degree, 60_degree, 6});
+
+  auto mergedPtr =
+      GridPortalLink::merge(*grid1, *grid2, BinningValue::binPhi, *logger);
+  BOOST_REQUIRE(mergedPtr);
+  const auto* merged = dynamic_cast<const GridPortalLink*>(mergedPtr.get());
+  BOOST_REQUIRE_NE(merged, nullptr);
+
+  BOOST_CHECK_EQUAL(merged->grid().axes().size(), 2);
+  const auto& axis1 = *merged->grid().axes().front();
+  const auto& axis2 = *merged->grid().axes().back();
+
+  BOOST_CHECK_EQUAL(axis1.getMin(), 30_mm);
+  BOOST_CHECK_EQUAL(axis1.getMax(), 100_mm);
+  BOOST_CHECK_EQUAL(axis1.getNBins(), 3);
+  BOOST_CHECK_EQUAL(axis1.getType(), AxisType::Equidistant);
+  BOOST_CHECK_EQUAL(axis1.getBoundaryType(), AxisBoundaryType::Bound);
+  BOOST_CHECK_CLOSE(axis2.getMin(), -90_degree, 1e-6);
+  BOOST_CHECK_CLOSE(axis2.getMax(), 90_degree, 1e-6);
+  BOOST_CHECK_EQUAL(axis2.getNBins(), 9);
+  BOOST_CHECK_EQUAL(axis2.getType(), AxisType::Equidistant);
+  BOOST_CHECK_EQUAL(axis2.getBoundaryType(), AxisBoundaryType::Bound);
+}
+
+BOOST_AUTO_TEST_CASE(BinFilling) {
+  // Volumes for bin content checking
+  // Volume shape/transform is irrelevant, only used for pointer identity
+  auto vol1 = std::make_shared<TrackingVolume>(
+      Transform3::Identity(),
+      std::make_shared<CylinderVolumeBounds>(30_mm, 40_mm, 100_mm));
+
+  auto vol2 = std::make_shared<TrackingVolume>(
+      Transform3::Identity(),
+      std::make_shared<CylinderVolumeBounds>(30_mm, 40_mm, 100_mm));
+
+  auto fillCheckerBoard = [&](auto& grid) {
+    auto loc = grid.numLocalBins();
+    for (std::size_t i = 1; i <= loc[0]; ++i) {
+      for (std::size_t j = 1; j <= loc[1]; ++j) {
+        grid.atLocalBins({i, j}) = (i + j) % 2 == 0 ? vol1.get() : vol2.get();
+      }
+    }
+  };
+
+  auto checkCheckerBoard = [&](const auto& grid) {
+    auto loc = grid.numLocalBins();
+    for (std::size_t i = 1; i <= loc[0]; ++i) {
+      for (std::size_t j = 1; j <= loc[1]; ++j) {
+        const auto* vol = grid.atLocalBins({i, j});
+        if (vol != ((i + j) % 2 == 0 ? vol1.get() : vol2.get())) {
+          BOOST_ERROR("Is not a checkerboard pattern");
+          return;
+        }
+      }
+    }
+  };
+
+  BOOST_TEST_CONTEXT("RDirection") {
+    auto discPhi1 = Surface::makeShared<DiscSurface>(Transform3::Identity(),
+                                                     30_mm, 60_mm, 30_degree);
+
+    auto discPhiGrid1 =
+        GridPortalLink::make(discPhi1, Axis{AxisBound, 30_mm, 60_mm, 2},
+                             Axis{AxisBound, -30_degree, 30_degree, 2});
+
+    fillCheckerBoard(discPhiGrid1->grid());
+    checkCheckerBoard(discPhiGrid1->grid());
+
+    auto discPhi2 = Surface::makeShared<DiscSurface>(Transform3::Identity(),
+                                                     60_mm, 90_mm, 30_degree);
+
+    auto discPhiGrid2 =
+        GridPortalLink::make(discPhi2, Axis{AxisBound, 60_mm, 90_mm, 2},
+                             Axis{AxisBound, -30_degree, 30_degree, 2});
+
+    fillCheckerBoard(discPhiGrid2->grid());
+    checkCheckerBoard(discPhiGrid2->grid());
+
+    auto mergedPtr = GridPortalLink::merge(*discPhiGrid1, *discPhiGrid2,
+                                           BinningValue::binR, *logger);
+
+    using merged_type =
+        GridPortalLinkT<Axis<AxisType::Equidistant, AxisBoundaryType::Bound>,
+                        Axis<AxisType::Equidistant, AxisBoundaryType::Bound>>;
+
+    const auto* merged = dynamic_cast<const merged_type*>(mergedPtr.get());
+    BOOST_REQUIRE(merged);
+    checkCheckerBoard(merged->grid());
+
+    // Fill a / b
+    discPhiGrid1->setVolume(vol1.get());
+    discPhiGrid2->setVolume(vol2.get());
+
+    mergedPtr = GridPortalLink::merge(*discPhiGrid1, *discPhiGrid2,
+                                      BinningValue::binR, *logger);
+
+    merged = dynamic_cast<const merged_type*>(mergedPtr.get());
+    BOOST_REQUIRE(merged);
+
+    const auto* v1 = vol1.get();
+    const auto* v2 = vol2.get();
+
+    std::vector<std::pair<Vector2, const TrackingVolume*>> locations = {
+        {{40_mm, -20_degree}, v1}, {{40_mm, 20_degree}, v1},
+        {{50_mm, -20_degree}, v1}, {{50_mm, 20_degree}, v1},
+        {{70_mm, -20_degree}, v2}, {{70_mm, 20_degree}, v2},
+        {{80_mm, -20_degree}, v2}, {{80_mm, 20_degree}, v2},
+    };
+
+    for (const auto& [loc, vol] : locations) {
+      BOOST_TEST_CONTEXT(loc.transpose())
+      BOOST_CHECK_EQUAL(merged->resolveVolume(gctx, loc).value(), vol);
+    }
+
+    std::vector<std::vector<const TrackingVolume*>> contents = {
+        {v1, v1},
+        {v1, v1},
+        {v2, v2},
+        {v2, v2},
+    };
+
+    for (std::size_t i = 0; i < 4; ++i) {
+      for (std::size_t j = 0; j < 2; ++j) {
+        BOOST_CHECK_EQUAL(merged->grid().atLocalBins({i + 1, j + 1}),
+                          contents.at(i).at(j));
+      }
+    }
+  }
+
+  BOOST_TEST_CONTEXT("PhiDirection") {
+    auto disc1 = Surface::makeShared<DiscSurface>(Transform3::Identity(), 30_mm,
+                                                  100_mm, 30_degree);
+
+    auto grid1 =
+        GridPortalLink::make(disc1, Axis{AxisBound, 30_mm, 100_mm, 2},
+                             Axis{AxisBound, -30_degree, 30_degree, 2});
+    fillCheckerBoard(grid1->grid());
+    checkCheckerBoard(grid1->grid());
+
+    auto disc2 = Surface::makeShared<DiscSurface>(
+        Transform3{AngleAxis3{60_degree, Vector3::UnitZ()}}, 30_mm, 100_mm,
+        30_degree);
+
+    auto grid2 =
+        GridPortalLink::make(disc2, Axis{AxisBound, 30_mm, 100_mm, 2},
+                             Axis{AxisBound, -30_degree, 30_degree, 2});
+    fillCheckerBoard(grid2->grid());
+    checkCheckerBoard(grid2->grid());
+
+    auto mergedPtr =
+        GridPortalLink::merge(*grid1, *grid2, BinningValue::binPhi, *logger);
+
+    BOOST_REQUIRE(mergedPtr);
+
+    using merged_type =
+        GridPortalLinkT<Axis<AxisType::Equidistant, AxisBoundaryType::Bound>,
+                        Axis<AxisType::Equidistant, AxisBoundaryType::Bound>>;
+
+    const auto* merged = dynamic_cast<const merged_type*>(mergedPtr.get());
+    BOOST_REQUIRE(merged);
+
+    checkCheckerBoard(merged->grid());
+
+    // Fill a / b
+    grid1->setVolume(vol1.get());
+    grid2->setVolume(vol2.get());
+
+    mergedPtr =
+        GridPortalLink::merge(*grid1, *grid2, BinningValue::binPhi, *logger);
+    merged = dynamic_cast<const merged_type*>(mergedPtr.get());
+    BOOST_REQUIRE(merged);
+
+    const auto* v1 = vol1.get();
+    const auto* v2 = vol2.get();
+
+    std::vector<std::pair<Vector2, const TrackingVolume*>> locations = {
+        {{40_mm, -50_degree}, v2}, {{40_mm, -10_degree}, v2},
+        {{50_mm, -50_degree}, v2}, {{50_mm, -10_degree}, v2},
+        {{40_mm, 10_degree}, v1},  {{50_mm, 50_degree}, v1},
+        {{50_mm, 10_degree}, v1},  {{50_mm, 50_degree}, v1},
+    };
+
+    for (const auto& [loc, vol] : locations) {
+      BOOST_TEST_CONTEXT(loc.transpose())
+      BOOST_CHECK_EQUAL(merged->resolveVolume(gctx, loc).value(), vol);
+    }
+
+    std::vector<std::vector<const TrackingVolume*>> contents = {
+        {v2, v2, v1, v1},
+        {v2, v2, v1, v1},
+    };
+
+    for (std::size_t i = 0; i < 2; ++i) {
+      for (std::size_t j = 0; j < 4; ++j) {
+        BOOST_CHECK_EQUAL(merged->grid().atLocalBins({i + 1, j + 1}),
+                          contents.at(i).at(j));
+      }
+    }
+  }
+}
+
+BOOST_AUTO_TEST_SUITE_END()  // Merging2dDisc
+
+BOOST_AUTO_TEST_SUITE(MergingMixedDisc)
+
+BOOST_AUTO_TEST_CASE(RDirection) {
+  auto discPhi1 = Surface::makeShared<DiscSurface>(Transform3::Identity(),
+                                                   30_mm, 100_mm, 30_degree);
+
+  auto discPhiGrid1 =
+      GridPortalLink::make(discPhi1, Axis{AxisBound, 30_mm, 100_mm, 7},
+                           Axis{AxisBound, -30_degree, 30_degree, 3});
+
+  auto discPhi2 = Surface::makeShared<DiscSurface>(Transform3::Identity(),
+                                                   100_mm, 150_mm, 30_degree);
+
+  auto discPhiGrid21dPhi =
+      GridPortalLink::make(discPhi2, BinningValue::binPhi,
+                           Axis{AxisBound, -30_degree, 30_degree, 3});
+
+  auto merged12PhiPtr = GridPortalLink::merge(*discPhiGrid1, *discPhiGrid21dPhi,
+                                              BinningValue::binR, *logger);
+  BOOST_REQUIRE(merged12PhiPtr);
+  const auto* merged12Phi =
+      dynamic_cast<const GridPortalLink*>(merged12PhiPtr.get());
+  BOOST_REQUIRE_NE(merged12Phi, nullptr);
+
+  auto merged21PhiPtr = GridPortalLink::merge(*discPhiGrid21dPhi, *discPhiGrid1,
+                                              BinningValue::binR, *logger);
+  BOOST_REQUIRE(merged21PhiPtr);
+  const auto* merged21Phi =
+      dynamic_cast<const GridPortalLink*>(merged21PhiPtr.get());
+  BOOST_REQUIRE_NE(merged21Phi, nullptr);
+
+  BOOST_CHECK_EQUAL(merged12Phi->grid(), merged21Phi->grid());
+
+  BOOST_CHECK_EQUAL(merged12Phi->grid().axes().size(), 2);
+  const auto& axis1 = *merged12Phi->grid().axes().front();
+  const auto& axis2 = *merged12Phi->grid().axes().back();
+
+  BOOST_CHECK_EQUAL(axis1.getMin(), 30_mm);
+  BOOST_CHECK_EQUAL(axis1.getMax(), 150_mm);
+  BOOST_CHECK_EQUAL(axis1.getNBins(), 8);
+  BOOST_CHECK_EQUAL(axis1.getType(), AxisType::Variable);
+  BOOST_CHECK_EQUAL(axis1.getBoundaryType(), AxisBoundaryType::Bound);
+  BOOST_CHECK_EQUAL(axis2.getMin(), -30_degree);
+  BOOST_CHECK_EQUAL(axis2.getMax(), 30_degree);
+  BOOST_CHECK_EQUAL(axis2.getNBins(), 3);
+  BOOST_CHECK_EQUAL(axis2.getType(), AxisType::Equidistant);
+  BOOST_CHECK_EQUAL(axis2.getBoundaryType(), AxisBoundaryType::Bound);
+
+  auto discPhiGrid21dR = GridPortalLink::make(
+      discPhi2, BinningValue::binR, Axis{AxisBound, 100_mm, 150_mm, 5});
+
+  auto merged12RPtr = GridPortalLink::merge(*discPhiGrid1, *discPhiGrid21dR,
+                                            BinningValue::binR, *logger);
+  BOOST_REQUIRE(merged12RPtr);
+  const auto* merged12R =
+      dynamic_cast<const GridPortalLink*>(merged12RPtr.get());
+  BOOST_REQUIRE_NE(merged12R, nullptr);
+
+  auto merged21RPtr = GridPortalLink::merge(*discPhiGrid21dR, *discPhiGrid1,
+                                            BinningValue::binR, *logger);
+  BOOST_REQUIRE(merged21RPtr);
+  const auto* merged21R =
+      dynamic_cast<const GridPortalLink*>(merged21RPtr.get());
+  BOOST_REQUIRE_NE(merged21R, nullptr);
+  BOOST_CHECK_EQUAL(merged12R->grid(), merged21R->grid());
+
+  BOOST_CHECK_EQUAL(merged12R->grid().axes().size(), 2);
+  const auto& axis1R = *merged12R->grid().axes().front();
+  const auto& axis2R = *merged12R->grid().axes().back();
+
+  BOOST_CHECK_EQUAL(axis1R.getMin(), 30_mm);
+  BOOST_CHECK_EQUAL(axis1R.getMax(), 150_mm);
+  BOOST_CHECK_EQUAL(axis1R.getNBins(), 12);
+  BOOST_CHECK_EQUAL(axis1R.getType(), AxisType::Equidistant);
+  BOOST_CHECK_EQUAL(axis1R.getBoundaryType(), AxisBoundaryType::Bound);
+  BOOST_CHECK_EQUAL(axis2R.getMin(), -30_degree);
+  BOOST_CHECK_EQUAL(axis2R.getMax(), 30_degree);
+  BOOST_CHECK_EQUAL(axis2R.getNBins(), 3);
+  BOOST_CHECK_EQUAL(axis2R.getType(), AxisType::Equidistant);
+  BOOST_CHECK_EQUAL(axis2R.getBoundaryType(), AxisBoundaryType::Bound);
+}
+
+BOOST_AUTO_TEST_CASE(PhiDirection) {
+  auto disc1 = Surface::makeShared<DiscSurface>(Transform3::Identity(), 30_mm,
+                                                100_mm, 30_degree);
+
+  auto grid1 = GridPortalLink::make(disc1, Axis{AxisBound, 30_mm, 100_mm, 3},
+                                    Axis{AxisBound, -30_degree, 30_degree, 3});
+
+  auto disc2 = Surface::makeShared<DiscSurface>(
+      Transform3{AngleAxis3{90_degree, Vector3::UnitZ()}}, 30_mm, 100_mm,
+      60_degree);
+
+  auto grid21dPhi =
+      GridPortalLink::make(disc2, BinningValue::binPhi,
+
+                           Axis{AxisBound, -60_degree, 60_degree, 6});
+
+  auto merged12PhiPtr =
+      GridPortalLink::merge(*grid1, *grid21dPhi, BinningValue::binPhi, *logger);
+  BOOST_REQUIRE(merged12PhiPtr);
+  const auto* merged12Phi =
+      dynamic_cast<const GridPortalLink*>(merged12PhiPtr.get());
+  BOOST_REQUIRE_NE(merged12Phi, nullptr);
+
+  BOOST_CHECK_EQUAL(merged12Phi->grid().axes().size(), 2);
+  const auto& axis1 = *merged12Phi->grid().axes().front();
+  const auto& axis2 = *merged12Phi->grid().axes().back();
+
+  BOOST_CHECK_EQUAL(axis1.getMin(), 30_mm);
+  BOOST_CHECK_EQUAL(axis1.getMax(), 100_mm);
+  BOOST_CHECK_EQUAL(axis1.getNBins(), 3);
+  BOOST_CHECK_EQUAL(axis1.getType(), AxisType::Equidistant);
+  BOOST_CHECK_EQUAL(axis1.getBoundaryType(), AxisBoundaryType::Bound);
+  BOOST_CHECK_CLOSE(axis2.getMin(), -90_degree, 1e-6);
+  BOOST_CHECK_CLOSE(axis2.getMax(), 90_degree, 1e-6);
+  BOOST_CHECK_EQUAL(axis2.getNBins(), 9);
+  BOOST_CHECK_EQUAL(axis2.getType(), AxisType::Equidistant);
+  BOOST_CHECK_EQUAL(axis2.getBoundaryType(), AxisBoundaryType::Bound);
+
+  auto grid21dR = GridPortalLink::make(disc2, BinningValue::binR,
+                                       Axis{AxisBound, 30_mm, 100_mm, 3});
+
+  auto merged12RPtr =
+      GridPortalLink::merge(*grid1, *grid21dR, BinningValue::binPhi, *logger);
+  BOOST_REQUIRE(merged12RPtr);
+  const auto* merged12R =
+      dynamic_cast<const GridPortalLink*>(merged12RPtr.get());
+  BOOST_REQUIRE_NE(merged12R, nullptr);
+
+  BOOST_CHECK_EQUAL(merged12R->grid().axes().size(), 2);
+  const auto& axis1R = *merged12R->grid().axes().front();
+  const auto& axis2R = *merged12R->grid().axes().back();
+
+  BOOST_CHECK_EQUAL(axis1R.getMin(), 30_mm);
+  BOOST_CHECK_EQUAL(axis1R.getMax(), 100_mm);
+  BOOST_CHECK_EQUAL(axis1R.getNBins(), 3);
+  BOOST_CHECK_EQUAL(axis1R.getType(), AxisType::Equidistant);
+  BOOST_CHECK_EQUAL(axis1R.getBoundaryType(), AxisBoundaryType::Bound);
+  BOOST_CHECK_CLOSE(axis2R.getMin(), -90_degree, 1e-6);
+  BOOST_CHECK_CLOSE(axis2R.getMax(), 90_degree, 1e-6);
+  BOOST_CHECK_EQUAL(axis2R.getNBins(), 4);
+  BOOST_CHECK_EQUAL(axis2R.getType(), AxisType::Variable);
+  BOOST_CHECK_EQUAL(axis2R.getBoundaryType(), AxisBoundaryType::Bound);
+}
+
+BOOST_AUTO_TEST_SUITE_END()  // MergingMixedDisc
+
+BOOST_AUTO_TEST_SUITE(MergingCrossDisc)
+
+BOOST_AUTO_TEST_CASE(RDirection) {
+  // Volumes for bin content checking
+  auto vol1 = makeDummyVolume();
+  auto vol2 = makeDummyVolume();
+  auto vol3 = makeDummyVolume();
+  auto vol4 = makeDummyVolume();
+
+  auto disc1 = Surface::makeShared<DiscSurface>(Transform3::Identity(), 30_mm,
+                                                100_mm, 30_degree);
+
+  auto grid1 = GridPortalLink::make(disc1, BinningValue::binR,
+                                    Axis{AxisBound, 30_mm, 100_mm, 2});
+  grid1->grid().atLocalBins({1}) = vol1.get();
+  grid1->grid().atLocalBins({2}) = vol2.get();
+
+  auto disc2 = Surface::makeShared<DiscSurface>(Transform3::Identity(), 100_mm,
+                                                150_mm, 30_degree);
+
+  auto grid2 = GridPortalLink::make(disc2, BinningValue::binPhi,
+                                    Axis{AxisBound, -30_degree, 30_degree, 2});
+
+  grid2->grid().atLocalBins({1}) = vol3.get();
+  grid2->grid().atLocalBins({2}) = vol4.get();
+
+  auto mergedPtr =
+      GridPortalLink::merge(*grid1, *grid2, BinningValue::binR, *logger);
+
+  const auto* merged = dynamic_cast<const GridPortalLink*>(mergedPtr.get());
+  BOOST_REQUIRE_NE(merged, nullptr);
+
+  BOOST_CHECK_EQUAL(merged->grid().axes().size(), 2);
+  const auto& axis1 = *merged->grid().axes().front();
+  const auto& axis2 = *merged->grid().axes().back();
+  Axis axisExpectedR{AxisBound, {30_mm, 65_mm, 100_mm, 150_mm}};
+  Axis axisExpectedPhi{AxisBound, -30_degree, 30_degree, 2};
+  BOOST_CHECK_EQUAL(axis1, axisExpectedR);
+  BOOST_CHECK_EQUAL(axis2, axisExpectedPhi);
+
+  std::vector<std::pair<Vector2, TrackingVolume*>> locations = {
+      {{40_mm, -15_degree}, vol1.get()},  {{40_mm, 15_degree}, vol1.get()},
+      {{90_mm, -15_degree}, vol2.get()},  {{90_mm, 15_degree}, vol2.get()},
+
+      {{110_mm, -15_degree}, vol3.get()}, {{110_mm, 15_degree}, vol4.get()},
+      {{140_mm, -15_degree}, vol3.get()}, {{140_mm, 15_degree}, vol4.get()},
+  };
+
+  for (const auto& [loc, vol] : locations) {
+    BOOST_TEST_CONTEXT(loc.transpose())
+    BOOST_CHECK_EQUAL(merged->resolveVolume(gctx, loc).value(), vol);
+  }
+
+  grid1->printContents(std::cout);
+  grid2->printContents(std::cout);
+  merged->printContents(std::cout);
+}
+
+BOOST_AUTO_TEST_CASE(PhiDirection) {
+  // Volumes for bin content checking
+
+  auto vol1 = makeDummyVolume();
+  auto vol2 = makeDummyVolume();
+  auto vol3 = makeDummyVolume();
+  auto vol4 = makeDummyVolume();
+
+  auto disc1 = Surface::makeShared<DiscSurface>(Transform3::Identity(), 30_mm,
+                                                100_mm, 30_degree);
+
+  auto grid1 = GridPortalLink::make(disc1, BinningValue::binR,
+                                    Axis{AxisBound, 30_mm, 100_mm, 2});
+
+  grid1->grid().atLocalBins({1}) = vol1.get();
+  grid1->grid().atLocalBins({2}) = vol2.get();
+
+  auto disc2 = Surface::makeShared<DiscSurface>(
+      Transform3{AngleAxis3{90_degree, Vector3::UnitZ()}}, 30_mm, 100_mm,
+      60_degree);
+
+  auto grid2 = GridPortalLink::make(disc2, BinningValue::binPhi,
+                                    Axis{AxisBound, -60_degree, 60_degree, 2});
+
+  grid2->grid().atLocalBins({1}) = vol3.get();
+  grid2->grid().atLocalBins({2}) = vol4.get();
+
+  auto mergedPtr =
+      GridPortalLink::merge(*grid1, *grid2, BinningValue::binPhi, *logger);
+
+  using merged_type =
+      GridPortalLinkT<Axis<AxisType::Equidistant, AxisBoundaryType::Bound>,
+                      Axis<AxisType::Equidistant, AxisBoundaryType::Bound>>;
+
+  const auto* merged = dynamic_cast<const merged_type*>(mergedPtr.get());
+  BOOST_REQUIRE_NE(merged, nullptr);
+
+  BOOST_CHECK_EQUAL(merged->grid().axes().size(), 2);
+  const auto& axis1 = *merged->grid().axes().front();
+  const auto& axis2 = *merged->grid().axes().back();
+  Axis axisExpectedR{AxisBound, 30_mm, 100_mm, 2};
+  BOOST_CHECK_EQUAL(axis1, axisExpectedR);
+
+  BOOST_CHECK_CLOSE(axis2.getMin(), -90_degree, 1e-6);
+  BOOST_CHECK_CLOSE(axis2.getMax(), 90_degree, 1e-6);
+  BOOST_CHECK_EQUAL(axis2.getNBins(), 3);
+  BOOST_CHECK_EQUAL(axis2.getType(), AxisType::Equidistant);
+  BOOST_CHECK_EQUAL(axis2.getBoundaryType(), AxisBoundaryType::Bound);
+
+  std::vector<std::pair<Vector2, TrackingVolume*>> locations = {
+      {{40_mm, 45_degree}, vol1.get()},  {{40_mm, 0_degree}, vol4.get()},
+      {{40_mm, -80_degree}, vol3.get()}, {{90_mm, 45_degree}, vol2.get()},
+      {{90_mm, 0_degree}, vol4.get()},   {{90_mm, -80_degree}, vol3.get()},
+  };
+
+  grid1->printContents(std::cout);
+  grid2->printContents(std::cout);
+  merged->printContents(std::cout);
+
+  for (const auto& [loc, vol] : locations) {
+    BOOST_TEST_CONTEXT((Vector2{loc[0], loc[1] / 1_degree}.transpose()))
+    BOOST_CHECK_EQUAL(merged->resolveVolume(gctx, loc).value(), vol);
+  }
+}
+
+BOOST_AUTO_TEST_SUITE_END()  // MergeCrossDisc
+
+BOOST_AUTO_TEST_SUITE_END()  // GridMerging
+
+BOOST_AUTO_TEST_CASE(CompositeConstruction) {
+  // Arbitrary volumes for testing only
+  auto vol1 = std::make_shared<TrackingVolume>(
+      Transform3::Identity(),
+      std::make_shared<CylinderVolumeBounds>(30_mm, 40_mm, 100_mm));
+
+  auto vol2 = std::make_shared<TrackingVolume>(
+      Transform3::Identity(),
+      std::make_shared<CylinderVolumeBounds>(30_mm, 40_mm, 100_mm));
+
+  auto vol3 = std::make_shared<TrackingVolume>(
+      Transform3::Identity(),
+      std::make_shared<CylinderVolumeBounds>(30_mm, 40_mm, 100_mm));
+
+  auto disc1 =
+      Surface::makeShared<DiscSurface>(Transform3::Identity(), 30_mm, 60_mm);
+
+  auto trivial1 = std::make_unique<TrivialPortalLink>(disc1, *vol1);
+
+  auto disc2 =
+      Surface::makeShared<DiscSurface>(Transform3::Identity(), 60_mm, 90_mm);
+  auto trivial2 = std::make_unique<TrivialPortalLink>(disc2, *vol2);
+
+  auto composite = std::make_unique<CompositePortalLink>(
+      copy(trivial1), copy(trivial2), BinningValue::binR);
+
+  auto compositeCopy = std::make_unique<CompositePortalLink>(
+      copy(trivial1), copy(trivial2), BinningValue::binR);
+
+  BOOST_CHECK_EQUAL(
+      composite->resolveVolume(gctx, Vector2{40_mm, 0_degree}).value(),
+      vol1.get());
+  BOOST_CHECK_EQUAL(
+      composite->resolveVolume(gctx, Vector2{70_mm, 0_degree}).value(),
+      vol2.get());
+
+  BOOST_CHECK_EQUAL(composite->depth(), 1);
+
+  // Test exception on different surface types
+  auto cyl = Surface::makeShared<CylinderSurface>(Transform3::Identity(), 30_mm,
+                                                  40_mm);
+  auto trivialCyl = std::make_unique<TrivialPortalLink>(cyl, *vol3);
+  BOOST_CHECK_THROW(
+      CompositePortalLink(copy(trivial1), copy(trivialCyl), BinningValue::binR),
+      std::invalid_argument);
+
+  auto disc3 =
+      Surface::makeShared<DiscSurface>(Transform3::Identity(), 90_mm, 120_mm);
+  auto trivial3 = std::make_unique<TrivialPortalLink>(disc3, *vol3);
+
+  // Test exception on un-mergable surfaces
+  BOOST_CHECK_THROW(
+      CompositePortalLink(copy(trivial1), copy(trivial3), BinningValue::binR),
+      SurfaceMergingException);
+
+  // Composite with a composite (this should work regardless of flattening)
+
+  CompositePortalLink composite2(std::move(composite), copy(trivial3),
+                                 BinningValue::binR, false);
+
+  BOOST_CHECK_EQUAL(
+      composite2.resolveVolume(gctx, Vector2{40_mm, 0_degree}).value(),
+      vol1.get());
+  BOOST_CHECK_EQUAL(
+      composite2.resolveVolume(gctx, Vector2{70_mm, 0_degree}).value(),
+      vol2.get());
+  BOOST_CHECK_EQUAL(
+      composite2.resolveVolume(gctx, Vector2{100_mm, 0_degree}).value(),
+      vol3.get());
+
+  // Two without flattening
+  BOOST_CHECK_EQUAL(composite2.depth(), 2);
+
+  CompositePortalLink composite2Flat(std::move(compositeCopy), copy(trivial3),
+                                     BinningValue::binR, true);
+
+  // One because of flattening
+  BOOST_CHECK_EQUAL(composite2Flat.depth(), 1);
+
+  BOOST_CHECK_EQUAL(
+      composite2Flat.resolveVolume(gctx, Vector2{40_mm, 0_degree}).value(),
+      vol1.get());
+  BOOST_CHECK_EQUAL(
+      composite2Flat.resolveVolume(gctx, Vector2{70_mm, 0_degree}).value(),
+      vol2.get());
+  BOOST_CHECK_EQUAL(
+      composite2Flat.resolveVolume(gctx, Vector2{100_mm, 0_degree}).value(),
+      vol3.get());
+}
+
+BOOST_AUTO_TEST_SUITE(PortalMerging)
+
+BOOST_DATA_TEST_CASE(TrivialTrivial,
+                     (boost::unit_test::data::make(0, -135, 180, 45) *
+                      boost::unit_test::data::make(Vector3{0_mm, 0_mm, 0_mm},
+                                                   Vector3{20_mm, 0_mm, 0_mm},
+                                                   Vector3{0_mm, 20_mm, 0_mm},
+                                                   Vector3{20_mm, 20_mm, 0_mm},
+                                                   Vector3{0_mm, 0_mm, 20_mm})),
+                     angle, offset) {
+  Transform3 base =
+      AngleAxis3(angle * 1_degree, Vector3::UnitX()) * Translation3(offset);
+
+  BOOST_TEST_CONTEXT("RDirection") {
+    auto vol1 = std::make_shared<TrackingVolume>(
+        base, std::make_shared<CylinderVolumeBounds>(30_mm, 40_mm, 100_mm));
+
+    auto vol2 = std::make_shared<TrackingVolume>(
+        base, std::make_shared<CylinderVolumeBounds>(30_mm, 40_mm, 100_mm));
+
+    auto vol3 = std::make_shared<TrackingVolume>(
+        base, std::make_shared<CylinderVolumeBounds>(40_mm, 50_mm, 100_mm));
+
+    auto disc1 =
+        Surface::makeShared<DiscSurface>(Transform3::Identity(), 30_mm, 60_mm);
+
+    auto disc2 =
+        Surface::makeShared<DiscSurface>(Transform3::Identity(), 60_mm, 90_mm);
+
+    auto disc3 =
+        Surface::makeShared<DiscSurface>(Transform3::Identity(), 90_mm, 120_mm);
+
+    auto trivial1 = std::make_unique<TrivialPortalLink>(disc1, *vol1);
+    BOOST_REQUIRE(trivial1);
+    auto trivial2 = std::make_unique<TrivialPortalLink>(disc2, *vol2);
+    BOOST_REQUIRE(trivial2);
+    auto trivial3 = std::make_unique<TrivialPortalLink>(disc3, *vol3);
+    BOOST_REQUIRE(trivial3);
+
+    auto grid1 = trivial1->makeGrid(BinningValue::binR);
+    auto compGridTrivial = PortalLinkBase::merge(
+        std::move(grid1), std::make_unique<TrivialPortalLink>(*trivial2),
+        BinningValue::binR, *logger);
+    BOOST_REQUIRE(compGridTrivial);
+    BOOST_CHECK_EQUAL(dynamic_cast<CompositePortalLink&>(*compGridTrivial)
+                          .makeGrid(gctx, *logger),
+                      nullptr);
+
+    auto composite = PortalLinkBase::merge(
+        std::move(trivial1), std::move(trivial2), BinningValue::binR, *logger);
+    BOOST_REQUIRE(composite);
+
+    auto grid12 =
+        dynamic_cast<CompositePortalLink&>(*composite).makeGrid(gctx, *logger);
+    BOOST_REQUIRE(grid12);
+
+    BOOST_CHECK_EQUAL(
+        grid12->resolveVolume(gctx, Vector2{40_mm, 0_degree}).value(),
+        vol1.get());
+
+    BOOST_CHECK_EQUAL(
+        grid12->resolveVolume(gctx, Vector2{70_mm, 0_degree}).value(),
+        vol2.get());
+
+    composite = PortalLinkBase::merge(std::move(composite), std::move(trivial3),
+                                      BinningValue::binR, *logger);
+    BOOST_REQUIRE(composite);
+
+    auto grid123 =
+        dynamic_cast<CompositePortalLink&>(*composite).makeGrid(gctx, *logger);
+    BOOST_REQUIRE(grid123);
+
+    BOOST_CHECK_EQUAL(
+        grid123->resolveVolume(gctx, Vector2{40_mm, 0_degree}).value(),
+        vol1.get());
+
+    BOOST_CHECK_EQUAL(
+        grid123->resolveVolume(gctx, Vector2{70_mm, 0_degree}).value(),
+        vol2.get());
+
+    BOOST_CHECK_EQUAL(
+        grid123->resolveVolume(gctx, Vector2{100_mm, 0_degree}).value(),
+        vol3.get());
+  }
+
+  BOOST_TEST_CONTEXT("ZDirection") {
+    auto vol1 = std::make_shared<TrackingVolume>(
+        base, std::make_shared<CylinderVolumeBounds>(30_mm, 40_mm, 100_mm));
+
+    auto vol2 = std::make_shared<TrackingVolume>(
+        base * Translation3{Vector3::UnitZ() * 200},
+        std::make_shared<CylinderVolumeBounds>(30_mm, 40_mm, 100_mm));
+
+    auto vol3 = std::make_shared<TrackingVolume>(
+        base * Translation3{Vector3::UnitZ() * 400},
+        std::make_shared<CylinderVolumeBounds>(30_mm, 40_mm, 100_mm));
+
+    auto cyl1 = Surface::makeShared<CylinderSurface>(base, 40_mm, 100_mm);
+
+    auto cyl2 = Surface::makeShared<CylinderSurface>(
+        base * Translation3{Vector3::UnitZ() * 200}, 40_mm, 100_mm);
+
+    auto cyl3 = Surface::makeShared<CylinderSurface>(
+        base * Translation3{Vector3::UnitZ() * 400}, 40_mm, 100_mm);
+
+    auto trivial1 = std::make_unique<TrivialPortalLink>(cyl1, *vol1);
+    BOOST_REQUIRE(trivial1);
+    auto trivial2 = std::make_unique<TrivialPortalLink>(cyl2, *vol2);
+    BOOST_REQUIRE(trivial2);
+    auto trivial3 = std::make_unique<TrivialPortalLink>(cyl3, *vol3);
+    BOOST_REQUIRE(trivial3);
+
+    auto grid1 = trivial1->makeGrid(BinningValue::binZ);
+    auto compGridTrivial = PortalLinkBase::merge(
+        std::move(grid1), std::make_unique<TrivialPortalLink>(*trivial2),
+        BinningValue::binZ, *logger);
+    BOOST_REQUIRE(compGridTrivial);
+    BOOST_CHECK_EQUAL(dynamic_cast<CompositePortalLink&>(*compGridTrivial)
+                          .makeGrid(gctx, *logger),
+                      nullptr);
+
+    auto composite = PortalLinkBase::merge(
+        std::move(trivial1), std::move(trivial2), BinningValue::binZ, *logger);
+    BOOST_REQUIRE(composite);
+
+    auto grid12 =
+        dynamic_cast<CompositePortalLink&>(*composite).makeGrid(gctx, *logger);
+    BOOST_REQUIRE(grid12);
+
+    BOOST_CHECK_EQUAL(
+        grid12->resolveVolume(gctx, Vector2{40_mm, -40_mm}).value(),
+        vol1.get());
+
+    BOOST_CHECK_EQUAL(
+        grid12->resolveVolume(gctx, Vector2{40_mm, 40_mm}).value(), vol2.get());
+
+    composite = PortalLinkBase::merge(std::move(composite), std::move(trivial3),
+                                      BinningValue::binZ, *logger);
+    BOOST_REQUIRE(composite);
+
+    auto grid123 =
+        dynamic_cast<CompositePortalLink&>(*composite).makeGrid(gctx, *logger);
+    BOOST_REQUIRE(grid123);
+
+    BOOST_CHECK_EQUAL(
+        grid123->resolveVolume(gctx, Vector2{40_mm, -110_mm}).value(),
+        vol1.get());
+
+    BOOST_CHECK_EQUAL(
+        grid123->resolveVolume(gctx, Vector2{40_mm, -10_mm}).value(),
+        vol2.get());
+
+    BOOST_CHECK_EQUAL(
+        grid123->resolveVolume(gctx, Vector2{40_mm, 190_mm}).value(),
+        vol3.get());
+  }
+}
+
+BOOST_AUTO_TEST_CASE(TrivialGridR) {
+  auto vol1 = std::make_shared<TrackingVolume>(
+      Transform3::Identity(),
+      std::make_shared<CylinderVolumeBounds>(30_mm, 40_mm, 100_mm));
+
+  auto vol2 = std::make_shared<TrackingVolume>(
+      Transform3::Identity(),
+      std::make_shared<CylinderVolumeBounds>(30_mm, 40_mm, 100_mm));
+
+  auto disc1 =
+      Surface::makeShared<DiscSurface>(Transform3::Identity(), 30_mm, 60_mm);
+
+  auto disc2 =
+      Surface::makeShared<DiscSurface>(Transform3::Identity(), 60_mm, 90_mm);
+
+  auto trivial = std::make_unique<TrivialPortalLink>(disc2, *vol2);
+  BOOST_REQUIRE(trivial);
+
+  auto gridPhi = GridPortalLink::make(
+      disc1, BinningValue::binPhi,
+      Axis{AxisClosed, -std::numbers::pi, std::numbers::pi, 2});
+  gridPhi->setVolume(vol1.get());
+
+  auto gridR = GridPortalLink::make(disc1, BinningValue::binR,
+                                    Axis{AxisBound, 30_mm, 60_mm, 2});
+  gridR->setVolume(vol1.get());
+
+  BOOST_TEST_CONTEXT("Colinear") {
+    auto merged = PortalLinkBase::merge(copy(trivial), copy(gridR),
+                                        BinningValue::binR, *logger);
+    BOOST_REQUIRE(merged);
+    BOOST_CHECK_NE(dynamic_cast<CompositePortalLink*>(merged.get()), nullptr);
+  }
+
+  BOOST_TEST_CONTEXT("Orthogonal") {
+    auto merged = PortalLinkBase::merge(copy(gridPhi), copy(trivial),
+                                        BinningValue::binR, *logger);
+    BOOST_REQUIRE(merged);
+    BOOST_CHECK_NE(dynamic_cast<CompositePortalLink*>(merged.get()), nullptr);
+  }
+}
+
+BOOST_AUTO_TEST_CASE(TrivialGridPhi) {
+  auto vol1 = std::make_shared<TrackingVolume>(
+      Transform3::Identity(),
+      std::make_shared<CylinderVolumeBounds>(30_mm, 40_mm, 100_mm));
+
+  auto vol2 = std::make_shared<TrackingVolume>(
+      Transform3::Identity(),
+      std::make_shared<CylinderVolumeBounds>(30_mm, 40_mm, 100_mm));
+
+  auto disc1 = Surface::makeShared<DiscSurface>(Transform3::Identity(), 30_mm,
+                                                100_mm, 30_degree);
+
+  auto disc2 = Surface::makeShared<DiscSurface>(
+      Transform3{AngleAxis3{90_degree, Vector3::UnitZ()}}, 30_mm, 100_mm,
+      60_degree);
+
+  auto trivial = std::make_unique<TrivialPortalLink>(disc2, *vol2);
+  BOOST_REQUIRE(trivial);
+
+  auto gridPhi = GridPortalLink::make(
+      disc1, BinningValue::binPhi, Axis{AxisBound, -30_degree, 30_degree, 2});
+  gridPhi->setVolume(vol1.get());
+
+  auto gridR = GridPortalLink::make(disc1, BinningValue::binR,
+                                    Axis{AxisBound, 30_mm, 100_mm, 2});
+  gridR->setVolume(vol1.get());
+
+  BOOST_TEST_CONTEXT("Colinear") {
+    auto merged = PortalLinkBase::merge(copy(trivial), copy(gridPhi),
+                                        BinningValue::binPhi, *logger);
+    BOOST_REQUIRE(merged);
+    BOOST_CHECK_NE(dynamic_cast<CompositePortalLink*>(merged.get()), nullptr);
+  }
+
+  BOOST_TEST_CONTEXT("Orthogonal") {
+    auto merged = PortalLinkBase::merge(copy(gridR), copy(trivial),
+                                        BinningValue::binPhi, *logger);
+    BOOST_REQUIRE(merged);
+    BOOST_CHECK_NE(dynamic_cast<CompositePortalLink*>(merged.get()), nullptr);
+  }
+}
+
+BOOST_AUTO_TEST_CASE(CompositeOther) {
+  auto vol1 = std::make_shared<TrackingVolume>(
+      Transform3::Identity(),
+      std::make_shared<CylinderVolumeBounds>(30_mm, 40_mm, 100_mm));
+
+  auto vol2 = std::make_shared<TrackingVolume>(
+      Transform3::Identity(),
+      std::make_shared<CylinderVolumeBounds>(30_mm, 40_mm, 100_mm));
+
+  auto vol3 = std::make_shared<TrackingVolume>(
+      Transform3::Identity(),
+      std::make_shared<CylinderVolumeBounds>(30_mm, 40_mm, 100_mm));
+
+  auto disc1 =
+      Surface::makeShared<DiscSurface>(Transform3::Identity(), 30_mm, 60_mm);
+  auto disc2 =
+      Surface::makeShared<DiscSurface>(Transform3::Identity(), 60_mm, 90_mm);
+  auto disc3 =
+      Surface::makeShared<DiscSurface>(Transform3::Identity(), 90_mm, 120_mm);
+
+  auto grid1 = GridPortalLink::make(disc1, *vol1, BinningValue::binR);
+  auto trivial2 = std::make_unique<TrivialPortalLink>(disc2, *vol2);
+
+  auto composite12 = std::make_unique<CompositePortalLink>(
+      std::move(grid1), std::move(trivial2), BinningValue::binR);
+
+  BOOST_CHECK_EQUAL(composite12->depth(), 1);
+  BOOST_CHECK_EQUAL(composite12->size(), 2);
+
+  auto trivial3 = std::make_unique<TrivialPortalLink>(disc3, *vol3);
+
+  auto composite123Ptr = PortalLinkBase::merge(
+      std::move(composite12), std::move(trivial3), BinningValue::binR, *logger);
+
+  const auto* composite123 =
+      dynamic_cast<const CompositePortalLink*>(composite123Ptr.get());
+  BOOST_REQUIRE(composite123);
+
+  BOOST_CHECK_EQUAL(composite123->depth(), 1);
+
+  BOOST_CHECK_EQUAL(
+      composite123->resolveVolume(gctx, Vector2{40_mm, 0_degree}).value(),
+      vol1.get());
+  BOOST_CHECK_EQUAL(
+      composite123->resolveVolume(gctx, Vector2{70_mm, 0_degree}).value(),
+      vol2.get());
+  BOOST_CHECK_EQUAL(
+      composite123->resolveVolume(gctx, Vector2{100_mm, 0_degree}).value(),
+      vol3.get());
+
+  BOOST_CHECK_EQUAL(composite123->size(), 3);
+}
+
+BOOST_AUTO_TEST_SUITE_END()  // PortalMerging
+
+BOOST_AUTO_TEST_SUITE_END()  // Geometry
+
+}  // namespace Acts::Test
diff --git a/Tests/UnitTests/Core/Geometry/PortalShellTests.cpp b/Tests/UnitTests/Core/Geometry/PortalShellTests.cpp
new file mode 100644
index 00000000000..090dc851611
--- /dev/null
+++ b/Tests/UnitTests/Core/Geometry/PortalShellTests.cpp
@@ -0,0 +1,768 @@
+// This file is part of the ACTS project.
+//
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
+//
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
+
+#include <boost/test/tools/context.hpp>
+#include <boost/test/tools/old/interface.hpp>
+#include <boost/test/unit_test.hpp>
+#include <boost/test/unit_test_suite.hpp>
+
+#include "Acts/Definitions/Units.hpp"
+#include "Acts/Geometry/CuboidVolumeBounds.hpp"
+#include "Acts/Geometry/CutoutCylinderVolumeBounds.hpp"
+#include "Acts/Geometry/CylinderVolumeBounds.hpp"
+#include "Acts/Geometry/GridPortalLink.hpp"
+#include "Acts/Geometry/Portal.hpp"
+#include "Acts/Geometry/PortalShell.hpp"
+#include "Acts/Geometry/TrackingVolume.hpp"
+#include "Acts/Geometry/TrivialPortalLink.hpp"
+#include "Acts/Surfaces/SurfaceMergingException.hpp"
+
+#include <stdexcept>
+
+using namespace Acts::UnitLiterals;
+
+namespace Acts::Test {
+GeometryContext gctx;
+
+std::size_t getVolumeIndex() {
+  static std::size_t i = 1;
+  return i++;
+}
+
+auto makeVolume(auto&&... pars) {
+  TrackingVolume vol(Transform3::Identity(),
+                     std::make_shared<CylinderVolumeBounds>(
+                         std::forward<decltype(pars)>(pars)...));
+  vol.setVolumeName("cyl" + std::to_string(getVolumeIndex()));
+  return vol;
+};
+
+auto logger = Acts::getDefaultLogger("UnitTests", Acts::Logging::VERBOSE);
+
+BOOST_AUTO_TEST_SUITE(PortalShellTests)
+
+BOOST_AUTO_TEST_CASE(ConstructionFromVolume) {
+  // - Cylinder
+  // |           | no phi | phi |
+  // | --------- | ------ | --- |
+  // | rMin > 0  | 1      | 3   |
+  // | rMin == 0 | 2      | 4   |
+
+  auto cyl1 = makeVolume(30_mm, 40_mm, 100_mm);
+  auto cyl2 = makeVolume(0_mm, 40_mm, 100_mm);
+  auto cyl3 = makeVolume(30_mm, 40_mm, 100_mm, 45_degree);
+  auto cyl4 = makeVolume(0_mm, 40_mm, 100_mm, 45_degree);
+
+  TrackingVolume boxVolume(
+      Transform3::Identity(),
+      std::make_shared<CuboidVolumeBounds>(10_mm, 10_mm, 10_mm));
+
+  BOOST_CHECK_THROW(SingleCylinderPortalShell{boxVolume},
+                    std::invalid_argument);
+
+  SingleCylinderPortalShell shell1{cyl1};
+  BOOST_CHECK_EQUAL(shell1.size(), 4);
+
+  using enum CylinderVolumeBounds::Face;
+
+  const auto* pDisc = shell1.portal(PositiveDisc);
+  BOOST_REQUIRE_NE(pDisc, nullptr);
+  BOOST_CHECK_EQUAL(
+      pDisc
+          ->resolveVolume(gctx, Vector3{35_mm, 0_mm, 100_mm}, -Vector3::UnitZ())
+          .value(),
+      &cyl1);
+  BOOST_CHECK_EQUAL(
+      pDisc->resolveVolume(gctx, Vector3{35_mm, 0_mm, 100_mm}, Vector3::UnitZ())
+          .value(),
+      nullptr);
+
+  const auto* nDisc = shell1.portal(NegativeDisc);
+  BOOST_REQUIRE_NE(nDisc, nullptr);
+  BOOST_CHECK_EQUAL(nDisc
+                        ->resolveVolume(gctx, Vector3{35_mm, 0_mm, -100_mm},
+                                        -Vector3::UnitZ())
+                        .value(),
+                    nullptr);
+  BOOST_CHECK_EQUAL(
+      nDisc
+          ->resolveVolume(gctx, Vector3{35_mm, 0_mm, -100_mm}, Vector3::UnitZ())
+          .value(),
+      &cyl1);
+
+  const auto* oCyl = shell1.portal(OuterCylinder);
+  BOOST_REQUIRE_NE(oCyl, nullptr);
+  BOOST_CHECK_EQUAL(
+      oCyl->resolveVolume(gctx, Vector3{40_mm, 0_mm, 10_mm}, Vector3::UnitX())
+          .value(),
+      nullptr);
+  BOOST_CHECK_EQUAL(
+      oCyl->resolveVolume(gctx, Vector3{40_mm, 0_mm, 10_mm}, -Vector3::UnitX())
+          .value(),
+      &cyl1);
+
+  const auto* iCyl = shell1.portal(InnerCylinder);
+  BOOST_REQUIRE_NE(iCyl, nullptr);
+  BOOST_CHECK_EQUAL(
+      iCyl->resolveVolume(gctx, Vector3{30_mm, 0_mm, 10_mm}, Vector3::UnitX())
+          .value(),
+      &cyl1);
+  BOOST_CHECK_EQUAL(
+      iCyl->resolveVolume(gctx, Vector3{30_mm, 0_mm, 10_mm}, -Vector3::UnitX())
+          .value(),
+      nullptr);
+
+  SingleCylinderPortalShell shell2{cyl2};
+  BOOST_CHECK_EQUAL(shell2.size(), 3);
+
+  pDisc = shell2.portal(PositiveDisc);
+  BOOST_REQUIRE_NE(pDisc, nullptr);
+  BOOST_CHECK_EQUAL(
+      pDisc
+          ->resolveVolume(gctx, Vector3{35_mm, 0_mm, 100_mm}, -Vector3::UnitZ())
+          .value(),
+      &cyl2);
+  BOOST_CHECK_EQUAL(
+      pDisc->resolveVolume(gctx, Vector3{35_mm, 0_mm, 100_mm}, Vector3::UnitZ())
+          .value(),
+      nullptr);
+
+  nDisc = shell2.portal(NegativeDisc);
+  BOOST_REQUIRE_NE(nDisc, nullptr);
+  BOOST_CHECK_EQUAL(nDisc
+                        ->resolveVolume(gctx, Vector3{35_mm, 0_mm, -100_mm},
+                                        -Vector3::UnitZ())
+                        .value(),
+                    nullptr);
+  BOOST_CHECK_EQUAL(
+      nDisc
+          ->resolveVolume(gctx, Vector3{35_mm, 0_mm, -100_mm}, Vector3::UnitZ())
+          .value(),
+      &cyl2);
+
+  oCyl = shell2.portal(OuterCylinder);
+  BOOST_REQUIRE_NE(oCyl, nullptr);
+  BOOST_CHECK_EQUAL(
+      oCyl->resolveVolume(gctx, Vector3{40_mm, 0_mm, 10_mm}, Vector3::UnitX())
+          .value(),
+      nullptr);
+  BOOST_CHECK_EQUAL(
+      oCyl->resolveVolume(gctx, Vector3{40_mm, 0_mm, 10_mm}, -Vector3::UnitX())
+          .value(),
+      &cyl2);
+
+  iCyl = shell2.portal(InnerCylinder);
+  BOOST_CHECK_EQUAL(iCyl, nullptr);
+
+  SingleCylinderPortalShell shell3{cyl3};
+  BOOST_CHECK_EQUAL(shell3.size(), 6);
+
+  pDisc = shell3.portal(PositiveDisc);
+  BOOST_REQUIRE_NE(pDisc, nullptr);
+  BOOST_CHECK_EQUAL(
+      pDisc
+          ->resolveVolume(gctx, Vector3{35_mm, 0_mm, 100_mm}, -Vector3::UnitZ())
+          .value(),
+      &cyl3);
+  BOOST_CHECK_EQUAL(
+      pDisc->resolveVolume(gctx, Vector3{35_mm, 0_mm, 100_mm}, Vector3::UnitZ())
+          .value(),
+      nullptr);
+
+  nDisc = shell3.portal(NegativeDisc);
+  BOOST_REQUIRE_NE(nDisc, nullptr);
+  BOOST_CHECK_EQUAL(nDisc
+                        ->resolveVolume(gctx, Vector3{35_mm, 0_mm, -100_mm},
+                                        -Vector3::UnitZ())
+                        .value(),
+                    nullptr);
+  BOOST_CHECK_EQUAL(
+      nDisc
+          ->resolveVolume(gctx, Vector3{35_mm, 0_mm, -100_mm}, Vector3::UnitZ())
+          .value(),
+      &cyl3);
+
+  oCyl = shell3.portal(OuterCylinder);
+  BOOST_REQUIRE_NE(oCyl, nullptr);
+  BOOST_CHECK_EQUAL(
+      oCyl->resolveVolume(gctx, Vector3{40_mm, 0_mm, 10_mm}, Vector3::UnitX())
+          .value(),
+      nullptr);
+  BOOST_CHECK_EQUAL(
+      oCyl->resolveVolume(gctx, Vector3{40_mm, 0_mm, 10_mm}, -Vector3::UnitX())
+          .value(),
+      &cyl3);
+
+  iCyl = shell3.portal(InnerCylinder);
+  BOOST_REQUIRE_NE(iCyl, nullptr);
+  BOOST_CHECK_EQUAL(
+      iCyl->resolveVolume(gctx, Vector3{30_mm, 0_mm, 10_mm}, Vector3::UnitX())
+          .value(),
+      &cyl3);
+  BOOST_CHECK_EQUAL(
+      iCyl->resolveVolume(gctx, Vector3{30_mm, 0_mm, 10_mm}, -Vector3::UnitX())
+          .value(),
+      nullptr);
+
+  auto anglePoint = [](double angle, double r, double z) {
+    return Vector3{r * std::cos(angle), r * std::sin(angle), z};
+  };
+
+  const auto* nPhi = shell3.portal(NegativePhiPlane);
+  BOOST_REQUIRE_NE(nPhi, nullptr);
+  Vector3 point = anglePoint(-45_degree, 35_mm, 10_mm);
+  Vector3 dir = Vector3::UnitZ().cross(point).normalized();
+  Vector3 idir = (-Vector3::UnitZ()).cross(point).normalized();
+  BOOST_CHECK_EQUAL(nPhi->resolveVolume(gctx, point, dir).value(), nullptr);
+  BOOST_CHECK_EQUAL(nPhi->resolveVolume(gctx, point, idir).value(), &cyl3);
+
+  const auto* pPhi = shell3.portal(PositivePhiPlane);
+  BOOST_REQUIRE_NE(pPhi, nullptr);
+  point = anglePoint(45_degree, 35_mm, 10_mm);
+  dir = Vector3::UnitZ().cross(point).normalized();
+  idir = (-Vector3::UnitZ()).cross(point).normalized();
+  BOOST_CHECK_EQUAL(pPhi->resolveVolume(gctx, point, dir).value(), nullptr);
+  BOOST_CHECK_EQUAL(pPhi->resolveVolume(gctx, point, idir).value(), &cyl3);
+
+  SingleCylinderPortalShell shell4{cyl4};
+  BOOST_CHECK_EQUAL(shell4.size(), 5);
+
+  pDisc = shell4.portal(PositiveDisc);
+  BOOST_REQUIRE_NE(pDisc, nullptr);
+  BOOST_CHECK_EQUAL(
+      pDisc
+          ->resolveVolume(gctx, Vector3{35_mm, 0_mm, 100_mm}, -Vector3::UnitZ())
+          .value(),
+      &cyl4);
+  BOOST_CHECK_EQUAL(
+      pDisc->resolveVolume(gctx, Vector3{35_mm, 0_mm, 100_mm}, Vector3::UnitZ())
+          .value(),
+      nullptr);
+
+  nDisc = shell4.portal(NegativeDisc);
+  BOOST_REQUIRE_NE(nDisc, nullptr);
+  BOOST_CHECK_EQUAL(nDisc
+                        ->resolveVolume(gctx, Vector3{35_mm, 0_mm, -100_mm},
+                                        -Vector3::UnitZ())
+                        .value(),
+                    nullptr);
+  BOOST_CHECK_EQUAL(
+      nDisc
+          ->resolveVolume(gctx, Vector3{35_mm, 0_mm, -100_mm}, Vector3::UnitZ())
+          .value(),
+      &cyl4);
+
+  oCyl = shell4.portal(OuterCylinder);
+  BOOST_REQUIRE_NE(oCyl, nullptr);
+  BOOST_CHECK_EQUAL(
+      oCyl->resolveVolume(gctx, Vector3{40_mm, 0_mm, 10_mm}, Vector3::UnitX())
+          .value(),
+      nullptr);
+  BOOST_CHECK_EQUAL(
+      oCyl->resolveVolume(gctx, Vector3{40_mm, 0_mm, 10_mm}, -Vector3::UnitX())
+          .value(),
+      &cyl4);
+
+  iCyl = shell4.portal(InnerCylinder);
+  BOOST_CHECK_EQUAL(iCyl, nullptr);
+
+  nPhi = shell4.portal(NegativePhiPlane);
+  BOOST_REQUIRE_NE(nPhi, nullptr);
+  point = anglePoint(-45_degree, 35_mm, 10_mm);
+  dir = Vector3::UnitZ().cross(point).normalized();
+  idir = (-Vector3::UnitZ()).cross(point).normalized();
+  BOOST_CHECK_EQUAL(nPhi->resolveVolume(gctx, point, dir).value(), nullptr);
+  BOOST_CHECK_EQUAL(nPhi->resolveVolume(gctx, point, idir).value(), &cyl4);
+
+  pPhi = shell4.portal(PositivePhiPlane);
+  BOOST_REQUIRE_NE(pPhi, nullptr);
+  point = anglePoint(45_degree, 35_mm, 10_mm);
+  dir = Vector3::UnitZ().cross(point).normalized();
+  idir = (-Vector3::UnitZ()).cross(point).normalized();
+  BOOST_CHECK_EQUAL(pPhi->resolveVolume(gctx, point, dir).value(), nullptr);
+  BOOST_CHECK_EQUAL(pPhi->resolveVolume(gctx, point, idir).value(), &cyl4);
+}
+
+//              outer cylinder
+//          +----------+----------+
+//          |          |          |
+// negative |          v          | positive
+//     disc +-->               <--+ disc
+//          |          ^          |
+//          |          |          |
+//          +----------+----------+
+//              inner cylinder
+
+BOOST_AUTO_TEST_CASE(PortalAssignment) {
+  using enum CylinderVolumeBounds::Face;
+  TrackingVolume vol(
+      Transform3::Identity(),
+      std::make_shared<CylinderVolumeBounds>(30_mm, 100_mm, 100_mm));
+
+  SingleCylinderPortalShell shell{vol};
+
+  const auto* iCyl = shell.portal(InnerCylinder);
+  const auto* pDisc = shell.portal(PositiveDisc);
+  auto* oCyl = shell.portal(OuterCylinder);
+  auto* nDisc = shell.portal(NegativeDisc);
+
+  // Setting new outer cylinder
+  BOOST_REQUIRE_NE(oCyl, nullptr);
+  auto* oCylLink = dynamic_cast<const TrivialPortalLink*>(
+      oCyl->getLink(Direction::OppositeNormal));
+  BOOST_REQUIRE_NE(oCylLink, nullptr);
+
+  auto grid = oCylLink->makeGrid(BinningValue::binZ);
+
+  auto portal2 =
+      std::make_shared<Portal>(Direction::OppositeNormal, std::move(grid));
+  shell.setPortal(portal2, OuterCylinder);
+  BOOST_CHECK_EQUAL(shell.portal(OuterCylinder), portal2.get());
+
+  // Other portals should stay the same
+  BOOST_CHECK_EQUAL(shell.portal(InnerCylinder), iCyl);
+  BOOST_CHECK_EQUAL(shell.portal(PositiveDisc), pDisc);
+  BOOST_CHECK_EQUAL(shell.portal(NegativeDisc), nDisc);
+
+  // Setting new negative disc
+  BOOST_REQUIRE_NE(nDisc, nullptr);
+  auto* nDiscLink = dynamic_cast<const TrivialPortalLink*>(
+      nDisc->getLink(Direction::AlongNormal));
+  BOOST_REQUIRE_NE(nDiscLink, nullptr);
+
+  grid = nDiscLink->makeGrid(BinningValue::binR);
+
+  auto portal3 =
+      std::make_shared<Portal>(Direction::AlongNormal, std::move(grid));
+  shell.setPortal(portal3, NegativeDisc);
+  BOOST_CHECK_EQUAL(shell.portal(NegativeDisc), portal3.get());
+
+  // Other portals should stay the same
+  BOOST_CHECK_EQUAL(shell.portal(OuterCylinder), portal2.get());
+  BOOST_CHECK_EQUAL(shell.portal(InnerCylinder), iCyl);
+  BOOST_CHECK_EQUAL(shell.portal(PositiveDisc), pDisc);
+}
+
+BOOST_AUTO_TEST_SUITE(CylinderStack)
+BOOST_AUTO_TEST_CASE(ZDirection) {
+  using enum CylinderVolumeBounds::Face;
+  BOOST_TEST_CONTEXT("rMin>0") {
+    TrackingVolume vol1(
+        Transform3{Translation3{Vector3::UnitZ() * -100_mm}},
+        std::make_shared<CylinderVolumeBounds>(30_mm, 100_mm, 100_mm));
+
+    TrackingVolume vol2(
+        Transform3{Translation3{Vector3::UnitZ() * 100_mm}},
+        std::make_shared<CylinderVolumeBounds>(30_mm, 100_mm, 100_mm));
+
+    SingleCylinderPortalShell shell1{vol1};
+    SingleCylinderPortalShell shell2{vol2};
+
+    BOOST_CHECK_NE(shell1.portal(PositiveDisc), shell2.portal(NegativeDisc));
+
+    CylinderStackPortalShell stack{
+        gctx, {&shell1, &shell2}, BinningValue::binZ};
+    BOOST_CHECK_EQUAL(stack.size(), 4);
+
+    const auto* iCyl = stack.portal(InnerCylinder);
+    BOOST_CHECK_EQUAL(shell1.portal(InnerCylinder), iCyl);
+    BOOST_CHECK_EQUAL(shell2.portal(InnerCylinder), iCyl);
+
+    const auto* oCyl = stack.portal(OuterCylinder);
+    BOOST_CHECK_EQUAL(shell1.portal(OuterCylinder), oCyl);
+    BOOST_CHECK_EQUAL(shell2.portal(OuterCylinder), oCyl);
+
+    BOOST_CHECK_EQUAL(stack.portal(PositiveDisc), shell2.portal(PositiveDisc));
+    BOOST_CHECK_EQUAL(stack.portal(NegativeDisc), shell1.portal(NegativeDisc));
+
+    BOOST_CHECK_EQUAL(stack.portal(NegativePhiPlane), nullptr);
+    BOOST_CHECK_EQUAL(stack.portalPtr(NegativePhiPlane), nullptr);
+
+    BOOST_CHECK_EQUAL(stack.portal(PositivePhiPlane), nullptr);
+    BOOST_CHECK_EQUAL(stack.portalPtr(PositivePhiPlane), nullptr);
+
+    // Disc portals have been fused
+    BOOST_CHECK_EQUAL(shell1.portal(PositiveDisc), shell2.portal(NegativeDisc));
+
+    shell1 = SingleCylinderPortalShell{vol1};
+    shell2 = SingleCylinderPortalShell{vol2};
+
+    BOOST_CHECK_THROW(
+        CylinderStackPortalShell(gctx, {&shell1, &shell2}, BinningValue::binR),
+        SurfaceMergingException);
+  }
+
+  BOOST_TEST_CONTEXT("rMin==0") {
+    TrackingVolume vol1(
+        Transform3{Translation3{Vector3::UnitZ() * -100_mm}},
+        std::make_shared<CylinderVolumeBounds>(0_mm, 100_mm, 100_mm));
+
+    TrackingVolume vol2(
+        Transform3{Translation3{Vector3::UnitZ() * 100_mm}},
+        std::make_shared<CylinderVolumeBounds>(0_mm, 100_mm, 100_mm));
+
+    SingleCylinderPortalShell shell1{vol1};
+    SingleCylinderPortalShell shell2{vol2};
+
+    BOOST_CHECK_EQUAL(shell1.portal(InnerCylinder), nullptr);
+    BOOST_CHECK_EQUAL(shell2.portal(InnerCylinder), nullptr);
+
+    BOOST_CHECK_NE(shell1.portal(PositiveDisc), shell2.portal(NegativeDisc));
+
+    CylinderStackPortalShell stack{
+        gctx, {&shell1, &shell2}, BinningValue::binZ};
+    BOOST_CHECK_EQUAL(stack.size(), 3);
+
+    // Disc portals have been fused
+    BOOST_CHECK_EQUAL(shell1.portal(PositiveDisc), shell2.portal(NegativeDisc));
+
+    const auto* iCyl = stack.portal(InnerCylinder);
+    BOOST_CHECK_EQUAL(iCyl, nullptr);
+
+    const auto* oCyl = stack.portal(OuterCylinder);
+    BOOST_CHECK_EQUAL(shell1.portal(OuterCylinder), oCyl);
+    BOOST_CHECK_EQUAL(shell2.portal(OuterCylinder), oCyl);
+
+    BOOST_CHECK_EQUAL(stack.portal(PositiveDisc), shell2.portal(PositiveDisc));
+    BOOST_CHECK_EQUAL(stack.portal(NegativeDisc), shell1.portal(NegativeDisc));
+
+    BOOST_CHECK_EQUAL(stack.portal(NegativePhiPlane), nullptr);
+    BOOST_CHECK_EQUAL(stack.portalPtr(NegativePhiPlane), nullptr);
+
+    BOOST_CHECK_EQUAL(stack.portal(PositivePhiPlane), nullptr);
+    BOOST_CHECK_EQUAL(stack.portalPtr(PositivePhiPlane), nullptr);
+
+    shell1 = SingleCylinderPortalShell{vol1};
+    shell2 = SingleCylinderPortalShell{vol2};
+
+    BOOST_CHECK_THROW(
+        CylinderStackPortalShell(gctx, {&shell1, &shell2}, BinningValue::binR),
+        SurfaceMergingException);
+  }
+}
+
+BOOST_AUTO_TEST_CASE(RDirection) {
+  using enum CylinderVolumeBounds::Face;
+  BOOST_TEST_CONTEXT("rMin>0") {
+    TrackingVolume vol1(
+        Transform3::Identity(),
+        std::make_shared<CylinderVolumeBounds>(30_mm, 100_mm, 100_mm));
+
+    TrackingVolume vol2(
+        Transform3::Identity(),
+        std::make_shared<CylinderVolumeBounds>(100_mm, 150_mm, 100_mm));
+
+    SingleCylinderPortalShell shell1{vol1};
+    SingleCylinderPortalShell shell2{vol2};
+
+    BOOST_CHECK_NE(shell1.portal(OuterCylinder), shell2.portal(InnerCylinder));
+
+    CylinderStackPortalShell stack{
+        gctx, {&shell1, &shell2}, BinningValue::binR};
+    BOOST_CHECK_EQUAL(stack.size(), 4);
+
+    // Internal cylinder portals have been fused
+    BOOST_CHECK_EQUAL(shell1.portal(OuterCylinder),
+                      shell2.portal(InnerCylinder));
+
+    const auto* nDisc = stack.portal(NegativeDisc);
+    const auto* pDisc = stack.portal(PositiveDisc);
+
+    BOOST_CHECK_EQUAL(shell1.portal(NegativeDisc), nDisc);
+    BOOST_CHECK_EQUAL(shell2.portal(NegativeDisc), nDisc);
+    BOOST_CHECK_EQUAL(shell1.portal(PositiveDisc), pDisc);
+    BOOST_CHECK_EQUAL(shell2.portal(PositiveDisc), pDisc);
+
+    BOOST_CHECK_EQUAL(stack.portal(InnerCylinder),
+                      shell1.portal(InnerCylinder));
+    BOOST_CHECK_EQUAL(stack.portal(OuterCylinder),
+                      shell2.portal(OuterCylinder));
+
+    BOOST_CHECK_EQUAL(stack.portal(NegativePhiPlane), nullptr);
+    BOOST_CHECK_EQUAL(stack.portalPtr(NegativePhiPlane), nullptr);
+
+    BOOST_CHECK_EQUAL(stack.portal(PositivePhiPlane), nullptr);
+    BOOST_CHECK_EQUAL(stack.portalPtr(PositivePhiPlane), nullptr);
+
+    shell1 = SingleCylinderPortalShell{vol1};
+    shell2 = SingleCylinderPortalShell{vol2};
+
+    BOOST_CHECK_THROW(
+        CylinderStackPortalShell(gctx, {&shell1, &shell2}, BinningValue::binZ),
+        SurfaceMergingException);
+  }
+
+  BOOST_TEST_CONTEXT("rMin==0") {
+    TrackingVolume vol1(
+        Transform3::Identity(),
+        std::make_shared<CylinderVolumeBounds>(0_mm, 100_mm, 100_mm));
+
+    TrackingVolume vol2(
+        Transform3::Identity(),
+        std::make_shared<CylinderVolumeBounds>(100_mm, 150_mm, 100_mm));
+
+    SingleCylinderPortalShell shell1{vol1};
+    SingleCylinderPortalShell shell2{vol2};
+
+    BOOST_CHECK_EQUAL(shell1.portal(InnerCylinder), nullptr);
+    BOOST_CHECK_NE(shell1.portal(OuterCylinder), shell2.portal(InnerCylinder));
+
+    CylinderStackPortalShell stack{
+        gctx, {&shell1, &shell2}, BinningValue::binR};
+    BOOST_CHECK_EQUAL(stack.size(), 4);
+
+    // Internal cylinder portals have been fused
+    BOOST_CHECK_EQUAL(shell1.portal(OuterCylinder),
+                      shell2.portal(InnerCylinder));
+
+    const auto* nDisc = stack.portal(NegativeDisc);
+    const auto* pDisc = stack.portal(PositiveDisc);
+
+    BOOST_CHECK_EQUAL(shell1.portal(NegativeDisc), nDisc);
+    BOOST_CHECK_EQUAL(shell2.portal(NegativeDisc), nDisc);
+    BOOST_CHECK_EQUAL(shell1.portal(PositiveDisc), pDisc);
+    BOOST_CHECK_EQUAL(shell2.portal(PositiveDisc), pDisc);
+
+    BOOST_CHECK_EQUAL(stack.portal(InnerCylinder), nullptr);
+    BOOST_CHECK_EQUAL(stack.portal(OuterCylinder),
+                      shell2.portal(OuterCylinder));
+
+    BOOST_CHECK_EQUAL(stack.portal(NegativePhiPlane), nullptr);
+    BOOST_CHECK_EQUAL(stack.portalPtr(NegativePhiPlane), nullptr);
+
+    BOOST_CHECK_EQUAL(stack.portal(PositivePhiPlane), nullptr);
+    BOOST_CHECK_EQUAL(stack.portalPtr(PositivePhiPlane), nullptr);
+
+    shell1 = SingleCylinderPortalShell{vol1};
+    shell2 = SingleCylinderPortalShell{vol2};
+
+    BOOST_CHECK_THROW(
+        CylinderStackPortalShell(gctx, {&shell1, &shell2}, BinningValue::binZ),
+        std::invalid_argument);
+  }
+}
+
+BOOST_AUTO_TEST_CASE(NestedStacks) {
+  //   ^
+  // r |    +---------------------------------+---------+
+  //   |    |                                 |         |
+  //   |    |                                 |         |
+  //   |    |              vol2               |         |
+  //   |    |                                 |         |
+  //   |    |                                 |         |
+  //   |    +---------------------------------+         |
+  //   |    |                                 |         |
+  //   |    |                                 |         |
+  //   |    |               gap               |  vol3   |
+  //   |    |                                 |         |
+  //   |    |                                 |         |
+  //   |    +---------------------------------+         |
+  //   |    |                                 |         |
+  //   |    |                                 |         |
+  //   |    |              vol1               |         |
+  //   |    |                                 |         |
+  //   |    |                                 |         |
+  //   |    +---------------------------------+---------+
+  //   |
+  //   +-------------------------------------------------->
+  //                                                      z
+
+  Transform3 base = Transform3::Identity();
+
+  TrackingVolume vol1(
+      base, std::make_shared<CylinderVolumeBounds>(23_mm, 48_mm, 200_mm),
+      "PixelLayer0");
+
+  TrackingVolume gap(
+      base, std::make_shared<CylinderVolumeBounds>(48_mm, 250_mm, 200_mm),
+      "Gap");
+
+  TrackingVolume vol2(
+      base, std::make_shared<CylinderVolumeBounds>(250_mm, 400_mm, 200_mm),
+      "PixelLayer3");
+
+  TrackingVolume vol3(
+      base * Translation3{Vector3::UnitZ() * 300_mm},
+      std::make_shared<CylinderVolumeBounds>(23_mm, 400_mm, 100_mm),
+      "PixelEcPos");
+
+  SingleCylinderPortalShell shell1{vol1};
+  BOOST_CHECK(shell1.isValid());
+  SingleCylinderPortalShell gapShell{gap};
+  BOOST_CHECK(gapShell.isValid());
+  SingleCylinderPortalShell shell2{vol2};
+  BOOST_CHECK(shell2.isValid());
+
+  CylinderStackPortalShell stack{
+      gctx, {&shell1, &gapShell, &shell2}, BinningValue::binR};
+
+  BOOST_CHECK(stack.isValid());
+
+  SingleCylinderPortalShell shell3{vol3};
+  BOOST_CHECK(shell3.isValid());
+
+  CylinderStackPortalShell stack2{
+      gctx, {&stack, &shell3}, BinningValue::binZ, *logger};
+  BOOST_CHECK(stack2.isValid());
+
+  using enum CylinderVolumeBounds::Face;
+
+  auto lookup = [](auto& shell, CylinderPortalShell::Face face,
+                   Vector3 position,
+                   Vector3 direction) -> const TrackingVolume* {
+    const auto* portal = shell.portal(face);
+    BOOST_REQUIRE_NE(portal, nullptr);
+    return portal->resolveVolume(gctx, position, direction).value();
+  };
+
+  // Interconnection in the r direction
+
+  BOOST_CHECK_EQUAL(lookup(shell1, InnerCylinder, 23_mm * Vector3::UnitX(),
+                           -Vector3::UnitX()),
+                    nullptr);
+  BOOST_CHECK_EQUAL(
+      lookup(shell1, InnerCylinder, 23_mm * Vector3::UnitX(), Vector3::UnitX()),
+      &vol1);
+
+  BOOST_CHECK_EQUAL(
+      lookup(shell1, OuterCylinder, 48_mm * Vector3::UnitX(), Vector3::UnitX()),
+      &gap);
+
+  BOOST_CHECK_EQUAL(lookup(gapShell, InnerCylinder, 48_mm * Vector3::UnitX(),
+                           -Vector3::UnitX()),
+                    &vol1);
+
+  BOOST_CHECK_EQUAL(lookup(gapShell, OuterCylinder, 250_mm * Vector3::UnitX(),
+                           Vector3::UnitX()),
+                    &vol2);
+
+  BOOST_CHECK_EQUAL(lookup(shell2, InnerCylinder, 250_mm * Vector3::UnitX(),
+                           -Vector3::UnitX()),
+                    &gap);
+
+  BOOST_CHECK_EQUAL(lookup(shell2, OuterCylinder, 400_mm * Vector3::UnitX(),
+                           Vector3::UnitX()),
+                    nullptr);
+
+  BOOST_CHECK_EQUAL(lookup(shell2, OuterCylinder, 400_mm * Vector3::UnitX(),
+                           -Vector3::UnitX()),
+                    &vol2);
+
+  BOOST_CHECK_EQUAL(lookup(shell2, OuterCylinder, 400_mm * Vector3::UnitX(),
+                           -Vector3::UnitX()),
+                    &vol2);
+
+  // Left connection
+
+  BOOST_CHECK_EQUAL(lookup(shell1, NegativeDisc, Vector3(30_mm, 0, -200_mm),
+                           -Vector3::UnitZ()),
+                    nullptr);
+
+  BOOST_CHECK_EQUAL(lookup(shell1, NegativeDisc, Vector3(30_mm, 0, -200_mm),
+                           Vector3::UnitZ()),
+                    &vol1);
+
+  BOOST_CHECK_EQUAL(lookup(gapShell, NegativeDisc, Vector3(60_mm, 0, -200_mm),
+                           -Vector3::UnitZ()),
+                    nullptr);
+
+  BOOST_CHECK_EQUAL(lookup(gapShell, NegativeDisc, Vector3(60_mm, 0, -200_mm),
+                           Vector3::UnitZ()),
+                    &gap);
+
+  BOOST_CHECK_EQUAL(lookup(shell2, NegativeDisc, Vector3(300_mm, 0, -200_mm),
+                           -Vector3::UnitZ()),
+                    nullptr);
+
+  BOOST_CHECK_EQUAL(lookup(shell2, NegativeDisc, Vector3(300_mm, 0, -200_mm),
+                           Vector3::UnitZ()),
+                    &vol2);
+
+  // Right connection
+
+  BOOST_CHECK_EQUAL(lookup(shell1, PositiveDisc, Vector3(30_mm, 0, 200_mm),
+                           -Vector3::UnitZ()),
+                    &vol1);
+
+  BOOST_CHECK_EQUAL(
+      lookup(shell1, PositiveDisc, Vector3(30_mm, 0, 200_mm), Vector3::UnitZ()),
+      &vol3);
+
+  BOOST_CHECK_EQUAL(lookup(gapShell, PositiveDisc, Vector3(60_mm, 0, 200_mm),
+                           -Vector3::UnitZ()),
+                    &gap);
+
+  BOOST_CHECK_EQUAL(lookup(gapShell, PositiveDisc, Vector3(60_mm, 0, 200_mm),
+                           Vector3::UnitZ()),
+                    &vol3);
+
+  BOOST_CHECK_EQUAL(lookup(shell2, PositiveDisc, Vector3(300_mm, 0, 200_mm),
+                           -Vector3::UnitZ()),
+                    &vol2);
+
+  BOOST_CHECK_EQUAL(lookup(shell2, PositiveDisc, Vector3(300_mm, 0, 200_mm),
+                           Vector3::UnitZ()),
+                    &vol3);
+
+  // Right outer connection
+
+  BOOST_CHECK_EQUAL(lookup(shell3, PositiveDisc, Vector3(300_mm, 0, 400_mm),
+                           -Vector3::UnitZ()),
+                    &vol3);
+
+  BOOST_CHECK_EQUAL(lookup(shell3, PositiveDisc, Vector3(300_mm, 0, 400_mm),
+                           Vector3::UnitZ()),
+                    nullptr);
+}
+
+BOOST_AUTO_TEST_CASE(Fill) {
+  auto cyl1 = makeVolume(30_mm, 40_mm, 100_mm);
+  auto cyl2 = makeVolume(0_mm, 50_mm, 110_mm);
+
+  SingleCylinderPortalShell shell{cyl1};
+
+  using enum CylinderVolumeBounds::Face;
+  BOOST_CHECK_EQUAL(
+      shell.portal(OuterCylinder)->getLink(Direction::AlongNormal), nullptr);
+  BOOST_CHECK_EQUAL(
+      shell.portal(InnerCylinder)->getLink(Direction::OppositeNormal), nullptr);
+  BOOST_CHECK_EQUAL(shell.portal(PositiveDisc)->getLink(Direction::AlongNormal),
+                    nullptr);
+  BOOST_CHECK_EQUAL(
+      shell.portal(NegativeDisc)->getLink(Direction::OppositeNormal), nullptr);
+
+  shell.fill(cyl2);
+
+  BOOST_CHECK_NE(shell.portal(OuterCylinder)->getLink(Direction::AlongNormal),
+                 nullptr);
+  BOOST_CHECK_NE(
+      shell.portal(InnerCylinder)->getLink(Direction::OppositeNormal), nullptr);
+  BOOST_CHECK_NE(shell.portal(PositiveDisc)->getLink(Direction::AlongNormal),
+                 nullptr);
+  BOOST_CHECK_NE(shell.portal(NegativeDisc)->getLink(Direction::OppositeNormal),
+                 nullptr);
+}
+
+BOOST_AUTO_TEST_CASE(RegisterInto) {
+  using enum CylinderVolumeBounds::Face;
+  TrackingVolume vol1(
+      Transform3::Identity(),
+      std::make_shared<CylinderVolumeBounds>(0_mm, 100_mm, 100_mm));
+
+  SingleCylinderPortalShell shell{vol1};
+
+  BOOST_CHECK_EQUAL(vol1.portals().size(), 0);
+
+  shell.applyToVolume();
+  BOOST_CHECK_EQUAL(vol1.portals().size(), 3);
+}
+
+BOOST_AUTO_TEST_SUITE_END()  // CylinderStack
+BOOST_AUTO_TEST_SUITE_END()
+
+}  // namespace Acts::Test
diff --git a/Tests/UnitTests/Core/Geometry/PortalTests.cpp b/Tests/UnitTests/Core/Geometry/PortalTests.cpp
new file mode 100644
index 00000000000..8997ccedda7
--- /dev/null
+++ b/Tests/UnitTests/Core/Geometry/PortalTests.cpp
@@ -0,0 +1,663 @@
+// This file is part of the ACTS project.
+//
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
+//
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
+
+#include <boost/test/tools/context.hpp>
+#include <boost/test/tools/old/interface.hpp>
+#include <boost/test/unit_test.hpp>
+#include <boost/test/unit_test_suite.hpp>
+
+#include "Acts/Definitions/Units.hpp"
+#include "Acts/Geometry/CompositePortalLink.hpp"
+#include "Acts/Geometry/CylinderVolumeBounds.hpp"
+#include "Acts/Geometry/GeometryContext.hpp"
+#include "Acts/Geometry/GridPortalLink.hpp"
+#include "Acts/Geometry/Portal.hpp"
+#include "Acts/Geometry/TrackingVolume.hpp"
+#include "Acts/Geometry/TrivialPortalLink.hpp"
+#include "Acts/Material/HomogeneousSurfaceMaterial.hpp"
+#include "Acts/Surfaces/CylinderSurface.hpp"
+#include "Acts/Surfaces/DiscSurface.hpp"
+#include "Acts/Surfaces/RadialBounds.hpp"
+#include "Acts/Surfaces/Surface.hpp"
+#include "Acts/Surfaces/SurfaceMergingException.hpp"
+#include "Acts/Utilities/BinningType.hpp"
+#include "Acts/Utilities/ThrowAssert.hpp"
+
+#include <stdexcept>
+
+using namespace Acts::UnitLiterals;
+
+namespace Acts::Test {
+
+auto logger = Acts::getDefaultLogger("UnitTests", Acts::Logging::VERBOSE);
+
+struct Fixture {
+  Logging::Level m_level;
+  Fixture() {
+    m_level = Acts::Logging::getFailureThreshold();
+    Acts::Logging::setFailureThreshold(Acts::Logging::FATAL);
+  }
+
+  ~Fixture() { Acts::Logging::setFailureThreshold(m_level); }
+};
+
+std::shared_ptr<TrackingVolume> makeDummyVolume() {
+  return std::make_shared<TrackingVolume>(
+      Transform3::Identity(),
+      std::make_shared<CylinderVolumeBounds>(30_mm, 40_mm, 100_mm));
+}
+
+GeometryContext gctx;
+
+BOOST_FIXTURE_TEST_SUITE(Geometry, Fixture)
+
+BOOST_AUTO_TEST_SUITE(Portals)
+BOOST_AUTO_TEST_SUITE(Merging)
+
+BOOST_AUTO_TEST_CASE(Cylinder) {
+  auto vol1 = makeDummyVolume();
+  vol1->setVolumeName("vol1");
+  auto vol2 = makeDummyVolume();
+  vol2->setVolumeName("vol2");
+
+  auto cyl1 = Surface::makeShared<CylinderSurface>(
+      Transform3{Translation3{Vector3::UnitZ() * -100_mm}}, 50_mm, 100_mm);
+
+  auto cyl2 = Surface::makeShared<CylinderSurface>(
+      Transform3{Translation3{Vector3::UnitZ() * 100_mm}}, 50_mm, 100_mm);
+
+  Portal portal1{Direction::AlongNormal,
+                 std::make_unique<TrivialPortalLink>(cyl1, *vol1)};
+  BOOST_CHECK(portal1.isValid());
+
+  BOOST_CHECK_EQUAL(
+      portal1
+          .resolveVolume(gctx, Vector3{50_mm, 0_mm, -100_mm}, Vector3::UnitX())
+          .value(),
+      vol1.get());
+
+  BOOST_CHECK_EQUAL(
+      portal1
+          .resolveVolume(gctx, Vector3{50_mm, 0_mm, -100_mm}, -Vector3::UnitX())
+          .value(),
+      nullptr);
+
+  Portal portal2{Direction::AlongNormal, cyl2, *vol2};
+  BOOST_CHECK(portal2.isValid());
+
+  BOOST_CHECK_EQUAL(
+      portal2
+          .resolveVolume(gctx, Vector3{50_mm, 0_mm, 100_mm}, -Vector3::UnitX())
+          .value(),
+      nullptr);
+
+  BOOST_CHECK_EQUAL(
+      portal2
+          .resolveVolume(gctx, Vector3{50_mm, 0_mm, 100_mm}, Vector3::UnitX())
+          .value(),
+      vol2.get());
+
+  Portal portal3{gctx, std::make_unique<TrivialPortalLink>(cyl2, *vol2),
+                 nullptr};
+  BOOST_CHECK(portal3.isValid());
+
+  BOOST_CHECK_NE(portal3.getLink(Direction::AlongNormal), nullptr);
+  BOOST_CHECK_EQUAL(portal3.getLink(Direction::OppositeNormal), nullptr);
+
+  Portal portal4{gctx, nullptr,
+                 std::make_unique<TrivialPortalLink>(cyl2, *vol2)};
+  BOOST_CHECK(portal4.isValid());
+
+  BOOST_CHECK_EQUAL(portal4.getLink(Direction::AlongNormal), nullptr);
+  BOOST_CHECK_NE(portal4.getLink(Direction::OppositeNormal), nullptr);
+
+  // Not mergeable because 1 has portal along but 4 has portal oppsite
+  //         ^
+  //         |
+  //  portal1|              portal2
+  // +-------+-------+  +  +---------------+
+  // |               |     |               |
+  // +---------------+     +-------+-------+
+  //                               |
+  //                               |
+  //                               v
+  BOOST_CHECK_THROW(
+      Portal::merge(gctx, portal1, portal4, BinningValue::binZ, *logger),
+      PortalMergingException);
+
+  // This call leaves both valid because the exception is thrown before the
+  // pointers are moved
+  BOOST_CHECK(portal1.isValid());
+  BOOST_CHECK(portal2.isValid());
+
+  BOOST_CHECK_EQUAL(
+      portal2.resolveVolume(gctx, Vector3{50_mm, 0_mm, 50_mm}, Vector3::UnitX())
+          .value(),
+      vol2.get());
+
+  BOOST_CHECK_EQUAL(
+      portal2
+          .resolveVolume(gctx, Vector3{50_mm, 0_mm, 50_mm}, -Vector3::UnitX())
+          .value(),
+      nullptr);
+
+  // Cannot merge in binRPhi
+  BOOST_CHECK_THROW(
+      Portal::merge(gctx, portal1, portal2, BinningValue::binRPhi, *logger),
+      SurfaceMergingException);
+
+  // The call above leaves both portals invalid because the exception is thrown
+  // after the pointers are moved (during durface merging)
+  BOOST_CHECK(!portal1.isValid());
+  BOOST_CHECK(!portal2.isValid());
+
+  //         ^                     ^
+  //         |                     |
+  //  portal1|              portal2|
+  // +-------+-------+  +  +-------+-------+
+  // |               |     |               |
+  // +---------------+     +---------------+
+
+  // Reset portals to valid to continue
+  portal1 = Portal{gctx, {.alongNormal = {cyl1, *vol1}}};
+  portal2 = Portal{gctx, {.alongNormal = {cyl2, *vol2}}};
+
+  Portal merged12 =
+      Portal::merge(gctx, portal1, portal2, BinningValue::binZ, *logger);
+  BOOST_CHECK_NE(merged12.getLink(Direction::AlongNormal), nullptr);
+  BOOST_CHECK_EQUAL(merged12.getLink(Direction::OppositeNormal), nullptr);
+
+  auto composite12 = dynamic_cast<const CompositePortalLink*>(
+      merged12.getLink(Direction::AlongNormal));
+  BOOST_REQUIRE_NE(composite12, nullptr);
+
+  BOOST_CHECK_EQUAL(
+      merged12
+          .resolveVolume(gctx, Vector3{50_mm, 0_mm, -50_mm}, Vector3::UnitX())
+          .value(),
+      vol1.get());
+
+  BOOST_CHECK_EQUAL(
+      merged12
+          .resolveVolume(gctx, Vector3{50_mm, 0_mm, 50_mm}, Vector3::UnitX())
+          .value(),
+      vol2.get());
+
+  BOOST_CHECK_EQUAL(
+      merged12
+          .resolveVolume(gctx, Vector3{50_mm, 0_mm, -50_mm}, -Vector3::UnitX())
+          .value(),
+      nullptr);
+
+  BOOST_CHECK_EQUAL(
+      merged12
+          .resolveVolume(gctx, Vector3{50_mm, 0_mm, 50_mm}, -Vector3::UnitX())
+          .value(),
+      nullptr);
+
+  portal1 = Portal{gctx, {.alongNormal = {cyl1, *vol1}}};
+
+  // Can't merge with self
+  BOOST_CHECK_THROW(
+      Portal::merge(gctx, portal1, portal1, BinningValue::binZ, *logger),
+      PortalMergingException);
+
+  // Can't merge because the surfaces are the same
+  portal1 = Portal{gctx, {.alongNormal = {cyl1, *vol1}}};
+  portal2 = Portal{gctx, {.alongNormal = {cyl1, *vol2}}};
+  BOOST_CHECK_THROW(
+      Portal::merge(gctx, portal1, portal2, BinningValue::binZ, *logger),
+      AssertionFailureException);
+
+  // Can't merge because surface has material
+  auto material =
+      std::make_shared<HomogeneousSurfaceMaterial>(MaterialSlab{});  // vacuum
+  cyl2->assignSurfaceMaterial(material);
+  portal1 = Portal{gctx, {.alongNormal = {cyl1, *vol1}}};
+  portal2 = Portal{gctx, {.alongNormal = {cyl2, *vol2}}};
+  BOOST_CHECK_THROW(
+      Portal::merge(gctx, portal1, portal2, BinningValue::binZ, *logger),
+      PortalMergingException);
+}
+
+BOOST_AUTO_TEST_CASE(Disc) {
+  auto vol1 = makeDummyVolume();
+  vol1->setVolumeName("vol1");
+  auto vol2 = makeDummyVolume();
+  vol2->setVolumeName("vol2");
+  auto vol3 = makeDummyVolume();
+  vol3->setVolumeName("vol3");
+  auto vol4 = makeDummyVolume();
+  vol4->setVolumeName("vol4");
+
+  auto disc1 = Surface::makeShared<DiscSurface>(
+      Transform3::Identity(), std::make_shared<RadialBounds>(50_mm, 100_mm));
+
+  auto disc2 = Surface::makeShared<DiscSurface>(
+      Transform3::Identity(), std::make_shared<RadialBounds>(100_mm, 150_mm));
+
+  Portal portal1{
+      gctx, {.alongNormal = {disc1, *vol1}, .oppositeNormal = {disc1, *vol2}}};
+
+  Portal portal2{
+      gctx, {.alongNormal = {disc2, *vol3}, .oppositeNormal = {disc2, *vol4}}};
+
+  BOOST_CHECK(portal1.isValid());
+  BOOST_CHECK(portal2.isValid());
+
+  BOOST_CHECK_EQUAL(
+      portal1.resolveVolume(gctx, Vector3{55_mm, 0_mm, 0_mm}, Vector3::UnitZ())
+          .value(),
+      vol1.get());
+  BOOST_CHECK_EQUAL(
+      portal1.resolveVolume(gctx, Vector3{55_mm, 0_mm, 0_mm}, -Vector3::UnitZ())
+          .value(),
+      vol2.get());
+
+  BOOST_CHECK_EQUAL(
+      portal2.resolveVolume(gctx, Vector3{105_mm, 0_mm, 0_mm}, Vector3::UnitZ())
+          .value(),
+      vol3.get());
+  BOOST_CHECK_EQUAL(
+      portal2
+          .resolveVolume(gctx, Vector3{105_mm, 0_mm, 0_mm}, -Vector3::UnitZ())
+          .value(),
+      vol4.get());
+
+  BOOST_CHECK_THROW(
+      Portal::merge(gctx, portal1, portal2, BinningValue::binZ, *logger),
+      AssertionFailureException);
+
+  BOOST_CHECK(portal1.isValid());
+  BOOST_CHECK(portal2.isValid());
+
+  BOOST_CHECK_THROW(
+      Portal::merge(gctx, portal1, portal2, BinningValue::binPhi, *logger),
+      SurfaceMergingException);
+
+  // Portals not valid anymore because they were moved before the exception was
+  // thrown
+  BOOST_CHECK(!portal1.isValid());
+  BOOST_CHECK(!portal2.isValid());
+
+  // recreate them
+  portal1 = Portal{
+      gctx, {.alongNormal = {disc1, *vol1}, .oppositeNormal = {disc1, *vol2}}};
+
+  portal2 = Portal{
+      gctx, {.alongNormal = {disc2, *vol3}, .oppositeNormal = {disc2, *vol4}}};
+
+  //         ^                     ^
+  //         |                     |
+  //  portal1|              portal2|
+  // +-------+-------+     +-------+-------+
+  // |               |  +  |               |
+  // +-------+-------+     +-------+-------+
+  //         |                     |
+  //         |                     |
+  //         v                     v
+  Portal merged12 =
+      Portal::merge(gctx, portal1, portal2, BinningValue::binR, *logger);
+
+  BOOST_CHECK_EQUAL(
+      merged12.resolveVolume(gctx, Vector3{55_mm, 0_mm, 0_mm}, Vector3::UnitZ())
+          .value(),
+      vol1.get());
+  BOOST_CHECK_EQUAL(
+      merged12
+          .resolveVolume(gctx, Vector3{55_mm, 0_mm, 0_mm}, -Vector3::UnitZ())
+          .value(),
+      vol2.get());
+
+  BOOST_CHECK_EQUAL(
+      merged12
+          .resolveVolume(gctx, Vector3{105_mm, 0_mm, 0_mm}, Vector3::UnitZ())
+          .value(),
+      vol3.get());
+  BOOST_CHECK_EQUAL(
+      merged12
+          .resolveVolume(gctx, Vector3{105_mm, 0_mm, 0_mm}, -Vector3::UnitZ())
+          .value(),
+      vol4.get());
+
+  // Can't merge because surface has material
+  auto material =
+      std::make_shared<HomogeneousSurfaceMaterial>(MaterialSlab{});  // vacuum
+  disc2->assignSurfaceMaterial(material);
+  portal1 = Portal{
+      gctx, {.alongNormal = {disc1, *vol1}, .oppositeNormal = {disc1, *vol2}}};
+  portal2 = Portal{
+      gctx, {.alongNormal = {disc2, *vol3}, .oppositeNormal = {disc2, *vol4}}};
+  BOOST_CHECK_THROW(
+      Portal::merge(gctx, portal1, portal2, BinningValue::binR, *logger),
+      PortalMergingException);
+}
+
+BOOST_AUTO_TEST_SUITE_END()  // Merging
+
+BOOST_AUTO_TEST_SUITE(Fusing)
+
+BOOST_AUTO_TEST_CASE(Separated) {
+  auto vol1 = makeDummyVolume();
+  vol1->setVolumeName("vol1");
+  auto vol2 = makeDummyVolume();
+  vol2->setVolumeName("vol2");
+
+  auto cyl1 = Surface::makeShared<CylinderSurface>(Transform3::Identity(),
+                                                   50_mm, 100_mm);
+
+  auto cyl2 = Surface::makeShared<CylinderSurface>(Transform3::Identity(),
+                                                   60_mm, 100_mm);
+
+  Portal portal1{gctx, {.oppositeNormal = {cyl1, *vol1}}};
+
+  Portal portal2{gctx, {.alongNormal = {cyl2, *vol2}}};
+
+  BOOST_CHECK(portal1.isValid());
+  BOOST_CHECK(portal2.isValid());
+
+  // Surfaces have a 10mm gap in r
+  BOOST_CHECK_THROW(Portal::fuse(gctx, portal1, portal2, *logger),
+                    PortalFusingException);
+
+  BOOST_CHECK(portal1.isValid());
+  BOOST_CHECK(portal2.isValid());
+
+  // Same way can't set cyl2 as other link
+  BOOST_CHECK_THROW(portal1.setLink(gctx, Direction::AlongNormal, cyl2, *vol2),
+                    PortalFusingException);
+  BOOST_CHECK_EQUAL(portal1.getLink(Direction::AlongNormal), nullptr);
+
+  Portal portal1b{gctx, {.oppositeNormal = {cyl1, *vol1}}};
+  BOOST_CHECK(portal1b.isValid());
+
+  //    portal1     portal1b
+  //      +---+        +---+
+  //      |   |        |   |
+  //      |   |        |   |
+  // <----+   | + <----+   |
+  //      |   |        |   |
+  //      |   |        |   |
+  //      +---+        +---+
+  BOOST_CHECK_THROW(Portal::fuse(gctx, portal1, portal1b, *logger),
+                    PortalFusingException);
+  BOOST_CHECK(portal1.isValid());
+  BOOST_CHECK(portal1b.isValid());
+
+  auto disc1 = Surface::makeShared<DiscSurface>(
+      Transform3::Identity(), std::make_shared<RadialBounds>(50_mm, 100_mm));
+
+  auto disc2 = Surface::makeShared<DiscSurface>(
+      Transform3{Translation3{Vector3{0, 0, 5_mm}}},
+      std::make_shared<RadialBounds>(50_mm, 100_mm));
+
+  // portal2       portal2b
+  //   +---+          +---+
+  //   |   |          |   |
+  //   |   |          |   |
+  //   |   +---->  +  |   +---->
+  //   |   |          |   |
+  //   |   |          |   |
+  //   +---+          +---+
+  Portal portal2b{gctx, {.alongNormal = {disc2, *vol2}}};
+
+  BOOST_CHECK_THROW(Portal::fuse(gctx, portal2, portal2b, *logger),
+                    PortalFusingException);
+  BOOST_CHECK(portal1.isValid());
+  BOOST_CHECK(portal2.isValid());
+
+  //    portal2     portal2c
+  //      +---+        +---+
+  //      |   |        |   |
+  //      |   |        |   |
+  // <----+   | + <----+   +---->
+  //      |   |        |   |
+  //      |   |        |   |
+  //      +---+        +---+
+  Portal portal2c{
+      gctx, {.alongNormal = {disc2, *vol1}, .oppositeNormal = {disc2, *vol2}}};
+  BOOST_CHECK(portal2c.isValid());
+
+  BOOST_CHECK_THROW(Portal::fuse(gctx, portal2, portal2c, *logger),
+                    PortalFusingException);
+  BOOST_CHECK(portal2.isValid());
+  BOOST_CHECK(portal2c.isValid());
+}
+
+BOOST_AUTO_TEST_CASE(Success) {
+  auto vol1 = makeDummyVolume();
+  vol1->setVolumeName("vol1");
+  auto vol2 = makeDummyVolume();
+  vol2->setVolumeName("vol2");
+
+  auto cyl1 = Surface::makeShared<CylinderSurface>(Transform3::Identity(),
+                                                   50_mm, 100_mm);
+
+  auto cyl2 = Surface::makeShared<CylinderSurface>(Transform3::Identity(),
+                                                   50_mm, 100_mm);
+
+  BOOST_CHECK(*cyl1 == *cyl2);
+
+  //    portal1   portal2
+  //      +---+   +---+
+  //      |   |   |   |
+  //      |   |   |   |
+  // <----+   | + |   +---->
+  //      |   |   |   |
+  //      |   |   |   |
+  //      +---+   +---+
+  Portal portal1{gctx, {.oppositeNormal = {cyl1, *vol1}}};
+  BOOST_CHECK_EQUAL(&portal1.getLink(Direction::OppositeNormal)->surface(),
+                    cyl1.get());
+
+  Portal portal2{gctx, {.alongNormal = {cyl2, *vol2}}};
+
+  BOOST_CHECK(portal1.isValid());
+  BOOST_CHECK(portal2.isValid());
+
+  Portal portal3 = Portal::fuse(gctx, portal1, portal2, *logger);
+  // Input portals get invalidated by the fuse
+  BOOST_CHECK(!portal1.isValid());
+  BOOST_CHECK(!portal2.isValid());
+  BOOST_CHECK(portal3.isValid());
+
+  BOOST_CHECK_EQUAL(portal3.surface().surfaceMaterial(), nullptr);
+
+  // Portal surface is set to the one from "along", because it gets set first
+  BOOST_CHECK_EQUAL(&portal3.surface(), cyl2.get());
+  // "Opposite" gets the already-set surface set as well
+  BOOST_CHECK_EQUAL(&portal3.getLink(Direction::OppositeNormal)->surface(),
+                    cyl2.get());
+}
+
+BOOST_AUTO_TEST_CASE(Material) {
+  auto vol1 = makeDummyVolume();
+  auto vol2 = makeDummyVolume();
+
+  auto cyl1 = Surface::makeShared<CylinderSurface>(Transform3::Identity(),
+                                                   50_mm, 100_mm);
+
+  auto cyl2 = Surface::makeShared<CylinderSurface>(Transform3::Identity(),
+                                                   50_mm, 100_mm);
+
+  //    portal1   portal2
+  //      +---+   +---+
+  //      |   |   |   |
+  //      |   |   |   |
+  // <----+   | + |   +---->
+  //      |   |   |   |
+  //      |   |   |   |
+  //      +---+   +---+
+  Portal portal1{gctx, {.oppositeNormal = {cyl1, *vol1}}};
+  Portal portal2{gctx, {.alongNormal = {cyl2, *vol2}}};
+
+  auto material =
+      std::make_shared<HomogeneousSurfaceMaterial>(MaterialSlab{});  // vacuum
+
+  cyl1->assignSurfaceMaterial(material);
+
+  Portal portal12 = Portal::fuse(gctx, portal1, portal2, *logger);
+
+  // cyl1 had material, so this surface needs to be retained
+  BOOST_CHECK_EQUAL(&portal12.surface(), cyl1.get());
+  BOOST_CHECK_EQUAL(portal12.surface().surfaceMaterial(), material.get());
+
+  // Reset portals
+  portal1 = Portal{gctx, {.oppositeNormal = {cyl1, *vol1}}};
+  portal2 = Portal{gctx, {.alongNormal = {cyl2, *vol2}}};
+  cyl2->assignSurfaceMaterial(material);
+
+  // Both have material, this should fail
+  BOOST_CHECK_THROW(Portal::fuse(gctx, portal1, portal2, *logger),
+                    PortalFusingException);
+  // Portals should stay valid
+  BOOST_CHECK(portal1.isValid());
+  BOOST_CHECK(portal2.isValid());
+
+  cyl1->assignSurfaceMaterial(nullptr);
+
+  portal12 = Portal::fuse(gctx, portal1, portal2, *logger);
+
+  // cyl2 had material, so this surface needs to be retained
+  BOOST_CHECK_EQUAL(&portal12.surface(), cyl2.get());
+  BOOST_CHECK_EQUAL(portal12.surface().surfaceMaterial(), material.get());
+}
+
+BOOST_AUTO_TEST_CASE(GridCreationOnFuse) {
+  Transform3 base = Transform3::Identity();
+
+  auto vol1 = std::make_shared<TrackingVolume>(
+      base, std::make_shared<CylinderVolumeBounds>(30_mm, 40_mm, 100_mm));
+
+  auto vol2 = std::make_shared<TrackingVolume>(
+      base, std::make_shared<CylinderVolumeBounds>(30_mm, 40_mm, 100_mm));
+
+  auto vol3 = std::make_shared<TrackingVolume>(
+      base, std::make_shared<CylinderVolumeBounds>(40_mm, 50_mm, 100_mm));
+
+  auto vol4 = std::make_shared<TrackingVolume>(
+      base, std::make_shared<CylinderVolumeBounds>(40_mm, 50_mm, 100_mm));
+
+  auto disc1 =
+      Surface::makeShared<DiscSurface>(Transform3::Identity(), 30_mm, 60_mm);
+
+  auto disc2 =
+      Surface::makeShared<DiscSurface>(Transform3::Identity(), 60_mm, 90_mm);
+
+  auto disc3 =
+      Surface::makeShared<DiscSurface>(Transform3::Identity(), 90_mm, 120_mm);
+
+  auto trivial1 = std::make_unique<TrivialPortalLink>(disc1, *vol1);
+  BOOST_REQUIRE(trivial1);
+  auto trivial2 = std::make_unique<TrivialPortalLink>(disc2, *vol2);
+  BOOST_REQUIRE(trivial2);
+  auto trivial3 = std::make_unique<TrivialPortalLink>(disc3, *vol3);
+  BOOST_REQUIRE(trivial3);
+
+  std::vector<std::unique_ptr<PortalLinkBase>> links;
+  links.push_back(std::move(trivial1));
+  links.push_back(std::move(trivial2));
+  links.push_back(std::move(trivial3));
+
+  auto composite = std::make_unique<CompositePortalLink>(std::move(links),
+                                                         BinningValue::binR);
+
+  auto discOpposite =
+      Surface::makeShared<DiscSurface>(Transform3::Identity(), 30_mm, 120_mm);
+
+  auto trivialOpposite =
+      std::make_unique<TrivialPortalLink>(discOpposite, *vol4);
+
+  Portal aPortal{gctx, std::move(composite), nullptr};
+  Portal bPortal{gctx, nullptr, std::move(trivialOpposite)};
+
+  Portal fused = Portal::fuse(gctx, aPortal, bPortal, *logger);
+
+  BOOST_CHECK_NE(dynamic_cast<const TrivialPortalLink*>(
+                     fused.getLink(Direction::OppositeNormal)),
+                 nullptr);
+
+  const auto* grid = dynamic_cast<const GridPortalLink*>(
+      fused.getLink(Direction::AlongNormal));
+  BOOST_REQUIRE_NE(grid, nullptr);
+
+  BOOST_CHECK_EQUAL(grid->grid().axes().front()->getNBins(), 3);
+}
+
+BOOST_AUTO_TEST_SUITE_END()  // Fusing
+
+BOOST_AUTO_TEST_CASE(Construction) {
+  auto vol1 = makeDummyVolume();
+
+  // Displaced surfaces fail
+  auto disc1 = Surface::makeShared<DiscSurface>(
+      Transform3::Identity(), std::make_shared<RadialBounds>(50_mm, 100_mm));
+
+  auto disc2 = Surface::makeShared<DiscSurface>(
+      Transform3{Translation3{Vector3{0, 0, 5_mm}}},
+      std::make_shared<RadialBounds>(50_mm, 100_mm));
+
+  BOOST_CHECK_THROW(std::make_unique<Portal>(
+                        gctx, std::make_unique<TrivialPortalLink>(disc1, *vol1),
+                        std::make_unique<TrivialPortalLink>(disc2, *vol1)),
+                    PortalFusingException);
+
+  BOOST_CHECK_THROW((Portal{gctx, nullptr, nullptr}), std::invalid_argument);
+  BOOST_CHECK_THROW(Portal(gctx, {}), std::invalid_argument);
+}
+
+BOOST_AUTO_TEST_CASE(InvalidConstruction) {
+  BOOST_CHECK_THROW(Portal(Direction::AlongNormal, nullptr),
+                    std::invalid_argument);
+
+  auto vol1 = makeDummyVolume();
+
+  BOOST_CHECK_THROW(Portal(Direction::AlongNormal, nullptr, *vol1),
+                    std::invalid_argument);
+
+  auto disc1 = Surface::makeShared<DiscSurface>(
+      Transform3::Identity(), std::make_shared<RadialBounds>(50_mm, 100_mm));
+  Portal portal(Direction::AlongNormal, disc1, *vol1);
+
+  BOOST_CHECK_THROW(portal.setLink(gctx, Direction::AlongNormal, nullptr),
+                    std::invalid_argument);
+}
+
+BOOST_AUTO_TEST_CASE(PortalFill) {
+  auto vol1 = makeDummyVolume();
+  auto vol2 = makeDummyVolume();
+
+  auto cyl1 = Surface::makeShared<CylinderSurface>(Transform3::Identity(),
+                                                   50_mm, 100_mm);
+
+  Portal portal1{gctx, {.oppositeNormal = {cyl1, *vol1}}};
+  Portal portal2{gctx, {.alongNormal = {cyl1, *vol2}}};
+
+  // Fuse these to make portal 1 and 2 empty
+  Portal::fuse(gctx, portal1, portal2, *logger);
+
+  BOOST_CHECK_THROW(portal1.fill(*vol2), std::logic_error);
+
+  portal1 = Portal{gctx, {.oppositeNormal = {cyl1, *vol1}}};
+  portal2 = Portal{gctx, {.alongNormal = {cyl1, *vol2}}};
+
+  BOOST_CHECK_EQUAL(portal1.getLink(Direction::AlongNormal), nullptr);
+  BOOST_CHECK_NE(portal1.getLink(Direction::OppositeNormal), nullptr);
+
+  portal1.fill(*vol2);
+  BOOST_CHECK_NE(portal1.getLink(Direction::AlongNormal), nullptr);
+  BOOST_CHECK_NE(portal1.getLink(Direction::OppositeNormal), nullptr);
+
+  BOOST_CHECK_THROW(portal1.fill(*vol2), std::logic_error);
+}
+
+BOOST_AUTO_TEST_SUITE_END()  // Portals
+
+BOOST_AUTO_TEST_SUITE_END()  // Geometry
+
+}  // namespace Acts::Test
diff --git a/Tests/UnitTests/Core/Geometry/ProtoLayerHelperTests.cpp b/Tests/UnitTests/Core/Geometry/ProtoLayerHelperTests.cpp
index e316b2f29aa..c6ccd763095 100644
--- a/Tests/UnitTests/Core/Geometry/ProtoLayerHelperTests.cpp
+++ b/Tests/UnitTests/Core/Geometry/ProtoLayerHelperTests.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2018 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include <boost/test/unit_test.hpp>
 
@@ -62,7 +62,7 @@ BOOST_AUTO_TEST_CASE(ProtoLayerHelperTests) {
                             layerSurfaces.end());
   }
 
-  ViewConfig unsorted({252, 160, 0});
+  ViewConfig unsorted{.color = {252, 160, 0}};
   for (auto& sf : cylinderSurfaces) {
     GeometryView3D::drawSurface(objVis, *sf, tgContext, Transform3::Identity(),
                                 unsorted);
@@ -78,16 +78,16 @@ BOOST_AUTO_TEST_CASE(ProtoLayerHelperTests) {
 
   BOOST_CHECK_EQUAL(radialLayers.size(), 4);
 
-  std::vector<ColorRGB> sortedColors = {{102, 204, 255},
-                                        {102, 255, 153},
-                                        {255, 204, 102},
-                                        {204, 102, 0},
-                                        {278, 123, 55}};
+  std::vector<Color> sortedColors = {{102, 204, 255},
+                                     {102, 255, 153},
+                                     {255, 204, 102},
+                                     {204, 102, 0},
+                                     {278, 123, 55}};
 
   std::size_t il = 0;
   for (auto& layer : radialLayers) {
     for (auto& sf : layer.surfaces()) {
-      ViewConfig sorted(sortedColors[il]);
+      ViewConfig sorted{.color = sortedColors[il]};
       GeometryView3D::drawSurface(objVis, *sf, tgContext,
                                   Transform3::Identity(), sorted);
     }
@@ -136,7 +136,7 @@ BOOST_AUTO_TEST_CASE(ProtoLayerHelperTests) {
   il = 0;
   for (auto& layer : discLayersZ) {
     for (auto& sf : layer.surfaces()) {
-      ViewConfig ViewConfig(sortedColors[il]);
+      ViewConfig ViewConfig{.color = sortedColors[il]};
       GeometryView3D::drawSurface(objVis, *sf, tgContext,
                                   Transform3::Identity(), ViewConfig);
     }
@@ -184,7 +184,7 @@ BOOST_AUTO_TEST_CASE(ProtoLayerHelperTests) {
       ProtoLayerHelper::SortingConfig(BinningValue::binR, 1.));
   BOOST_CHECK_EQUAL(rSorted.size(), 3);
 
-  ColorRGB dColor = {0, 0, 0};
+  Color dColor = {0, 0, 0};
 
   int ir = 0;
   for (auto& rBatch : rSorted) {
diff --git a/Tests/UnitTests/Core/Geometry/ProtoLayerTests.cpp b/Tests/UnitTests/Core/Geometry/ProtoLayerTests.cpp
index 434b808e309..3fdf8ec1c16 100644
--- a/Tests/UnitTests/Core/Geometry/ProtoLayerTests.cpp
+++ b/Tests/UnitTests/Core/Geometry/ProtoLayerTests.cpp
@@ -1,49 +1,55 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2020 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include <boost/test/unit_test.hpp>
 
 #include "Acts/Definitions/Algebra.hpp"
+#include "Acts/Definitions/Units.hpp"
+#include "Acts/Geometry/DetectorElementBase.hpp"
 #include "Acts/Geometry/Extent.hpp"
 #include "Acts/Geometry/GeometryContext.hpp"
 #include "Acts/Geometry/ProtoLayer.hpp"
 #include "Acts/Surfaces/PlaneSurface.hpp"
 #include "Acts/Surfaces/RectangleBounds.hpp"
 #include "Acts/Surfaces/Surface.hpp"
+#include "Acts/Tests/CommonHelpers/DetectorElementStub.hpp"
 #include "Acts/Tests/CommonHelpers/FloatComparisons.hpp"
 #include "Acts/Utilities/BinningType.hpp"
 #include "Acts/Utilities/RangeXD.hpp"
 
-#include <array>
 #include <cmath>
 #include <memory>
+#include <numbers>
 #include <sstream>
 #include <string>
-#include <utility>
 #include <vector>
 
 namespace Acts::Test::Layers {
 
+GeometryContext tgContext = GeometryContext();
+
 BOOST_AUTO_TEST_SUITE(Geometry)
 
 BOOST_AUTO_TEST_CASE(ProtoLayerTests) {
-  GeometryContext tgContext = GeometryContext();
+  using enum BinningValue;
 
   // Create a proto layer with 4 surfaces on the x/y grid
   auto recBounds = std::make_shared<RectangleBounds>(3., 6.);
 
   // Planar definitions to help construct the boundary surfaces
-  static const Transform3 planeYZ = AngleAxis3(0.5 * M_PI, Vector3::UnitY()) *
-                                    AngleAxis3(0.5 * M_PI, Vector3::UnitZ()) *
-                                    Transform3::Identity();
-  static const Transform3 planeZX = AngleAxis3(-0.5 * M_PI, Vector3::UnitX()) *
-                                    AngleAxis3(-0.5 * M_PI, Vector3::UnitZ()) *
-                                    Transform3::Identity();
+  static const Transform3 planeYZ =
+      AngleAxis3(std::numbers::pi / 2., Vector3::UnitY()) *
+      AngleAxis3(std::numbers::pi / 2., Vector3::UnitZ()) *
+      Transform3::Identity();
+  static const Transform3 planeZX =
+      AngleAxis3(-std::numbers::pi / 2., Vector3::UnitX()) *
+      AngleAxis3(-std::numbers::pi / 2., Vector3::UnitZ()) *
+      Transform3::Identity();
 
   std::vector<std::shared_ptr<const Surface>> surfaceStore;
   surfaceStore.reserve(100);
@@ -105,20 +111,20 @@ BOOST_AUTO_TEST_CASE(ProtoLayerTests) {
   // Test 1 - identity transform
   auto protoLayer = createProtoLayer(Transform3::Identity());
 
-  CHECK_CLOSE_ABS(protoLayer.range(BinningValue::binX), 12., 1e-8);
-  CHECK_CLOSE_ABS(protoLayer.medium(BinningValue::binX), 0., 1e-8);
-  CHECK_CLOSE_ABS(protoLayer.min(BinningValue::binX), -6., 1e-8);
-  CHECK_CLOSE_ABS(protoLayer.max(BinningValue::binX), 6., 1e-8);
-  CHECK_CLOSE_ABS(protoLayer.range(BinningValue::binY), 6., 1e-8);
-  CHECK_CLOSE_ABS(protoLayer.medium(BinningValue::binY), 0., 1e-8);
-  CHECK_CLOSE_ABS(protoLayer.min(BinningValue::binY), -3., 1e-8);
-  CHECK_CLOSE_ABS(protoLayer.max(BinningValue::binY), 3., 1e-8);
-  CHECK_CLOSE_ABS(protoLayer.range(BinningValue::binZ), 12., 1e-8);
-  CHECK_CLOSE_ABS(protoLayer.medium(BinningValue::binZ), 0., 1e-8);
-  CHECK_CLOSE_ABS(protoLayer.min(BinningValue::binZ), -6., 1e-8);
-  CHECK_CLOSE_ABS(protoLayer.max(BinningValue::binZ), 6., 1e-8);
-  CHECK_CLOSE_ABS(protoLayer.max(BinningValue::binR), std::hypot(3, 6), 1e-8);
-  CHECK_CLOSE_ABS(protoLayer.min(BinningValue::binR), 3., 1e-8);
+  CHECK_CLOSE_ABS(protoLayer.range(binX), 12., 1e-8);
+  CHECK_CLOSE_ABS(protoLayer.medium(binX), 0., 1e-8);
+  CHECK_CLOSE_ABS(protoLayer.min(binX), -6., 1e-8);
+  CHECK_CLOSE_ABS(protoLayer.max(binX), 6., 1e-8);
+  CHECK_CLOSE_ABS(protoLayer.range(binY), 6., 1e-8);
+  CHECK_CLOSE_ABS(protoLayer.medium(binY), 0., 1e-8);
+  CHECK_CLOSE_ABS(protoLayer.min(binY), -3., 1e-8);
+  CHECK_CLOSE_ABS(protoLayer.max(binY), 3., 1e-8);
+  CHECK_CLOSE_ABS(protoLayer.range(binZ), 12., 1e-8);
+  CHECK_CLOSE_ABS(protoLayer.medium(binZ), 0., 1e-8);
+  CHECK_CLOSE_ABS(protoLayer.min(binZ), -6., 1e-8);
+  CHECK_CLOSE_ABS(protoLayer.max(binZ), 6., 1e-8);
+  CHECK_CLOSE_ABS(protoLayer.max(binR), std::hypot(3, 6), 1e-8);
+  CHECK_CLOSE_ABS(protoLayer.min(binR), 3., 1e-8);
 
   // Test 1a
 
@@ -127,16 +133,15 @@ BOOST_AUTO_TEST_CASE(ProtoLayerTests) {
   auto protoLayerRot = createProtoLayer(AngleAxis3(-0.345, Vector3::UnitZ()) *
                                         Transform3::Identity());
 
-  BOOST_CHECK_NE(protoLayer.min(BinningValue::binX), -6.);
-  CHECK_CLOSE_ABS(protoLayerRot.medium(BinningValue::binX), 0., 1e-8);
-  CHECK_CLOSE_ABS(protoLayerRot.medium(BinningValue::binY), 0., 1e-8);
-  CHECK_CLOSE_ABS(protoLayerRot.range(BinningValue::binZ), 12., 1e-8);
-  CHECK_CLOSE_ABS(protoLayerRot.medium(BinningValue::binZ), 0., 1e-8);
-  CHECK_CLOSE_ABS(protoLayerRot.min(BinningValue::binZ), -6., 1e-8);
-  CHECK_CLOSE_ABS(protoLayerRot.max(BinningValue::binZ), 6., 1e-8);
-  CHECK_CLOSE_ABS(protoLayerRot.min(BinningValue::binR), 3., 1e-8);
-  CHECK_CLOSE_ABS(protoLayerRot.max(BinningValue::binR), std::hypot(3, 6),
-                  1e-8);
+  BOOST_CHECK_NE(protoLayer.min(binX), -6.);
+  CHECK_CLOSE_ABS(protoLayerRot.medium(binX), 0., 1e-8);
+  CHECK_CLOSE_ABS(protoLayerRot.medium(binY), 0., 1e-8);
+  CHECK_CLOSE_ABS(protoLayerRot.range(binZ), 12., 1e-8);
+  CHECK_CLOSE_ABS(protoLayerRot.medium(binZ), 0., 1e-8);
+  CHECK_CLOSE_ABS(protoLayerRot.min(binZ), -6., 1e-8);
+  CHECK_CLOSE_ABS(protoLayerRot.max(binZ), 6., 1e-8);
+  CHECK_CLOSE_ABS(protoLayerRot.min(binR), 3., 1e-8);
+  CHECK_CLOSE_ABS(protoLayerRot.max(binR), std::hypot(3, 6), 1e-8);
 
   std::stringstream sstream;
   protoLayerRot.toStream(sstream);
@@ -155,6 +160,111 @@ Extent in space :
   BOOST_CHECK_EQUAL(sstream.str(), oString);
 }
 
+BOOST_AUTO_TEST_CASE(OrientedLayer) {
+  using enum BinningValue;
+  using namespace Acts::UnitLiterals;
+
+  Transform3 base = Transform3::Identity();
+
+  auto recBounds = std::make_shared<RectangleBounds>(3_mm, 6_mm);
+
+  std::vector<std::unique_ptr<DetectorElementBase>> detectorElements;
+
+  auto makeFan = [&](double yrot, double thickness = 0) {
+    detectorElements.clear();
+
+    std::size_t nSensors = 8;
+    double deltaPhi = 2 * std::numbers::pi / nSensors;
+    double r = 20_mm;
+    std::vector<std::shared_ptr<const Surface>> surfaces;
+    for (std::size_t i = 0; i < nSensors; i++) {
+      // Create a fan of sensors
+
+      Transform3 trf = base * AngleAxis3{yrot, Vector3::UnitY()} *
+                       AngleAxis3{deltaPhi * i, Vector3::UnitZ()} *
+                       Translation3(Vector3::UnitX() * r);
+
+      auto& element = detectorElements.emplace_back(
+          std::make_unique<DetectorElementStub>(trf, recBounds, thickness));
+
+      surfaces.push_back(element->surface().getSharedPtr());
+    }
+    return surfaces;
+  };
+
+  std::vector<std::shared_ptr<const Surface>> surfaces = makeFan(0_degree);
+
+  ProtoLayer protoLayer(tgContext, surfaces);
+
+  BOOST_CHECK_EQUAL(protoLayer.surfaces().size(), 8);
+  BOOST_CHECK_CLOSE(protoLayer.min(binX), -23_mm, 1e-8);
+  BOOST_CHECK_CLOSE(protoLayer.max(binX), 23_mm, 1e-8);
+  BOOST_CHECK_CLOSE(protoLayer.min(binY), -23_mm, 1e-8);
+  BOOST_CHECK_CLOSE(protoLayer.max(binY), 23_mm, 1e-8);
+  BOOST_CHECK_CLOSE(protoLayer.min(binZ), 0_mm, 1e-8);
+  BOOST_CHECK_CLOSE(protoLayer.max(binZ), 0_mm, 1e-8);
+  BOOST_CHECK_CLOSE(protoLayer.min(binR), 17_mm, 1e-8);
+  BOOST_CHECK_CLOSE(protoLayer.max(binR), 23.769728648_mm, 1e-8);
+
+  surfaces = makeFan(45_degree);
+
+  // Do NOT provide rotation matrix: sizing will be affected
+  protoLayer = {tgContext, surfaces};
+
+  BOOST_CHECK_EQUAL(protoLayer.surfaces().size(), 8);
+  BOOST_CHECK_CLOSE(protoLayer.min(binX), -16.26345596_mm, 1e-4);
+  BOOST_CHECK_CLOSE(protoLayer.max(binX), 16.26345596_mm, 1e-4);
+  BOOST_CHECK_CLOSE(protoLayer.min(binY), -23_mm, 1e-8);
+  BOOST_CHECK_CLOSE(protoLayer.max(binY), 23_mm, 1e-8);
+  BOOST_CHECK_CLOSE(protoLayer.min(binZ), -16.26345596_mm, 1e-4);
+  BOOST_CHECK_CLOSE(protoLayer.max(binZ), 16.26345596_mm, 1e-4);
+
+  protoLayer = {tgContext, surfaces,
+                Transform3{AngleAxis3{45_degree, Vector3::UnitY()}}.inverse()};
+
+  BOOST_CHECK_EQUAL(protoLayer.surfaces().size(), 8);
+  BOOST_CHECK_CLOSE(protoLayer.range(binX), 46_mm, 1e-8);
+  BOOST_CHECK_CLOSE(protoLayer.min(binX), -23_mm, 1e-8);
+  BOOST_CHECK_CLOSE(protoLayer.max(binX), 23_mm, 1e-8);
+  BOOST_CHECK_CLOSE(protoLayer.range(binY), 46_mm, 1e-8);
+  BOOST_CHECK_CLOSE(protoLayer.min(binY), -23_mm, 1e-8);
+  BOOST_CHECK_CLOSE(protoLayer.max(binY), 23_mm, 1e-8);
+  CHECK_SMALL(protoLayer.range(binZ), 1e-14);
+  CHECK_SMALL(protoLayer.min(binZ), 1e-14);
+  CHECK_SMALL(protoLayer.max(binZ), 1e-14);
+
+  surfaces = makeFan(0_degree, 10_mm);
+
+  protoLayer = {tgContext, surfaces};
+
+  BOOST_CHECK_EQUAL(protoLayer.surfaces().size(), 8);
+  BOOST_CHECK_CLOSE(protoLayer.range(binX), 46_mm, 1e-8);
+  BOOST_CHECK_CLOSE(protoLayer.min(binX), -23_mm, 1e-8);
+  BOOST_CHECK_CLOSE(protoLayer.max(binX), 23_mm, 1e-8);
+  BOOST_CHECK_CLOSE(protoLayer.range(binY), 46_mm, 1e-8);
+  BOOST_CHECK_CLOSE(protoLayer.min(binY), -23_mm, 1e-8);
+  BOOST_CHECK_CLOSE(protoLayer.max(binY), 23_mm, 1e-8);
+  BOOST_CHECK_CLOSE(protoLayer.range(binZ), 10_mm, 1e-8);
+  BOOST_CHECK_CLOSE(protoLayer.min(binZ), -5_mm, 1e-8);
+  BOOST_CHECK_CLOSE(protoLayer.max(binZ), 5_mm, 1e-8);
+
+  surfaces = makeFan(45_degree, 10_mm);
+
+  protoLayer = {tgContext, surfaces,
+                Transform3{AngleAxis3{45_degree, Vector3::UnitY()}}.inverse()};
+
+  BOOST_CHECK_EQUAL(protoLayer.surfaces().size(), 8);
+  BOOST_CHECK_CLOSE(protoLayer.range(binX), 46_mm, 1e-8);
+  BOOST_CHECK_CLOSE(protoLayer.min(binX), -23_mm, 1e-8);
+  BOOST_CHECK_CLOSE(protoLayer.max(binX), 23_mm, 1e-8);
+  BOOST_CHECK_CLOSE(protoLayer.range(binY), 46_mm, 1e-8);
+  BOOST_CHECK_CLOSE(protoLayer.min(binY), -23_mm, 1e-8);
+  BOOST_CHECK_CLOSE(protoLayer.max(binY), 23_mm, 1e-8);
+  BOOST_CHECK_CLOSE(protoLayer.range(binZ), 10_mm, 1e-8);
+  BOOST_CHECK_CLOSE(protoLayer.min(binZ), -5_mm, 1e-8);
+  BOOST_CHECK_CLOSE(protoLayer.max(binZ), 5_mm, 1e-8);
+}
+
 BOOST_AUTO_TEST_SUITE_END()
 
 }  // namespace Acts::Test::Layers
diff --git a/Tests/UnitTests/Core/Geometry/SimpleGeometryTests.cpp b/Tests/UnitTests/Core/Geometry/SimpleGeometryTests.cpp
index a8fe3cb2955..60c3dc6d282 100644
--- a/Tests/UnitTests/Core/Geometry/SimpleGeometryTests.cpp
+++ b/Tests/UnitTests/Core/Geometry/SimpleGeometryTests.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2017-2018 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include <boost/test/unit_test.hpp>
 
diff --git a/Tests/UnitTests/Core/Geometry/SurfaceArrayCreatorTests.cpp b/Tests/UnitTests/Core/Geometry/SurfaceArrayCreatorTests.cpp
index 6f68b8b7315..00b6509ef25 100644
--- a/Tests/UnitTests/Core/Geometry/SurfaceArrayCreatorTests.cpp
+++ b/Tests/UnitTests/Core/Geometry/SurfaceArrayCreatorTests.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2017-2018 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include <boost/test/unit_test.hpp>
 
@@ -37,6 +37,7 @@
 #include <iomanip>
 #include <iterator>
 #include <memory>
+#include <numbers>
 #include <set>
 #include <stdexcept>
 #include <string>
@@ -91,7 +92,7 @@ struct SurfaceArrayCreatorFixture {
     SrfVec res;
     // TODO: The test is extremely numerically unstable in the face of upward
     //       rounding in this multiplication and division. Find out why.
-    double phiStep = 2 * M_PI / n;
+    double phiStep = 2 * std::numbers::pi / n;
     for (std::size_t i = 0; i < n; ++i) {
       double z = zbase + ((i % 2 == 0) ? 1 : -1) * 0.2;
       double phi = std::fma(i, phiStep, shift);
@@ -115,12 +116,13 @@ struct SurfaceArrayCreatorFixture {
   }
 
   SrfVec fullPhiTestSurfacesBRL(std::size_t n = 10, double shift = 0,
-                                double zbase = 0, double incl = M_PI / 9.,
+                                double zbase = 0,
+                                double incl = std::numbers::pi / 9.,
                                 double w = 2, double h = 1.5) {
     SrfVec res;
     // TODO: The test is extremely numerically unstable in the face of upward
     //       rounding in this multiplication and division. Find out why.
-    double phiStep = 2 * M_PI / n;
+    double phiStep = 2 * std::numbers::pi / n;
     for (std::size_t i = 0; i < n; ++i) {
       double z = zbase;
       double phi = std::fma(i, phiStep, shift);
@@ -130,7 +132,7 @@ struct SurfaceArrayCreatorFixture {
       trans.rotate(Eigen::AngleAxisd(phi, Vector3(0, 0, 1)));
       trans.translate(Vector3(10, 0, z));
       trans.rotate(Eigen::AngleAxisd(incl, Vector3(0, 0, 1)));
-      trans.rotate(Eigen::AngleAxisd(M_PI / 2., Vector3(0, 1, 0)));
+      trans.rotate(Eigen::AngleAxisd(std::numbers::pi / 2., Vector3(0, 1, 0)));
 
       auto bounds = std::make_shared<const RectangleBounds>(w, h);
       std::shared_ptr<Surface> srf =
@@ -153,8 +155,8 @@ struct SurfaceArrayCreatorFixture {
       Transform3 trans;
       trans.setIdentity();
       trans.translate(origin + dir * step * i);
-      // trans.rotate(AngleAxis3(M_PI/9., Vector3(0, 0, 1)));
-      trans.rotate(AngleAxis3(M_PI / 2., Vector3(1, 0, 0)));
+      // trans.rotate(AngleAxis3(std::numbers::pi / 9., Vector3(0, 0, 1)));
+      trans.rotate(AngleAxis3(std::numbers::pi / 2., Vector3(1, 0, 0)));
       trans = trans * pretrans;
 
       auto bounds = std::make_shared<const RectangleBounds>(2, 1.5);
@@ -177,7 +179,8 @@ struct SurfaceArrayCreatorFixture {
     for (int i = 0; i < nZ; i++) {
       double z = i * w * 2 + z0;
       // std::cout << "z=" << z << std::endl;
-      SrfVec ring = fullPhiTestSurfacesBRL(nPhi, 0, z, M_PI / 9., w, h);
+      SrfVec ring =
+          fullPhiTestSurfacesBRL(nPhi, 0, z, std::numbers::pi / 9., w, h);
       res.insert(res.end(), ring.begin(), ring.end());
     }
 
@@ -185,14 +188,15 @@ struct SurfaceArrayCreatorFixture {
   }
 
   std::pair<SrfVec, std::vector<std::pair<const Surface*, const Surface*>>>
-  makeBarrelStagger(int nPhi, int nZ, double shift = 0, double incl = M_PI / 9.,
-                    double w = 2, double h = 1.5) {
+  makeBarrelStagger(int nPhi, int nZ, double shift = 0,
+                    double incl = std::numbers::pi / 9., double w = 2,
+                    double h = 1.5) {
     double z0 = -(nZ - 1) * w;
     SrfVec res;
     std::vector<std::pair<const Surface*, const Surface*>> pairs;
     // TODO: The test is extremely numerically unstable in the face of upward
     //       rounding in this multiplication and division. Find out why.
-    double phiStep = 2 * M_PI / nPhi;
+    double phiStep = 2 * std::numbers::pi / nPhi;
     for (int i = 0; i < nZ; i++) {
       double z = i * w * 2 + z0;
       for (int j = 0; j < nPhi; ++j) {
@@ -202,7 +206,8 @@ struct SurfaceArrayCreatorFixture {
         trans.rotate(Eigen::AngleAxisd(phi, Vector3(0, 0, 1)));
         trans.translate(Vector3(10, 0, z));
         trans.rotate(Eigen::AngleAxisd(incl, Vector3(0, 0, 1)));
-        trans.rotate(Eigen::AngleAxisd(M_PI / 2., Vector3(0, 1, 0)));
+        trans.rotate(
+            Eigen::AngleAxisd(std::numbers::pi / 2., Vector3(0, 1, 0)));
 
         auto bounds = std::make_shared<const RectangleBounds>(w, h);
         std::shared_ptr<PlaneSurface> srfA =
@@ -278,7 +283,7 @@ BOOST_FIXTURE_TEST_CASE(SurfaceArrayCreator_createEquidistantAxis_Phi,
       1.25664,  1.46608,  1.67552,  1.88496,  2.09439,   2.30383,   2.51327,
       2.72271,  2.93215,  3.14159};
 
-  double step = 2 * M_PI / 30.;
+  double step = 2 * std::numbers::pi / 30.;
 
   // endcap style modules
 
@@ -294,8 +299,8 @@ BOOST_FIXTURE_TEST_CASE(SurfaceArrayCreator_createEquidistantAxis_Phi,
                                       BinningValue::binPhi, pl, tr);
 
     BOOST_CHECK_EQUAL(axis.nBins, 30u);
-    CHECK_CLOSE_REL(axis.max, M_PI, 1e-6);
-    CHECK_CLOSE_REL(axis.min, -M_PI, 1e-6);
+    CHECK_CLOSE_REL(axis.max, std::numbers::pi, 1e-6);
+    CHECK_CLOSE_REL(axis.min, -std::numbers::pi, 1e-6);
     BOOST_CHECK_EQUAL(axis.bType, equidistant);
     CHECK_SMALL(phi(tr * Vector3::UnitX()), 1e-6);
 
@@ -310,8 +315,8 @@ BOOST_FIXTURE_TEST_CASE(SurfaceArrayCreator_createEquidistantAxis_Phi,
     draw_surfaces(surfaces,
                   "SurfaceArrayCreator_createEquidistantAxis_EC_2.obj");
     BOOST_CHECK_EQUAL(axis.nBins, 30u);
-    CHECK_CLOSE_REL(axis.max, M_PI, 1e-6);
-    CHECK_CLOSE_REL(axis.min, -M_PI, 1e-6);
+    CHECK_CLOSE_REL(axis.max, std::numbers::pi, 1e-6);
+    CHECK_CLOSE_REL(axis.min, -std::numbers::pi, 1e-6);
     BOOST_CHECK_EQUAL(axis.bType, equidistant);
     // CHECK_CLOSE_REL(bdExp, axis.binEdges, 0.001);
     CHECK_CLOSE_REL(phi(tr * Vector3::UnitX()), -0.5 * step, 1e-3);
@@ -326,8 +331,8 @@ BOOST_FIXTURE_TEST_CASE(SurfaceArrayCreator_createEquidistantAxis_Phi,
     draw_surfaces(surfaces,
                   "SurfaceArrayCreator_createEquidistantAxis_EC_3.obj");
     BOOST_CHECK_EQUAL(axis.nBins, 30u);
-    CHECK_CLOSE_REL(axis.max, M_PI, 1e-6);
-    CHECK_CLOSE_REL(axis.min, -M_PI, 1e-6);
+    CHECK_CLOSE_REL(axis.max, std::numbers::pi, 1e-6);
+    CHECK_CLOSE_REL(axis.min, -std::numbers::pi, 1e-6);
     BOOST_CHECK_EQUAL(axis.bType, equidistant);
     CHECK_CLOSE_REL(phi(tr * Vector3::UnitX()), step / -4., 1e-3);
 
@@ -344,8 +349,8 @@ BOOST_FIXTURE_TEST_CASE(SurfaceArrayCreator_createEquidistantAxis_Phi,
     draw_surfaces(surfaces,
                   "SurfaceArrayCreator_createEquidistantAxis_EC_4.obj");
     BOOST_CHECK_EQUAL(axis.nBins, 30u);
-    CHECK_CLOSE_REL(axis.max, M_PI, 1e-6);
-    CHECK_CLOSE_REL(axis.min, -M_PI, 1e-6);
+    CHECK_CLOSE_REL(axis.max, std::numbers::pi, 1e-6);
+    CHECK_CLOSE_REL(axis.min, -std::numbers::pi, 1e-6);
     BOOST_CHECK_EQUAL(axis.bType, equidistant);
     CHECK_CLOSE_REL(phi(tr * Vector3::UnitX()), step / 4., 1e-3);
   }
@@ -363,8 +368,8 @@ BOOST_FIXTURE_TEST_CASE(SurfaceArrayCreator_createEquidistantAxis_Phi,
     draw_surfaces(surfaces,
                   "SurfaceArrayCreator_createEquidistantAxis_BRL_1.obj");
     BOOST_CHECK_EQUAL(axis.nBins, 30u);
-    CHECK_CLOSE_REL(axis.max, M_PI, 1e-6);
-    CHECK_CLOSE_REL(axis.min, -M_PI, 1e-6);
+    CHECK_CLOSE_REL(axis.max, std::numbers::pi, 1e-6);
+    CHECK_CLOSE_REL(axis.min, -std::numbers::pi, 1e-6);
     BOOST_CHECK_EQUAL(axis.bType, equidistant);
     CHECK_SMALL(phi(tr * Vector3::UnitX()), 1e-6);
 
@@ -379,8 +384,8 @@ BOOST_FIXTURE_TEST_CASE(SurfaceArrayCreator_createEquidistantAxis_Phi,
     draw_surfaces(surfaces,
                   "SurfaceArrayCreator_createEquidistantAxis_BRL_2.obj");
     BOOST_CHECK_EQUAL(axis.nBins, 30u);
-    CHECK_CLOSE_REL(axis.max, M_PI, 1e-6);
-    CHECK_CLOSE_REL(axis.min, -M_PI, 1e-6);
+    CHECK_CLOSE_REL(axis.max, std::numbers::pi, 1e-6);
+    CHECK_CLOSE_REL(axis.min, -std::numbers::pi, 1e-6);
     BOOST_CHECK_EQUAL(axis.bType, equidistant);
     // CHECK_CLOSE_REL(bdExp, axis.binEdges, 0.001);
     CHECK_CLOSE_REL(phi(tr * Vector3::UnitX()), -0.5 * step, 1e-3);
@@ -396,8 +401,8 @@ BOOST_FIXTURE_TEST_CASE(SurfaceArrayCreator_createEquidistantAxis_Phi,
     draw_surfaces(surfaces,
                   "SurfaceArrayCreator_createEquidistantAxis_BRL_3.obj");
     BOOST_CHECK_EQUAL(axis.nBins, 30u);
-    CHECK_CLOSE_REL(axis.max, M_PI, 1e-6);
-    CHECK_CLOSE_REL(axis.min, -M_PI, 1e-6);
+    CHECK_CLOSE_REL(axis.max, std::numbers::pi, 1e-6);
+    CHECK_CLOSE_REL(axis.min, -std::numbers::pi, 1e-6);
     BOOST_CHECK_EQUAL(axis.bType, equidistant);
     // CHECK_CLOSE_REL(bdExp, axis.binEdges, 0.001);
     CHECK_CLOSE_REL(phi(tr * Vector3::UnitX()), step / -4., 1e-3);
@@ -413,8 +418,8 @@ BOOST_FIXTURE_TEST_CASE(SurfaceArrayCreator_createEquidistantAxis_Phi,
     draw_surfaces(surfaces,
                   "SurfaceArrayCreator_createEquidistantAxis_BRL_4.obj");
     BOOST_CHECK_EQUAL(axis.nBins, 30u);
-    CHECK_CLOSE_REL(axis.max, M_PI, 1e-6);
-    CHECK_CLOSE_REL(axis.min, -M_PI, 1e-6);
+    CHECK_CLOSE_REL(axis.max, std::numbers::pi, 1e-6);
+    CHECK_CLOSE_REL(axis.min, -std::numbers::pi, 1e-6);
     BOOST_CHECK_EQUAL(axis.bType, equidistant);
     // CHECK_CLOSE_REL(bdExp, axis.binEdges, 0.001);
     CHECK_CLOSE_REL(phi(tr * Vector3::UnitX()), step / 4., 1e-3);
@@ -477,7 +482,7 @@ BOOST_FIXTURE_TEST_CASE(SurfaceArrayCreator_createEquidistantAxis_Z,
 
   // z row where elements are rotated around y
   Transform3 tr = Transform3::Identity();
-  tr.rotate(AngleAxis3(M_PI / 4., Vector3(0, 0, 1)));
+  tr.rotate(AngleAxis3(std::numbers::pi / 4., Vector3(0, 0, 1)));
   surfaces = straightLineSurfaces(10, 3, Vector3(0, 0, 0 + 1.5), tr);
   surfacesRaw = unpack_shared_vector(surfaces);
   pl = ProtoLayer(tgContext, surfacesRaw);
@@ -563,16 +568,16 @@ BOOST_FIXTURE_TEST_CASE(SurfaceArrayCreator_completeBinning,
   std::vector<const Surface*> brlRaw = unpack_shared_vector(brl);
   draw_surfaces(brl, "SurfaceArrayCreator_completeBinning_BRL.obj");
 
-  Axis<AxisType::Equidistant, AxisBoundaryType::Closed> phiAxis(-M_PI, M_PI,
-                                                                30u);
+  Axis<AxisType::Equidistant, AxisBoundaryType::Closed> phiAxis(
+      -std::numbers::pi, std::numbers::pi, 30u);
   Axis<AxisType::Equidistant, AxisBoundaryType::Bound> zAxis(-14, 14, 7u);
 
   double R = 10.;
   auto globalToLocal = [](const Vector3& pos) {
-    return Vector2(phi(pos) + 2 * M_PI / 30 / 2, pos.z());
+    return Vector2(phi(pos) + 2 * std::numbers::pi / 30 / 2, pos.z());
   };
   auto localToGlobal = [R](const Vector2& loc) {
-    double phi = loc[0] - 2 * M_PI / 30 / 2;
+    double phi = loc[0] - 2 * std::numbers::pi / 30 / 2;
     return Vector3(R * std::cos(phi), R * std::sin(phi), loc[1]);
   };
 
@@ -600,7 +605,7 @@ BOOST_FIXTURE_TEST_CASE(SurfaceArrayCreator_completeBinning,
 
 BOOST_FIXTURE_TEST_CASE(SurfaceArrayCreator_barrelStagger,
                         SurfaceArrayCreatorFixture) {
-  auto barrel = makeBarrelStagger(30, 7, 0, M_PI / 9.);
+  auto barrel = makeBarrelStagger(30, 7, 0, std::numbers::pi / 9.);
   auto brl = barrel.first;
   std::vector<const Surface*> brlRaw = unpack_shared_vector(brl);
   draw_surfaces(brl, "SurfaceArrayCreator_barrelStagger.obj");
@@ -696,7 +701,7 @@ BOOST_FIXTURE_TEST_CASE(SurfaceArrayCreator_barrelStagger,
     for (const auto& edge : axes.at(0)->getBinEdges()) {
       BOOST_TEST_INFO("phi edge index " << i);
       auto phiEdge = phiEdgesExp.at(i);
-      CHECK_CLOSE_ABS(edge, phiEdge, 1e-5 * M_PI);
+      CHECK_CLOSE_ABS(edge, phiEdge, 1e-5 * std::numbers::pi);
       i++;
     }
     i = 0;
diff --git a/Tests/UnitTests/Core/Geometry/SurfaceBinningMatcherTests.cpp b/Tests/UnitTests/Core/Geometry/SurfaceBinningMatcherTests.cpp
index efd2da5e8b6..6a3c92aa8a3 100644
--- a/Tests/UnitTests/Core/Geometry/SurfaceBinningMatcherTests.cpp
+++ b/Tests/UnitTests/Core/Geometry/SurfaceBinningMatcherTests.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2017-2018 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include <boost/test/unit_test.hpp>
 
@@ -18,6 +18,7 @@
 
 #include <cmath>
 #include <memory>
+#include <numbers>
 #include <vector>
 
 #include <boost/format.hpp>
@@ -37,20 +38,22 @@ BOOST_AUTO_TEST_CASE(PlaneSurfaceMatcher) {
 
   double phiTol = 0.1;
 
-  auto oneBounds = std::make_shared<RadialBounds>(rMin, rMax, M_PI / 16, 0.);
+  auto oneBounds =
+      std::make_shared<RadialBounds>(rMin, rMax, std::numbers::pi / 16., 0.);
   auto oneSurface = Surface::makeShared<DiscSurface>(identity, oneBounds);
 
-  auto otherBounds =
-      std::make_shared<RadialBounds>(2 * rMax, 4 * rMax, M_PI / 16, 0.5 * M_PI);
+  auto otherBounds = std::make_shared<RadialBounds>(
+      2 * rMax, 4 * rMax, std::numbers::pi / 16., std::numbers::pi / 2.);
   auto otherSurface = Surface::makeShared<DiscSurface>(identity, otherBounds);
 
   auto similarRbounds = std::make_shared<RadialBounds>(
-      rMin - 0.5 * rMinTol, rMax + 0.5 * rMaxTol, M_PI / 16, 0.5 * M_PI);
+      rMin - 0.5 * rMinTol, rMax + 0.5 * rMaxTol, std::numbers::pi / 1.,
+      std::numbers::pi / 2.);
   auto similarRSurface =
       Surface::makeShared<DiscSurface>(identity, similarRbounds);
 
-  auto similarPhiBounds =
-      std::make_shared<RadialBounds>(0.25 * rMin, 0.5 * rMin, M_PI / 16, 0.);
+  auto similarPhiBounds = std::make_shared<RadialBounds>(
+      0.25 * rMin, 0.5 * rMin, std::numbers::pi / 16., 0.);
   auto similarPhiSurface =
       Surface::makeShared<DiscSurface>(identity, similarPhiBounds);
 
diff --git a/Tests/UnitTests/Core/Geometry/TrackingGeometryClosureTests.cpp b/Tests/UnitTests/Core/Geometry/TrackingGeometryClosureTests.cpp
index daed16a2987..8c60e3898b9 100644
--- a/Tests/UnitTests/Core/Geometry/TrackingGeometryClosureTests.cpp
+++ b/Tests/UnitTests/Core/Geometry/TrackingGeometryClosureTests.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2017-2018 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include <boost/test/unit_test.hpp>
 
diff --git a/Tests/UnitTests/Core/Geometry/TrackingGeometryCreationTests.cpp b/Tests/UnitTests/Core/Geometry/TrackingGeometryCreationTests.cpp
index 46af559ff1a..6bd139bb82d 100644
--- a/Tests/UnitTests/Core/Geometry/TrackingGeometryCreationTests.cpp
+++ b/Tests/UnitTests/Core/Geometry/TrackingGeometryCreationTests.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2017-2018 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include <boost/test/unit_test.hpp>
 
diff --git a/Tests/UnitTests/Core/Geometry/TrackingGeometryGeometryIdTests.cpp b/Tests/UnitTests/Core/Geometry/TrackingGeometryGeometryIdTests.cpp
index a12b70d2ffb..d1d7e8da025 100644
--- a/Tests/UnitTests/Core/Geometry/TrackingGeometryGeometryIdTests.cpp
+++ b/Tests/UnitTests/Core/Geometry/TrackingGeometryGeometryIdTests.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2017-2018 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include <boost/test/unit_test.hpp>
 
diff --git a/Tests/UnitTests/Core/Geometry/TrackingVolumeCreation.hpp b/Tests/UnitTests/Core/Geometry/TrackingVolumeCreation.hpp
index 58a7b30380a..d895f74ccab 100644
--- a/Tests/UnitTests/Core/Geometry/TrackingVolumeCreation.hpp
+++ b/Tests/UnitTests/Core/Geometry/TrackingVolumeCreation.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2016-2018 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
diff --git a/Tests/UnitTests/Core/Geometry/TrackingVolumeTests.cpp b/Tests/UnitTests/Core/Geometry/TrackingVolumeTests.cpp
index 992762bb657..d6d9bb6dd0f 100644
--- a/Tests/UnitTests/Core/Geometry/TrackingVolumeTests.cpp
+++ b/Tests/UnitTests/Core/Geometry/TrackingVolumeTests.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2019 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include <boost/test/unit_test.hpp>
 
diff --git a/Tests/UnitTests/Core/Geometry/TrapezoidVolumeBoundsTests.cpp b/Tests/UnitTests/Core/Geometry/TrapezoidVolumeBoundsTests.cpp
index cb10d347428..a6bd725bd3d 100644
--- a/Tests/UnitTests/Core/Geometry/TrapezoidVolumeBoundsTests.cpp
+++ b/Tests/UnitTests/Core/Geometry/TrapezoidVolumeBoundsTests.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2019-2020 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include <boost/test/unit_test.hpp>
 
@@ -20,6 +20,7 @@
 
 #include <cmath>
 #include <memory>
+#include <numbers>
 #include <utility>
 #include <vector>
 
@@ -44,7 +45,7 @@ BOOST_AUTO_TEST_CASE(bounding_box_creation) {
   CHECK_CLOSE_ABS(bb.max(), Vector3(10, 38, 24), tol);
   CHECK_CLOSE_ABS(bb.min(), Vector3(-10, 22, 16), tol);
 
-  trf = AngleAxis3(M_PI / 2., Vector3(-2, 4, 5).normalized());
+  trf = AngleAxis3(std::numbers::pi / 2., Vector3(-2, 4, 5).normalized());
 
   bb = tvb.boundingBox(&trf);
   CHECK_CLOSE_ABS(bb.max(), Vector3(9.32577, 11.4906, 11.5777), tol);
diff --git a/Tests/UnitTests/Core/Geometry/VolumeBoundsTests.cpp b/Tests/UnitTests/Core/Geometry/VolumeBoundsTests.cpp
index 6f25d8caed1..8a04bfd2a17 100644
--- a/Tests/UnitTests/Core/Geometry/VolumeBoundsTests.cpp
+++ b/Tests/UnitTests/Core/Geometry/VolumeBoundsTests.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2019-2020 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include <boost/test/unit_test.hpp>
 
diff --git a/Tests/UnitTests/Core/Geometry/VolumeTests.cpp b/Tests/UnitTests/Core/Geometry/VolumeTests.cpp
index 93d86595b12..599870f1a12 100644
--- a/Tests/UnitTests/Core/Geometry/VolumeTests.cpp
+++ b/Tests/UnitTests/Core/Geometry/VolumeTests.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2020 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include <boost/test/unit_test.hpp>
 
diff --git a/Tests/UnitTests/Core/MagneticField/ConstantBFieldTests.cpp b/Tests/UnitTests/Core/MagneticField/ConstantBFieldTests.cpp
index 4548cb94933..f6d8486e054 100644
--- a/Tests/UnitTests/Core/MagneticField/ConstantBFieldTests.cpp
+++ b/Tests/UnitTests/Core/MagneticField/ConstantBFieldTests.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2017-2018 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include <boost/test/data/test_case.hpp>
 #include <boost/test/unit_test.hpp>
diff --git a/Tests/UnitTests/Core/MagneticField/InterpolatedBFieldMapTests.cpp b/Tests/UnitTests/Core/MagneticField/InterpolatedBFieldMapTests.cpp
index 46d1caec469..1671aa7a429 100644
--- a/Tests/UnitTests/Core/MagneticField/InterpolatedBFieldMapTests.cpp
+++ b/Tests/UnitTests/Core/MagneticField/InterpolatedBFieldMapTests.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2017-2018 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include <boost/test/unit_test.hpp>
 
diff --git a/Tests/UnitTests/Core/MagneticField/MagneticFieldProviderTests.cpp b/Tests/UnitTests/Core/MagneticField/MagneticFieldProviderTests.cpp
index a57275d08b7..dd8e5b4d274 100644
--- a/Tests/UnitTests/Core/MagneticField/MagneticFieldProviderTests.cpp
+++ b/Tests/UnitTests/Core/MagneticField/MagneticFieldProviderTests.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2017-2018 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include <boost/test/unit_test.hpp>
 
diff --git a/Tests/UnitTests/Core/MagneticField/SolenoidBFieldTests.cpp b/Tests/UnitTests/Core/MagneticField/SolenoidBFieldTests.cpp
index 22f727e6231..885e9ee59ec 100644
--- a/Tests/UnitTests/Core/MagneticField/SolenoidBFieldTests.cpp
+++ b/Tests/UnitTests/Core/MagneticField/SolenoidBFieldTests.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2017-2018 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include <boost/test/unit_test.hpp>
 
diff --git a/Tests/UnitTests/Core/Material/AccumulatedMaterialSlabTests.cpp b/Tests/UnitTests/Core/Material/AccumulatedMaterialSlabTests.cpp
index f9e0c4ad759..34f9fe76f16 100644
--- a/Tests/UnitTests/Core/Material/AccumulatedMaterialSlabTests.cpp
+++ b/Tests/UnitTests/Core/Material/AccumulatedMaterialSlabTests.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2017-2020 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include <boost/test/unit_test.hpp>
 
@@ -35,7 +35,7 @@ BOOST_AUTO_TEST_CASE(Nothing) {
   AccumulatedMaterialSlab a;
   auto [average, trackCount] = a.totalAverage();
   // material is vacuum
-  BOOST_CHECK(!(average));
+  BOOST_CHECK(!average.isValid());
   BOOST_CHECK_EQUAL(trackCount, 0u);
 }
 
@@ -46,7 +46,7 @@ BOOST_AUTO_TEST_CASE(EmptyTracksIgnored) {
   a.trackAverage();
   a.trackAverage();
   auto [average, trackCount] = a.totalAverage();
-  BOOST_CHECK(!(average));
+  BOOST_CHECK(!average.isValid());
   BOOST_CHECK_EQUAL(trackCount, 0u);
 }
 
@@ -57,7 +57,7 @@ BOOST_AUTO_TEST_CASE(EmptyTracks) {
   a.trackAverage(true);
   a.trackAverage(true);
   auto [average, trackCount] = a.totalAverage();
-  BOOST_CHECK(!(average));
+  BOOST_CHECK(!average.isValid());
   BOOST_CHECK_EQUAL(trackCount, 3u);
 }
 
diff --git a/Tests/UnitTests/Core/Material/AccumulatedSurfaceMaterialTests.cpp b/Tests/UnitTests/Core/Material/AccumulatedSurfaceMaterialTests.cpp
index edb601fe5ad..9eb412a344d 100644
--- a/Tests/UnitTests/Core/Material/AccumulatedSurfaceMaterialTests.cpp
+++ b/Tests/UnitTests/Core/Material/AccumulatedSurfaceMaterialTests.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2017-2018 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include <boost/test/unit_test.hpp>
 
diff --git a/Tests/UnitTests/Core/Material/AccumulatedVolumeMaterialTests.cpp b/Tests/UnitTests/Core/Material/AccumulatedVolumeMaterialTests.cpp
index 10fdced1c15..8cac0b95277 100644
--- a/Tests/UnitTests/Core/Material/AccumulatedVolumeMaterialTests.cpp
+++ b/Tests/UnitTests/Core/Material/AccumulatedVolumeMaterialTests.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2019 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include <boost/test/unit_test.hpp>
 
@@ -23,11 +23,11 @@ BOOST_AUTO_TEST_CASE(vacuum) {
   AccumulatedVolumeMaterial avm;
 
   // averaging over nothing is vacuum
-  BOOST_CHECK(!avm.average());
+  BOOST_CHECK(!avm.average().isValid());
 
   // averaging over vacuum is still vacuum
   avm.accumulate(MaterialSlab(1));
-  BOOST_CHECK(!avm.average());
+  BOOST_CHECK(!avm.average().isValid());
 }
 
 BOOST_AUTO_TEST_CASE(single_material) {
diff --git a/Tests/UnitTests/Core/Material/AverageMaterialsTests.cpp b/Tests/UnitTests/Core/Material/AverageMaterialsTests.cpp
index 599c7f739c4..ee8a40d9ff3 100644
--- a/Tests/UnitTests/Core/Material/AverageMaterialsTests.cpp
+++ b/Tests/UnitTests/Core/Material/AverageMaterialsTests.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2020 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include <boost/test/unit_test.hpp>
 
@@ -41,7 +41,8 @@ BOOST_AUTO_TEST_CASE(CombineSlabsVacuum) {
   // vacuum with zero thickness
   {
     auto slab = combineSlabs(zeroVacuum, zeroVacuum);
-    BOOST_CHECK(!slab.material());
+    BOOST_CHECK(!slab.isValid());
+    BOOST_CHECK(!slab.material().isValid());
     BOOST_CHECK_EQUAL(slab.thickness(), 0.0f);
     BOOST_CHECK_EQUAL(slab.thicknessInX0(), 0.0f);
     BOOST_CHECK_EQUAL(slab.thicknessInL0(), 0.0f);
@@ -49,7 +50,8 @@ BOOST_AUTO_TEST_CASE(CombineSlabsVacuum) {
   // vacuum with unit thickness
   {
     auto slab = combineSlabs(unitVacuum, unitVacuum);
-    BOOST_CHECK(!slab.material());
+    BOOST_CHECK(!slab.isValid());
+    BOOST_CHECK(!slab.material().isValid());
     BOOST_CHECK_EQUAL(slab.thickness(), 2.0f);
     BOOST_CHECK_EQUAL(slab.thicknessInX0(), 0.0f);
     BOOST_CHECK_EQUAL(slab.thicknessInL0(), 0.0f);
@@ -59,8 +61,9 @@ BOOST_AUTO_TEST_CASE(CombineSlabsVacuum) {
 BOOST_AUTO_TEST_CASE(CombineSlabsPercent) {
   auto slab = combineSlabs(percent, percent);
   // combining two identical slabs must give the same average material
-  BOOST_CHECK(slab.material());
-  BOOST_CHECK_EQUAL(slab.material(), percent);
+  BOOST_CHECK(slab.isValid());
+  BOOST_CHECK(slab.material().isValid());
+  BOOST_CHECK_EQUAL(slab.material(), percent.material());
   // thickness-like properties must double
   BOOST_CHECK_EQUAL(slab.thickness(), 2 * percent.thickness());
   BOOST_CHECK_EQUAL(slab.thicknessInX0(), 2 * percent.thicknessInX0());
@@ -70,8 +73,9 @@ BOOST_AUTO_TEST_CASE(CombineSlabsPercent) {
 BOOST_AUTO_TEST_CASE(CombineSlabsUnit) {
   auto slab = combineSlabs(unit, unit);
   // combining two identical slabs must give the same average material
-  BOOST_CHECK(slab.material());
-  BOOST_CHECK_EQUAL(slab.material(), unit);
+  BOOST_CHECK(slab.isValid());
+  BOOST_CHECK(slab.material().isValid());
+  BOOST_CHECK_EQUAL(slab.material(), unit.material());
   // thickness-like properties must double
   BOOST_CHECK_EQUAL(slab.thickness(), 2 * unit.thickness());
   BOOST_CHECK_EQUAL(slab.thicknessInX0(), 2 * unit.thicknessInX0());
@@ -83,8 +87,9 @@ BOOST_AUTO_TEST_CASE(CombineSlabsUnit) {
 BOOST_AUTO_TEST_CASE(CombineSlabsPercentZeroVacuum) {
   {
     auto slab = combineSlabs(percent, zeroVacuum);
-    BOOST_CHECK(slab.material());
-    BOOST_CHECK_EQUAL(slab.material(), percent);
+    BOOST_CHECK(slab.isValid());
+    BOOST_CHECK(slab.material().isValid());
+    BOOST_CHECK_EQUAL(slab.material(), percent.material());
     BOOST_CHECK_EQUAL(slab.thickness(), percent.thickness());
     BOOST_CHECK_EQUAL(slab.thicknessInX0(), percent.thicknessInX0());
     BOOST_CHECK_EQUAL(slab.thicknessInL0(), percent.thicknessInL0());
@@ -92,8 +97,9 @@ BOOST_AUTO_TEST_CASE(CombineSlabsPercentZeroVacuum) {
   // reverse input order
   {
     auto slab = combineSlabs(zeroVacuum, percent);
-    BOOST_CHECK(slab.material());
-    BOOST_CHECK_EQUAL(slab.material(), percent);
+    BOOST_CHECK(slab.isValid());
+    BOOST_CHECK(slab.material().isValid());
+    BOOST_CHECK_EQUAL(slab.material(), percent.material());
     BOOST_CHECK_EQUAL(slab.thickness(), percent.thickness());
     BOOST_CHECK_EQUAL(slab.thicknessInX0(), percent.thicknessInX0());
     BOOST_CHECK_EQUAL(slab.thicknessInL0(), percent.thicknessInL0());
@@ -103,8 +109,9 @@ BOOST_AUTO_TEST_CASE(CombineSlabsPercentZeroVacuum) {
 BOOST_AUTO_TEST_CASE(CombineSlabsUnitZeroVacuum) {
   {
     auto slab = combineSlabs(unit, zeroVacuum);
-    BOOST_CHECK(slab.material());
-    BOOST_CHECK_EQUAL(slab.material(), unit);
+    BOOST_CHECK(slab.isValid());
+    BOOST_CHECK(slab.material().isValid());
+    BOOST_CHECK_EQUAL(slab.material(), unit.material());
     BOOST_CHECK_EQUAL(slab.thickness(), unit.thickness());
     BOOST_CHECK_EQUAL(slab.thicknessInX0(), unit.thicknessInX0());
     BOOST_CHECK_EQUAL(slab.thicknessInL0(), unit.thicknessInL0());
@@ -112,8 +119,9 @@ BOOST_AUTO_TEST_CASE(CombineSlabsUnitZeroVacuum) {
   // reverse input order
   {
     auto slab = combineSlabs(zeroVacuum, unit);
-    BOOST_CHECK(slab.material());
-    BOOST_CHECK_EQUAL(slab.material(), unit);
+    BOOST_CHECK(slab.isValid());
+    BOOST_CHECK(slab.material().isValid());
+    BOOST_CHECK_EQUAL(slab.material(), unit.material());
     BOOST_CHECK_EQUAL(slab.thickness(), unit.thickness());
     BOOST_CHECK_EQUAL(slab.thicknessInX0(), unit.thicknessInX0());
     BOOST_CHECK_EQUAL(slab.thicknessInL0(), unit.thicknessInL0());
@@ -126,8 +134,9 @@ BOOST_AUTO_TEST_CASE(CombineSlabsPercentUnit) {
   // the two slabs have the same material -> average should be identical
   {
     auto slab = combineSlabs(percent, unit);
-    BOOST_CHECK(slab.material());
-    BOOST_CHECK_EQUAL(slab.material(), percent);
+    BOOST_CHECK(slab.isValid());
+    BOOST_CHECK(slab.material().isValid());
+    BOOST_CHECK_EQUAL(slab.material(), percent.material());
     BOOST_CHECK_EQUAL(slab.thickness(), percent.thickness() + unit.thickness());
     BOOST_CHECK_EQUAL(slab.thicknessInX0(),
                       percent.thicknessInX0() + unit.thicknessInX0());
@@ -137,8 +146,9 @@ BOOST_AUTO_TEST_CASE(CombineSlabsPercentUnit) {
   // reverse input order
   {
     auto slab = combineSlabs(unit, percent);
-    BOOST_CHECK(slab.material());
-    BOOST_CHECK_EQUAL(slab.material(), unit);
+    BOOST_CHECK(slab.isValid());
+    BOOST_CHECK(slab.material().isValid());
+    BOOST_CHECK_EQUAL(slab.material(), unit.material());
     BOOST_CHECK_EQUAL(slab.thickness(), unit.thickness() + percent.thickness());
     BOOST_CHECK_EQUAL(slab.thicknessInX0(),
                       percent.thicknessInX0() + unit.thicknessInX0());
@@ -153,8 +163,9 @@ BOOST_AUTO_TEST_CASE(CombineSlabsUnitZero) {
   // the two slabs have the same material -> average should be identical
   {
     auto slab = combineSlabs(unit, zero);
-    BOOST_CHECK(slab.material());
-    BOOST_CHECK_EQUAL(slab.material(), unit);
+    BOOST_CHECK(slab.isValid());
+    BOOST_CHECK(slab.material().isValid());
+    BOOST_CHECK_EQUAL(slab.material(), unit.material());
     BOOST_CHECK_EQUAL(slab.thickness(), unit.thickness());
     BOOST_CHECK_EQUAL(slab.thicknessInX0(), unit.thicknessInX0());
     BOOST_CHECK_EQUAL(slab.thicknessInL0(), unit.thicknessInL0());
@@ -162,8 +173,9 @@ BOOST_AUTO_TEST_CASE(CombineSlabsUnitZero) {
   // reverse input order
   {
     auto slab = combineSlabs(zero, unit);
-    BOOST_CHECK(slab.material());
-    BOOST_CHECK_EQUAL(slab.material(), unit);
+    BOOST_CHECK(slab.isValid());
+    BOOST_CHECK(slab.material().isValid());
+    BOOST_CHECK_EQUAL(slab.material(), unit.material());
     BOOST_CHECK_EQUAL(slab.thickness(), unit.thickness());
     BOOST_CHECK_EQUAL(slab.thicknessInX0(), unit.thicknessInX0());
     BOOST_CHECK_EQUAL(slab.thicknessInL0(), unit.thicknessInL0());
@@ -178,10 +190,11 @@ BOOST_AUTO_TEST_CASE(CombineSlabsEqualThicknessVacuum) {
   const auto slabVac = Acts::MaterialSlab(Acts::Material(), 1.0f);
   {
     auto slab = combineSlabs(slabMat, slabVac);
+    BOOST_CHECK(slab.isValid());
+    BOOST_CHECK(slab.material().isValid());
     BOOST_CHECK_EQUAL(slab.thickness(), 2.0f);
     BOOST_CHECK_EQUAL(slab.thicknessInX0(), slabMat.thicknessInX0());
     BOOST_CHECK_EQUAL(slab.thicknessInL0(), slabMat.thicknessInL0());
-    BOOST_CHECK(slab.material());
     // atomic mass and nuclear charge are per atom, adding any amount vacuum
     // does not change the average atom properties only their density
     BOOST_CHECK_EQUAL(slab.material().Ar(), mat.Ar());
@@ -196,7 +209,8 @@ BOOST_AUTO_TEST_CASE(CombineSlabsEqualThicknessVacuum) {
   // reverse input order
   {
     auto slab = combineSlabs(slabVac, slabMat);
-    BOOST_CHECK(slab.material());
+    BOOST_CHECK(slab.isValid());
+    BOOST_CHECK(slab.material().isValid());
     BOOST_CHECK_EQUAL(slab.thickness(), 2.0f);
     BOOST_CHECK_EQUAL(slab.thicknessInX0(), slabMat.thicknessInX0());
     BOOST_CHECK_EQUAL(slab.thicknessInL0(), slabMat.thicknessInL0());
@@ -222,16 +236,21 @@ BOOST_AUTO_TEST_CASE(CombineSlabs) {
   const auto slabMat1 = Acts::MaterialSlab(mat1, 1.0f);
   // verify derived quantities for the input slabs. these tests are not really
   // needed, but to show the input values for the tests below.
+  BOOST_CHECK(slabMat0.isValid());
+  BOOST_CHECK(slabMat0.material().isValid());
   BOOST_CHECK_EQUAL(slabMat0.thickness(), 0.5f);
   BOOST_CHECK_EQUAL(slabMat0.thicknessInX0(), 0.5f);
   BOOST_CHECK_EQUAL(slabMat0.thicknessInL0(), 0.5f);
+  BOOST_CHECK(slabMat1.isValid());
+  BOOST_CHECK(slabMat1.material().isValid());
   BOOST_CHECK_EQUAL(slabMat1.thickness(), 1.0f);
   BOOST_CHECK_EQUAL(slabMat1.thicknessInX0(), 0.5f);
   BOOST_CHECK_EQUAL(slabMat1.thicknessInL0(), 0.5f);
   // check combined slabs
   {
     auto slab = combineSlabs(slabMat0, slabMat1);
-    BOOST_CHECK(slab.material());
+    BOOST_CHECK(slab.isValid());
+    BOOST_CHECK(slab.material().isValid());
     BOOST_CHECK_EQUAL(slab.thickness(), 1.5f);
     BOOST_CHECK_EQUAL(slab.thicknessInX0(), 1.0f);
     BOOST_CHECK_EQUAL(slab.thicknessInL0(), 1.0f);
@@ -246,7 +265,8 @@ BOOST_AUTO_TEST_CASE(CombineSlabs) {
   // reverse input order
   {
     auto slab = combineSlabs(slabMat0, slabMat1);
-    BOOST_CHECK(slab.material());
+    BOOST_CHECK(slab.isValid());
+    BOOST_CHECK(slab.material().isValid());
     BOOST_CHECK_EQUAL(slab.thickness(), 1.5f);
     BOOST_CHECK_EQUAL(slab.thicknessInX0(), 1.0f);
     BOOST_CHECK_EQUAL(slab.thicknessInL0(), 1.0f);
diff --git a/Tests/UnitTests/Core/Material/BinnedSurfaceMaterialAccumulaterTests.cpp b/Tests/UnitTests/Core/Material/BinnedSurfaceMaterialAccumulaterTests.cpp
index f4aea23e2dc..a249d22ba4b 100644
--- a/Tests/UnitTests/Core/Material/BinnedSurfaceMaterialAccumulaterTests.cpp
+++ b/Tests/UnitTests/Core/Material/BinnedSurfaceMaterialAccumulaterTests.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2024 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include <boost/test/unit_test.hpp>
 
@@ -22,6 +22,7 @@
 #include "Acts/Utilities/BinUtility.hpp"
 #include "Acts/Utilities/Logger.hpp"
 
+#include <numbers>
 #include <tuple>
 #include <utility>
 #include <vector>
@@ -85,7 +86,8 @@ BOOST_AUTO_TEST_CASE(AccumulationTest) {
       std::make_shared<HomogeneousSurfaceMaterial>(mp, 1.));
 
   // Second surface is binned Phi / Z
-  BinUtility sb1(4, -M_PI, M_PI, closed, BinningValue::binPhi);
+  BinUtility sb1(4, -std::numbers::pi, std::numbers::pi, closed,
+                 BinningValue::binPhi);
   sb1 += BinUtility(2, -100., 100., open, BinningValue::binZ);
   surfaces[1u]->assignSurfaceMaterial(
       std::make_shared<ProtoSurfaceMaterial>(sb1));
diff --git a/Tests/UnitTests/Core/Material/BinnedSurfaceMaterialTests.cpp b/Tests/UnitTests/Core/Material/BinnedSurfaceMaterialTests.cpp
index 7cd38d324b4..f9c2d26df40 100644
--- a/Tests/UnitTests/Core/Material/BinnedSurfaceMaterialTests.cpp
+++ b/Tests/UnitTests/Core/Material/BinnedSurfaceMaterialTests.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2017-2018 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include <boost/test/unit_test.hpp>
 
diff --git a/Tests/UnitTests/Core/Material/GridSurfaceMaterialTests.cpp b/Tests/UnitTests/Core/Material/GridSurfaceMaterialTests.cpp
index 910f6c9960f..fbce80b8d5e 100644
--- a/Tests/UnitTests/Core/Material/GridSurfaceMaterialTests.cpp
+++ b/Tests/UnitTests/Core/Material/GridSurfaceMaterialTests.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2024 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include <boost/test/unit_test.hpp>
 
@@ -14,6 +14,7 @@
 #include "Acts/Utilities/GridAxisGenerators.hpp"
 #include "Acts/Utilities/VectorHelpers.hpp"
 
+#include <numbers>
 #include <vector>
 
 // this is a global access to the x coordinate
@@ -152,7 +153,7 @@ BOOST_AUTO_TEST_CASE(GridIndexedMaterial1D) {
   const Acts::MaterialSlab& mg4 = ism.materialSlab(g4);
 
   BOOST_CHECK_EQUAL(mg0.material().X0(), 1.);
-  BOOST_CHECK(!mg1.material());
+  BOOST_CHECK(!mg1.material().isValid());
   BOOST_CHECK_EQUAL(mg2.material().X0(), 11.);
   BOOST_CHECK_EQUAL(mg3.material().X0(), 11.);
   BOOST_CHECK_EQUAL(mg4.material().X0(), 21.);
@@ -171,7 +172,7 @@ BOOST_AUTO_TEST_CASE(GridIndexedMaterial1D) {
   const Acts::MaterialSlab& ml4 = ism.materialSlab(l4);
 
   BOOST_CHECK_EQUAL(ml0.material().X0(), 1.);
-  BOOST_CHECK(!ml1.material());
+  BOOST_CHECK(!ml1.material().isValid());
   BOOST_CHECK_EQUAL(ml2.material().X0(), 11.);
   BOOST_CHECK_EQUAL(ml3.material().X0(), 11.);
   BOOST_CHECK_EQUAL(ml4.material().X0(), 21.);
@@ -185,7 +186,7 @@ BOOST_AUTO_TEST_CASE(GridIndexedMaterial1D) {
   const Acts::MaterialSlab& sml4 = ism.materialSlab(l4);
 
   BOOST_CHECK_EQUAL(sml0.thickness(), 2.);
-  BOOST_CHECK(!sml1.material());
+  BOOST_CHECK(!sml1.material().isValid());
   BOOST_CHECK_EQUAL(sml2.thickness(), 4.);
   BOOST_CHECK_EQUAL(sml3.thickness(), 4.);
   BOOST_CHECK_EQUAL(sml4.thickness(), 6.);
@@ -206,18 +207,20 @@ BOOST_AUTO_TEST_CASE(GridIndexedMaterial2D) {
   using EqEqGrid = EqBoundEqClosed::grid_type<std::size_t>;
   using Point = EqEqGrid::point_t;
 
-  EqBoundEqClosed eqeqBound{{-1., 1.}, 2, {-M_PI, M_PI}, 4};
+  EqBoundEqClosed eqeqBound{
+      {-1., 1.}, 2, {-std::numbers::pi, std::numbers::pi}, 4};
   EqEqGrid eqeqGrid{eqeqBound()};
 
-  eqeqGrid.atPosition(Point{-0.5, -M_PI * 0.75}) = 1u;  // material 1
-  eqeqGrid.atPosition(Point{-0.5, -M_PI * 0.25}) = 1u;  // material 1
-  eqeqGrid.atPosition(Point{-0.5, M_PI * 0.25}) = 0u;   // vacuum
-  eqeqGrid.atPosition(Point{-0.5, M_PI * 0.75}) = 2u;   // material 2
+  eqeqGrid.atPosition(Point{-0.5, -std::numbers::pi * 0.75}) =
+      1u;                                                          // material 1
+  eqeqGrid.atPosition(Point{-0.5, -std::numbers::pi / 4.}) = 1u;   // material 1
+  eqeqGrid.atPosition(Point{-0.5, std::numbers::pi / 4.}) = 0u;    // vacuum
+  eqeqGrid.atPosition(Point{-0.5, std::numbers::pi * 0.75}) = 2u;  // material 2
 
-  eqeqGrid.atPosition(Point{0.5, -M_PI * 0.75}) = 0u;  // vacuum
-  eqeqGrid.atPosition(Point{0.5, -M_PI * 0.25}) = 3u;  // material 3
-  eqeqGrid.atPosition(Point{0.5, M_PI * 0.25}) = 3u;   // material 3
-  eqeqGrid.atPosition(Point{0.5, M_PI * 0.75}) = 0u;   // vacuum
+  eqeqGrid.atPosition(Point{0.5, -std::numbers::pi * 0.75}) = 0u;  // vacuum
+  eqeqGrid.atPosition(Point{0.5, -std::numbers::pi / 4.}) = 3u;    // material 3
+  eqeqGrid.atPosition(Point{0.5, std::numbers::pi / 4.}) = 3u;     // material 3
+  eqeqGrid.atPosition(Point{0.5, std::numbers::pi * 0.75}) = 0u;   // vacuum
 
   // With radius 20
   auto boundToGrid = std::make_unique<const LocalToZPhi>(20.);
@@ -245,7 +248,7 @@ BOOST_AUTO_TEST_CASE(GridIndexedMaterial2D) {
 
   Acts::Vector3 g2(0.5, 0.5, -10.5);
   const Acts::MaterialSlab& mg2 = ism.materialSlab(g2);
-  BOOST_CHECK(!mg2.material());  // vacuum
+  BOOST_CHECK(!mg2.material().isValid());  // vacuum
 
   Acts::Vector3 g3(0.5, 0.5,
                    -9.5);  // should be material 3, same phi but different z
@@ -306,7 +309,7 @@ BOOST_AUTO_TEST_CASE(GridGloballyIndexedMaterialNonShared) {
   const Acts::MaterialSlab& ml4 = ism.materialSlab(l4);
 
   BOOST_CHECK_EQUAL(ml0.material().X0(), 1.);
-  BOOST_CHECK(!ml1.material());
+  BOOST_CHECK(!ml1.material().isValid());
   BOOST_CHECK_EQUAL(ml2.material().X0(), 11.);
   BOOST_CHECK_EQUAL(ml3.material().X0(), 11.);
   BOOST_CHECK_EQUAL(ml4.material().X0(), 21.);
diff --git a/Tests/UnitTests/Core/Material/HomogeneousSurfaceMaterialTests.cpp b/Tests/UnitTests/Core/Material/HomogeneousSurfaceMaterialTests.cpp
index aa31a88f46c..7c310b7c11a 100644
--- a/Tests/UnitTests/Core/Material/HomogeneousSurfaceMaterialTests.cpp
+++ b/Tests/UnitTests/Core/Material/HomogeneousSurfaceMaterialTests.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2017-2018 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include <boost/test/unit_test.hpp>
 
diff --git a/Tests/UnitTests/Core/Material/HomogeneousVolumeMaterialTests.cpp b/Tests/UnitTests/Core/Material/HomogeneousVolumeMaterialTests.cpp
index 09fac3c8e54..c71c3f99eb4 100644
--- a/Tests/UnitTests/Core/Material/HomogeneousVolumeMaterialTests.cpp
+++ b/Tests/UnitTests/Core/Material/HomogeneousVolumeMaterialTests.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2017-2018 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include <boost/test/unit_test.hpp>
 
diff --git a/Tests/UnitTests/Core/Material/ISurfaceMaterialTests.cpp b/Tests/UnitTests/Core/Material/ISurfaceMaterialTests.cpp
index 24bb823db74..067e460b71f 100644
--- a/Tests/UnitTests/Core/Material/ISurfaceMaterialTests.cpp
+++ b/Tests/UnitTests/Core/Material/ISurfaceMaterialTests.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2022 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include <boost/test/unit_test.hpp>
 
diff --git a/Tests/UnitTests/Core/Material/InteractionsTests.cpp b/Tests/UnitTests/Core/Material/InteractionsTests.cpp
index 80134c43f30..4dd45ec8606 100644
--- a/Tests/UnitTests/Core/Material/InteractionsTests.cpp
+++ b/Tests/UnitTests/Core/Material/InteractionsTests.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2019 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include <boost/test/data/test_case.hpp>
 #include <boost/test/unit_test.hpp>
diff --git a/Tests/UnitTests/Core/Material/InterpolatedMaterialMapTests.cpp b/Tests/UnitTests/Core/Material/InterpolatedMaterialMapTests.cpp
index f75bd1e5176..10933ccfa0c 100644
--- a/Tests/UnitTests/Core/Material/InterpolatedMaterialMapTests.cpp
+++ b/Tests/UnitTests/Core/Material/InterpolatedMaterialMapTests.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2019 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include <boost/test/unit_test.hpp>
 
@@ -57,8 +57,7 @@ BOOST_AUTO_TEST_CASE(InterpolatedMaterialMap_MaterialCell_test) {
   BOOST_CHECK_EQUAL(materialCell.isInside(Vector3(0., 0., 2.)), true);
 
   // Test the getter
-  CHECK_CLOSE_REL(materialCell.getMaterial({0.5, 0.5, 0.5}), Material(mat),
-                  1e-4);
+  BOOST_CHECK_EQUAL(materialCell.getMaterial({0.5, 0.5, 0.5}), Material(mat));
 }
 
 BOOST_AUTO_TEST_CASE(InterpolatedMaterialMap_MaterialMapper_test) {
@@ -77,12 +76,12 @@ BOOST_AUTO_TEST_CASE(InterpolatedMaterialMap_MaterialMapper_test) {
   MaterialMapper<grid_t> matMap(trafoGlobalToLocal, grid);
 
   // Test Material getter
-  CHECK_CLOSE_REL(matMap.getMaterial({0.5, 0.5, 0.5}), Material(mat), 1e-4);
+  BOOST_CHECK_EQUAL(matMap.getMaterial({0.5, 0.5, 0.5}), Material(mat));
 
   // Test the MaterialCell getter
   MaterialMapper<grid_t>::MaterialCell matCell =
       matMap.getMaterialCell({0.5, 0.5, 0.5});
-  CHECK_CLOSE_REL(matCell.getMaterial({0.5, 0.5, 0.5}), Material(mat), 1e-4);
+  BOOST_CHECK_EQUAL(matCell.getMaterial({0.5, 0.5, 0.5}), Material(mat));
 
   // Test the number of bins getter
   std::vector<std::size_t> nBins = matMap.getNBins();
@@ -137,7 +136,7 @@ BOOST_AUTO_TEST_CASE(InterpolatedMaterialMap_test) {
   InterpolatedMaterialMap ipolMatMap(std::move(matMap));
 
   // Test the material getter
-  CHECK_CLOSE_REL(ipolMatMap.material({0.5, 0.5, 0.5}), Material(mat), 1e-4);
+  BOOST_CHECK_EQUAL(ipolMatMap.material({0.5, 0.5, 0.5}), Material(mat));
 
   // Test the material getter with a cache
   // Build a material cell
@@ -151,8 +150,8 @@ BOOST_AUTO_TEST_CASE(InterpolatedMaterialMap_test) {
   InterpolatedMaterialMap<MaterialMapper<grid_t>>::Cache cache;
   cache.matCell = materialCell;
   cache.initialized = true;
-  CHECK_CLOSE_REL(ipolMatMap.getMaterial(Vector3(0.5, 0.5, 0.5), cache),
-                  Material(mat), 1e-4);
+  BOOST_CHECK_EQUAL(ipolMatMap.getMaterial(Vector3(0.5, 0.5, 0.5), cache),
+                    Material(mat));
 
   // Test the inside check
   BOOST_CHECK_EQUAL(ipolMatMap.isInside(Vector3(1., 1., 1.)), true);
diff --git a/Tests/UnitTests/Core/Material/IntersectionMaterialAssignerTests.cpp b/Tests/UnitTests/Core/Material/IntersectionMaterialAssignerTests.cpp
index 42a15a860f8..83606b85ff0 100644
--- a/Tests/UnitTests/Core/Material/IntersectionMaterialAssignerTests.cpp
+++ b/Tests/UnitTests/Core/Material/IntersectionMaterialAssignerTests.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2019 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include <boost/test/unit_test.hpp>
 
diff --git a/Tests/UnitTests/Core/Material/MaterialCompositionTests.cpp b/Tests/UnitTests/Core/Material/MaterialCompositionTests.cpp
index ce924a82f6d..86cdd83e3bf 100644
--- a/Tests/UnitTests/Core/Material/MaterialCompositionTests.cpp
+++ b/Tests/UnitTests/Core/Material/MaterialCompositionTests.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2017-2018 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include <boost/test/unit_test.hpp>
 
diff --git a/Tests/UnitTests/Core/Material/MaterialGridHelperTests.cpp b/Tests/UnitTests/Core/Material/MaterialGridHelperTests.cpp
index 2eebf107fc9..1c76cf866f7 100644
--- a/Tests/UnitTests/Core/Material/MaterialGridHelperTests.cpp
+++ b/Tests/UnitTests/Core/Material/MaterialGridHelperTests.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2019 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include <boost/test/unit_test.hpp>
 
@@ -23,6 +23,7 @@
 #include <cmath>
 #include <functional>
 #include <memory>
+#include <numbers>
 #include <utility>
 #include <vector>
 
@@ -60,10 +61,8 @@ BOOST_AUTO_TEST_CASE(Square_Grid_test) {
   BOOST_CHECK_EQUAL(Grid.minPosition()[0], bd[0].min);
   BOOST_CHECK_EQUAL(Grid.minPosition()[1], bd[1].min);
 
-  float max1 =
-      bd[0].max + std::fabs(bd[0].max - bd[0].min) / (bd[0].bins() - 1);
-  float max2 =
-      bd[1].max + std::fabs(bd[1].max - bd[1].min) / (bd[1].bins() - 1);
+  float max1 = bd[0].max + std::abs(bd[0].max - bd[0].min) / (bd[0].bins() - 1);
+  float max2 = bd[1].max + std::abs(bd[1].max - bd[1].min) / (bd[1].bins() - 1);
 
   BOOST_CHECK_EQUAL(Grid.maxPosition()[0], max1);
   BOOST_CHECK_EQUAL(Grid.maxPosition()[1], max2);
@@ -131,7 +130,8 @@ BOOST_AUTO_TEST_CASE(Square_Grid_test) {
 /// with a 2D grid
 BOOST_AUTO_TEST_CASE(PhiZ_Grid_test) {
   BinUtility bu(2, -2., 2., open, BinningValue::binZ);
-  bu += BinUtility(3, -M_PI, M_PI, closed, BinningValue::binPhi);
+  bu += BinUtility(3, -std::numbers::pi, std::numbers::pi, closed,
+                   BinningValue::binPhi);
   auto bd = bu.binningData();
   std::function<Acts::Vector2(Acts::Vector3)> transfoGlobalToLocal;
 
@@ -152,10 +152,8 @@ BOOST_AUTO_TEST_CASE(PhiZ_Grid_test) {
   BOOST_CHECK_EQUAL(Grid.minPosition()[0], bd[0].min);
   BOOST_CHECK_EQUAL(Grid.minPosition()[1], bd[1].min);
 
-  float max1 =
-      bd[0].max + std::fabs(bd[0].max - bd[0].min) / (bd[0].bins() - 1);
-  float max2 =
-      bd[1].max + std::fabs(bd[1].max - bd[1].min) / (bd[1].bins() - 1);
+  float max1 = bd[0].max + std::abs(bd[0].max - bd[0].min) / (bd[0].bins() - 1);
+  float max2 = bd[1].max + std::abs(bd[1].max - bd[1].min) / (bd[1].bins() - 1);
 
   BOOST_CHECK_EQUAL(Grid.maxPosition()[0], max1);
   BOOST_CHECK_EQUAL(Grid.maxPosition()[1], max2);
@@ -244,12 +242,9 @@ BOOST_AUTO_TEST_CASE(Cubic_Grid_test) {
   BOOST_CHECK_EQUAL(Grid.minPosition()[1], bd[1].min);
   BOOST_CHECK_EQUAL(Grid.minPosition()[2], bd[2].min);
 
-  float max1 =
-      bd[0].max + std::fabs(bd[0].max - bd[0].min) / (bd[0].bins() - 1);
-  float max2 =
-      bd[1].max + std::fabs(bd[1].max - bd[1].min) / (bd[1].bins() - 1);
-  float max3 =
-      bd[2].max + std::fabs(bd[2].max - bd[2].min) / (bd[2].bins() - 1);
+  float max1 = bd[0].max + std::abs(bd[0].max - bd[0].min) / (bd[0].bins() - 1);
+  float max2 = bd[1].max + std::abs(bd[1].max - bd[1].min) / (bd[1].bins() - 1);
+  float max3 = bd[2].max + std::abs(bd[2].max - bd[2].min) / (bd[2].bins() - 1);
 
   BOOST_CHECK_EQUAL(Grid.maxPosition()[0], max1);
   BOOST_CHECK_EQUAL(Grid.maxPosition()[1], max2);
@@ -316,7 +311,8 @@ BOOST_AUTO_TEST_CASE(Cubic_Grid_test) {
 /// @brief Various test for the Material in the case of a Cylindrical volume
 BOOST_AUTO_TEST_CASE(Cylindrical_Grid_test) {
   BinUtility bu(4, 1., 4., open, BinningValue::binR);
-  bu += BinUtility(3, -M_PI, M_PI, closed, BinningValue::binPhi);
+  bu += BinUtility(3, -std::numbers::pi, std::numbers::pi, closed,
+                   BinningValue::binPhi);
   bu += BinUtility(2, -2., 2., open, BinningValue::binZ);
   auto bd = bu.binningData();
   std::function<Acts::Vector3(Acts::Vector3)> transfoGlobalToLocal;
@@ -341,12 +337,9 @@ BOOST_AUTO_TEST_CASE(Cylindrical_Grid_test) {
   BOOST_CHECK_EQUAL(Grid.minPosition()[1], bd[1].min);
   BOOST_CHECK_EQUAL(Grid.minPosition()[2], bd[2].min);
 
-  float max1 =
-      bd[0].max + std::fabs(bd[0].max - bd[0].min) / (bd[0].bins() - 1);
-  float max2 =
-      bd[1].max + std::fabs(bd[1].max - bd[1].min) / (bd[1].bins() - 1);
-  float max3 =
-      bd[2].max + std::fabs(bd[2].max - bd[2].min) / (bd[2].bins() - 1);
+  float max1 = bd[0].max + std::abs(bd[0].max - bd[0].min) / (bd[0].bins() - 1);
+  float max2 = bd[1].max + std::abs(bd[1].max - bd[1].min) / (bd[1].bins() - 1);
+  float max3 = bd[2].max + std::abs(bd[2].max - bd[2].min) / (bd[2].bins() - 1);
 
   BOOST_CHECK_EQUAL(Grid.maxPosition()[0], max1);
   BOOST_CHECK_EQUAL(Grid.maxPosition()[1], max2);
diff --git a/Tests/UnitTests/Core/Material/MaterialInteractionAssignmentTests.cpp b/Tests/UnitTests/Core/Material/MaterialInteractionAssignmentTests.cpp
index 5d6101cd3be..34771c759ec 100644
--- a/Tests/UnitTests/Core/Material/MaterialInteractionAssignmentTests.cpp
+++ b/Tests/UnitTests/Core/Material/MaterialInteractionAssignmentTests.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2019 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include <boost/test/unit_test.hpp>
 
diff --git a/Tests/UnitTests/Core/Material/MaterialMapperTests.cpp b/Tests/UnitTests/Core/Material/MaterialMapperTests.cpp
index ae279cfbc55..9fca8bb64b7 100644
--- a/Tests/UnitTests/Core/Material/MaterialMapperTests.cpp
+++ b/Tests/UnitTests/Core/Material/MaterialMapperTests.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2024 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include <boost/test/unit_test.hpp>
 
diff --git a/Tests/UnitTests/Core/Material/MaterialSlabTests.cpp b/Tests/UnitTests/Core/Material/MaterialSlabTests.cpp
index f997e3b08dc..3dfab084a2b 100644
--- a/Tests/UnitTests/Core/Material/MaterialSlabTests.cpp
+++ b/Tests/UnitTests/Core/Material/MaterialSlabTests.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2017-2018 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include <boost/test/unit_test.hpp>
 
diff --git a/Tests/UnitTests/Core/Material/MaterialTests.cpp b/Tests/UnitTests/Core/Material/MaterialTests.cpp
index 2df7c8c6183..8e2e7736449 100644
--- a/Tests/UnitTests/Core/Material/MaterialTests.cpp
+++ b/Tests/UnitTests/Core/Material/MaterialTests.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2017-2018 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include <boost/test/data/test_case.hpp>
 #include <boost/test/unit_test.hpp>
@@ -30,13 +30,13 @@ BOOST_AUTO_TEST_SUITE(Material)
 BOOST_AUTO_TEST_CASE(ConstructVacuum) {
   // default constructor builds invalid material a.k.a. vacuum
   Acts::Material vacuum;
-  BOOST_CHECK(!vacuum);
+  BOOST_CHECK(!vacuum.isValid());
 }
 
 BOOST_AUTO_TEST_CASE(ConstructSomething) {
   // anything with non-zero Ar is a valid material
   auto notVacuum = Acts::Material::fromMolarDensity(1, 2, 3, 4, 5);
-  BOOST_CHECK(!!notVacuum);
+  BOOST_CHECK(notVacuum.isValid());
 }
 
 BOOST_AUTO_TEST_CASE(Units) {
diff --git a/Tests/UnitTests/Core/Material/MaterialValidaterTests.cpp b/Tests/UnitTests/Core/Material/MaterialValidaterTests.cpp
index fd13f594fd3..7a8004f1b65 100644
--- a/Tests/UnitTests/Core/Material/MaterialValidaterTests.cpp
+++ b/Tests/UnitTests/Core/Material/MaterialValidaterTests.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2024 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include <boost/test/unit_test.hpp>
 
@@ -22,6 +22,7 @@
 #include "Acts/Tests/CommonHelpers/FloatComparisons.hpp"
 
 #include <limits>
+#include <numbers>
 
 namespace Acts::Test {
 
@@ -125,7 +126,7 @@ BOOST_AUTO_TEST_CASE(MaterialValidaterFlowTest) {
       tContext, MagneticFieldContext(), Vector3(0, 0, 0),
       Vector3(1, 0, 1).normalized());
 
-  ActsScalar pathCorrection = std::sqrt(2.);
+  ActsScalar pathCorrection = std::numbers::sqrt2;
   CHECK_CLOSE_ABS(rMaterial2.materialInX0,
                   pathCorrection * (2. / 21. + 4. / 41. + 6. / 61.), 1e-6);
   CHECK_CLOSE_ABS(rMaterial2.materialInL0,
diff --git a/Tests/UnitTests/Core/Material/PropagatorMaterialAssignerTests.cpp b/Tests/UnitTests/Core/Material/PropagatorMaterialAssignerTests.cpp
index 9f33c2d62b1..ac58f82c595 100644
--- a/Tests/UnitTests/Core/Material/PropagatorMaterialAssignerTests.cpp
+++ b/Tests/UnitTests/Core/Material/PropagatorMaterialAssignerTests.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2019 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include <boost/test/unit_test.hpp>
 
diff --git a/Tests/UnitTests/Core/Material/ProtoSurfaceMaterialTests.cpp b/Tests/UnitTests/Core/Material/ProtoSurfaceMaterialTests.cpp
index a5b28beee03..195ef30b81d 100644
--- a/Tests/UnitTests/Core/Material/ProtoSurfaceMaterialTests.cpp
+++ b/Tests/UnitTests/Core/Material/ProtoSurfaceMaterialTests.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2018 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include <boost/test/unit_test.hpp>
 
diff --git a/Tests/UnitTests/Core/Material/ProtoVolumeMaterialTests.cpp b/Tests/UnitTests/Core/Material/ProtoVolumeMaterialTests.cpp
index a3ebc0e527a..f5cc2c90953 100644
--- a/Tests/UnitTests/Core/Material/ProtoVolumeMaterialTests.cpp
+++ b/Tests/UnitTests/Core/Material/ProtoVolumeMaterialTests.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2018 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include <boost/test/unit_test.hpp>
 
diff --git a/Tests/UnitTests/Core/Material/SurfaceMaterialMapperTests.cpp b/Tests/UnitTests/Core/Material/SurfaceMaterialMapperTests.cpp
index 661463fcb11..6d7b94fecde 100644
--- a/Tests/UnitTests/Core/Material/SurfaceMaterialMapperTests.cpp
+++ b/Tests/UnitTests/Core/Material/SurfaceMaterialMapperTests.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2017-2018 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include <boost/test/unit_test.hpp>
 
diff --git a/Tests/UnitTests/Core/Material/VolumeMaterialMapperTests.cpp b/Tests/UnitTests/Core/Material/VolumeMaterialMapperTests.cpp
index 98c10e33767..ffe731cb6ca 100644
--- a/Tests/UnitTests/Core/Material/VolumeMaterialMapperTests.cpp
+++ b/Tests/UnitTests/Core/Material/VolumeMaterialMapperTests.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2019 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include <boost/test/unit_test.hpp>
 
@@ -26,8 +26,7 @@
 #include "Acts/Material/MaterialSlab.hpp"
 #include "Acts/Material/ProtoVolumeMaterial.hpp"
 #include "Acts/Material/VolumeMaterialMapper.hpp"
-#include "Acts/Propagator/AbortList.hpp"
-#include "Acts/Propagator/ActionList.hpp"
+#include "Acts/Propagator/ActorList.hpp"
 #include "Acts/Propagator/Navigator.hpp"
 #include "Acts/Propagator/Propagator.hpp"
 #include "Acts/Propagator/StandardAborters.hpp"
@@ -60,9 +59,9 @@ struct MaterialCollector {
 
   template <typename propagator_state_t, typename stepper_t,
             typename navigator_t>
-  void operator()(propagator_state_t& state, const stepper_t& stepper,
-                  const navigator_t& navigator, result_type& result,
-                  const Logger& /*logger*/) const {
+  void act(propagator_state_t& state, const stepper_t& stepper,
+           const navigator_t& navigator, result_type& result,
+           const Logger& /*logger*/) const {
     if (navigator.currentVolume(state.navigation) != nullptr) {
       auto position = stepper.position(state.stepping);
       result.matTrue.push_back(
@@ -267,7 +266,7 @@ BOOST_AUTO_TEST_CASE(VolumeMaterialMapper_comparison_tests) {
   MagneticFieldContext mc;
   // Launch propagation and gather result
   using PropagatorOptions = Propagator<StraightLineStepper, Navigator>::Options<
-      ActionList<MaterialCollector>, AbortList<EndOfWorldReached>>;
+      ActorList<MaterialCollector, EndOfWorldReached>>;
   PropagatorOptions po(gc, mc);
   po.stepping.maxStepSize = 1._mm;
   po.maxSteps = 1e6;
@@ -280,7 +279,8 @@ BOOST_AUTO_TEST_CASE(VolumeMaterialMapper_comparison_tests) {
   std::vector<Material> matvector;
   double gridX0 = 0., gridL0 = 0., trueX0 = 0., trueL0 = 0.;
   for (unsigned int i = 0; i < stepResult.position.size(); i++) {
-    matvector.push_back(matGrid.atPosition(stepResult.position[i]));
+    matvector.push_back(
+        Acts::Material{matGrid.atPosition(stepResult.position[i])});
     gridX0 += 1 / matvector[i].X0();
     gridL0 += 1 / matvector[i].L0();
     trueX0 += 1 / stepResult.matTrue[i].X0();
diff --git a/Tests/UnitTests/Core/Navigation/CMakeLists.txt b/Tests/UnitTests/Core/Navigation/CMakeLists.txt
index 69ebc582396..a18c2d34c9c 100644
--- a/Tests/UnitTests/Core/Navigation/CMakeLists.txt
+++ b/Tests/UnitTests/Core/Navigation/CMakeLists.txt
@@ -1,6 +1,8 @@
 add_unittest(PortalNavigation PortalNavigationTests.cpp)
 add_unittest(DetectorVolumeFinders DetectorVolumeFindersTests.cpp)
 add_unittest(NavigationState NavigationStateTests.cpp)
+add_unittest(NavigationStream NavigationStreamTests.cpp)
 add_unittest(NavigationStateUpdaters NavigationStateUpdatersTests.cpp)
 add_unittest(DetectorNavigator DetectorNavigatorTests.cpp)
 add_unittest(MultiWireNavigation MultiWireNavigationTests.cpp)
+add_unittest(NavigationPolicy NavigationPolicyTests.cpp)
diff --git a/Tests/UnitTests/Core/Navigation/DetectorNavigatorTests.cpp b/Tests/UnitTests/Core/Navigation/DetectorNavigatorTests.cpp
index 2ad242c1acc..2dc5bbacdbd 100644
--- a/Tests/UnitTests/Core/Navigation/DetectorNavigatorTests.cpp
+++ b/Tests/UnitTests/Core/Navigation/DetectorNavigatorTests.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2023 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include <boost/test/unit_test.hpp>
 
@@ -23,8 +23,7 @@
 #include "Acts/Navigation/DetectorNavigator.hpp"
 #include "Acts/Navigation/DetectorVolumeFinders.hpp"
 #include "Acts/Navigation/InternalNavigation.hpp"
-#include "Acts/Propagator/AbortList.hpp"
-#include "Acts/Propagator/ActionList.hpp"
+#include "Acts/Propagator/ActorList.hpp"
 #include "Acts/Propagator/Propagator.hpp"
 #include "Acts/Propagator/StraightLineStepper.hpp"
 #include "Acts/Surfaces/CylinderSurface.hpp"
@@ -48,9 +47,9 @@ struct StateRecorder {
 
   template <typename propagator_state_t, typename stepper_t,
             typename navigator_t>
-  void operator()(propagator_state_t& state, const stepper_t& /*stepper*/,
-                  const navigator_t& /*navigator*/, result_type& result,
-                  const Acts::Logger& /*logger*/) const {
+  void act(propagator_state_t& state, const stepper_t& /*stepper*/,
+           const navigator_t& /*navigator*/, result_type& result,
+           const Acts::Logger& /*logger*/) const {
     result.push_back(state.navigation);
   }
 };
@@ -72,9 +71,8 @@ BOOST_AUTO_TEST_CASE(DetectorNavigatorTestsInitialization) {
   using Stepper = Acts::StraightLineStepper;
   using Navigator = Acts::Experimental::DetectorNavigator;
   using Propagator = Acts::Propagator<Stepper, Navigator>;
-  using ActionList = Acts::ActionList<>;
-  using AbortList = Acts::AbortList<>;
-  using PropagatorOptions = Propagator::Options<ActionList, AbortList>;
+  using ActorList = Acts::ActorList<>;
+  using PropagatorOptions = Propagator::Options<ActorList>;
 
   PropagatorOptions options(geoContext, mfContext);
 
@@ -268,9 +266,8 @@ BOOST_AUTO_TEST_CASE(DetectorNavigatorTestsForwardBackward) {
   using Stepper = Acts::StraightLineStepper;
   using Navigator = Acts::Experimental::DetectorNavigator;
   using Propagator = Acts::Propagator<Stepper, Navigator>;
-  using ActionList = Acts::ActionList<StateRecorder>;
-  using AbortList = Acts::AbortList<Acts::EndOfWorldReached>;
-  using PropagatorOptions = Propagator::Options<ActionList, AbortList>;
+  using ActorList = Acts::ActorList<StateRecorder, Acts::EndOfWorldReached>;
+  using PropagatorOptions = Propagator::Options<ActorList>;
 
   Navigator::Config navCfg;
   navCfg.detector = detector.get();
@@ -429,9 +426,8 @@ BOOST_AUTO_TEST_CASE(DetectorNavigatorTestsAmbiguity) {
   using Stepper = Acts::StraightLineStepper;
   using Navigator = Acts::Experimental::DetectorNavigator;
   using Propagator = Acts::Propagator<Stepper, Navigator>;
-  using ActionList = Acts::ActionList<StateRecorder>;
-  using AbortList = Acts::AbortList<Acts::EndOfWorldReached>;
-  using PropagatorOptions = Propagator::Options<ActionList, AbortList>;
+  using ActorList = Acts::ActorList<StateRecorder, Acts::EndOfWorldReached>;
+  using PropagatorOptions = Propagator::Options<ActorList>;
 
   Navigator::Config navCfg;
   navCfg.detector = detector.get();
@@ -545,9 +541,8 @@ BOOST_AUTO_TEST_CASE(DetectorNavigatorTestsMultipleIntersection) {
   using Stepper = Acts::StraightLineStepper;
   using Navigator = Acts::Experimental::DetectorNavigator;
   using Propagator = Acts::Propagator<Stepper, Navigator>;
-  using ActionList = Acts::ActionList<StateRecorder>;
-  using AbortList = Acts::AbortList<Acts::EndOfWorldReached>;
-  using PropagatorOptions = Propagator::Options<ActionList, AbortList>;
+  using ActorList = Acts::ActorList<StateRecorder, Acts::EndOfWorldReached>;
+  using PropagatorOptions = Propagator::Options<ActorList>;
 
   Navigator::Config navCfg;
   navCfg.detector = detector.get();
diff --git a/Tests/UnitTests/Core/Navigation/DetectorVolumeFindersTests.cpp b/Tests/UnitTests/Core/Navigation/DetectorVolumeFindersTests.cpp
index 959aae85be8..6c9efd3949c 100644
--- a/Tests/UnitTests/Core/Navigation/DetectorVolumeFindersTests.cpp
+++ b/Tests/UnitTests/Core/Navigation/DetectorVolumeFindersTests.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2022 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include <boost/test/unit_test.hpp>
 
diff --git a/Tests/UnitTests/Core/Navigation/MultiWireNavigationTests.cpp b/Tests/UnitTests/Core/Navigation/MultiWireNavigationTests.cpp
index 56d163b08a7..3d5f11261da 100644
--- a/Tests/UnitTests/Core/Navigation/MultiWireNavigationTests.cpp
+++ b/Tests/UnitTests/Core/Navigation/MultiWireNavigationTests.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2022-2023 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include <boost/test/unit_test.hpp>
 
diff --git a/Tests/UnitTests/Core/Navigation/NavigationPolicyTests.cpp b/Tests/UnitTests/Core/Navigation/NavigationPolicyTests.cpp
new file mode 100644
index 00000000000..181e1ad2a1f
--- /dev/null
+++ b/Tests/UnitTests/Core/Navigation/NavigationPolicyTests.cpp
@@ -0,0 +1,240 @@
+// This file is part of the ACTS project.
+//
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
+//
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
+
+#include <boost/test/unit_test.hpp>
+
+#include "Acts/Definitions/Units.hpp"
+#include "Acts/Geometry/CylinderVolumeBounds.hpp"
+#include "Acts/Geometry/NavigationPolicyFactory.hpp"
+#include "Acts/Geometry/TrackingVolume.hpp"
+#include "Acts/Navigation/INavigationPolicy.hpp"
+#include "Acts/Navigation/MultiNavigationPolicy.hpp"
+#include "Acts/Navigation/NavigationDelegate.hpp"
+#include "Acts/Navigation/NavigationStream.hpp"
+#include "Acts/Navigation/TryAllNavigationPolicy.hpp"
+
+using namespace Acts;
+using namespace Acts::UnitLiterals;
+
+BOOST_AUTO_TEST_SUITE(NavigationPolicyTests)
+
+GeometryContext gctx;
+auto logger = getDefaultLogger("NavigationPolicyTests", Logging::VERBOSE);
+
+struct APolicy : public INavigationPolicy {
+  APolicy(const GeometryContext& /*gctx*/, const TrackingVolume& /*volume*/,
+          const Logger& /*logger*/) {}
+
+  void initializeCandidates(const NavigationArguments& /*unused*/,
+                            AppendOnlyNavigationStream& /*unused*/,
+                            const Logger& /*unused*/) const {
+    const_cast<APolicy*>(this)->executed = true;
+  }
+
+  void connect(NavigationDelegate& delegate) const override {
+    connectDefault<APolicy>(delegate);
+  }
+
+  bool executed = false;
+};
+
+struct BPolicy : public INavigationPolicy {
+  struct Config {
+    int value;
+  };
+
+  BPolicy(const GeometryContext& /*gctx*/, const TrackingVolume& /*volume*/,
+          const Logger& /*logger*/, Config config)
+      : m_config(config) {}
+
+  void connect(NavigationDelegate& delegate) const override {
+    connectDefault<BPolicy>(delegate);
+  }
+
+  void initializeCandidates(const NavigationArguments& /*unused*/,
+                            AppendOnlyNavigationStream& /*unused*/,
+                            const Logger& /*unused*/) const {
+    const_cast<BPolicy*>(this)->executed = true;
+    const_cast<BPolicy*>(this)->value = m_config.value;
+  }
+
+  bool executed = false;
+  int value = 0;
+
+  Config m_config;
+};
+
+BOOST_AUTO_TEST_CASE(DirectTest) {
+  TrackingVolume volume{
+      Transform3::Identity(),
+      std::make_shared<CylinderVolumeBounds>(250_mm, 400_mm, 310_mm),
+      "PixelLayer3"};
+
+  MultiNavigationPolicy policy{APolicy{gctx, volume, *logger},
+                               BPolicy{gctx, volume, *logger, {.value = 4242}}};
+
+  NavigationDelegate delegate;
+  policy.connect(delegate);
+
+  NavigationStream main;
+  AppendOnlyNavigationStream stream{main};
+  delegate(NavigationArguments{.position = Vector3::Zero(),
+                               .direction = Vector3::Zero()},
+           stream, *logger);
+
+  BOOST_CHECK(std::get<APolicy>(policy.policies()).executed);
+  BOOST_CHECK(std::get<BPolicy>(policy.policies()).executed);
+  BOOST_CHECK_EQUAL(std::get<BPolicy>(policy.policies()).value, 4242);
+}
+
+BOOST_AUTO_TEST_CASE(FactoryTest) {
+  TrackingVolume volume{
+      Transform3::Identity(),
+      std::make_shared<CylinderVolumeBounds>(250_mm, 400_mm, 310_mm),
+      "PixelLayer3"};
+
+  BPolicy::Config config{.value = 42};
+
+  std::function<std::unique_ptr<INavigationPolicy>(
+      const GeometryContext&, const TrackingVolume&, const Logger&)>
+      factory = NavigationPolicyFactory::make()
+                    .add<APolicy>()         // no arguments
+                    .add<BPolicy>(config);  // config struct as argument
+
+  auto policyBase = factory(gctx, volume, *logger);
+  auto policyBase2 = factory(gctx, volume, *logger);
+
+  auto& policy =
+      dynamic_cast<MultiNavigationPolicy<APolicy, BPolicy>&>(*policyBase);
+
+  NavigationDelegate delegate;
+  policy.connect(delegate);
+
+  NavigationStream main;
+  AppendOnlyNavigationStream stream{main};
+  delegate(NavigationArguments{.position = Vector3::Zero(),
+                               .direction = Vector3::Zero()},
+           stream, *logger);
+
+  BOOST_CHECK(std::get<APolicy>(policy.policies()).executed);
+  BOOST_CHECK(std::get<BPolicy>(policy.policies()).executed);
+  BOOST_CHECK_EQUAL(std::get<BPolicy>(policy.policies()).value, 42);
+
+  auto& policy2 =
+      dynamic_cast<MultiNavigationPolicy<APolicy, BPolicy>&>(*policyBase2);
+
+  NavigationDelegate delegate2;
+  policyBase2->connect(delegate2);
+
+  delegate2(NavigationArguments{.position = Vector3::Zero(),
+                                .direction = Vector3::Zero()},
+            stream, *logger);
+
+  BOOST_CHECK(std::get<APolicy>(policy2.policies()).executed);
+  BOOST_CHECK(std::get<BPolicy>(policy2.policies()).executed);
+  BOOST_CHECK_EQUAL(std::get<BPolicy>(policy2.policies()).value, 42);
+}
+
+BOOST_AUTO_TEST_CASE(AsUniquePtrTest) {
+  TrackingVolume volume{
+      Transform3::Identity(),
+      std::make_shared<CylinderVolumeBounds>(250_mm, 400_mm, 310_mm),
+      "PixelLayer3"};
+
+  std::unique_ptr<NavigationPolicyFactory> factory =
+      NavigationPolicyFactory::make().add<APolicy>().asUniquePtr();
+
+  auto policyBase = factory->build(gctx, volume, *logger);
+  auto& policy = dynamic_cast<MultiNavigationPolicy<APolicy>&>(*policyBase);
+
+  NavigationDelegate delegate;
+  policyBase->connect(delegate);
+
+  NavigationStream main;
+  AppendOnlyNavigationStream stream{main};
+  delegate(NavigationArguments{.position = Vector3::Zero(),
+                               .direction = Vector3::Zero()},
+           stream, *logger);
+
+  BOOST_CHECK(std::get<APolicy>(policy.policies()).executed);
+}
+
+struct CPolicy : public INavigationPolicy {};
+
+template <typename T>
+struct CPolicySpecialized : public CPolicy {
+  struct Config {
+    T value;
+  };
+
+  CPolicySpecialized(const TrackingVolume& /*volume*/, Config config)
+      : m_config(config) {}
+
+  void connect(NavigationDelegate& delegate) const override {
+    connectDefault<CPolicySpecialized<T>>(delegate);
+  }
+
+  void initializeCandidates(const NavigationArguments& /*unused*/,
+                            AppendOnlyNavigationStream& /*stream*/,
+                            const Logger& /*logger*/) const {
+    auto* self = const_cast<CPolicySpecialized<int>*>(this);
+    self->executed = true;
+    self->value = m_config.value;
+  }
+
+  bool executed = false;
+  int value = 0;
+
+  Config m_config;
+};
+
+struct IsolatedConfig {
+  int value;
+};
+
+auto makeCPolicy(const GeometryContext& /*gctx*/, const TrackingVolume& volume,
+                 const Logger& /*logger*/, IsolatedConfig config) {
+  // I can do arbitrary stuff here
+  CPolicySpecialized<int>::Config config2{.value = config.value};
+  return CPolicySpecialized<int>(volume, config2);
+}
+
+BOOST_AUTO_TEST_CASE(IsolatedFactory) {
+  TrackingVolume volume{
+      Transform3::Identity(),
+      std::make_shared<CylinderVolumeBounds>(250_mm, 400_mm, 310_mm),
+      "PixelLayer3"};
+
+  IsolatedConfig config{.value = 44};
+  auto factory =
+      NavigationPolicyFactory::make().add<APolicy>().add(makeCPolicy, config);
+
+  auto factory2 =
+      NavigationPolicyFactory::make().add(makeCPolicy, config).add<APolicy>();
+
+  auto policyBase = factory(gctx, volume, *logger);
+  auto& policy =
+      dynamic_cast<MultiNavigationPolicy<APolicy, CPolicySpecialized<int>>&>(
+          *policyBase);
+
+  NavigationDelegate delegate;
+  policyBase->connect(delegate);
+
+  NavigationStream main;
+  AppendOnlyNavigationStream stream{main};
+  delegate(NavigationArguments{.position = Vector3::Zero(),
+                               .direction = Vector3::Zero()},
+           stream, *logger);
+
+  BOOST_CHECK(std::get<APolicy>(policy.policies()).executed);
+  BOOST_CHECK(std::get<CPolicySpecialized<int>>(policy.policies()).executed);
+  BOOST_CHECK_EQUAL(std::get<CPolicySpecialized<int>>(policy.policies()).value,
+                    44);
+}
+
+BOOST_AUTO_TEST_SUITE_END()
diff --git a/Tests/UnitTests/Core/Navigation/NavigationStateTests.cpp b/Tests/UnitTests/Core/Navigation/NavigationStateTests.cpp
index e9f1f1b35aa..1ad61af8bfe 100644
--- a/Tests/UnitTests/Core/Navigation/NavigationStateTests.cpp
+++ b/Tests/UnitTests/Core/Navigation/NavigationStateTests.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2022 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include <boost/test/unit_test.hpp>
 
diff --git a/Tests/UnitTests/Core/Navigation/NavigationStateUpdatersTests.cpp b/Tests/UnitTests/Core/Navigation/NavigationStateUpdatersTests.cpp
index 3829fddb354..35157b26218 100644
--- a/Tests/UnitTests/Core/Navigation/NavigationStateUpdatersTests.cpp
+++ b/Tests/UnitTests/Core/Navigation/NavigationStateUpdatersTests.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2023-2024 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include <boost/test/unit_test.hpp>
 
diff --git a/Tests/UnitTests/Core/Navigation/NavigationStreamTests.cpp b/Tests/UnitTests/Core/Navigation/NavigationStreamTests.cpp
new file mode 100644
index 00000000000..9ca578b0aba
--- /dev/null
+++ b/Tests/UnitTests/Core/Navigation/NavigationStreamTests.cpp
@@ -0,0 +1,286 @@
+// This file is part of the ACTS project.
+//
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
+//
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
+
+#include <boost/test/unit_test.hpp>
+
+#include "Acts/Navigation/NavigationStream.hpp"
+#include "Acts/Surfaces/CylinderSurface.hpp"
+#include "Acts/Surfaces/PlaneSurface.hpp"
+#include "Acts/Surfaces/RectangleBounds.hpp"
+#include "Acts/Tests/CommonHelpers/FloatComparisons.hpp"
+
+namespace {
+
+// This creates a set of plane surfaces along the z axis
+std::vector<std::shared_ptr<Acts::Surface>> createPlaneSurfaces() {
+  auto rectangle = std::make_shared<Acts::RectangleBounds>(10., 10.);
+  // Surface A:
+  // This surface should not be reachable from (0.,0.,0.) position along z
+  Acts::Transform3 aTransform = Acts::Transform3::Identity();
+  aTransform.pretranslate(Acts::Vector3(0., 0., -20.));
+  auto surfaceA =
+      Acts::Surface::makeShared<Acts::PlaneSurface>(aTransform, rectangle);
+  // Surface B:
+  // This surface should not be reachable from (0.,0.,0.) position along z with
+  // boundary check
+  Acts::Transform3 bTransform = Acts::Transform3::Identity();
+  bTransform.pretranslate(Acts::Vector3(50., 50., 100.));
+  auto surfaceB =
+      Acts::Surface::makeShared<Acts::PlaneSurface>(bTransform, rectangle);
+  // Surface C:
+  Acts::Transform3 cTransform = Acts::Transform3::Identity();
+  cTransform.pretranslate(Acts::Vector3(0., 0., 200.));
+  auto surfaceC =
+      Acts::Surface::makeShared<Acts::PlaneSurface>(cTransform, rectangle);
+  // Surface D:
+  Acts::Transform3 dTransform = Acts::Transform3::Identity();
+  dTransform.pretranslate(Acts::Vector3(0., 0., 400.));
+  auto surfaceD =
+      Acts::Surface::makeShared<Acts::PlaneSurface>(dTransform, rectangle);
+
+  // Let's fill them shuffled
+  return {surfaceC, surfaceA, surfaceD, surfaceB};
+}
+
+// This creates a set of cylinder surfaces
+std::vector<std::shared_ptr<Acts::Surface>> createCylinders() {
+  // Surface A:
+  // A concentric cylinder with a radius of 10 and a half length of 20
+  Acts::Transform3 aTransform = Acts::Transform3::Identity();
+  auto surfaceA =
+      Acts::Surface::makeShared<Acts::CylinderSurface>(aTransform, 10., 20);
+
+  // Surface B:
+  // A  small cylinder sitting at 20, 20
+  Acts::Transform3 bTransform = Acts::Transform3::Identity();
+  bTransform.pretranslate(Acts::Vector3(20., 20., 0.));
+  auto surfaceB =
+      Acts::Surface::makeShared<Acts::CylinderSurface>(bTransform, 2., 10);
+
+  // Surface C:
+  // A concentric cylinder with a radius of 40 and a half length of 20
+  Acts::Transform3 cTransform = Acts::Transform3::Identity();
+  auto surfaceC =
+      Acts::Surface::makeShared<Acts::CylinderSurface>(cTransform, 40., 20);
+
+  // Surface C:
+  // A concentric, but shifted cylinder with a radius of 50 and a half length of
+  // 5
+  Acts::Transform3 dTransform = Acts::Transform3::Identity();
+  dTransform.pretranslate(Acts::Vector3(0., 0., 10.));
+  auto surfaceD =
+      Acts::Surface::makeShared<Acts::CylinderSurface>(dTransform, 50., 5.);
+
+  // Return in a shuffled order
+  return {surfaceC, surfaceB, surfaceA, surfaceD};
+}
+
+}  // namespace
+
+using namespace Acts;
+
+auto gContext = GeometryContext();
+
+BOOST_AUTO_TEST_SUITE(Navigation)
+
+BOOST_AUTO_TEST_CASE(NavigationStream_InitializePlanes) {
+  // Create the punch of surfaces
+  auto surfaces = createPlaneSurfaces();
+
+  NavigationStream nStreamTemplate;
+  for (const auto& surface : surfaces) {
+    nStreamTemplate.addSurfaceCandidate(*surface,
+                                        Acts::BoundaryTolerance::None());
+  }
+  BOOST_CHECK_EQUAL(nStreamTemplate.remainingCandidates(), 4u);
+
+  // (1) Run an initial update
+  // - from a position where all are reachable and valid
+  // - with infinite boundary tolerance
+  NavigationStream nStream = nStreamTemplate;
+  BOOST_CHECK(nStream.initialize(gContext,
+                                 {Vector3(0., 0., -30.), Vector3(0., 0., 1.)},
+                                 BoundaryTolerance::Infinite()));
+
+  BOOST_CHECK_EQUAL(nStream.remainingCandidates(), 4u);
+  BOOST_CHECK_EQUAL(&nStream.currentCandidate().surface(), surfaces[1u].get());
+
+  // (2) Run an initial update
+  // - from a position where all but one are reachable
+  // - with infinite boundary tolerance
+  nStream = nStreamTemplate;
+  BOOST_CHECK(nStream.initialize(gContext,
+                                 {Vector3(0., 0., 0.), Vector3(0., 0., 1.)},
+                                 BoundaryTolerance::Infinite()));
+  BOOST_CHECK_EQUAL(nStream.remainingCandidates(), 3u);
+  BOOST_CHECK_EQUAL(&nStream.currentCandidate().surface(), surfaces[3u].get());
+
+  // (3) Run an initial update
+  // - from a position where all would be reachable, but
+  // - with no boundary tolerance
+  nStream = nStreamTemplate;
+  BOOST_CHECK(nStream.initialize(gContext,
+                                 {Vector3(0., 0., -100.), Vector3(0., 0., 1.)},
+                                 BoundaryTolerance::None()));
+  BOOST_CHECK_EQUAL(nStream.remainingCandidates(), 3u);
+
+  // (4) Run an initial update
+  // - none of the surfaces should be reachable
+  nStream = nStreamTemplate;
+  BOOST_CHECK(!nStream.initialize(gContext,
+                                  {Vector3(0., 0., 0.), Vector3(1., 0., 0.)},
+                                  BoundaryTolerance::Infinite()));
+  BOOST_CHECK_EQUAL(nStream.remainingCandidates(), 0u);
+  BOOST_CHECK_THROW(nStream.currentCandidate(), std::out_of_range);
+
+  // (5) Test de-duplication
+  nStream = nStreamTemplate;
+  nStreamTemplate.addSurfaceCandidate(*surfaces.at(0),
+                                      Acts::BoundaryTolerance::None());
+  // One surface is duplicated in the stream
+  BOOST_CHECK_EQUAL(nStreamTemplate.remainingCandidates(), 5u);
+  // Initialize stream reaches all surfaces, but also de-duplicates
+  BOOST_CHECK(nStream.initialize(gContext,
+                                 {Vector3(0., 0., -100.), Vector3(0., 0., 1.)},
+                                 BoundaryTolerance::Infinite()));
+  BOOST_CHECK_EQUAL(nStream.remainingCandidates(), 4u);
+}
+
+BOOST_AUTO_TEST_CASE(NavigationStream_UpdatePlanes) {
+  // Create the punch of surfaces
+  auto surfaces = createPlaneSurfaces();
+
+  // Surfaces are filled with no boundary tolerance, we require them to be
+  // reachable and intersections inside bounds
+  NavigationStream nStreamTemplate;
+  for (const auto& surface : surfaces) {
+    nStreamTemplate.addSurfaceCandidate(*surface,
+                                        Acts::BoundaryTolerance::None());
+  }
+  BOOST_CHECK_EQUAL(nStreamTemplate.remainingCandidates(), 4u);
+
+  // Run an initial update
+  // - from a position where all are reachable and valid
+  // - with infinite boundary tolerance
+  NavigationStream::QueryPoint qPoint = {Vector3(0., 0., -30.),
+                                         Vector3(0., 0., 1.)};
+
+  NavigationStream nStream = nStreamTemplate;
+  BOOST_CHECK(
+      nStream.initialize(gContext, qPoint, BoundaryTolerance::Infinite()));
+  BOOST_CHECK_EQUAL(nStream.remainingCandidates(), 4u);
+  BOOST_CHECK_EQUAL(&nStream.currentCandidate().surface(), surfaces[1u].get());
+  CHECK_CLOSE_ABS(nStream.currentCandidate().pathLength(), 10.,
+                  std::numeric_limits<ActsScalar>::epsilon());
+
+  // Let's push a bit closer to the surface
+  qPoint.position = Vector3(0., 0., -22.);
+  BOOST_CHECK(nStream.update(gContext, qPoint));
+  // Surface unchanged, but the intersection should be closer
+  BOOST_CHECK_EQUAL(&nStream.currentCandidate().surface(), surfaces[1u].get());
+  CHECK_CLOSE_ABS(nStream.currentCandidate().pathLength(), 2.,
+                  std::numeric_limits<ActsScalar>::epsilon());
+
+  // Uuuups, an overstep
+  qPoint.position = Vector3(0., 0., -19.5);
+  BOOST_CHECK(nStream.update(gContext, qPoint));
+  // Surface still unchanged, but pathLength is now negative
+  BOOST_CHECK_EQUAL(&nStream.currentCandidate().surface(), surfaces[1u].get());
+  CHECK_CLOSE_ABS(nStream.currentCandidate().pathLength(), -0.5,
+                  std::numeric_limits<ActsScalar>::epsilon());
+
+  // Finally hit it
+  qPoint.position = Vector3(0., 0., -20.);
+  BOOST_CHECK(nStream.update(gContext, qPoint));
+  // Surface still unchanged, however, now withL
+  // - pathlength smaller on surface tolerance, intersection status onSurface
+  BOOST_CHECK_EQUAL(&nStream.currentCandidate().surface(), surfaces[1u].get());
+  CHECK_CLOSE_ABS(
+      nStream.currentCandidate().pathLength(), s_onSurfaceTolerance,
+      std::numeric_limits<ActsScalar>::epsilon() + s_onSurfaceTolerance);
+  BOOST_CHECK_EQUAL(nStream.currentCandidate().intersection.status(),
+                    IntersectionStatus::onSurface);
+  // Let's say the stepper confirms this
+  BOOST_CHECK(nStream.switchToNextCandidate());
+  // Surface is now surfaceB
+  BOOST_CHECK_EQUAL(&nStream.currentCandidate().surface(), surfaces[3u].get());
+  // Distance should be the initial estimate from the intialializeStream() call
+  CHECK_CLOSE_ABS(nStream.currentCandidate().pathLength(), 130.,
+                  std::numeric_limits<ActsScalar>::epsilon());
+  // Query update will re-evaluate this one: however, we will miss the surface
+  // due to outside bounds - and will switch to the next candidate: which sits
+  // at 200 and then will yield 220
+  BOOST_CHECK(nStream.update(gContext, qPoint));
+  CHECK_CLOSE_ABS(nStream.currentCandidate().pathLength(), 220.,
+                  std::numeric_limits<ActsScalar>::epsilon());
+  // Oh noooo, an actor just kicked in and changed the direction
+  qPoint.direction = Vector3(0., 1., 1.).normalized();
+  // All is lost, no surface is reachable anymore
+  BOOST_CHECK(!nStream.update(gContext, qPoint));
+}
+
+BOOST_AUTO_TEST_CASE(NavigationStream_InitializeCylinders) {
+  // Create the cylinder setup
+  auto surfaces = createCylinders();
+
+  // Let us fill the surfaces into the navigation stream
+  NavigationStream nStreamTemplate;
+  for (const auto& surface : surfaces) {
+    const Surface* pointer = surface.get();
+    nStreamTemplate.addSurfaceCandidates({&pointer, 1},
+                                         Acts::BoundaryTolerance::None());
+  }
+  BOOST_CHECK_EQUAL(nStreamTemplate.remainingCandidates(), 4u);
+
+  // (1) Run an initial update - from a position/direction where all are
+  // reachable
+  // - with infinite boundary tolerance
+  NavigationStream nStream = nStreamTemplate;
+  BOOST_CHECK(nStream.initialize(
+      gContext, {Vector3(0., 0., 0.), Vector3(1., 1., 0.).normalized()},
+      BoundaryTolerance::Infinite()));
+  // We should have 5 candidates, as one cylinder is reachable twice
+  BOOST_CHECK_EQUAL(nStream.remainingCandidates(), 5u);
+  // First one is inner candidate
+  BOOST_CHECK_EQUAL(&nStream.currentCandidate().surface(), surfaces[2].get());
+  // Surface of 2nd and 3rd candidate should be the same
+  BOOST_CHECK_EQUAL(&nStream.candidates()[1u].surface(), surfaces[1].get());
+  BOOST_CHECK_EQUAL(&nStream.candidates()[2u].surface(), surfaces[1].get());
+
+  // (2) Run an initial update - from a position/direction where only
+  // the concentric ones are reachable
+  // - with infinite boundary tolerance
+  nStream = nStreamTemplate;
+  BOOST_CHECK(nStream.initialize(gContext,
+                                 {Vector3(0., 0., 0.), Vector3(1., 0., 0.)},
+                                 BoundaryTolerance::Infinite()));
+  // We should have 3 candidates
+  BOOST_CHECK_EQUAL(nStream.remainingCandidates(), 3u);
+
+  // (3) Run an initial update - from a position/direction where only the
+  // concentric ones within bounds are reachable
+  nStream = nStreamTemplate;
+  BOOST_CHECK(nStream.initialize(gContext,
+                                 {Vector3(0., 0., 0.), Vector3(1., 0., 0.)},
+                                 BoundaryTolerance::None()));
+  // We should have 2 candidates
+  BOOST_CHECK_EQUAL(nStream.remainingCandidates(), 2u);
+
+  // (4) Run an initial update - from a position/direction where none are
+  // reachable
+  // - (even) with infinite boundary tolerance
+  nStream = nStreamTemplate;
+  BOOST_CHECK(!nStream.initialize(gContext,
+                                  {Vector3(0., 0., 0.), Vector3(0., 0., 1.)},
+                                  BoundaryTolerance::None()));
+  // We should have 0 candidates
+  BOOST_CHECK_EQUAL(nStream.remainingCandidates(), 0u);
+  BOOST_CHECK_THROW(nStream.currentCandidate(), std::out_of_range);
+}
+
+BOOST_AUTO_TEST_SUITE_END()
diff --git a/Tests/UnitTests/Core/Navigation/PortalNavigationTests.cpp b/Tests/UnitTests/Core/Navigation/PortalNavigationTests.cpp
index a379d72c4eb..baa81813e8d 100644
--- a/Tests/UnitTests/Core/Navigation/PortalNavigationTests.cpp
+++ b/Tests/UnitTests/Core/Navigation/PortalNavigationTests.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2022 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include <boost/test/unit_test.hpp>
 
diff --git a/Tests/UnitTests/Core/Propagator/AtlasStepperTests.cpp b/Tests/UnitTests/Core/Propagator/AtlasStepperTests.cpp
index 90860e0cc44..0a707c7f299 100644
--- a/Tests/UnitTests/Core/Propagator/AtlasStepperTests.cpp
+++ b/Tests/UnitTests/Core/Propagator/AtlasStepperTests.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2020 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include <boost/test/test_tools.hpp>
 #include <boost/test/unit_test.hpp>
@@ -27,6 +27,7 @@
 #include "Acts/Propagator/AtlasStepper.hpp"
 #include "Acts/Propagator/ConstrainedStep.hpp"
 #include "Acts/Surfaces/BoundaryTolerance.hpp"
+#include "Acts/Surfaces/CurvilinearSurface.hpp"
 #include "Acts/Surfaces/DiscSurface.hpp"
 #include "Acts/Surfaces/PerigeeSurface.hpp"
 #include "Acts/Surfaces/PlaneSurface.hpp"
@@ -183,7 +184,7 @@ BOOST_AUTO_TEST_CASE(UpdateFromBound) {
   auto newAbsMom = 0.9 * absMom;
 
   // example surface and bound parameters at the updated position
-  auto plane = Surface::makeShared<PlaneSurface>(newPos, newUnitDir);
+  auto plane = CurvilinearSurface(newPos, newUnitDir).planeSurface();
   auto params =
       BoundTrackParameters::create(plane, geoCtx, newPos4, newUnitDir,
                                    charge / absMom, cov, particleHypothesis)
@@ -242,7 +243,7 @@ BOOST_AUTO_TEST_CASE(BuildBound) {
                                  particleHypothesis),
       stepSize, tolerance);
   // example surface at the current state position
-  auto plane = Surface::makeShared<PlaneSurface>(pos, unitDir);
+  auto plane = CurvilinearSurface(pos, unitDir).planeSurface();
 
   auto&& [pars, jac, pathLength] = stepper.boundState(state, *plane).value();
   // check parameters
@@ -578,8 +579,8 @@ BOOST_AUTO_TEST_CASE(StepSizeSurface) {
       stepSize, tolerance);
 
   auto distance = 10_mm;
-  auto target = Surface::makeShared<PlaneSurface>(
-      pos + navDir * distance * unitDir, unitDir);
+  auto target = CurvilinearSurface(pos + navDir * distance * unitDir, unitDir)
+                    .planeSurface();
 
   stepper.updateSurfaceStatus(state, *target, 0, navDir,
                               BoundaryTolerance::Infinite());
diff --git a/Tests/UnitTests/Core/Propagator/AuctioneerTests.cpp b/Tests/UnitTests/Core/Propagator/AuctioneerTests.cpp
deleted file mode 100644
index 8d3a96158ea..00000000000
--- a/Tests/UnitTests/Core/Propagator/AuctioneerTests.cpp
+++ /dev/null
@@ -1,52 +0,0 @@
-// This file is part of the Acts project.
-//
-// Copyright (C) 2016-2018 CERN for the benefit of the Acts project
-//
-// This Source Code Form is subject to the terms of the Mozilla Public
-// License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-#include <boost/test/unit_test.hpp>
-
-#include "Acts/Propagator/detail/Auctioneer.hpp"
-
-#include <array>
-
-namespace Acts::Test {
-
-BOOST_AUTO_TEST_CASE(AuctioneerTest_VoidAuctioneer) {
-  // Build arbitrary vector
-  std::array<int, 4> vecArb = {0, 2, -5, 4};
-  std::array<bool, 4> vecRes = {false, true, false, true};
-  // Let it run through auction
-  detail::VoidAuctioneer va;
-  std::array<bool, 4> resultVa = va(vecArb);
-  // Test that vector did not change
-  BOOST_CHECK_EQUAL_COLLECTIONS(vecRes.begin(), vecRes.end(), resultVa.begin(),
-                                resultVa.end());
-}
-
-BOOST_AUTO_TEST_CASE(AuctioneerTest_FirstValidAuctioneer) {
-  // Build arbitrary vector
-  std::array<int, 4> vecArb = {0, 1, -2, 4};
-  // Let it run through auction
-  detail::FirstValidAuctioneer fva;
-  std::array<bool, 4> resultFva = fva(vecArb);
-  std::array<bool, 4> expected = {false, true, false, false};
-  // Test that vector did not change
-  BOOST_CHECK_EQUAL_COLLECTIONS(expected.begin(), expected.end(),
-                                resultFva.begin(), resultFva.end());
-}
-
-BOOST_AUTO_TEST_CASE(AuctioneerTest_HighestValidAuctioneer) {
-  // Build arbitrary vector
-  std::array<int, 4> vecArb = {0, 1, -2, 4};
-  // Let it run through auction
-  detail::HighestValidAuctioneer fva;
-  std::array<bool, 4> resultFva = fva(vecArb);
-  std::array<bool, 4> expected = {false, false, false, true};
-  // Test that vector did not change
-  BOOST_CHECK_EQUAL_COLLECTIONS(expected.begin(), expected.end(),
-                                resultFva.begin(), resultFva.end());
-}
-}  // namespace Acts::Test
diff --git a/Tests/UnitTests/Core/Propagator/BoundToCurvilinearConversionTests.cpp b/Tests/UnitTests/Core/Propagator/BoundToCurvilinearConversionTests.cpp
index 3ab839d96b1..8f2ce96f8ae 100644
--- a/Tests/UnitTests/Core/Propagator/BoundToCurvilinearConversionTests.cpp
+++ b/Tests/UnitTests/Core/Propagator/BoundToCurvilinearConversionTests.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2022 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include <boost/test/unit_test.hpp>
 #include <boost/test/unit_test_log_formatter.hpp>
@@ -91,7 +91,7 @@ FreeToPathMatrix computeFreeToPathDerivatives(
   return path_length_deriv;
 }
 template <typename T, std::size_t Rows, std::size_t Cols>
-inline constexpr Eigen::Matrix<T, Rows, Cols> makeMatrix(
+constexpr Eigen::Matrix<T, Rows, Cols> makeMatrix(
     std::initializer_list<double> elements) {
   // static_assert( elements.size() == Rows*Cols )
   if (!(elements.size() == Rows * Cols)) {
@@ -110,7 +110,7 @@ inline constexpr Eigen::Matrix<T, Rows, Cols> makeMatrix(
   return matrix;
 }
 template <typename T, std::size_t Rows>
-inline constexpr Eigen::Matrix<T, Rows, 1> makeVector(
+constexpr Eigen::Matrix<T, Rows, 1> makeVector(
     std::initializer_list<double> elements) {
   return makeMatrix<T, Rows, 1>(elements);
 }
diff --git a/Tests/UnitTests/Core/Propagator/CMakeLists.txt b/Tests/UnitTests/Core/Propagator/CMakeLists.txt
index 0b2edabe26c..671697dd07b 100644
--- a/Tests/UnitTests/Core/Propagator/CMakeLists.txt
+++ b/Tests/UnitTests/Core/Propagator/CMakeLists.txt
@@ -1,5 +1,4 @@
 add_unittest(AtlasStepper AtlasStepperTests.cpp)
-add_unittest(Auctioneer AuctioneerTests.cpp)
 add_unittest(ConstrainedStep ConstrainedStepTests.cpp)
 add_unittest(CovarianceEngine CovarianceEngineTests.cpp)
 add_unittest(DirectNavigator DirectNavigatorTests.cpp)
diff --git a/Tests/UnitTests/Core/Propagator/ConstrainedStepTests.cpp b/Tests/UnitTests/Core/Propagator/ConstrainedStepTests.cpp
index a5d381981ab..ecbcf32054f 100644
--- a/Tests/UnitTests/Core/Propagator/ConstrainedStepTests.cpp
+++ b/Tests/UnitTests/Core/Propagator/ConstrainedStepTests.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2018 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include <boost/test/unit_test.hpp>
 
diff --git a/Tests/UnitTests/Core/Propagator/CovarianceEngineTests.cpp b/Tests/UnitTests/Core/Propagator/CovarianceEngineTests.cpp
index b8fd2280852..5ba2af8da41 100644
--- a/Tests/UnitTests/Core/Propagator/CovarianceEngineTests.cpp
+++ b/Tests/UnitTests/Core/Propagator/CovarianceEngineTests.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2020 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include <boost/test/data/test_case.hpp>
 #include <boost/test/unit_test.hpp>
@@ -30,6 +30,7 @@
 
 #include <cmath>
 #include <memory>
+#include <numbers>
 #include <optional>
 #include <random>
 #include <tuple>
@@ -97,7 +98,7 @@ BOOST_AUTO_TEST_CASE(covariance_engine_test) {
 
   // Repeat transport to surface
   FreeToBoundCorrection freeToBoundCorrection(false);
-  auto surface = Surface::makeShared<PlaneSurface>(position, direction);
+  auto surface = CurvilinearSurface(position, direction).planeSurface();
   detail::transportCovarianceToBound(
       tgContext, *surface, covariance, jacobian, transportJacobian, derivatives,
       boundToFreeJacobian, parameters, freeToBoundCorrection);
@@ -255,7 +256,7 @@ auto makeDist(double a, double b) {
 
 const auto locDist = makeDist(-5_mm, 5_mm);
 const auto bFieldDist = makeDist(0, 3_T);
-const auto angleDist = makeDist(-2 * M_PI, 2 * M_PI);
+const auto angleDist = makeDist(-2 * std::numbers::pi, 2 * std::numbers::pi);
 const auto posDist = makeDist(-50_mm, 50_mm);
 
 #define MAKE_SURFACE()                                    \
@@ -286,7 +287,8 @@ BOOST_DATA_TEST_CASE(CovarianceConversionSamePlane,
   covA.diagonal() << 1, 2, 3, 4, 5, 6;
 
   BoundVector parA;
-  parA << l0, l1, M_PI / 4., M_PI_2 * 0.9, -1 / 1_GeV, 5_ns;
+  parA << l0, l1, std::numbers::pi / 4., std::numbers::pi / 2. * 0.9,
+      -1 / 1_GeV, 5_ns;
 
   // identical surface, this should work
   auto [parB, covB] =
@@ -336,7 +338,8 @@ BOOST_DATA_TEST_CASE(CovarianceConversionRotatedPlane,
   covA.diagonal() << 1, 2, 3, 4, 5, 6;
 
   BoundVector parA;
-  parA << l0, l1, M_PI / 4., M_PI_2 * 0.9, -1 / 1_GeV, 5_ns;
+  parA << l0, l1, std::numbers::pi / 4., std::numbers::pi / 2. * 0.9,
+      -1 / 1_GeV, 5_ns;
 
   auto [parB, covB] =
       boundToBound(parA, covA, *planeSurfaceA, *planeSurfaceB, bField);
@@ -384,7 +387,8 @@ BOOST_DATA_TEST_CASE(CovarianceConversionL0TiltedPlane,
 
   BoundVector parA;
   // loc 0 must be zero so we're on the intersection of both surfaces.
-  parA << 0, l1, M_PI / 4., M_PI_2 * 0.9, -1 / 1_GeV, 5_ns;
+  parA << 0, l1, std::numbers::pi / 4., std::numbers::pi / 2. * 0.9, -1 / 1_GeV,
+      5_ns;
 
   BoundMatrix covA;
   covA.setZero();
@@ -432,7 +436,8 @@ BOOST_DATA_TEST_CASE(CovarianceConversionL1TiltedPlane,
 
   BoundVector parA;
   // loc 1 must be zero so we're on the intersection of both surfaces.
-  parA << l0, 0, M_PI / 4., M_PI_2 * 0.9, -1 / 1_GeV, 5_ns;
+  parA << l0, 0, std::numbers::pi / 4., std::numbers::pi / 2. * 0.9, -1 / 1_GeV,
+      5_ns;
 
   BoundMatrix covA;
   covA.setZero();
@@ -470,7 +475,8 @@ BOOST_DATA_TEST_CASE(CovarianceConversionPerigee,
   auto planeSurfaceA = MAKE_SURFACE();
 
   BoundVector parA;
-  parA << l0, l1, M_PI / 4., M_PI_2 * 0.9, -1 / 1_GeV, 5_ns;
+  parA << l0, l1, std::numbers::pi / 4., std::numbers::pi / 2. * 0.9,
+      -1 / 1_GeV, 5_ns;
 
   BoundMatrix covA;
   covA.setZero();
diff --git a/Tests/UnitTests/Core/Propagator/DirectNavigatorTests.cpp b/Tests/UnitTests/Core/Propagator/DirectNavigatorTests.cpp
index 2ca796a9d23..586e51bfc31 100644
--- a/Tests/UnitTests/Core/Propagator/DirectNavigatorTests.cpp
+++ b/Tests/UnitTests/Core/Propagator/DirectNavigatorTests.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2019 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include <boost/test/data/test_case.hpp>
 #include <boost/test/unit_test.hpp>
@@ -16,8 +16,7 @@
 #include "Acts/Geometry/GeometryContext.hpp"
 #include "Acts/MagneticField/ConstantBField.hpp"
 #include "Acts/MagneticField/MagneticFieldContext.hpp"
-#include "Acts/Propagator/AbortList.hpp"
-#include "Acts/Propagator/ActionList.hpp"
+#include "Acts/Propagator/ActorList.hpp"
 #include "Acts/Propagator/DirectNavigator.hpp"
 #include "Acts/Propagator/EigenStepper.hpp"
 #include "Acts/Propagator/MaterialInteractor.hpp"
@@ -33,6 +32,7 @@
 #include <cmath>
 #include <iostream>
 #include <memory>
+#include <numbers>
 #include <random>
 #include <tuple>
 #include <utility>
@@ -107,19 +107,18 @@ void runTest(const rpropagator_t& rprop, const dpropagator_t& dprop, double pT,
   using EndOfWorld = EndOfWorldReached;
 
   // Action list and abort list
-  using RefereceActionList = ActionList<MaterialInteractor, SurfaceCollector<>>;
-  using ReferenceAbortList = AbortList<EndOfWorld>;
+  using ReferenceActorList =
+      ActorList<MaterialInteractor, SurfaceCollector<>, EndOfWorld>;
 
   // Options definition
-  using Options = typename rpropagator_t::template Options<RefereceActionList,
-                                                           ReferenceAbortList>;
+  using Options = typename rpropagator_t::template Options<ReferenceActorList>;
   Options pOptions(tgContext, mfContext);
   if (oversteppingTest) {
     pOptions.stepping.maxStepSize = oversteppingMaxStepSize;
   }
 
   // Surface collector configuration
-  auto& sCollector = pOptions.actionList.template get<SurfaceCollector<>>();
+  auto& sCollector = pOptions.actorList.template get<SurfaceCollector<>>();
   sCollector.selector.selectSensitive = true;
   sCollector.selector.selectMaterial = true;
 
@@ -141,16 +140,16 @@ void runTest(const rpropagator_t& rprop, const dpropagator_t& dprop, double pT,
     }
 
     // Action list for direct navigator with its initializer
-    using DirectActionList = ActionList<MaterialInteractor, SurfaceCollector<>>;
+    using DirectActorList = ActorList<MaterialInteractor, SurfaceCollector<>>;
 
     // Direct options definition
     using DirectOptions =
-        typename dpropagator_t::template Options<DirectActionList, AbortList<>>;
+        typename dpropagator_t::template Options<DirectActorList>;
     DirectOptions dOptions(tgContext, mfContext);
     // Set the surface sequence
     dOptions.navigation.surfaces = surfaceSequence;
     // Surface collector configuration
-    auto& dCollector = dOptions.actionList.template get<SurfaceCollector<>>();
+    auto& dCollector = dOptions.actorList.template get<SurfaceCollector<>>();
     dCollector.selector.selectSensitive = true;
     dCollector.selector.selectMaterial = true;
 
@@ -180,14 +179,14 @@ BOOST_DATA_TEST_CASE(
     bdata::random((bdata::engine = std::mt19937(), bdata::seed = 20,
                    bdata::distribution = std::uniform_real_distribution<double>(
                        0.15_GeV, 10_GeV))) ^
-        bdata::random((bdata::engine = std::mt19937(), bdata::seed = 21,
-                       bdata::distribution =
-                           std::uniform_real_distribution<double>(-M_PI,
-                                                                  M_PI))) ^
+        bdata::random(
+            (bdata::engine = std::mt19937(), bdata::seed = 21,
+             bdata::distribution = std::uniform_real_distribution<double>(
+                 -std::numbers::pi, std::numbers::pi))) ^
         bdata::random(
             (bdata::engine = std::mt19937(), bdata::seed = 22,
-             bdata::distribution =
-                 std::uniform_real_distribution<double>(1.0, M_PI - 1.0))) ^
+             bdata::distribution = std::uniform_real_distribution<double>(
+                 1., std::numbers::pi - 1.))) ^
         bdata::random((bdata::engine = std::mt19937(), bdata::seed = 23,
                        bdata::distribution =
                            std::uniform_int_distribution<std::uint8_t>(0, 1))) ^
diff --git a/Tests/UnitTests/Core/Propagator/EigenStepperTests.cpp b/Tests/UnitTests/Core/Propagator/EigenStepperTests.cpp
index dbf6b7b8ad4..d784c0b26bb 100644
--- a/Tests/UnitTests/Core/Propagator/EigenStepperTests.cpp
+++ b/Tests/UnitTests/Core/Propagator/EigenStepperTests.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2018-2020 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include <boost/test/unit_test.hpp>
 
@@ -12,7 +12,6 @@
 #include "Acts/Definitions/Direction.hpp"
 #include "Acts/Definitions/TrackParametrization.hpp"
 #include "Acts/Definitions/Units.hpp"
-#include "Acts/EventData/Charge.hpp"
 #include "Acts/EventData/GenericBoundTrackParameters.hpp"
 #include "Acts/EventData/GenericCurvilinearTrackParameters.hpp"
 #include "Acts/EventData/ParticleHypothesis.hpp"
@@ -31,19 +30,17 @@
 #include "Acts/Material/HomogeneousSurfaceMaterial.hpp"
 #include "Acts/Material/HomogeneousVolumeMaterial.hpp"
 #include "Acts/Material/MaterialSlab.hpp"
-#include "Acts/Propagator/AbortList.hpp"
-#include "Acts/Propagator/ActionList.hpp"
+#include "Acts/Propagator/ActorList.hpp"
 #include "Acts/Propagator/ConstrainedStep.hpp"
-#include "Acts/Propagator/DefaultExtension.hpp"
-#include "Acts/Propagator/DenseEnvironmentExtension.hpp"
 #include "Acts/Propagator/EigenStepper.hpp"
+#include "Acts/Propagator/EigenStepperDefaultExtension.hpp"
+#include "Acts/Propagator/EigenStepperDenseExtension.hpp"
 #include "Acts/Propagator/EigenStepperError.hpp"
 #include "Acts/Propagator/MaterialInteractor.hpp"
 #include "Acts/Propagator/Navigator.hpp"
 #include "Acts/Propagator/Propagator.hpp"
-#include "Acts/Propagator/StepperExtensionList.hpp"
-#include "Acts/Propagator/detail/Auctioneer.hpp"
 #include "Acts/Surfaces/BoundaryTolerance.hpp"
+#include "Acts/Surfaces/CurvilinearSurface.hpp"
 #include "Acts/Surfaces/PlaneSurface.hpp"
 #include "Acts/Surfaces/RectangleBounds.hpp"
 #include "Acts/Surfaces/Surface.hpp"
@@ -54,15 +51,12 @@
 #include "Acts/Utilities/UnitVectors.hpp"
 
 #include <algorithm>
-#include <array>
 #include <cmath>
-#include <functional>
 #include <limits>
-#include <map>
 #include <memory>
+#include <numbers>
 #include <optional>
 #include <string>
-#include <tuple>
 #include <type_traits>
 #include <utility>
 #include <vector>
@@ -117,9 +111,6 @@ struct EndOfWorld {
   /// Maximum value in x-direction of the detector
   double maxX = 1_m;
 
-  /// @brief Constructor
-  EndOfWorld() = default;
-
   /// @brief Main call operator for the abort operation
   ///
   /// @tparam propagator_state_t State of the propagator
@@ -133,7 +124,7 @@ struct EndOfWorld {
   /// @return Boolean statement if the particle is still in the detector
   template <typename propagator_state_t, typename stepper_t,
             typename navigator_t>
-  bool operator()(propagator_state_t& state, const stepper_t& stepper,
+  bool checkAbort(propagator_state_t& state, const stepper_t& stepper,
                   const navigator_t& /*navigator*/,
                   const Logger& /*logger*/) const {
     const double tolerance = state.options.surfaceTolerance;
@@ -175,12 +166,20 @@ struct StepCollector {
   /// @param [out] result Struct which is filled with the data
   template <typename propagator_state_t, typename stepper_t,
             typename navigator_t>
-  void operator()(propagator_state_t& state, const stepper_t& stepper,
-                  const navigator_t& /*navigator*/, result_type& result,
-                  const Logger& /*logger*/) const {
+  void act(propagator_state_t& state, const stepper_t& stepper,
+           const navigator_t& /*navigator*/, result_type& result,
+           const Logger& /*logger*/) const {
     result.position.push_back(stepper.position(state.stepping));
     result.momentum.push_back(stepper.momentum(state.stepping));
   }
+
+  template <typename propagator_state_t, typename stepper_t,
+            typename navigator_t>
+  bool checkAbort(propagator_state_t& /*state*/, const stepper_t& /*stepper*/,
+                  const navigator_t& /*navigator*/, result_type& /*result*/,
+                  const Logger& /*logger*/) const {
+    return false;
+  }
 };
 
 /// These tests are aiming to test whether the state setup is working properly
@@ -369,7 +368,6 @@ BOOST_AUTO_TEST_CASE(eigen_stepper_test) {
 
     copy.geoContext = state.geoContext;
     copy.extension = state.extension;
-    copy.auctioneer = state.auctioneer;
     copy.stepData = state.stepData;
 
     return copy;
@@ -448,7 +446,7 @@ BOOST_AUTO_TEST_CASE(eigen_stepper_test) {
   BOOST_CHECK_EQUAL(esStateCopy.previousStepSize, ps.stepping.previousStepSize);
 
   /// Repeat with surface related methods
-  auto plane = Surface::makeShared<PlaneSurface>(pos, dir.normalized());
+  auto plane = CurvilinearSurface(pos, dir.normalized()).planeSurface();
   auto bp = BoundTrackParameters::create(
                 plane, tgContext, makeVector4(pos, time), dir, charge / absMom,
                 cov, ParticleHypothesis::pion())
@@ -458,7 +456,7 @@ BOOST_AUTO_TEST_CASE(eigen_stepper_test) {
 
   // Test the intersection in the context of a surface
   auto targetSurface =
-      Surface::makeShared<PlaneSurface>(pos + navDir * 2. * dir, dir);
+      CurvilinearSurface(pos + navDir * 2. * dir, dir).planeSurface();
   es.updateSurfaceStatus(esState, *targetSurface, 0, navDir,
                          BoundaryTolerance::Infinite());
   CHECK_CLOSE_ABS(esState.stepSize.value(ConstrainedStep::actor), navDir * 2.,
@@ -543,14 +541,13 @@ BOOST_AUTO_TEST_CASE(eigen_stepper_test) {
   BOOST_CHECK_EQUAL(res.error(), EigenStepperError::StepSizeAdjustmentFailed);
 }
 
-/// @brief This function tests the EigenStepper with the DefaultExtension and
-/// the DenseEnvironmentExtension. The focus of this tests lies in the
-/// choosing of the right extension for the individual use case. This is
+/// @brief This function tests the EigenStepper with the EigenStepperDefaultExtension and
+/// the EigenStepperDenseExtension. The focus of this tests lies in
+/// the choosing of the right extension for the individual use case. This is
 /// performed with three different detectors:
 /// a) Pure vacuum -> DefaultExtension needs to act
 /// b) Pure Be -> DenseEnvironmentExtension needs to act
-/// c) Vacuum - Be - Vacuum -> Both should act and switch during the
-/// propagation
+/// c) Vacuum - Be - Vacuum -> Both should act and switch during the propagation
 
 // Test case a). The DenseEnvironmentExtension should state that it is not
 // valid in this case.
@@ -585,12 +582,10 @@ BOOST_AUTO_TEST_CASE(step_extension_vacuum_test) {
   const CurvilinearTrackParameters sbtp(Vector4::Zero(), startDir, 1_e / 1_GeV,
                                         cov, ParticleHypothesis::pion());
 
-  using Stepper = EigenStepper<
-      StepperExtensionList<DefaultExtension, DenseEnvironmentExtension>,
-      detail::HighestValidAuctioneer>;
+  using Stepper = EigenStepper<EigenStepperDenseExtension>;
   using Propagator = Propagator<Stepper, Navigator>;
   using PropagatorOptions =
-      Propagator::Options<ActionList<StepCollector>, AbortList<EndOfWorld>>;
+      Propagator::Options<ActorList<StepCollector, EndOfWorld>>;
 
   // Set options for propagator
   PropagatorOptions propOpts(tgContext, mfContext);
@@ -619,12 +614,10 @@ BOOST_AUTO_TEST_CASE(step_extension_vacuum_test) {
     CHECK_CLOSE_ABS(mom, startMom, 1_keV);
   }
 
-  using DefStepper = EigenStepper<
-      StepperExtensionList<DefaultExtension, DenseEnvironmentExtension>,
-      detail::HighestValidAuctioneer>;
+  using DefStepper = EigenStepper<EigenStepperDenseExtension>;
   using DefPropagator = Acts::Propagator<DefStepper, Navigator>;
   using DefPropagatorOptions =
-      DefPropagator::Options<ActionList<StepCollector>, AbortList<EndOfWorld>>;
+      DefPropagator::Options<ActorList<StepCollector, EndOfWorld>>;
 
   // Set options for propagator
   DefPropagatorOptions propOptsDef(tgContext, mfContext);
@@ -684,12 +677,10 @@ BOOST_AUTO_TEST_CASE(step_extension_material_test) {
   const CurvilinearTrackParameters sbtp(Vector4::Zero(), startDir, 1_e / 5_GeV,
                                         cov, ParticleHypothesis::pion());
 
-  using Stepper = EigenStepper<
-      StepperExtensionList<DefaultExtension, DenseEnvironmentExtension>,
-      detail::HighestValidAuctioneer>;
+  using Stepper = EigenStepper<EigenStepperDenseExtension>;
   using Propagator = Propagator<Stepper, Navigator>;
   using PropagatorOptions =
-      Propagator::Options<ActionList<StepCollector>, AbortList<EndOfWorld>>;
+      Propagator::Options<ActorList<StepCollector, EndOfWorld>>;
 
   // Set options for propagator
   PropagatorOptions propOpts(tgContext, mfContext);
@@ -727,13 +718,10 @@ BOOST_AUTO_TEST_CASE(step_extension_material_test) {
     }
   }
 
-  using DenseStepper =
-      EigenStepper<StepperExtensionList<DenseEnvironmentExtension>,
-                   detail::HighestValidAuctioneer>;
+  using DenseStepper = EigenStepper<EigenStepperDenseExtension>;
   using DensePropagator = Acts::Propagator<DenseStepper, Navigator>;
   using DensePropagatorOptions =
-      DensePropagator::Options<ActionList<StepCollector>,
-                               AbortList<EndOfWorld>>;
+      DensePropagator::Options<ActorList<StepCollector, EndOfWorld>>;
 
   // Rebuild and check the choice of extension
   // Set options for propagator
@@ -834,16 +822,14 @@ BOOST_AUTO_TEST_CASE(step_extension_vacmatvac_test) {
                                   1_e / 5_GeV, Covariance::Identity(),
                                   ParticleHypothesis::pion());
 
-  using Stepper = EigenStepper<
-      StepperExtensionList<DefaultExtension, DenseEnvironmentExtension>,
-      detail::HighestValidAuctioneer>;
+  using Stepper = EigenStepper<EigenStepperDenseExtension>;
   using Propagator = Acts::Propagator<Stepper, Navigator>;
   using PropagatorOptions =
-      Propagator::Options<ActionList<StepCollector>, AbortList<EndOfWorld>>;
+      Propagator::Options<ActorList<StepCollector, EndOfWorld>>;
 
   // Set options for propagator
   PropagatorOptions propOpts(tgContext, mfContext);
-  propOpts.abortList.get<EndOfWorld>().maxX = 3_m;
+  propOpts.actorList.get<EndOfWorld>().maxX = 3_m;
   propOpts.maxSteps = 1000;
   propOpts.stepping.maxStepSize = 1.5_m;
 
@@ -890,13 +876,13 @@ BOOST_AUTO_TEST_CASE(step_extension_vacmatvac_test) {
   // Build launcher through vacuum
   // Set options for propagator
 
-  using DefStepper = EigenStepper<StepperExtensionList<DefaultExtension>>;
+  using DefStepper = EigenStepper<EigenStepperDenseExtension>;
   using DefPropagator = Acts::Propagator<DefStepper, Navigator>;
   using DefPropagatorOptions =
-      DefPropagator::Options<ActionList<StepCollector>, AbortList<EndOfWorld>>;
+      DefPropagator::Options<ActorList<StepCollector, EndOfWorld>>;
 
   DefPropagatorOptions propOptsDef(tgContext, mfContext);
-  propOptsDef.abortList.get<EndOfWorld>().maxX = 3_m;
+  propOptsDef.actorList.get<EndOfWorld>().maxX = 3_m;
   propOptsDef.maxSteps = 1000;
   propOptsDef.stepping.maxStepSize = 1.5_m;
 
@@ -940,16 +926,14 @@ BOOST_AUTO_TEST_CASE(step_extension_vacmatvac_test) {
   // Set initial parameters for the particle track by using the result of the
   // first volume
 
-  using DenseStepper = EigenStepper<
-      StepperExtensionList<DefaultExtension, DenseEnvironmentExtension>>;
+  using DenseStepper = EigenStepper<EigenStepperDenseExtension>;
   using DensePropagator = Acts::Propagator<DenseStepper, Navigator>;
   using DensePropagatorOptions =
-      DensePropagator::Options<ActionList<StepCollector>,
-                               AbortList<EndOfWorld>>;
+      DensePropagator::Options<ActorList<StepCollector, EndOfWorld>>;
 
   // Set options for propagator
   DensePropagatorOptions propOptsDense(tgContext, mfContext);
-  propOptsDense.abortList.get<EndOfWorld>().maxX = 3_m;
+  propOptsDense.actorList.get<EndOfWorld>().maxX = 3_m;
   propOptsDense.maxSteps = 1000;
   propOptsDense.stepping.maxStepSize = 1.5_m;
 
@@ -985,7 +969,7 @@ BOOST_AUTO_TEST_CASE(step_extension_vacmatvac_test) {
 // Test case a). The DenseEnvironmentExtension should state that it is not
 // valid in this case.
 BOOST_AUTO_TEST_CASE(step_extension_trackercalomdt_test) {
-  double rotationAngle = M_PI * 0.5;
+  double rotationAngle = std::numbers::pi / 2.;
   Vector3 xPos(cos(rotationAngle), 0., sin(rotationAngle));
   Vector3 yPos(0., 1., 0.);
   Vector3 zPos(-sin(rotationAngle), 0., cos(rotationAngle));
@@ -1071,17 +1055,14 @@ BOOST_AUTO_TEST_CASE(step_extension_trackercalomdt_test) {
                                   1_e / 1_GeV, Covariance::Identity(),
                                   ParticleHypothesis::pion());
 
-  using Stepper = EigenStepper<
-      StepperExtensionList<DefaultExtension, DenseEnvironmentExtension>,
-      detail::HighestValidAuctioneer>;
+  using Stepper = EigenStepper<EigenStepperDenseExtension>;
   using Propagator = Acts::Propagator<Stepper, Navigator>;
-  using PropagatorOptions =
-      Propagator::Options<ActionList<StepCollector, MaterialInteractor>,
-                          AbortList<EndOfWorld>>;
+  using PropagatorOptions = Propagator::Options<
+      ActorList<StepCollector, MaterialInteractor, EndOfWorld>>;
 
   // Set options for propagator
   PropagatorOptions propOpts(tgContext, mfContext);
-  propOpts.abortList.get<EndOfWorld>().maxX = 3._m;
+  propOpts.actorList.get<EndOfWorld>().maxX = 3._m;
   propOpts.maxSteps = 10000;
 
   // Build stepper and propagator
diff --git a/Tests/UnitTests/Core/Propagator/ExtrapolatorTests.cpp b/Tests/UnitTests/Core/Propagator/ExtrapolatorTests.cpp
index e20cc7430ba..e8171faf004 100644
--- a/Tests/UnitTests/Core/Propagator/ExtrapolatorTests.cpp
+++ b/Tests/UnitTests/Core/Propagator/ExtrapolatorTests.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2018-2019 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include <boost/test/data/test_case.hpp>
 #include <boost/test/unit_test.hpp>
@@ -18,7 +18,7 @@
 #include "Acts/Geometry/GeometryContext.hpp"
 #include "Acts/MagneticField/ConstantBField.hpp"
 #include "Acts/MagneticField/MagneticFieldContext.hpp"
-#include "Acts/Propagator/ActionList.hpp"
+#include "Acts/Propagator/ActorList.hpp"
 #include "Acts/Propagator/EigenStepper.hpp"
 #include "Acts/Propagator/MaterialInteractor.hpp"
 #include "Acts/Propagator/Navigator.hpp"
@@ -36,6 +36,7 @@
 #include <cstdint>
 #include <map>
 #include <memory>
+#include <numbers>
 #include <optional>
 #include <random>
 #include <tuple>
@@ -85,14 +86,14 @@ BOOST_DATA_TEST_CASE(
     bdata::random((bdata::engine = std::mt19937(), bdata::seed = 0,
                    bdata::distribution = std::uniform_real_distribution<double>(
                        0.4_GeV, 10_GeV))) ^
-        bdata::random((bdata::engine = std::mt19937(), bdata::seed = 1,
-                       bdata::distribution =
-                           std::uniform_real_distribution<double>(-M_PI,
-                                                                  M_PI))) ^
+        bdata::random(
+            (bdata::engine = std::mt19937(), bdata::seed = 1,
+             bdata::distribution = std::uniform_real_distribution<double>(
+                 -std::numbers::pi, std::numbers::pi))) ^
         bdata::random(
             (bdata::engine = std::mt19937(), bdata::seed = 2,
-             bdata::distribution =
-                 std::uniform_real_distribution<double>(1.0, M_PI - 1.0))) ^
+             bdata::distribution = std::uniform_real_distribution<double>(
+                 1., std::numbers::pi - 1.))) ^
         bdata::random((bdata::engine = std::mt19937(), bdata::seed = 3,
                        bdata::distribution =
                            std::uniform_int_distribution<std::uint8_t>(0, 1))) ^
@@ -127,14 +128,14 @@ BOOST_DATA_TEST_CASE(
     bdata::random((bdata::engine = std::mt19937(), bdata::seed = 10,
                    bdata::distribution = std::uniform_real_distribution<double>(
                        0.4_GeV, 10_GeV))) ^
-        bdata::random((bdata::engine = std::mt19937(), bdata::seed = 11,
-                       bdata::distribution =
-                           std::uniform_real_distribution<double>(-M_PI,
-                                                                  M_PI))) ^
+        bdata::random(
+            (bdata::engine = std::mt19937(), bdata::seed = 11,
+             bdata::distribution = std::uniform_real_distribution<double>(
+                 -std::numbers::pi, std::numbers::pi))) ^
         bdata::random(
             (bdata::engine = std::mt19937(), bdata::seed = 12,
-             bdata::distribution =
-                 std::uniform_real_distribution<double>(1.0, M_PI - 1.0))) ^
+             bdata::distribution = std::uniform_real_distribution<double>(
+                 1., std::numbers::pi - 1.))) ^
         bdata::random((bdata::engine = std::mt19937(), bdata::seed = 13,
                        bdata::distribution =
                            std::uniform_int_distribution<std::uint8_t>(0, 1))) ^
@@ -157,8 +158,8 @@ BOOST_DATA_TEST_CASE(
   // A PlaneSelector for the SurfaceCollector
   using PlaneCollector = SurfaceCollector<PlaneSelector>;
 
-  EigenPropagatorType::Options<ActionList<PlaneCollector>> options(tgContext,
-                                                                   mfContext);
+  EigenPropagatorType::Options<ActorList<PlaneCollector>> options(tgContext,
+                                                                  mfContext);
 
   options.stepping.maxStepSize = 10_cm;
   options.pathLimit = 25_cm;
@@ -193,14 +194,14 @@ BOOST_DATA_TEST_CASE(
     bdata::random((bdata::engine = std::mt19937(), bdata::seed = 20,
                    bdata::distribution = std::uniform_real_distribution<double>(
                        0.4_GeV, 10_GeV))) ^
-        bdata::random((bdata::engine = std::mt19937(), bdata::seed = 21,
-                       bdata::distribution =
-                           std::uniform_real_distribution<double>(-M_PI,
-                                                                  M_PI))) ^
+        bdata::random(
+            (bdata::engine = std::mt19937(), bdata::seed = 21,
+             bdata::distribution = std::uniform_real_distribution<double>(
+                 -std::numbers::pi, std::numbers::pi))) ^
         bdata::random(
             (bdata::engine = std::mt19937(), bdata::seed = 22,
-             bdata::distribution =
-                 std::uniform_real_distribution<double>(1.0, M_PI - 1.0))) ^
+             bdata::distribution = std::uniform_real_distribution<double>(
+                 1., std::numbers::pi - 1.))) ^
         bdata::random((bdata::engine = std::mt19937(), bdata::seed = 23,
                        bdata::distribution =
                            std::uniform_int_distribution<std::uint8_t>(0, 1))) ^
@@ -220,7 +221,7 @@ BOOST_DATA_TEST_CASE(
   CurvilinearTrackParameters start(Vector4(0, 0, 0, 0), phi, theta, q / p, cov,
                                    ParticleHypothesis::pion());
 
-  EigenPropagatorType::Options<ActionList<MaterialInteractor>> options(
+  EigenPropagatorType::Options<ActorList<MaterialInteractor>> options(
       tgContext, mfContext);
   options.stepping.maxStepSize = 25_cm;
   options.pathLimit = 25_cm;
@@ -240,14 +241,14 @@ BOOST_DATA_TEST_CASE(
     bdata::random((bdata::engine = std::mt19937(), bdata::seed = 20,
                    bdata::distribution = std::uniform_real_distribution<double>(
                        0.1_GeV, 0.5_GeV))) ^
-        bdata::random((bdata::engine = std::mt19937(), bdata::seed = 21,
-                       bdata::distribution =
-                           std::uniform_real_distribution<double>(-M_PI,
-                                                                  M_PI))) ^
+        bdata::random(
+            (bdata::engine = std::mt19937(), bdata::seed = 21,
+             bdata::distribution = std::uniform_real_distribution<double>(
+                 -std::numbers::pi, std::numbers::pi))) ^
         bdata::random(
             (bdata::engine = std::mt19937(), bdata::seed = 22,
-             bdata::distribution =
-                 std::uniform_real_distribution<double>(1.0, M_PI - 1.0))) ^
+             bdata::distribution = std::uniform_real_distribution<double>(
+                 1., std::numbers::pi - 1.))) ^
         bdata::random((bdata::engine = std::mt19937(), bdata::seed = 23,
                        bdata::distribution =
                            std::uniform_int_distribution<std::uint8_t>(0, 1))) ^
@@ -268,7 +269,7 @@ BOOST_DATA_TEST_CASE(
                                    ParticleHypothesis::pion());
 
   // Action list and abort list
-  EigenPropagatorType::Options<ActionList<MaterialInteractor>> options(
+  EigenPropagatorType::Options<ActorList<MaterialInteractor>> options(
       tgContext, mfContext);
   options.stepping.maxStepSize = 25_cm;
   options.pathLimit = 1500_mm;
@@ -279,7 +280,8 @@ BOOST_DATA_TEST_CASE(
   auto bCache = bField->makeCache(mfContext);
   double pmax =
       options.pathLimit *
-      bField->getField(start.position(tgContext), bCache).value().norm() / M_PI;
+      bField->getField(start.position(tgContext), bCache).value().norm() /
+      std::numbers::pi;
   if (p < pmax) {
     BOOST_CHECK_LT(status.pathLength, options.pathLimit);
   } else {
diff --git a/Tests/UnitTests/Core/Propagator/JacobianEngineTests.cpp b/Tests/UnitTests/Core/Propagator/JacobianEngineTests.cpp
index 6371c03afd5..53b44d2bb48 100644
--- a/Tests/UnitTests/Core/Propagator/JacobianEngineTests.cpp
+++ b/Tests/UnitTests/Core/Propagator/JacobianEngineTests.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2021 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include <boost/test/unit_test.hpp>
 
@@ -33,11 +33,11 @@ BOOST_AUTO_TEST_CASE(jacobian_engine_to_bound) {
   double qop = 0.125;
 
   // Build a surface
-  auto pSurface = Surface::makeShared<PlaneSurface>(position, direction);
+  auto pSurface = CurvilinearSurface(position, direction).planeSurface();
 
   // Other rotated surface
   Vector3 odirection = Vector3(6., 2., 8.).normalized();
-  auto oSurface = Surface::makeShared<PlaneSurface>(position, odirection);
+  auto oSurface = CurvilinearSurface(position, odirection).planeSurface();
 
   // The free parameter vector
   FreeVector freeParameters;
@@ -108,7 +108,7 @@ BOOST_AUTO_TEST_CASE(jacobian_engine_to_curvilinear) {
   Vector3 direction = Vector3(5., 2., 7.).normalized();
 
   // Build a surface, starting surface for curvilinear
-  auto pSurface = Surface::makeShared<PlaneSurface>(position, direction);
+  auto pSurface = CurvilinearSurface(position, direction).planeSurface();
 
   // Build covariance matrices for bound and free case
   BoundSquareMatrix boundCovariance = 0.025 * BoundSquareMatrix::Identity();
@@ -160,7 +160,7 @@ BOOST_AUTO_TEST_CASE(jacobian_engine_to_free) {
   Vector3 direction = Vector3(5., 2., 7.).normalized();
 
   // Build a surface, starting surface for curvilinear
-  auto pSurface = Surface::makeShared<PlaneSurface>(position, direction);
+  auto pSurface = CurvilinearSurface(position, direction).planeSurface();
 
   // Build covariance matrices for bound and free case
   BoundSquareMatrix boundCovariance = 0.025 * BoundSquareMatrix::Identity();
diff --git a/Tests/UnitTests/Core/Propagator/JacobianTests.cpp b/Tests/UnitTests/Core/Propagator/JacobianTests.cpp
index c58bab9ee69..0761d5860eb 100644
--- a/Tests/UnitTests/Core/Propagator/JacobianTests.cpp
+++ b/Tests/UnitTests/Core/Propagator/JacobianTests.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2018-2019 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include <boost/test/unit_test.hpp>
 
@@ -18,6 +18,7 @@
 #include "Acts/MagneticField/MagneticFieldContext.hpp"
 #include "Acts/Propagator/AtlasStepper.hpp"
 #include "Acts/Propagator/EigenStepper.hpp"
+#include "Acts/Surfaces/CurvilinearSurface.hpp"
 #include "Acts/Surfaces/CylinderSurface.hpp"
 #include "Acts/Surfaces/DiscSurface.hpp"
 #include "Acts/Surfaces/PerigeeSurface.hpp"
@@ -209,7 +210,7 @@ BOOST_AUTO_TEST_CASE(JacobianPlaneToGlobalTest) {
   Vector3 sNormal = Vector3(1.2, -0.3, 0.05).normalized();
 
   // Create a surface & parameters with covariance on the surface
-  auto pSurface = Surface::makeShared<PlaneSurface>(sPosition, sNormal);
+  auto pSurface = CurvilinearSurface(sPosition, sNormal).planeSurface();
 
   Covariance cov;
   cov << 10_mm, 0, 0, 0, 0, 0, 0, 10_mm, 0, 0, 0, 0, 0, 0, 0.1, 0, 0, 0, 0, 0,
diff --git a/Tests/UnitTests/Core/Propagator/KalmanExtrapolatorTests.cpp b/Tests/UnitTests/Core/Propagator/KalmanExtrapolatorTests.cpp
index a41cce01297..5176d309ba6 100644
--- a/Tests/UnitTests/Core/Propagator/KalmanExtrapolatorTests.cpp
+++ b/Tests/UnitTests/Core/Propagator/KalmanExtrapolatorTests.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2018-2019 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include <boost/test/unit_test.hpp>
 
@@ -17,8 +17,7 @@
 #include "Acts/Geometry/GeometryContext.hpp"
 #include "Acts/MagneticField/ConstantBField.hpp"
 #include "Acts/MagneticField/MagneticFieldContext.hpp"
-#include "Acts/Propagator/AbortList.hpp"
-#include "Acts/Propagator/ActionList.hpp"
+#include "Acts/Propagator/ActorList.hpp"
 #include "Acts/Propagator/EigenStepper.hpp"
 #include "Acts/Propagator/Navigator.hpp"
 #include "Acts/Propagator/Propagator.hpp"
@@ -78,9 +77,9 @@ struct StepWiseActor {
   /// @param result is the mutable result state object
   template <typename propagator_state_t, typename stepper_t,
             typename navigator_t>
-  void operator()(propagator_state_t& state, const stepper_t& stepper,
-                  const navigator_t& navigator, result_type& result,
-                  const Logger& /*logger*/) const {
+  void act(propagator_state_t& state, const stepper_t& stepper,
+           const navigator_t& navigator, result_type& result,
+           const Logger& /*logger*/) const {
     // Listen to the surface and create bound state where necessary
     auto surface = navigator.currentSurface(state.navigation);
     if (surface && surface->associatedDetectorElement()) {
@@ -135,15 +134,14 @@ BOOST_AUTO_TEST_CASE(kalman_extrapolator) {
 
   // Create the ActionList and AbortList
   using StepWiseResult = StepWiseActor::result_type;
-  using StepWiseActors = ActionList<StepWiseActor>;
-  using Aborters = AbortList<EndOfWorldReached>;
+  using StepWiseActors = ActorList<StepWiseActor, EndOfWorldReached>;
 
   // Create some options
-  using StepWiseOptions = Propagator::Options<StepWiseActors, Aborters>;
+  using StepWiseOptions = Propagator::Options<StepWiseActors>;
   StepWiseOptions swOptions(tgContext, mfContext);
 
-  using PlainActors = ActionList<>;
-  using PlainOptions = Propagator::Options<PlainActors, Aborters>;
+  using PlainActors = ActorList<EndOfWorldReached>;
+  using PlainOptions = Propagator::Options<PlainActors>;
   PlainOptions pOptions(tgContext, mfContext);
 
   // Run the standard propagation
diff --git a/Tests/UnitTests/Core/Propagator/LoopProtectionTests.cpp b/Tests/UnitTests/Core/Propagator/LoopProtectionTests.cpp
index c0a2a35d214..ecb3fab014b 100644
--- a/Tests/UnitTests/Core/Propagator/LoopProtectionTests.cpp
+++ b/Tests/UnitTests/Core/Propagator/LoopProtectionTests.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2018-2019 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include <boost/test/data/test_case.hpp>
 #include <boost/test/unit_test.hpp>
@@ -18,8 +18,7 @@
 #include "Acts/Geometry/GeometryContext.hpp"
 #include "Acts/MagneticField/ConstantBField.hpp"
 #include "Acts/MagneticField/MagneticFieldContext.hpp"
-#include "Acts/Propagator/AbortList.hpp"
-#include "Acts/Propagator/ActionList.hpp"
+#include "Acts/Propagator/ActorList.hpp"
 #include "Acts/Propagator/EigenStepper.hpp"
 #include "Acts/Propagator/Propagator.hpp"
 #include "Acts/Propagator/StandardAborters.hpp"
@@ -33,6 +32,7 @@
 #include <cmath>
 #include <limits>
 #include <memory>
+#include <numbers>
 #include <optional>
 #include <random>
 #include <string>
@@ -103,7 +103,7 @@ struct Options {
   int debugPfxWidth = 30;
 
   /// Contains: target aborters
-  AbortList<PathLimitReached> abortList;
+  ActorList<PathLimitReached> abortList;
 
   const Acts::Logger& logger = Acts::getDummyLogger();
 };
@@ -123,12 +123,12 @@ struct PropagatorState {
 BOOST_DATA_TEST_CASE(
     loop_aborter_test,
     bdata::random((bdata::engine = std::mt19937(), bdata::seed = 21,
-                   bdata::distribution =
-                       std::uniform_real_distribution<double>(-M_PI, M_PI))) ^
-        bdata::random((bdata::engine = std::mt19937(), bdata::seed = 22,
-                       bdata::distribution =
-                           std::uniform_real_distribution<double>(-M_PI,
-                                                                  M_PI))) ^
+                   bdata::distribution = std::uniform_real_distribution<double>(
+                       -std::numbers::pi, std::numbers::pi))) ^
+        bdata::random(
+            (bdata::engine = std::mt19937(), bdata::seed = 22,
+             bdata::distribution = std::uniform_real_distribution<double>(
+                 -std::numbers::pi, std::numbers::pi))) ^
         bdata::xrange(1),
     phi, deltaPhi, index) {
   (void)index;
@@ -166,14 +166,14 @@ BOOST_DATA_TEST_CASE(
     bdata::random((bdata::engine = std::mt19937(), bdata::seed = 20,
                    bdata::distribution = std::uniform_real_distribution<double>(
                        0.5_GeV, 10_GeV))) ^
-        bdata::random((bdata::engine = std::mt19937(), bdata::seed = 21,
-                       bdata::distribution =
-                           std::uniform_real_distribution<double>(-M_PI,
-                                                                  M_PI))) ^
+        bdata::random(
+            (bdata::engine = std::mt19937(), bdata::seed = 21,
+             bdata::distribution = std::uniform_real_distribution<double>(
+                 -std::numbers::pi, std::numbers::pi))) ^
         bdata::random(
             (bdata::engine = std::mt19937(), bdata::seed = 22,
-             bdata::distribution =
-                 std::uniform_real_distribution<double>(1.0, M_PI - 1.0))) ^
+             bdata::distribution = std::uniform_real_distribution<double>(
+                 1., std::numbers::pi - 1.))) ^
         bdata::random((bdata::engine = std::mt19937(), bdata::seed = 23,
                        bdata::distribution =
                            std::uniform_int_distribution<std::uint8_t>(0, 1))) ^
@@ -198,7 +198,7 @@ BOOST_DATA_TEST_CASE(
   CurvilinearTrackParameters start(Vector4(0, 0, 0, 42), phi, theta, q / p,
                                    std::nullopt, ParticleHypothesis::pion());
 
-  using PropagatorOptions = EigenPropagator::Options<ActionList<>, AbortList<>>;
+  using PropagatorOptions = EigenPropagator::Options<ActorList<>>;
   PropagatorOptions options(tgContext, mfContext);
   options.maxSteps = 1e6;
   const auto& result = epropagator.propagate(start, options).value();
diff --git a/Tests/UnitTests/Core/Propagator/MaterialCollectionTests.cpp b/Tests/UnitTests/Core/Propagator/MaterialCollectionTests.cpp
index d87f26d14ff..c13304c3352 100644
--- a/Tests/UnitTests/Core/Propagator/MaterialCollectionTests.cpp
+++ b/Tests/UnitTests/Core/Propagator/MaterialCollectionTests.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2018-2019 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include <boost/test/data/test_case.hpp>
 #include <boost/test/unit_test.hpp>
@@ -19,8 +19,7 @@
 #include "Acts/Geometry/GeometryIdentifier.hpp"
 #include "Acts/MagneticField/ConstantBField.hpp"
 #include "Acts/MagneticField/MagneticFieldContext.hpp"
-#include "Acts/Propagator/AbortList.hpp"
-#include "Acts/Propagator/ActionList.hpp"
+#include "Acts/Propagator/ActorList.hpp"
 #include "Acts/Propagator/EigenStepper.hpp"
 #include "Acts/Propagator/MaterialInteractor.hpp"
 #include "Acts/Propagator/Navigator.hpp"
@@ -36,6 +35,7 @@
 #include <cmath>
 #include <iostream>
 #include <memory>
+#include <numbers>
 #include <optional>
 #include <random>
 #include <tuple>
@@ -86,18 +86,16 @@ template <typename propagator_t>
 void runTest(const propagator_t& prop,
              const CurvilinearTrackParameters& start) {
   // Action list and abort list
-  using ActionListType = ActionList<MaterialInteractor>;
-  using AbortListType = AbortList<>;
+  using ActorList = ActorList<MaterialInteractor>;
 
-  using Options =
-      typename propagator_t::template Options<ActionListType, AbortListType>;
+  using Options = typename propagator_t::template Options<ActorList>;
   Options fwdOptions(tgContext, mfContext);
   fwdOptions.stepping.maxStepSize = 25_cm;
   fwdOptions.pathLimit = 25_cm;
 
   // get the material collector and configure it
   auto& fwdMaterialInteractor =
-      fwdOptions.actionList.template get<MaterialInteractor>();
+      fwdOptions.actorList.template get<MaterialInteractor>();
   fwdMaterialInteractor.recordInteractions = true;
   fwdMaterialInteractor.energyLoss = false;
   fwdMaterialInteractor.multipleScattering = false;
@@ -141,7 +139,7 @@ void runTest(const propagator_t& prop,
 
   // get the material collector and configure it
   auto& bwdMaterialInteractor =
-      bwdOptions.actionList.template get<MaterialInteractor>();
+      bwdOptions.actorList.template get<MaterialInteractor>();
   bwdMaterialInteractor.recordInteractions = true;
   bwdMaterialInteractor.energyLoss = false;
   bwdMaterialInteractor.multipleScattering = false;
@@ -198,7 +196,7 @@ void runTest(const propagator_t& prop,
 
   // get the material collector and configure it
   auto& fwdStepMaterialInteractor =
-      fwdStepOptions.actionList.template get<MaterialInteractor>();
+      fwdStepOptions.actorList.template get<MaterialInteractor>();
   fwdStepMaterialInteractor.recordInteractions = true;
   fwdStepMaterialInteractor.energyLoss = false;
   fwdStepMaterialInteractor.multipleScattering = false;
@@ -272,7 +270,7 @@ void runTest(const propagator_t& prop,
 
   // get the material collector and configure it
   auto& bwdStepMaterialInteractor =
-      bwdStepOptions.actionList.template get<MaterialInteractor>();
+      bwdStepOptions.actorList.template get<MaterialInteractor>();
   bwdStepMaterialInteractor.recordInteractions = true;
   bwdStepMaterialInteractor.multipleScattering = false;
   bwdStepMaterialInteractor.energyLoss = false;
@@ -338,7 +336,7 @@ void runTest(const propagator_t& prop,
   // Test the material affects the covariance into the right direction
   // get the material collector and configure it
   auto& covfwdMaterialInteractor =
-      fwdOptions.actionList.template get<MaterialInteractor>();
+      fwdOptions.actorList.template get<MaterialInteractor>();
   covfwdMaterialInteractor.recordInteractions = false;
   covfwdMaterialInteractor.energyLoss = true;
   covfwdMaterialInteractor.multipleScattering = true;
@@ -358,14 +356,14 @@ BOOST_DATA_TEST_CASE(
     bdata::random((bdata::engine = std::mt19937(), bdata::seed = 20,
                    bdata::distribution = std::uniform_real_distribution<double>(
                        0.5_GeV, 10_GeV))) ^
-        bdata::random((bdata::engine = std::mt19937(), bdata::seed = 21,
-                       bdata::distribution =
-                           std::uniform_real_distribution<double>(-M_PI,
-                                                                  M_PI))) ^
+        bdata::random(
+            (bdata::engine = std::mt19937(), bdata::seed = 21,
+             bdata::distribution = std::uniform_real_distribution<double>(
+                 -std::numbers::pi, std::numbers::pi))) ^
         bdata::random(
             (bdata::engine = std::mt19937(), bdata::seed = 22,
-             bdata::distribution =
-                 std::uniform_real_distribution<double>(1.0, M_PI - 1.0))) ^
+             bdata::distribution = std::uniform_real_distribution<double>(
+                 1., std::numbers::pi - 1.))) ^
         bdata::random((bdata::engine = std::mt19937(), bdata::seed = 23,
                        bdata::distribution =
                            std::uniform_int_distribution<std::uint8_t>(0, 1))) ^
diff --git a/Tests/UnitTests/Core/Propagator/MultiStepperTests.cpp b/Tests/UnitTests/Core/Propagator/MultiStepperTests.cpp
index dea64db2a50..3fee9d4b6dd 100644
--- a/Tests/UnitTests/Core/Propagator/MultiStepperTests.cpp
+++ b/Tests/UnitTests/Core/Propagator/MultiStepperTests.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2018-2020 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include <boost/test/unit_test.hpp>
 
@@ -20,12 +20,12 @@
 #include "Acts/MagneticField/ConstantBField.hpp"
 #include "Acts/MagneticField/MagneticFieldContext.hpp"
 #include "Acts/MagneticField/NullBField.hpp"
-#include "Acts/Propagator/DefaultExtension.hpp"
 #include "Acts/Propagator/EigenStepper.hpp"
+#include "Acts/Propagator/EigenStepperDefaultExtension.hpp"
 #include "Acts/Propagator/MultiEigenStepperLoop.hpp"
 #include "Acts/Propagator/Navigator.hpp"
 #include "Acts/Propagator/Propagator.hpp"
-#include "Acts/Propagator/StepperExtensionList.hpp"
+#include "Acts/Surfaces/CurvilinearSurface.hpp"
 #include "Acts/Surfaces/PlaneSurface.hpp"
 #include "Acts/Surfaces/Surface.hpp"
 #include "Acts/Utilities/Helpers.hpp"
@@ -38,7 +38,9 @@
 #include <cmath>
 #include <cstddef>
 #include <memory>
+#include <numbers>
 #include <optional>
+#include <random>
 #include <stdexcept>
 #include <tuple>
 #include <type_traits>
@@ -46,6 +48,11 @@
 #include <vector>
 
 namespace Acts {
+namespace Concepts {
+template <typename T>
+concept has_components = requires { typename T::components; };
+}  // namespace Concepts
+
 struct MultiStepperSurfaceReached;
 }  // namespace Acts
 
@@ -58,9 +65,8 @@ using namespace Acts::VectorHelpers;
 const MagneticFieldContext magCtx;
 const GeometryContext geoCtx;
 
-using MultiStepperLoop =
-    MultiEigenStepperLoop<StepperExtensionList<DefaultExtension>>;
-using SingleStepper = EigenStepper<StepperExtensionList<DefaultExtension>>;
+using MultiStepperLoop = MultiEigenStepperLoop<EigenStepperDefaultExtension>;
+using SingleStepper = EigenStepper<EigenStepperDefaultExtension>;
 
 const double defaultStepSize = 123.;
 const auto defaultNDir = Direction::Backward;
@@ -105,9 +111,6 @@ struct DummyPropState {
   }
 };
 
-template <typename T>
-using components_t = typename T::components;
-
 // Makes random bound parameters and covariance and a plane surface at {0,0,0}
 // with normal {1,0,0}. Optionally some external fixed bound parameters can be
 // supplied
@@ -123,17 +126,93 @@ auto makeDefaultBoundPars(bool cov = true, std::size_t n = 4,
     return c;
   };
 
+  // note that we are using the default random device
+  std::mt19937 gen;
+  std::uniform_real_distribution<> locDis(-10., 10.);
+  std::uniform_real_distribution<> phiDis(-std::numbers::pi, std::numbers::pi);
+  std::uniform_real_distribution<> thetaDis(0., std::numbers::pi);
+  std::uniform_real_distribution<> qOverPDis(-10., 10.);
+  std::uniform_real_distribution<> timeDis(0., 100.);
+
   for (auto i = 0ul; i < n; ++i) {
-    cmps.push_back({1. / n, ext_pars ? *ext_pars : BoundVector::Random(),
-                    cov ? Opt{make_random_sym_matrix()} : Opt{}});
+    BoundVector params = BoundVector::Zero();
+
+    if (ext_pars) {
+      params = *ext_pars;
+    } else {
+      params[eBoundLoc0] = locDis(gen);
+      params[eBoundLoc1] = locDis(gen);
+      params[eBoundPhi] = phiDis(gen);
+      params[eBoundTheta] = thetaDis(gen);
+      params[eBoundQOverP] = qOverPDis(gen);
+      params[eBoundTime] = timeDis(gen);
+    }
+
+    cmps.push_back(
+        {1. / n, params, cov ? Opt{make_random_sym_matrix()} : Opt{}});
   }
 
-  auto surface = Acts::Surface::makeShared<Acts::PlaneSurface>(
-      Vector3::Zero(), Vector3{1., 0., 0.});
+  auto surface = Acts::CurvilinearSurface(Vector3::Zero(), Vector3{1., 0., 0.})
+                     .planeSurface();
 
   return MultiComponentBoundTrackParameters(surface, cmps, particleHypothesis);
 }
 
+//////////////////////
+/// Test the reducers
+//////////////////////
+BOOST_AUTO_TEST_CASE(test_max_weight_reducer) {
+  // Can use this multistepper since we only care about the state which is
+  // invariant
+  using MultiState = typename MultiStepperLoop::State;
+
+  constexpr std::size_t N = 4;
+  const auto multi_pars = makeDefaultBoundPars(false, N);
+  MultiState state(geoCtx, magCtx, defaultBField, multi_pars, defaultStepSize);
+  SingleStepper singleStepper(defaultBField);
+
+  double w = 0.1;
+  double wSum = 0.0;
+  for (auto &[sstate, weight, _] : state.components) {
+    weight = w;
+    wSum += w;
+    w += 0.1;
+  }
+  BOOST_CHECK_EQUAL(wSum, 1.0);
+  BOOST_CHECK_EQUAL(state.components.back().weight, 0.4);
+
+  MaxWeightReducerLoop reducer{};
+  BOOST_CHECK_EQUAL(reducer.position(state),
+                    singleStepper.position(state.components.back().state));
+  BOOST_CHECK_EQUAL(reducer.direction(state),
+                    singleStepper.direction(state.components.back().state));
+}
+
+BOOST_AUTO_TEST_CASE(test_max_momentum_reducer) {
+  // Can use this multistepper since we only care about the state which is
+  // invariant
+  using MultiState = typename MultiStepperLoop::State;
+
+  constexpr std::size_t N = 4;
+  const auto multi_pars = makeDefaultBoundPars(false, N);
+  MultiState state(geoCtx, magCtx, defaultBField, multi_pars, defaultStepSize);
+  SingleStepper singleStepper(defaultBField);
+
+  double p = 1.0;
+  double q = 1.0;
+  for (auto &[sstate, weight, _] : state.components) {
+    sstate.pars[eFreeQOverP] = q / p;
+    p *= 2.0;
+  }
+  BOOST_CHECK_EQUAL(state.components.back().state.pars[eFreeQOverP], q / 8.0);
+
+  MaxMomentumReducerLoop reducer{};
+  BOOST_CHECK_EQUAL(reducer.position(state),
+                    singleStepper.position(state.components.back().state));
+  BOOST_CHECK_EQUAL(reducer.direction(state),
+                    singleStepper.direction(state.components.back().state));
+}
+
 //////////////////////////////////////////////////////
 /// Test the construction of the MultiStepper::State
 //////////////////////////////////////////////////////
@@ -170,7 +249,7 @@ void test_multi_stepper_state() {
   // covTransport in the MultiEigenStepperLoop is redundant and
   // thus not part of the interface. However, we want to check them for
   // consistency.
-  if constexpr (Acts::Concepts::exists<components_t, MultiState>) {
+  if constexpr (Acts::Concepts::has_components<MultiState>) {
     BOOST_CHECK(!state.covTransport);
     for (const auto &cmp : state.components) {
       BOOST_CHECK_EQUAL(cmp.state.covTransport, Cov);
@@ -212,8 +291,9 @@ void test_multi_stepper_vs_eigen_stepper() {
   std::vector<std::tuple<double, BoundVector, std::optional<BoundSquareMatrix>>>
       cmps(4, {0.25, pars, cov});
 
-  auto surface = Acts::Surface::makeShared<Acts::PlaneSurface>(
-      Vector3::Zero(), Vector3::Ones().normalized());
+  auto surface =
+      Acts::CurvilinearSurface(Vector3::Zero(), Vector3::Ones().normalized())
+          .planeSurface();
 
   MultiComponentBoundTrackParameters multi_pars(surface, cmps,
                                                 particleHypothesis);
@@ -362,16 +442,19 @@ void test_multi_stepper_surface_status_update() {
   using MultiState = typename multi_stepper_t::State;
   using MultiStepper = multi_stepper_t;
 
-  auto start_surface = Acts::Surface::makeShared<Acts::PlaneSurface>(
-      Vector3::Zero(), Vector3{1.0, 0.0, 0.0});
+  auto start_surface =
+      Acts::CurvilinearSurface(Vector3::Zero(), Vector3{1.0, 0.0, 0.0})
+          .planeSurface();
 
-  auto right_surface = Acts::Surface::makeShared<Acts::PlaneSurface>(
-      Vector3{1.0, 0.0, 0.0}, Vector3{1.0, 0.0, 0.0});
+  auto right_surface =
+      Acts::CurvilinearSurface(Vector3{1.0, 0.0, 0.0}, Vector3{1.0, 0.0, 0.0})
+          .planeSurface();
 
   std::vector<std::tuple<double, BoundVector, std::optional<BoundSquareMatrix>>>
       cmps(2, {0.5, BoundVector::Zero(), std::nullopt});
-  std::get<BoundVector>(cmps[0])[eBoundTheta] = M_PI_2;
-  std::get<BoundVector>(cmps[1])[eBoundTheta] = -M_PI_2;
+  std::get<BoundVector>(cmps[0])[eBoundTheta] = std::numbers::pi / 2.;
+  std::get<BoundVector>(cmps[1])[eBoundPhi] = std::numbers::pi;
+  std::get<BoundVector>(cmps[1])[eBoundTheta] = std::numbers::pi / 2.;
   std::get<BoundVector>(cmps[0])[eBoundQOverP] = 1.0;
   std::get<BoundVector>(cmps[1])[eBoundQOverP] = 1.0;
 
@@ -471,16 +554,19 @@ void test_component_bound_state() {
   using MultiState = typename multi_stepper_t::State;
   using MultiStepper = multi_stepper_t;
 
-  auto start_surface = Acts::Surface::makeShared<Acts::PlaneSurface>(
-      Vector3::Zero(), Vector3{1.0, 0.0, 0.0});
+  auto start_surface =
+      Acts::CurvilinearSurface(Vector3::Zero(), Vector3{1.0, 0.0, 0.0})
+          .planeSurface();
 
-  auto right_surface = Acts::Surface::makeShared<Acts::PlaneSurface>(
-      Vector3{1.0, 0.0, 0.0}, Vector3{1.0, 0.0, 0.0});
+  auto right_surface =
+      Acts::CurvilinearSurface(Vector3{1.0, 0.0, 0.0}, Vector3{1.0, 0.0, 0.0})
+          .planeSurface();
 
   std::vector<std::tuple<double, BoundVector, std::optional<BoundSquareMatrix>>>
       cmps(2, {0.5, BoundVector::Zero(), std::nullopt});
-  std::get<BoundVector>(cmps[0])[eBoundTheta] = M_PI_2;
-  std::get<BoundVector>(cmps[1])[eBoundTheta] = -M_PI_2;
+  std::get<BoundVector>(cmps[0])[eBoundTheta] = std::numbers::pi / 2.;
+  std::get<BoundVector>(cmps[1])[eBoundPhi] = std::numbers::pi;
+  std::get<BoundVector>(cmps[1])[eBoundTheta] = std::numbers::pi / 2.;
   std::get<BoundVector>(cmps[0])[eBoundQOverP] = 1.0;
   std::get<BoundVector>(cmps[1])[eBoundQOverP] = 1.0;
 
@@ -549,8 +635,9 @@ void test_combined_bound_state_function() {
   using MultiState = typename multi_stepper_t::State;
   using MultiStepper = multi_stepper_t;
 
-  auto surface = Acts::Surface::makeShared<Acts::PlaneSurface>(
-      Vector3::Zero(), Vector3{1.0, 0.0, 0.0});
+  auto surface =
+      Acts::CurvilinearSurface(Vector3::Zero(), Vector3{1.0, 0.0, 0.0})
+          .planeSurface();
 
   // Use Ones() here, so that the angles are in correct range
   const auto pars = BoundVector::Ones().eval();
@@ -594,8 +681,9 @@ void test_combined_curvilinear_state_function() {
   using MultiState = typename multi_stepper_t::State;
   using MultiStepper = multi_stepper_t;
 
-  auto surface = Acts::Surface::makeShared<Acts::PlaneSurface>(
-      Vector3::Zero(), Vector3{1.0, 0.0, 0.0});
+  auto surface =
+      Acts::CurvilinearSurface(Vector3::Zero(), Vector3{1.0, 0.0, 0.0})
+          .planeSurface();
 
   // Use Ones() here, so that the angles are in correct range
   const auto pars = BoundVector::Ones().eval();
@@ -640,17 +728,7 @@ void test_single_component_interface_function() {
   using MultiState = typename multi_stepper_t::State;
   using MultiStepper = multi_stepper_t;
 
-  std::vector<std::tuple<double, BoundVector, std::optional<BoundSquareMatrix>>>
-      cmps;
-  for (int i = 0; i < 4; ++i) {
-    cmps.push_back({0.25, BoundVector::Random(), BoundSquareMatrix::Random()});
-  }
-
-  auto surface = Acts::Surface::makeShared<Acts::PlaneSurface>(
-      Vector3::Zero(), Vector3::Ones().normalized());
-
-  MultiComponentBoundTrackParameters multi_pars(surface, cmps,
-                                                particleHypothesis);
+  MultiComponentBoundTrackParameters multi_pars = makeDefaultBoundPars(true, 4);
 
   MultiState multi_state(geoCtx, magCtx, defaultBField, multi_pars,
                          defaultStepSize);
@@ -732,8 +810,9 @@ void propagator_instatiation_test_function() {
   Propagator<multi_stepper_t, Navigator> propagator(
       std::move(multi_stepper), Navigator{Navigator::Config{}});
 
-  auto surface = Acts::Surface::makeShared<Acts::PlaneSurface>(
-      Vector3::Zero(), Vector3{1.0, 0.0, 0.0});
+  auto surface =
+      Acts::CurvilinearSurface(Vector3::Zero(), Vector3{1.0, 0.0, 0.0})
+          .planeSurface();
   using PropagatorOptions =
       typename Propagator<multi_stepper_t, Navigator>::template Options<>;
   PropagatorOptions options(geoCtx, magCtx);
diff --git a/Tests/UnitTests/Core/Propagator/NavigatorTests.cpp b/Tests/UnitTests/Core/Propagator/NavigatorTests.cpp
new file mode 100644
index 00000000000..b9c6fdf87df
--- /dev/null
+++ b/Tests/UnitTests/Core/Propagator/NavigatorTests.cpp
@@ -0,0 +1,638 @@
+// This file is part of the ACTS project.
+//
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
+//
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
+
+#include <boost/test/data/test_case.hpp>
+#include <boost/test/unit_test.hpp>
+
+#include "Acts/Definitions/Algebra.hpp"
+#include "Acts/Definitions/Common.hpp"
+#include "Acts/Definitions/Direction.hpp"
+#include "Acts/Definitions/Tolerance.hpp"
+#include "Acts/Definitions/TrackParametrization.hpp"
+#include "Acts/Definitions/Units.hpp"
+#include "Acts/EventData/GenericBoundTrackParameters.hpp"
+#include "Acts/EventData/TrackParameters.hpp"
+#include "Acts/Geometry/GeometryContext.hpp"
+#include "Acts/Geometry/TrackingGeometry.hpp"
+#include "Acts/Geometry/TrackingVolume.hpp"
+#include "Acts/MagneticField/ConstantBField.hpp"
+#include "Acts/Propagator/ConstrainedStep.hpp"
+#include "Acts/Propagator/EigenStepper.hpp"
+#include "Acts/Propagator/Navigator.hpp"
+#include "Acts/Propagator/StepperConcept.hpp"
+#include "Acts/Surfaces/BoundaryTolerance.hpp"
+#include "Acts/Surfaces/PerigeeSurface.hpp"
+#include "Acts/Surfaces/Surface.hpp"
+#include "Acts/Tests/CommonHelpers/CylindricalTrackingGeometry.hpp"
+#include "Acts/Tests/CommonHelpers/FloatComparisons.hpp"
+#include "Acts/Utilities/Intersection.hpp"
+#include "Acts/Utilities/Logger.hpp"
+#include "Acts/Utilities/Result.hpp"
+
+#include <cstddef>
+#include <cstdint>
+#include <iostream>
+#include <memory>
+#include <string>
+#include <system_error>
+#include <tuple>
+#include <utility>
+
+namespace Acts {
+class Layer;
+struct FreeToBoundCorrection;
+}  // namespace Acts
+
+namespace bdata = boost::unit_test::data;
+using namespace Acts::UnitLiterals;
+using Acts::VectorHelpers::perp;
+
+namespace Acts::Test {
+
+// Create a test context
+GeometryContext tgContext = GeometryContext();
+MagneticFieldContext mfContext = MagneticFieldContext();
+
+/// This is a simple cache struct to mimic the
+/// Propagator cache
+struct PropagatorState {
+  /// This is a simple cache struct to mimic a Stepper
+  struct Stepper {
+    // comply with concept
+    using Jacobian = BoundMatrix;
+    using Covariance = BoundSquareMatrix;
+    using BoundState = std::tuple<BoundTrackParameters, Jacobian, double>;
+    using CurvilinearState =
+        std::tuple<CurvilinearTrackParameters, Jacobian, double>;
+    using BField = int;
+
+    template <typename, typename>
+    using return_parameter_type = void;
+
+    /// This is a simple cache struct to mimic the
+    /// Stepper cache in the propagation
+    struct State {
+      /// Position
+      Vector4 pos4 = Vector4(0., 0., 0., 0.);
+
+      /// Direction
+      Vector3 dir = Vector3(1., 0., 0.);
+
+      /// Momentum
+      double p = 0;
+
+      /// Charge
+      double q = 0;
+
+      /// Particle hypothesis
+      ParticleHypothesis particleHypothesis = ParticleHypothesis::pion();
+
+      // accummulated path length cache
+      double pathAccumulated = 0.;
+
+      // adaptive sep size of the runge-kutta integration
+      ConstrainedStep stepSize = ConstrainedStep(100_cm);
+
+      // Previous step size for overstep estimation (ignored here)
+      double previousStepSize = 0.;
+
+      GeometryContext geoContext = GeometryContext();
+    };
+
+    /// State resetter
+    void resetState(State& /*state*/, const BoundVector& /*boundParams*/,
+                    const BoundSquareMatrix& /*cov*/,
+                    const Surface& /*surface*/,
+                    const double /*stepSize*/) const {}
+
+    /// Global particle position accessor
+    Vector3 position(const State& state) const {
+      return state.pos4.segment<3>(Acts::ePos0);
+    }
+
+    /// Time access
+    double time(const State& state) const { return state.pos4[Acts::eTime]; }
+
+    /// Momentum direction accessor
+    Vector3 direction(const State& state) const { return state.dir; }
+
+    /// QoP accessor
+    double qOverP(const State& state) const {
+      return (state.q == 0 ? 1 : state.q) / state.p;
+    }
+
+    /// Absolute momentum accessor
+    double absoluteMomentum(const State& state) const { return state.p; }
+
+    /// Momentum accessor
+    Vector3 momentum(const State& state) const { return state.p * state.dir; }
+
+    /// Charge access
+    double charge(const State& state) const { return state.q; }
+
+    /// Overstep limit access
+    double overstepLimit(const State& /*state*/) const {
+      return s_onSurfaceTolerance;
+    }
+
+    Intersection3D::Status updateSurfaceStatus(
+        State& state, const Surface& surface, std::uint8_t index,
+        Direction navDir, const BoundaryTolerance& boundaryTolerance,
+        ActsScalar surfaceTolerance, const Logger& logger) const {
+      return detail::updateSingleSurfaceStatus<Stepper>(
+          *this, state, surface, index, navDir, boundaryTolerance,
+          surfaceTolerance, logger);
+    }
+
+    template <typename object_intersection_t>
+    void updateStepSize(State& state,
+                        const object_intersection_t& oIntersection,
+                        Direction /*direction*/, bool release = true) const {
+      detail::updateSingleStepSize<Stepper>(state, oIntersection, release);
+    }
+
+    void updateStepSize(State& state, double stepSize,
+                        ConstrainedStep::Type stype,
+                        bool release = true) const {
+      state.previousStepSize = state.stepSize.value();
+      state.stepSize.update(stepSize, stype, release);
+    }
+
+    double getStepSize(const State& state, ConstrainedStep::Type stype) const {
+      return state.stepSize.value(stype);
+    }
+
+    void releaseStepSize(State& state, ConstrainedStep::Type stype) const {
+      state.stepSize.release(stype);
+    }
+
+    std::string outputStepSize(const State& state) const {
+      return state.stepSize.toString();
+    }
+
+    Result<BoundState> boundState(
+        State& state, const Surface& surface, bool /*transportCov*/,
+        const FreeToBoundCorrection& /*freeToBoundCorrection*/
+    ) const {
+      auto bound = BoundTrackParameters::create(
+          surface.getSharedPtr(), tgContext, state.pos4, state.dir,
+          state.q / state.p, std::nullopt, state.particleHypothesis);
+      if (!bound.ok()) {
+        return bound.error();
+      }
+      BoundState bState{std::move(*bound), Jacobian::Identity(),
+                        state.pathAccumulated};
+      return bState;
+    }
+
+    CurvilinearState curvilinearState(State& state, bool /*transportCov*/
+    ) const {
+      CurvilinearTrackParameters parameters(state.pos4, state.dir,
+                                            state.q / state.p, std::nullopt,
+                                            state.particleHypothesis);
+      // Create the bound state
+      CurvilinearState curvState{std::move(parameters), Jacobian::Identity(),
+                                 state.pathAccumulated};
+      return curvState;
+    }
+
+    void update(State& /*state*/, const FreeVector& /*freePars*/,
+                const BoundVector& /*boundPars*/, const Covariance& /*cov*/,
+                const Surface& /*surface*/) const {}
+
+    void update(State& /*state*/, const Vector3& /*uposition*/,
+                const Vector3& /*udirection*/, double /*up*/,
+                double /*time*/) const {}
+
+    void transportCovarianceToCurvilinear(State& /*state*/) const {}
+
+    void transportCovarianceToBound(
+        State& /*state*/, const Surface& /*surface*/,
+        const FreeToBoundCorrection& /*freeToBoundCorrection*/) const {}
+
+    Result<Vector3> getField(State& /*state*/, const Vector3& /*pos*/) const {
+      // get the field from the cell
+      return Result<Vector3>::success({0., 0., 0.});
+    }
+  };
+
+  static_assert(StepperConcept<Stepper>,
+                "Dummy stepper does not fulfill concept");
+
+  /// emulate the options template
+  struct Options {
+    Direction direction = Direction::Forward;
+
+    const Acts::Logger& logger = Acts::getDummyLogger();
+
+    ActsScalar surfaceTolerance = s_onSurfaceTolerance;
+  };
+
+  /// Navigation cache: the start surface
+  const Surface* startSurface = nullptr;
+
+  /// Navigation cache: the current surface
+  const Surface* currentSurface = nullptr;
+
+  /// Navigation cache: the target surface
+  const Surface* targetSurface = nullptr;
+  bool targetReached = false;
+
+  /// Give some options
+  Options options;
+
+  /// The Stepper state - internal state of the Stepper
+  Stepper::State stepping;
+
+  /// Navigation state - internal state of the Navigator
+  Navigator::State navigation;
+
+  // The context cache for this propagation
+  GeometryContext geoContext = GeometryContext();
+};
+
+template <typename stepper_state_t>
+void step(stepper_state_t& sstate) {
+  // update the cache position
+  sstate.pos4[Acts::ePos0] += sstate.stepSize.value() * sstate.dir[Acts::eMom0];
+  sstate.pos4[Acts::ePos1] += sstate.stepSize.value() * sstate.dir[Acts::eMom1];
+  sstate.pos4[Acts::ePos2] += sstate.stepSize.value() * sstate.dir[Acts::eMom2];
+  // create navigation parameters
+  return;
+}
+
+/// @brief Method for testing vectors in @c Navigator::State
+///
+/// @param [in] state Navigator state
+/// @param [in] navSurf Number of navigation surfaces
+/// @param [in] navLay Number of navigation layers
+/// @param [in] navBound Number of navigation boundaries
+/// @param [in] extSurf Number of external surfaces
+bool testNavigatorStateVectors(Navigator::State& state, std::size_t navSurf,
+                               std::size_t navLay, std::size_t navBound) {
+  return ((state.navSurfaces.size() == navSurf) &&
+          (state.navLayers.size() == navLay) &&
+          (state.navBoundaries.size() == navBound));
+}
+
+/// @brief Method for testing pointers in @c Navigator::State
+///
+/// @param [in] state Navigation state
+/// @param [in] worldVol World volume
+/// @param [in] startVol Start volume
+/// @param [in] startLay Start layer
+/// @param [in] startSurf Start surface
+/// @param [in] currSurf Current surface
+/// @param [in] currVol Current volume
+/// @param [in] targetVol Target volume
+/// @param [in] targetLay Target layer
+/// @param [in] targetSurf Target surface
+bool testNavigatorStatePointers(Navigator::State& state,
+                                const TrackingVolume* worldVol,
+                                const TrackingVolume* startVol,
+                                const Layer* startLay, const Surface* startSurf,
+                                const Surface* currSurf,
+                                const TrackingVolume* currVol,
+                                const Surface* targetSurf) {
+  return ((state.worldVolume == worldVol) && (state.startVolume == startVol) &&
+          (state.startLayer == startLay) && (state.startSurface == startSurf) &&
+          (state.currentSurface == currSurf) &&
+          (state.currentVolume == currVol) &&
+          (state.targetSurface == targetSurf));
+}
+// the surface cache & the creation of the geometry
+
+CylindricalTrackingGeometry cGeometry(tgContext);
+auto tGeometry = cGeometry();
+
+const double Bz = 2_T;
+auto bField = std::make_shared<ConstantBField>(Vector3{0, 0, Bz});
+
+Acts::Logging::Level logLevel = Acts::Logging::INFO;
+
+BOOST_AUTO_TEST_CASE(Navigator_status_methods) {
+  ACTS_LOCAL_LOGGER(Acts::getDefaultLogger("NavigatorTest", logLevel))
+
+  // position and direction vector
+  Vector4 position4(0., 0., 0, 0);
+  Vector3 momentum(1., 1., 0);
+
+  // the propagator cache
+  PropagatorState state;
+
+  // the stepper cache
+  state.stepping.pos4 = position4;
+  state.stepping.dir = momentum.normalized();
+
+  // Stepper
+  PropagatorState::Stepper stepper;
+
+  ACTS_INFO("(1) Test for inactivity");
+  ACTS_INFO("    a) Run without anything present");
+  {
+    Navigator::Config navCfg;
+    navCfg.resolveSensitive = false;
+    navCfg.resolveMaterial = false;
+    navCfg.resolvePassive = false;
+    Navigator navigator{navCfg};
+
+    navigator.postStep(state, stepper);
+    BOOST_CHECK(testNavigatorStateVectors(state.navigation, 0u, 0u, 0u));
+    BOOST_CHECK(testNavigatorStatePointers(state.navigation, nullptr, nullptr,
+                                           nullptr, nullptr, nullptr, nullptr,
+                                           nullptr));
+  }
+
+  ACTS_INFO("    b) Run with geometry but without resolving");
+  {
+    Navigator::Config navCfg;
+    navCfg.resolveSensitive = false;
+    navCfg.resolveMaterial = false;
+    navCfg.resolvePassive = false;
+    navCfg.trackingGeometry = tGeometry;
+    Navigator navigator{navCfg};
+
+    navigator.postStep(state, stepper);
+    BOOST_CHECK(testNavigatorStateVectors(state.navigation, 0u, 0u, 0u));
+    BOOST_CHECK(testNavigatorStatePointers(state.navigation, nullptr, nullptr,
+                                           nullptr, nullptr, nullptr, nullptr,
+                                           nullptr));
+  }
+
+  ACTS_INFO(
+      "    c) Run with geometry and resolving but broken navigation for "
+      "various reasons");
+  {
+    Navigator::Config navCfg;
+    navCfg.resolveSensitive = true;
+    navCfg.resolveMaterial = true;
+    navCfg.resolvePassive = true;
+    navCfg.trackingGeometry = tGeometry;
+    Navigator navigator{navCfg};
+
+    state.navigation.navigationBreak = true;
+    ACTS_INFO("        i) Because target is reached");
+    state.navigation.targetReached = true;
+    navigator.postStep(state, stepper);
+    BOOST_CHECK(testNavigatorStateVectors(state.navigation, 0u, 0u, 0u));
+    BOOST_CHECK(testNavigatorStatePointers(state.navigation, nullptr, nullptr,
+                                           nullptr, nullptr, nullptr, nullptr,
+                                           nullptr));
+
+    ACTS_INFO("        ii) Because of no target surface");
+    state.navigation.targetReached = false;
+    state.navigation.targetSurface = nullptr;
+    navigator.postStep(state, stepper);
+    BOOST_CHECK(testNavigatorStateVectors(state.navigation, 0u, 0u, 0u));
+    BOOST_CHECK(testNavigatorStatePointers(state.navigation, nullptr, nullptr,
+                                           nullptr, nullptr, nullptr, nullptr,
+                                           nullptr));
+    ACTS_INFO("        iii) Because the target surface is reached");
+
+    auto beamline = Surface::makeShared<PerigeeSurface>(Vector3::Zero());
+    const Surface* startSurf = beamline.get();
+    state.stepping.pos4.segment<3>(Acts::ePos0) =
+        startSurf->center(state.geoContext);
+    const Surface* targetSurf = startSurf;
+    state.navigation.targetSurface = targetSurf;
+    navigator.postStep(state, stepper);
+    BOOST_CHECK(testNavigatorStateVectors(state.navigation, 0u, 0u, 0u));
+    BOOST_CHECK(testNavigatorStatePointers(state.navigation, nullptr, nullptr,
+                                           nullptr, nullptr, targetSurf,
+                                           nullptr, targetSurf));
+
+    ACTS_INFO("(2) Test the initialisation");
+    ACTS_INFO("    a) Initialise without additional information");
+    state.navigation = Navigator::State();
+    state.stepping.pos4 << 0., 0., 0., 0.;
+    const TrackingVolume* worldVol = tGeometry->highestTrackingVolume();
+    const TrackingVolume* startVol = tGeometry->lowestTrackingVolume(
+        state.geoContext, stepper.position(state.stepping));
+    const Layer* startLay = startVol->associatedLayer(
+        state.geoContext, stepper.position(state.stepping));
+    navigator.initialize(state, stepper);
+    BOOST_CHECK(testNavigatorStateVectors(state.navigation, 0u, 0u, 0u));
+    BOOST_CHECK(testNavigatorStatePointers(state.navigation, worldVol, startVol,
+                                           startLay, nullptr, nullptr, startVol,
+                                           nullptr));
+
+    ACTS_INFO("    b) Initialise having a start surface");
+    state.navigation = Navigator::State();
+    state.navigation.startSurface = startSurf;
+    navigator.initialize(state, stepper);
+    BOOST_CHECK(testNavigatorStateVectors(state.navigation, 0u, 0u, 0u));
+    BOOST_CHECK(testNavigatorStatePointers(state.navigation, worldVol, startVol,
+                                           startLay, startSurf, startSurf,
+                                           startVol, nullptr));
+
+    ACTS_INFO("    c) Initialise having a start volume");
+    state.navigation = Navigator::State();
+    state.navigation.startVolume = startVol;
+    navigator.initialize(state, stepper);
+    BOOST_CHECK(testNavigatorStateVectors(state.navigation, 0u, 0u, 0u));
+    BOOST_CHECK(testNavigatorStatePointers(state.navigation, worldVol, startVol,
+                                           startLay, nullptr, nullptr, startVol,
+                                           nullptr));
+  }
+}
+
+BOOST_AUTO_TEST_CASE(Navigator_target_methods) {
+  ACTS_LOCAL_LOGGER(Acts::getDefaultLogger("NavigatorTest", logLevel))
+
+  // create a navigator
+  Navigator::Config navCfg;
+  navCfg.trackingGeometry = tGeometry;
+  navCfg.resolveSensitive = true;
+  navCfg.resolveMaterial = true;
+  navCfg.resolvePassive = false;
+  Navigator navigator{navCfg};
+
+  // position and direction vector
+  Vector4 position4(0., 0., 0, 0);
+  Vector3 momentum(1., 1., 0);
+
+  // the propagator cache
+  PropagatorState state;
+
+  // the stepper cache
+  state.stepping.pos4 = position4;
+  state.stepping.dir = momentum.normalized();
+
+  // forward navigation ----------------------------------------------
+  ACTS_INFO("<<<<<<<<<<<<<<<<<<<<< FORWARD NAVIGATION >>>>>>>>>>>>>>>>>>");
+
+  // Stepper
+  PropagatorState::Stepper stepper;
+
+  // (1) Initialization navigation from start point
+  // - this will call resolveLayers() as well
+  // - and thus should call a return to the stepper
+  navigator.initialize(state, stepper);
+  // Check that the currentVolume is set
+  BOOST_CHECK_NE(state.navigation.currentVolume, nullptr);
+  // Check that the currentVolume is the startVolume
+  BOOST_CHECK_EQUAL(state.navigation.currentVolume,
+                    state.navigation.startVolume);
+  // Check that the currentSurface is reset to:
+  BOOST_CHECK_EQUAL(state.navigation.currentSurface, nullptr);
+  // No layer has been found
+  BOOST_CHECK_EQUAL(state.navigation.navLayers.size(), 0u);
+  // ACTORS-ABORTERS-TARGET
+  navigator.preStep(state, stepper);
+  // A layer has been found
+  BOOST_CHECK_EQUAL(state.navigation.navLayers.size(), 1u);
+  // The index should points to the begin
+  BOOST_CHECK_EQUAL(state.navigation.navLayerIndex, 0);
+  // Cache the beam pipe radius
+  double beamPipeR = perp(state.navigation.navLayer().first.position());
+  // step size has been updated
+  CHECK_CLOSE_ABS(state.stepping.stepSize.value(), beamPipeR,
+                  s_onSurfaceTolerance);
+
+  ACTS_INFO("<<< Test 1a >>> initialize at " << toString(state.stepping.pos4));
+
+  // Do the step towards the beam pipe
+  step(state.stepping);
+
+  // (2) re-entering navigator:
+  // POST STEP
+  navigator.postStep(state, stepper);
+  // Check that the currentVolume is the still startVolume
+  BOOST_CHECK_EQUAL(state.navigation.currentVolume,
+                    state.navigation.startVolume);
+  // The layer number has not changed
+  BOOST_CHECK_EQUAL(state.navigation.navLayers.size(), 1u);
+  // The index still points to the begin
+  BOOST_CHECK_EQUAL(state.navigation.navLayerIndex, 0);
+  // ACTORS - ABORTERS - PRE STEP
+  navigator.preStep(state, stepper);
+
+  ACTS_INFO("<<< Test 1b >>> step to the BeamPipe at  "
+            << toString(state.stepping.pos4));
+
+  // Do the step towards the boundary
+  step(state.stepping);
+
+  // (3) re-entering navigator:
+  // POST STEP
+  navigator.postStep(state, stepper);
+  // ACTORS - ABORTERS - PRE STEP
+  navigator.preStep(state, stepper);
+
+  ACTS_INFO("<<< Test 1c >>> step to the Boundary at  "
+            << toString(state.stepping.pos4));
+
+  // positive return: do the step
+  step(state.stepping);
+  // (4) re-entering navigator:
+  // POST STEP
+  navigator.postStep(state, stepper);
+  // ACTORS - ABORTERS - PRE STEP
+  navigator.preStep(state, stepper);
+
+  ACTS_INFO("<<< Test 1d >>> step to 1st layer at  "
+            << toString(state.stepping.pos4));
+
+  // Step through the surfaces on first layer
+  for (std::size_t isf = 0; isf < 5; ++isf) {
+    step(state.stepping);
+    // (5-9) re-entering navigator:
+    // POST STEP
+    navigator.postStep(state, stepper);
+    // ACTORS - ABORTERS - PRE STEP
+    navigator.preStep(state, stepper);
+
+    ACTS_INFO("<<< Test 1e-1i >>> step within 1st layer at  "
+              << toString(state.stepping.pos4));
+  }
+
+  // positive return: do the step
+  step(state.stepping);
+  // (10) re-entering navigator:
+  // POST STEP
+  navigator.postStep(state, stepper);
+  // ACTORS - ABORTERS - PRE STEP
+  navigator.preStep(state, stepper);
+
+  ACTS_INFO("<<< Test 1j >>> step to 2nd layer at  "
+            << toString(state.stepping.pos4));
+
+  // Step through the surfaces on second layer
+  for (std::size_t isf = 0; isf < 5; ++isf) {
+    step(state.stepping);
+    // (11-15) re-entering navigator:
+    // POST STEP
+    navigator.postStep(state, stepper);
+    // ACTORS - ABORTERS - PRE STEP
+    navigator.preStep(state, stepper);
+
+    ACTS_INFO("<<< Test 1k-1o >>> step within 2nd layer at  "
+              << toString(state.stepping.pos4));
+  }
+
+  // positive return: do the step
+  step(state.stepping);
+  // (16) re-entering navigator:
+  // POST STEP
+  navigator.postStep(state, stepper);
+  // ACTORS - ABORTERS - PRE STEP
+  navigator.preStep(state, stepper);
+
+  ACTS_INFO("<<< Test 1p >>> step to 3rd layer at  "
+            << toString(state.stepping.pos4));
+
+  // Step through the surfaces on third layer
+  for (std::size_t isf = 0; isf < 3; ++isf) {
+    step(state.stepping);
+    // (17-19) re-entering navigator:
+    // POST STEP
+    navigator.postStep(state, stepper);
+    // ACTORS - ABORTERS - PRE STEP
+    navigator.preStep(state, stepper);
+
+    ACTS_INFO("<<< Test 1q-1s >>> step within 3rd layer at  "
+              << toString(state.stepping.pos4));
+  }
+
+  // positive return: do the step
+  step(state.stepping);
+  // (20) re-entering navigator:
+  // POST STEP
+  navigator.postStep(state, stepper);
+  // ACTORS - ABORTERS - PRE STEP
+  navigator.preStep(state, stepper);
+
+  ACTS_INFO("<<< Test 1t >>> step to 4th layer at  "
+            << toString(state.stepping.pos4));
+
+  // Step through the surfaces on second layer
+  for (std::size_t isf = 0; isf < 3; ++isf) {
+    step(state.stepping);
+    // (21-23) re-entering navigator:
+    // POST STEP
+    navigator.postStep(state, stepper);
+    // ACTORS - ABORTERS - PRE STEP
+    navigator.preStep(state, stepper);
+
+    ACTS_INFO("<<< Test 1t-1v >>> step within 4th layer at  "
+              << toString(state.stepping.pos4));
+  }
+
+  // positive return: do the step
+  step(state.stepping);
+  // (24) re-entering navigator:
+  // POST STEP
+  navigator.postStep(state, stepper);
+  // ACTORS - ABORTERS - PRE STEP
+  navigator.preStep(state, stepper);
+
+  ACTS_INFO("<<< Test 1w >>> step to boundary at  "
+            << toString(state.stepping.pos4));
+}
+
+}  // namespace Acts::Test
diff --git a/Tests/UnitTests/Core/Propagator/PropagatorTests.cpp b/Tests/UnitTests/Core/Propagator/PropagatorTests.cpp
index a821175b409..777c9d27a5f 100644
--- a/Tests/UnitTests/Core/Propagator/PropagatorTests.cpp
+++ b/Tests/UnitTests/Core/Propagator/PropagatorTests.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2016-2024 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include <boost/test/data/test_case.hpp>
 #include <boost/test/unit_test.hpp>
@@ -20,18 +20,16 @@
 #include "Acts/Geometry/GeometryIdentifier.hpp"
 #include "Acts/MagneticField/ConstantBField.hpp"
 #include "Acts/MagneticField/MagneticFieldContext.hpp"
-#include "Acts/Propagator/AbortList.hpp"
-#include "Acts/Propagator/ActionList.hpp"
+#include "Acts/Propagator/ActorList.hpp"
 #include "Acts/Propagator/ConstrainedStep.hpp"
-#include "Acts/Propagator/DenseEnvironmentExtension.hpp"
 #include "Acts/Propagator/EigenStepper.hpp"
+#include "Acts/Propagator/EigenStepperDenseExtension.hpp"
 #include "Acts/Propagator/Navigator.hpp"
 #include "Acts/Propagator/NavigatorOptions.hpp"
 #include "Acts/Propagator/Propagator.hpp"
 #include "Acts/Propagator/StandardAborters.hpp"
-#include "Acts/Propagator/StepperExtensionList.hpp"
-#include "Acts/Propagator/StepperOptions.hpp"
 #include "Acts/Propagator/StraightLineStepper.hpp"
+#include "Acts/Surfaces/CurvilinearSurface.hpp"
 #include "Acts/Surfaces/CylinderBounds.hpp"
 #include "Acts/Surfaces/CylinderSurface.hpp"
 #include "Acts/Surfaces/PlaneSurface.hpp"
@@ -46,6 +44,7 @@
 #include <cstddef>
 #include <limits>
 #include <memory>
+#include <numbers>
 #include <optional>
 #include <random>
 #include <tuple>
@@ -108,9 +107,9 @@ struct SurfaceObserver {
 
   template <typename propagator_state_t, typename stepper_t,
             typename navigator_t>
-  void operator()(propagator_state_t& state, const stepper_t& stepper,
-                  const navigator_t& /*navigator*/, result_type& result,
-                  const Logger& /*logger*/) const {
+  void act(propagator_state_t& state, const stepper_t& stepper,
+           const navigator_t& /*navigator*/, result_type& result,
+           const Logger& /*logger*/) const {
     if (surface && !result.surfaces_passed) {
       // calculate the distance to the surface
       const double distance =
@@ -156,15 +155,10 @@ const int ntests = 5;
 // This tests the Options
 BOOST_AUTO_TEST_CASE(PropagatorOptions_) {
   using NullOptionsType = EigenPropagatorType::Options<>;
-  NullOptionsType nullOptions(tgContext, mfContext);
-  // TODO write null options test
-
-  using ActionListType = ActionList<PerpendicularMeasure>;
-  using AbortConditionsType = AbortList<>;
-  using OptionsType =
-      PropagatorOptions<StepperPlainOptions, NavigatorPlainOptions,
-                        ActionListType, AbortConditionsType>;
+  NullOptionsType null_options(tgContext, mfContext);
 
+  using ActorList = ActorList<PerpendicularMeasure>;
+  using OptionsType = EigenPropagatorType::Options<ActorList>;
   OptionsType options(tgContext, mfContext);
 }
 
@@ -173,14 +167,14 @@ BOOST_DATA_TEST_CASE(
     bdata::random((bdata::engine = std::mt19937(), bdata::seed = 0,
                    bdata::distribution = std::uniform_real_distribution<double>(
                        0.4_GeV, 10_GeV))) ^
-        bdata::random((bdata::engine = std::mt19937(), bdata::seed = 1,
-                       bdata::distribution =
-                           std::uniform_real_distribution<double>(-M_PI,
-                                                                  M_PI))) ^
+        bdata::random(
+            (bdata::engine = std::mt19937(), bdata::seed = 1,
+             bdata::distribution = std::uniform_real_distribution<double>(
+                 -std::numbers::pi, std::numbers::pi))) ^
         bdata::random(
             (bdata::engine = std::mt19937(), bdata::seed = 2,
-             bdata::distribution =
-                 std::uniform_real_distribution<double>(1.0, M_PI - 1.0))) ^
+             bdata::distribution = std::uniform_real_distribution<double>(
+                 1., std::numbers::pi - 1.))) ^
         bdata::random((bdata::engine = std::mt19937(), bdata::seed = 3,
                        bdata::distribution =
                            std::uniform_int_distribution<std::uint8_t>(0, 1))) ^
@@ -194,18 +188,16 @@ BOOST_DATA_TEST_CASE(
   (void)index;
 
   using CylinderObserver = SurfaceObserver<CylinderSurface>;
-  using ActionListType = ActionList<CylinderObserver>;
-  using AbortConditionsType = AbortList<>;
+  using ActorList = ActorList<CylinderObserver>;
 
   // setup propagation options
-  EigenPropagatorType::Options<ActionListType, AbortConditionsType> options(
-      tgContext, mfContext);
+  EigenPropagatorType::Options<ActorList> options(tgContext, mfContext);
 
   options.pathLimit = 20_m;
   options.stepping.maxStepSize = 1_cm;
 
   // set the surface to be passed by
-  options.actionList.get<CylinderObserver>().surface = mSurface.get();
+  options.actorList.get<CylinderObserver>().surface = mSurface.get();
 
   using so_result = typename CylinderObserver::result_type;
 
@@ -235,14 +227,14 @@ BOOST_DATA_TEST_CASE(
     bdata::random((bdata::engine = std::mt19937(), bdata::seed = 0,
                    bdata::distribution = std::uniform_real_distribution<double>(
                        0.4_GeV, 10_GeV))) ^
-        bdata::random((bdata::engine = std::mt19937(), bdata::seed = 1,
-                       bdata::distribution =
-                           std::uniform_real_distribution<double>(-M_PI,
-                                                                  M_PI))) ^
+        bdata::random(
+            (bdata::engine = std::mt19937(), bdata::seed = 1,
+             bdata::distribution = std::uniform_real_distribution<double>(
+                 -std::numbers::pi, std::numbers::pi))) ^
         bdata::random(
             (bdata::engine = std::mt19937(), bdata::seed = 2,
-             bdata::distribution =
-                 std::uniform_real_distribution<double>(1.0, M_PI - 1.0))) ^
+             bdata::distribution = std::uniform_real_distribution<double>(
+                 1., std::numbers::pi - 1.))) ^
         bdata::random((bdata::engine = std::mt19937(), bdata::seed = 3,
                        bdata::distribution =
                            std::uniform_int_distribution<std::uint8_t>(0, 1))) ^
@@ -315,14 +307,14 @@ BOOST_DATA_TEST_CASE(
     bdata::random((bdata::engine = std::mt19937(), bdata::seed = 0,
                    bdata::distribution = std::uniform_real_distribution<double>(
                        0.4_GeV, 10_GeV))) ^
-        bdata::random((bdata::engine = std::mt19937(), bdata::seed = 1,
-                       bdata::distribution =
-                           std::uniform_real_distribution<double>(-M_PI,
-                                                                  M_PI))) ^
+        bdata::random(
+            (bdata::engine = std::mt19937(), bdata::seed = 1,
+             bdata::distribution = std::uniform_real_distribution<double>(
+                 -std::numbers::pi, std::numbers::pi))) ^
         bdata::random(
             (bdata::engine = std::mt19937(), bdata::seed = 2,
-             bdata::distribution =
-                 std::uniform_real_distribution<double>(1.0, M_PI - 1.0))) ^
+             bdata::distribution = std::uniform_real_distribution<double>(
+                 1., std::numbers::pi - 1.))) ^
         bdata::random((bdata::engine = std::mt19937(), bdata::seed = 3,
                        bdata::distribution =
                            std::uniform_int_distribution<std::uint8_t>(0, 1))) ^
@@ -399,12 +391,13 @@ BOOST_AUTO_TEST_CASE(BasicPropagatorInterface) {
   VoidNavigator navigator{};
 
   auto startSurface =
-      Surface::makeShared<PlaneSurface>(Vector3::Zero(), Vector3::UnitX());
-  auto targetSurface = Surface::makeShared<PlaneSurface>(
-      Vector3::UnitX() * 20_mm, Vector3::UnitX());
+      CurvilinearSurface(Vector3::Zero(), Vector3::UnitX()).planeSurface();
+  auto targetSurface =
+      CurvilinearSurface(Vector3::UnitX() * 20_mm, Vector3::UnitX())
+          .planeSurface();
 
   BoundVector startPars;
-  startPars << 0, 0, 0, M_PI / 2, 1 / 1_GeV, 0;
+  startPars << 0, 0, 0, std::numbers::pi / 2., 1 / 1_GeV, 0;
 
   BoundTrackParameters startParameters{startSurface, startPars, std::nullopt,
                                        ParticleHypothesis::pion()};
@@ -478,8 +471,7 @@ BOOST_AUTO_TEST_CASE(BasicPropagatorInterface) {
     BOOST_CHECK(resultCurv.ok());
   }
 
-  EigenStepper<StepperExtensionList<DenseEnvironmentExtension>>
-      denseEigenStepper{field};
+  EigenStepper<EigenStepperDenseExtension> denseEigenStepper{field};
 
   {
     Propagator propagator{denseEigenStepper, navigator};
diff --git a/Tests/UnitTests/Core/Propagator/StraightLineStepperTests.cpp b/Tests/UnitTests/Core/Propagator/StraightLineStepperTests.cpp
index bbb9cb9b83a..fb8d348c38a 100644
--- a/Tests/UnitTests/Core/Propagator/StraightLineStepperTests.cpp
+++ b/Tests/UnitTests/Core/Propagator/StraightLineStepperTests.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2020 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include <boost/test/unit_test.hpp>
 
@@ -22,6 +22,7 @@
 #include "Acts/Propagator/ConstrainedStep.hpp"
 #include "Acts/Propagator/StraightLineStepper.hpp"
 #include "Acts/Surfaces/BoundaryTolerance.hpp"
+#include "Acts/Surfaces/CurvilinearSurface.hpp"
 #include "Acts/Surfaces/PlaneSurface.hpp"
 #include "Acts/Surfaces/Surface.hpp"
 #include "Acts/Tests/CommonHelpers/FloatComparisons.hpp"
@@ -319,7 +320,7 @@ BOOST_AUTO_TEST_CASE(straight_line_stepper_test) {
   BOOST_CHECK_EQUAL(slsStateCopy.tolerance, ps.stepping.tolerance);
 
   /// Repeat with surface related methods
-  auto plane = Surface::makeShared<PlaneSurface>(pos, dir);
+  auto plane = CurvilinearSurface(pos, dir).planeSurface();
   auto bp = BoundTrackParameters::create(
                 plane, tgContext, makeVector4(pos, time), dir, charge / absMom,
                 cov, ParticleHypothesis::pion())
@@ -329,7 +330,7 @@ BOOST_AUTO_TEST_CASE(straight_line_stepper_test) {
 
   // Test the intersection in the context of a surface
   auto targetSurface =
-      Surface::makeShared<PlaneSurface>(pos + navDir * 2. * dir, dir);
+      CurvilinearSurface(pos + navDir * 2. * dir, dir).planeSurface();
   sls.updateSurfaceStatus(slsState, *targetSurface, 0, navDir,
                           BoundaryTolerance::Infinite());
   CHECK_CLOSE_ABS(slsState.stepSize.value(ConstrainedStep::actor), navDir * 2.,
diff --git a/Tests/UnitTests/Core/Propagator/SympyStepperTests.cpp b/Tests/UnitTests/Core/Propagator/SympyStepperTests.cpp
index 1ea875e5735..fcdf13e9f8a 100644
--- a/Tests/UnitTests/Core/Propagator/SympyStepperTests.cpp
+++ b/Tests/UnitTests/Core/Propagator/SympyStepperTests.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2024 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include <boost/test/unit_test.hpp>
 
@@ -31,18 +31,14 @@
 #include "Acts/Material/HomogeneousSurfaceMaterial.hpp"
 #include "Acts/Material/HomogeneousVolumeMaterial.hpp"
 #include "Acts/Material/MaterialSlab.hpp"
-#include "Acts/Propagator/AbortList.hpp"
-#include "Acts/Propagator/ActionList.hpp"
+#include "Acts/Propagator/ActorList.hpp"
 #include "Acts/Propagator/ConstrainedStep.hpp"
-#include "Acts/Propagator/DefaultExtension.hpp"
-#include "Acts/Propagator/DenseEnvironmentExtension.hpp"
 #include "Acts/Propagator/MaterialInteractor.hpp"
 #include "Acts/Propagator/Navigator.hpp"
 #include "Acts/Propagator/Propagator.hpp"
-#include "Acts/Propagator/StepperExtensionList.hpp"
 #include "Acts/Propagator/SympyStepper.hpp"
-#include "Acts/Propagator/detail/Auctioneer.hpp"
 #include "Acts/Surfaces/BoundaryTolerance.hpp"
+#include "Acts/Surfaces/CurvilinearSurface.hpp"
 #include "Acts/Surfaces/PlaneSurface.hpp"
 #include "Acts/Surfaces/RectangleBounds.hpp"
 #include "Acts/Surfaces/Surface.hpp"
@@ -445,7 +441,7 @@ BOOST_AUTO_TEST_CASE(sympy_stepper_test) {
   BOOST_CHECK_EQUAL(esStateCopy.previousStepSize, ps.stepping.previousStepSize);
 
   /// Repeat with surface related methods
-  auto plane = Surface::makeShared<PlaneSurface>(pos, dir.normalized());
+  auto plane = CurvilinearSurface(pos, dir.normalized()).planeSurface();
   auto bp = BoundTrackParameters::create(
                 plane, tgContext, makeVector4(pos, time), dir, charge / absMom,
                 cov, ParticleHypothesis::pion())
@@ -455,7 +451,7 @@ BOOST_AUTO_TEST_CASE(sympy_stepper_test) {
 
   // Test the intersection in the context of a surface
   auto targetSurface =
-      Surface::makeShared<PlaneSurface>(pos + navDir * 2. * dir, dir);
+      CurvilinearSurface(pos + navDir * 2. * dir, dir).planeSurface();
   es.updateSurfaceStatus(esState, *targetSurface, 0, navDir,
                          BoundaryTolerance::None());
   CHECK_CLOSE_ABS(esState.stepSize.value(ConstrainedStep::actor), navDir * 2.,
diff --git a/Tests/UnitTests/Core/Propagator/VolumeMaterialInteractionTests.cpp b/Tests/UnitTests/Core/Propagator/VolumeMaterialInteractionTests.cpp
index d37ac188324..5bc361fc0a0 100644
--- a/Tests/UnitTests/Core/Propagator/VolumeMaterialInteractionTests.cpp
+++ b/Tests/UnitTests/Core/Propagator/VolumeMaterialInteractionTests.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2020 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include <boost/test/unit_test.hpp>
 
diff --git a/Tests/UnitTests/Core/Seeding/ATLASCuts.hpp b/Tests/UnitTests/Core/Seeding/ATLASCuts.hpp
index 35667ca1462..e86d2aec8d9 100644
--- a/Tests/UnitTests/Core/Seeding/ATLASCuts.hpp
+++ b/Tests/UnitTests/Core/Seeding/ATLASCuts.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2023 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
@@ -21,35 +21,31 @@ class ATLASCuts : public IExperimentCuts<SpacePoint> {
   /// @param middle middle space point of the current seed
   /// @param top top space point of the current seed
   /// @return seed weight to be added to the seed's weight
-  float seedWeight(const InternalSpacePoint<SpacePoint>& bottom,
-                   const InternalSpacePoint<SpacePoint>& middle,
-                   const InternalSpacePoint<SpacePoint>& top) const override;
+  float seedWeight(const SpacePoint& bottom, const SpacePoint& middle,
+                   const SpacePoint& top) const override;
   /// @param weight the current seed weight
   /// @param bottom bottom space point of the current seed
   /// @param middle middle space point of the current seed
   /// @param top top space point of the current seed
   /// @return true if the seed should be kept, false if the seed should be
   /// discarded
-  bool singleSeedCut(
-      float weight, const InternalSpacePoint<SpacePoint>& bottom,
-      const InternalSpacePoint<SpacePoint>& /*middle*/,
-      const InternalSpacePoint<SpacePoint>& /*top*/) const override;
+  bool singleSeedCut(float weight, const SpacePoint& bottom,
+                     const SpacePoint& /*middle*/,
+                     const SpacePoint& /*top*/) const override;
 
   /// @param seedCandidates contains collection of seed candidates created for one middle
   /// space point in a std::tuple format
   /// @return vector of seeds that pass the cut
-  std::vector<typename CandidatesForMiddleSp<
-      const InternalSpacePoint<SpacePoint>>::value_type>
-  cutPerMiddleSP(std::vector<typename CandidatesForMiddleSp<
-                     const InternalSpacePoint<SpacePoint>>::value_type>
-                     seedCandidates) const override;
+  std::vector<typename CandidatesForMiddleSp<const SpacePoint>::value_type>
+  cutPerMiddleSP(
+      std::vector<typename CandidatesForMiddleSp<const SpacePoint>::value_type>
+          seedCandidates) const override;
 };
 
 template <typename SpacePoint>
-float ATLASCuts<SpacePoint>::seedWeight(
-    const InternalSpacePoint<SpacePoint>& bottom,
-    const InternalSpacePoint<SpacePoint>& /*middle*/,
-    const InternalSpacePoint<SpacePoint>& top) const {
+float ATLASCuts<SpacePoint>::seedWeight(const SpacePoint& bottom,
+                                        const SpacePoint& /*middle*/,
+                                        const SpacePoint& top) const {
   float weight = 0;
   if (bottom.radius() > 150) {
     weight = 400;
@@ -61,22 +57,18 @@ float ATLASCuts<SpacePoint>::seedWeight(
 }
 
 template <typename SpacePoint>
-bool ATLASCuts<SpacePoint>::singleSeedCut(
-    float weight, const InternalSpacePoint<SpacePoint>& b,
-    const InternalSpacePoint<SpacePoint>& /*m*/,
-    const InternalSpacePoint<SpacePoint>& /*t*/) const {
+bool ATLASCuts<SpacePoint>::singleSeedCut(float weight, const SpacePoint& b,
+                                          const SpacePoint& /*m*/,
+                                          const SpacePoint& /*t*/) const {
   return !(b.radius() > 150. && weight < 380.);
 }
 
 template <typename SpacePoint>
-std::vector<typename CandidatesForMiddleSp<
-    const InternalSpacePoint<SpacePoint>>::value_type>
+std::vector<typename CandidatesForMiddleSp<const SpacePoint>::value_type>
 ATLASCuts<SpacePoint>::cutPerMiddleSP(
-    std::vector<typename CandidatesForMiddleSp<
-        const InternalSpacePoint<SpacePoint>>::value_type>
+    std::vector<typename CandidatesForMiddleSp<const SpacePoint>::value_type>
         seedCandidates) const {
-  std::vector<typename CandidatesForMiddleSp<
-      const InternalSpacePoint<SpacePoint>>::value_type>
+  std::vector<typename CandidatesForMiddleSp<const SpacePoint>::value_type>
       newSeedsVector;
   if (seedCandidates.size() <= 1) {
     return seedCandidates;
diff --git a/Tests/UnitTests/Core/Seeding/BinnedGroupTest.cpp b/Tests/UnitTests/Core/Seeding/BinnedGroupTest.cpp
index 18f20478488..97c6df0ae4a 100644
--- a/Tests/UnitTests/Core/Seeding/BinnedGroupTest.cpp
+++ b/Tests/UnitTests/Core/Seeding/BinnedGroupTest.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2024 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include <boost/test/unit_test.hpp>
 
@@ -15,6 +15,7 @@
 
 #include <array>
 #include <memory>
+#include <numbers>
 #include <vector>
 
 namespace Acts::Test {
@@ -156,7 +157,7 @@ BOOST_AUTO_TEST_CASE(binned_group_fill_2d) {
   using value_t = std::size_t;
   using binfinder_t = Acts::GridBinFinder<2ul>;
 
-  Axis phiAxis(AxisClosed, -M_PI, M_PI, 40);
+  Axis phiAxis(AxisClosed, -std::numbers::pi, std::numbers::pi, 40);
   Axis zAxis(AxisBound, 0, 100, 10);
 
   Grid grid(Type<std::vector<value_t>>, std::move(phiAxis), std::move(zAxis));
@@ -192,7 +193,7 @@ BOOST_AUTO_TEST_CASE(binned_group_fill_3d) {
   using grid_t = Acts::Grid<std::vector<value_t>, phiAxis_t, zAxis_t, rAxis_t>;
   using binfinder_t = Acts::GridBinFinder<3ul>;
 
-  phiAxis_t phiAxis(-M_PI, M_PI, 40);
+  phiAxis_t phiAxis(-std::numbers::pi, std::numbers::pi, 40);
   zAxis_t zAxis(0, 100, 10);
   rAxis_t rAxis(0, 11000, 1);
 
diff --git a/Tests/UnitTests/Core/Seeding/CMakeLists.txt b/Tests/UnitTests/Core/Seeding/CMakeLists.txt
index 5f59cf614ba..edf833c286b 100644
--- a/Tests/UnitTests/Core/Seeding/CMakeLists.txt
+++ b/Tests/UnitTests/Core/Seeding/CMakeLists.txt
@@ -3,6 +3,7 @@ target_link_libraries(ActsUnitTestSeedFinder PRIVATE ActsCore Boost::boost)
 
 add_unittest(EstimateTrackParamsFromSeed EstimateTrackParamsFromSeedTest.cpp)
 add_unittest(BinnedGroupTest BinnedGroupTest.cpp)
+add_unittest(PathSeeder PathSeederTest.cpp)
 add_unittest(HoughTransformTest HoughTransformTest.cpp)
 add_unittest(UtilityFunctions UtilityFunctionsTests.cpp)
 add_unittest(CandidatesForMiddleSp CandidatesForMiddleSpTests.cpp)
diff --git a/Tests/UnitTests/Core/Seeding/CandidatesForMiddleSpTests.cpp b/Tests/UnitTests/Core/Seeding/CandidatesForMiddleSpTests.cpp
index 3d8b672cb45..5d4eb26dec8 100644
--- a/Tests/UnitTests/Core/Seeding/CandidatesForMiddleSpTests.cpp
+++ b/Tests/UnitTests/Core/Seeding/CandidatesForMiddleSpTests.cpp
@@ -1,15 +1,16 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2024 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include <boost/test/unit_test.hpp>
 
 #include "Acts/Seeding/CandidatesForMiddleSp.hpp"
 
+#include <algorithm>
 #include <limits>
 #include <vector>
 
@@ -145,16 +146,16 @@ BOOST_AUTO_TEST_CASE(CandidatesForMiddleSpObject) {
     BOOST_CHECK(storagedValues[i].weight >= storagedValues[i + 1].weight);
   }
 
-  std::sort(
-      storagedValues.begin(), storagedValues.end(),
+  std::ranges::sort(
+      storagedValues,
       Acts::CandidatesForMiddleSp<UnitTestSpacePoint>::ascendingByQuality);
   // check values are sorted properly
   for (std::size_t i(0); i < storagedValues.size() - 1; ++i) {
     BOOST_CHECK(storagedValues[i].weight <= storagedValues[i + 1].weight);
   }
 
-  std::sort(
-      storagedValues.begin(), storagedValues.end(),
+  std::ranges::sort(
+      storagedValues,
       Acts::CandidatesForMiddleSp<UnitTestSpacePoint>::descendingByQuality);
   // check values are sorted properly
   for (std::size_t i(0); i < storagedValues.size() - 1; ++i) {
diff --git a/Tests/UnitTests/Core/Seeding/EstimateTrackParamsFromSeedTest.cpp b/Tests/UnitTests/Core/Seeding/EstimateTrackParamsFromSeedTest.cpp
index aaf3b7f66ff..6161a8bdd33 100644
--- a/Tests/UnitTests/Core/Seeding/EstimateTrackParamsFromSeedTest.cpp
+++ b/Tests/UnitTests/Core/Seeding/EstimateTrackParamsFromSeedTest.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2021 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include <boost/test/unit_test.hpp>
 
@@ -165,9 +165,6 @@ BOOST_AUTO_TEST_CASE(trackparameters_estimation_test) {
           BOOST_TEST_INFO(
               "The truth track parameters at the bottom space point: \n"
               << expParams.transpose());
-          // The curvature of track projection on the transverse plane in unit
-          // of 1/mm
-          double rho = expParams[eBoundQOverP] * 0.3 * 2. / UnitConstants::m;
 
           // The space point pointers
           std::array<const SpacePoint*, 3> spacePointPtrs{};
@@ -175,26 +172,6 @@ BOOST_AUTO_TEST_CASE(trackparameters_estimation_test) {
                          spacePointPtrs.begin(),
                          [](const auto& sp) { return &sp.second; });
 
-          // Test the partial track parameters estimator
-          auto partialParamsOpt = estimateTrackParamsFromSeed(
-              spacePointPtrs.begin(), spacePointPtrs.end(), *logger);
-          BOOST_REQUIRE(partialParamsOpt.has_value());
-          const auto& estPartialParams = partialParamsOpt.value();
-          BOOST_TEST_INFO(
-              "The estimated track parameters at the transverse plane: \n"
-              << estPartialParams.transpose());
-
-          // The particle starting position is (0, 0, 0). Hence, d0 is zero; the
-          // phi at the point of cloest approach is exactly the phi of the truth
-          // particle
-          CHECK_CLOSE_ABS(estPartialParams[eBoundLoc0], 0., 1e-5);
-          CHECK_CLOSE_ABS(estPartialParams[eBoundPhi], phi, 1e-5);
-          CHECK_CLOSE_ABS(estPartialParams[eBoundQOverP], rho, 1e-4);
-          // The loc1, theta and time are set to zero in the estimator
-          CHECK_CLOSE_ABS(estPartialParams[eBoundLoc1], 0., 1e-10);
-          CHECK_CLOSE_ABS(estPartialParams[eBoundTheta], 0., 1e-10);
-          CHECK_CLOSE_ABS(estPartialParams[eBoundTime], 0., 1e-10);
-
           // Test the full track parameters estimator
           auto fullParamsOpt = estimateTrackParamsFromSeed(
               geoCtx, spacePointPtrs.begin(), spacePointPtrs.end(),
diff --git a/Tests/UnitTests/Core/Seeding/HoughTransformTest.cpp b/Tests/UnitTests/Core/Seeding/HoughTransformTest.cpp
index 0a5b869e9da..30e3164f62c 100644
--- a/Tests/UnitTests/Core/Seeding/HoughTransformTest.cpp
+++ b/Tests/UnitTests/Core/Seeding/HoughTransformTest.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2024 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include <boost/test/unit_test.hpp>
 
diff --git a/Tests/UnitTests/Core/Seeding/PathSeederTest.cpp b/Tests/UnitTests/Core/Seeding/PathSeederTest.cpp
new file mode 100644
index 00000000000..428c5b0ef1f
--- /dev/null
+++ b/Tests/UnitTests/Core/Seeding/PathSeederTest.cpp
@@ -0,0 +1,411 @@
+// This file is part of the ACTS project.
+//
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
+//
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
+
+#include <boost/test/unit_test.hpp>
+
+#include "Acts/Detector/Detector.hpp"
+#include "Acts/Detector/DetectorVolume.hpp"
+#include "Acts/Detector/GeometryIdGenerator.hpp"
+#include "Acts/Detector/PortalGenerators.hpp"
+#include "Acts/Detector/detail/CuboidalDetectorHelper.hpp"
+#include "Acts/EventData/detail/TestSourceLink.hpp"
+#include "Acts/Geometry/CuboidVolumeBounds.hpp"
+#include "Acts/Geometry/GeometryContext.hpp"
+#include "Acts/MagneticField/ConstantBField.hpp"
+#include "Acts/Navigation/DetectorNavigator.hpp"
+#include "Acts/Navigation/DetectorVolumeFinders.hpp"
+#include "Acts/Navigation/InternalNavigation.hpp"
+#include "Acts/Propagator/EigenStepper.hpp"
+#include "Acts/Propagator/Propagator.hpp"
+#include "Acts/Propagator/StraightLineStepper.hpp"
+#include "Acts/Seeding/PathSeeder.hpp"
+#include "Acts/Surfaces/BoundaryTolerance.hpp"
+#include "Acts/Surfaces/PlaneSurface.hpp"
+#include "Acts/Surfaces/RectangleBounds.hpp"
+#include "Acts/Tests/CommonHelpers/MeasurementsCreator.hpp"
+#include "Acts/Utilities/Logger.hpp"
+
+#include <numbers>
+
+BOOST_AUTO_TEST_SUITE(PathSeeder)
+
+using namespace Acts;
+using namespace Acts::UnitLiterals;
+
+using Axis = Acts::Axis<AxisType::Equidistant, AxisBoundaryType::Open>;
+using Grid = Acts::Grid<std::vector<SourceLink>, Axis, Axis>;
+
+using TrackParameters = CurvilinearTrackParameters;
+
+GeometryContext gctx;
+
+// Parameters for the geometry
+const ActsScalar halfY = 10.;
+const ActsScalar halfZ = 10.;
+const ActsScalar deltaX = 10.;
+const ActsScalar deltaYZ = 1.;
+
+const Vector4 trueVertex(-5., 0., 0., 0);
+const std::vector<ActsScalar> truePhis = {-0.15, -0.1, -0.05, 0,
+                                          0.05,  0.1,  0.15};
+const ActsScalar trueTheta = std::numbers::pi / 2.;
+const ActsScalar trueQOverP = 1. / 1._GeV;
+
+// Intersection finding to get the
+// region of interest for seeding
+class NoFieldIntersectionFinder {
+ public:
+  ActsScalar m_tol = 1e-4;
+
+  std::vector<const Surface*> m_surfaces;
+
+  // Find the intersections along the path
+  // and return them in the order of the path
+  // length
+  std::vector<std::pair<GeometryIdentifier, Vector2>> operator()(
+      const GeometryContext& geoCtx,
+      const TrackParameters& trackParameters) const {
+    Vector3 position = trackParameters.position();
+    Vector3 direction = trackParameters.direction();
+
+    std::vector<std::pair<GeometryIdentifier, Vector2>> sIntersections;
+    // Intersect the surfaces
+    for (auto& surface : m_surfaces) {
+      // Get the intersection
+      auto sMultiIntersection = surface->intersect(
+          geoCtx, position, direction,
+          BoundaryTolerance::AbsoluteCartesian(m_tol, m_tol));
+
+      // Take the closest
+      auto closestForward = sMultiIntersection.closestForward();
+
+      // Store if the intersection is reachable
+      if (closestForward.status() == IntersectionStatus::reachable &&
+          closestForward.pathLength() > 0.0) {
+        sIntersections.push_back(
+            {closestForward.object()->geometryId(),
+             surface
+                 ->globalToLocal(geoCtx, closestForward.position(),
+                                 Vector3{0, 1, 0})
+                 .value()});
+        continue;
+      }
+    }
+    return sIntersections;
+  }
+};
+
+// A simple path width provider to set
+// the grid lookup boundaries around the
+// intersection point
+class PathWidthProvider {
+ public:
+  std::pair<ActsScalar, ActsScalar> width;
+
+  std::pair<ActsScalar, ActsScalar> operator()(
+      const GeometryContext& /*gctx*/,
+      const GeometryIdentifier& /*geoId*/) const {
+    return width;
+  }
+};
+
+// Estimator of the particle's energy,
+// vertex, momentum direction at the IP
+// and the direction at the first hit
+class TrackEstimator {
+ public:
+  Vector3 m_ip;
+  SourceLinkSurfaceAccessor m_surfaceAccessor;
+
+  std::pair<TrackParameters, TrackParameters> operator()(
+      const GeometryContext& geoCtx, const SourceLink& pivot) const {
+    auto testSourceLink = pivot.get<detail::Test::TestSourceLink>();
+    Vector3 pivot3 = m_surfaceAccessor(pivot)->localToGlobal(
+        geoCtx, testSourceLink.parameters, Vector3{0, 1, 0});
+
+    Vector3 direction = (pivot3 - m_ip).normalized();
+
+    Vector4 ip = {m_ip.x(), m_ip.y(), m_ip.z(), 0};
+    ActsScalar qOverP = 1_e / 1._GeV;
+    ActsScalar phi = Acts::VectorHelpers::phi(direction);
+    ActsScalar theta = Acts::VectorHelpers::theta(direction);
+    ParticleHypothesis particle = ParticleHypothesis::electron();
+
+    TrackParameters ipParams(ip, phi, theta, qOverP, std::nullopt, particle);
+    TrackParameters firstLayerParams(ip, phi, theta, qOverP, std::nullopt,
+                                     particle);
+
+    return {ipParams, firstLayerParams};
+  }
+};
+
+// Construct grid with the source links
+struct ConstructSourceLinkGrid {
+  SourceLinkSurfaceAccessor m_surfaceAccessor;
+
+  std::unordered_map<GeometryIdentifier, Grid> construct(
+      std::vector<SourceLink> sourceLinks) {
+    // Lookup table for each layer
+    std::unordered_map<GeometryIdentifier, Grid> lookupTable;
+
+    // Construct a binned grid for each layer
+    for (int i : {14, 15, 16, 17}) {
+      Axis xAxis(-halfY, halfY, 100);
+      Axis yAxis(-halfZ, halfZ, 100);
+
+      Grid grid(std::make_tuple(xAxis, yAxis));
+
+      GeometryIdentifier geoId;
+
+      geoId.setSensitive(i);
+
+      lookupTable.insert({geoId, grid});
+    }
+    // Fill the grid with source links
+    for (auto& sl : sourceLinks) {
+      auto tsl = sl.get<detail::Test::TestSourceLink>();
+      auto id = tsl.m_geometryId;
+
+      auto bin = lookupTable.at(id).localBinsFromPosition(tsl.parameters);
+      lookupTable.at(id).atLocalBins(bin).push_back(sl);
+    }
+
+    return lookupTable;
+  }
+};
+
+// Construct a simple telescope detector
+std::shared_ptr<Experimental::Detector> constructTelescopeDetector() {
+  RotationMatrix3 rotation;
+  double angle = 90_degree;
+  Vector3 xPos(cos(angle), 0., sin(angle));
+  Vector3 yPos(0., 1., 0.);
+  Vector3 zPos(-sin(angle), 0., cos(angle));
+  rotation.col(0) = xPos;
+  rotation.col(1) = yPos;
+  rotation.col(2) = zPos;
+
+  // Create a bunch of surface bounds
+  auto surf0bounds = std::make_unique<RectangleBounds>(halfY, halfZ);
+
+  auto surf1bounds = std::make_unique<RectangleBounds>(halfY, halfZ);
+
+  auto surf2bounds = std::make_unique<RectangleBounds>(halfY, halfZ);
+
+  auto surf3bounds = std::make_unique<RectangleBounds>(halfY, halfZ);
+
+  // Create a bunch of surfaces
+  auto transform0 = Transform3::Identity();
+  auto surf0 = Surface::makeShared<PlaneSurface>(
+      transform0 * Transform3(rotation), std::move(surf0bounds));
+  auto geoId0 = GeometryIdentifier();
+  geoId0.setSensitive(1);
+
+  auto transform1 =
+      Transform3::Identity() * Translation3(Vector3(2 * deltaX, 0, 0));
+  auto surf1 = Surface::makeShared<PlaneSurface>(
+      transform1 * Transform3(rotation), std::move(surf1bounds));
+  auto geoId1 = GeometryIdentifier();
+  geoId1.setSensitive(2);
+
+  auto transform2 =
+      Transform3::Identity() * Translation3(Vector3(4 * deltaX, 0, 0));
+  auto surf2 = Surface::makeShared<PlaneSurface>(
+      transform2 * Transform3(rotation), std::move(surf2bounds));
+  auto geoId2 = GeometryIdentifier();
+  geoId2.setSensitive(3);
+
+  auto transform3 =
+      Transform3::Identity() * Translation3(Vector3(6 * deltaX, 0, 0));
+  auto surf3 = Surface::makeShared<PlaneSurface>(
+      transform3 * Transform3(rotation), std::move(surf3bounds));
+  auto geoId3 = GeometryIdentifier();
+  geoId3.setSensitive(4);
+
+  // Create a bunch of volume bounds
+  auto vol0bounds = std::make_unique<CuboidVolumeBounds>(
+      deltaX, halfY + deltaYZ, halfZ + deltaYZ);
+
+  auto vol1bounds = std::make_unique<CuboidVolumeBounds>(
+      deltaX, halfY + deltaYZ, halfZ + deltaYZ);
+
+  auto vol2bounds = std::make_unique<CuboidVolumeBounds>(
+      deltaX, halfY + deltaYZ, halfZ + deltaYZ);
+
+  auto vol3bounds = std::make_unique<CuboidVolumeBounds>(
+      deltaX, halfY + deltaYZ, halfZ + deltaYZ);
+
+  // Create a bunch of volumes
+  auto vol0 = Experimental::DetectorVolumeFactory::construct(
+      Experimental::defaultPortalAndSubPortalGenerator(), gctx, "vol0",
+      transform0, std::move(vol0bounds), {surf0}, {},
+      Experimental::tryNoVolumes(), Experimental::tryAllPortalsAndSurfaces());
+
+  auto vol1 = Experimental::DetectorVolumeFactory::construct(
+      Experimental::defaultPortalAndSubPortalGenerator(), gctx, "vol1",
+      transform1, std::move(vol1bounds), {surf1}, {},
+      Experimental::tryNoVolumes(), Experimental::tryAllPortalsAndSurfaces());
+
+  auto vol2 = Experimental::DetectorVolumeFactory::construct(
+      Experimental::defaultPortalAndSubPortalGenerator(), gctx, "vol2",
+      transform2, std::move(vol2bounds), {surf2}, {},
+      Experimental::tryNoVolumes(), Experimental::tryAllPortalsAndSurfaces());
+
+  auto vol3 = Experimental::DetectorVolumeFactory::construct(
+      Experimental::defaultPortalAndSubPortalGenerator(), gctx, "vol3",
+      transform3, std::move(vol3bounds), {surf3}, {},
+      Experimental::tryNoVolumes(), Experimental::tryAllPortalsAndSurfaces());
+
+  std::vector<std::shared_ptr<Experimental::DetectorVolume>> volumes = {
+      vol0, vol1, vol2, vol3};
+
+  // Connect the volumes
+  auto portalContainer = Experimental::detail::CuboidalDetectorHelper::connect(
+      gctx, volumes, BinningValue::binX, {}, Logging::INFO);
+
+  // Make sure that the geometry ids are
+  // independent of the potential Id generation
+  // changes
+  int id = 1;
+
+  // Volume ids
+  for (auto& volume : volumes) {
+    volume->assignGeometryId(id);
+    id++;
+  }
+  // Intervolume portal ids
+  for (auto& volume : volumes) {
+    for (auto& port : volume->portalPtrs()) {
+      if (port->surface().geometryId() == 0) {
+        port->surface().assignGeometryId(id);
+        id++;
+      }
+    }
+  }
+  // Surface ids
+  for (auto& surf : {surf0, surf1, surf2, surf3}) {
+    auto geoId = GeometryIdentifier();
+    geoId.setSensitive(id);
+    surf->assignGeometryId(geoId);
+    id++;
+  }
+
+  auto detector = Experimental::Detector::makeShared(
+      "TelescopeDetector", volumes, Experimental::tryRootVolumes());
+
+  return detector;
+}
+
+std::vector<SourceLink> createSourceLinks(
+    const GeometryContext& geoCtx, const Experimental::Detector& detector) {
+  NoFieldIntersectionFinder intersectionFinder;
+
+  for (auto volume : detector.volumes()) {
+    for (auto surface : volume->surfaces()) {
+      intersectionFinder.m_surfaces.push_back(surface);
+    }
+  }
+
+  std::vector<SourceLink> sourceLinks;
+  for (ActsScalar phi : truePhis) {
+    TrackParameters trackParameters(trueVertex, phi, trueTheta, trueQOverP,
+                                    std::nullopt,
+                                    ParticleHypothesis::electron());
+
+    auto intersections = intersectionFinder(geoCtx, trackParameters);
+
+    SquareMatrix2 cov = SquareMatrix2::Identity();
+
+    for (auto& [id, refPoint] : intersections) {
+      detail::Test::TestSourceLink sourceLink(eBoundLoc0, eBoundLoc1, refPoint,
+                                              cov, id, id.value());
+
+      SourceLink sl{sourceLink};
+      sourceLinks.push_back(sl);
+    }
+  }
+
+  return sourceLinks;
+}
+
+BOOST_AUTO_TEST_CASE(PathSeederZeroField) {
+  using SurfaceAccessor =
+      detail::Test::Experimental::TestSourceLinkSurfaceAccessor;
+
+  // Create detector
+  auto detector = constructTelescopeDetector();
+
+  // Create source links
+  auto sourceLinks = createSourceLinks(gctx, *detector);
+
+  // Prepare the PathSeeder
+  auto pathSeederCfg = Acts::PathSeeder::Config();
+
+  // Grid to bin the source links
+  SurfaceAccessor surfaceAccessor{*detector};
+  auto sourceLinkGridConstructor = ConstructSourceLinkGrid();
+  sourceLinkGridConstructor.m_surfaceAccessor
+      .connect<&SurfaceAccessor::operator()>(&surfaceAccessor);
+
+  // Create the grid
+  std::unordered_map<GeometryIdentifier, Grid> sourceLinkGrid =
+      sourceLinkGridConstructor.construct(sourceLinks);
+
+  // Estimator of the IP and first hit
+  // parameters of the track
+  TrackEstimator trackEstimator;
+  trackEstimator.m_ip = Vector3(-5., 0., 0.);
+  trackEstimator.m_surfaceAccessor.connect<&SurfaceAccessor::operator()>(
+      &surfaceAccessor);
+  pathSeederCfg.trackEstimator.connect<&TrackEstimator::operator()>(
+      &trackEstimator);
+
+  // Intersection finder
+  NoFieldIntersectionFinder intersectionFinder;
+  for (auto volume : detector->volumes()) {
+    for (auto surface : volume->surfaces()) {
+      intersectionFinder.m_surfaces.push_back(surface);
+    }
+  }
+  pathSeederCfg.intersectionFinder
+      .connect<&NoFieldIntersectionFinder::operator()>(&intersectionFinder);
+
+  // Path width provider
+  PathWidthProvider pathWidthProvider;
+
+  pathSeederCfg.pathWidthProvider.connect<&PathWidthProvider::operator()>(
+      &pathWidthProvider);
+
+  GeometryIdentifier geoId;
+  geoId.setSensitive(14);
+  pathSeederCfg.refLayerIds.push_back(geoId);
+
+  // Create the PathSeeder
+  Acts::PathSeeder pathSeeder(pathSeederCfg);
+
+  // Get the seeds
+  pathWidthProvider.width = {1e-3, 1e-3};
+
+  std::vector<Acts::PathSeeder::PathSeed> seeds;
+
+  // SeedTreeContainer seeds;
+  pathSeeder.findSeeds(gctx, sourceLinkGrid, seeds);
+
+  // Check the seeds
+  BOOST_CHECK_EQUAL(seeds.size(), 7);
+
+  for (std::size_t i = 0; i < seeds.size(); i++) {
+    auto seed = seeds.at(i);
+    BOOST_CHECK_EQUAL(seed.second.size(), 4);
+    BOOST_CHECK_EQUAL(seed.first.phi(), truePhis.at(i));
+    BOOST_CHECK_EQUAL(seed.first.theta(), trueTheta);
+    BOOST_CHECK_EQUAL(seed.first.qOverP(), trueQOverP);
+  }
+}
+
+BOOST_AUTO_TEST_SUITE_END()
diff --git a/Tests/UnitTests/Core/Seeding/SeedFinderTest.cpp b/Tests/UnitTests/Core/Seeding/SeedFinderTest.cpp
index 9ed80438814..8368bdbc3f2 100644
--- a/Tests/UnitTests/Core/Seeding/SeedFinderTest.cpp
+++ b/Tests/UnitTests/Core/Seeding/SeedFinderTest.cpp
@@ -1,16 +1,16 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2024 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include "Acts/Definitions/Algebra.hpp"
 #include "Acts/Definitions/Units.hpp"
-#include "Acts/Geometry/Extent.hpp"
+#include "Acts/EventData/Seed.hpp"
+#include "Acts/EventData/SpacePointContainer.hpp"
 #include "Acts/Seeding/BinnedGroup.hpp"
-#include "Acts/Seeding/Seed.hpp"
 #include "Acts/Seeding/SeedFilter.hpp"
 #include "Acts/Seeding/SeedFilterConfig.hpp"
 #include "Acts/Seeding/SeedFinder.hpp"
@@ -34,6 +34,7 @@
 
 #include "ATLASCuts.hpp"
 #include "SpacePoint.hpp"
+#include "SpacePointContainer.hpp"
 
 using namespace Acts::UnitLiterals;
 
@@ -123,12 +124,28 @@ int main(int argc, char** argv) {
   auto end_read = std::chrono::system_clock::now();
   std::chrono::duration<double> elapsed_read = end_read - start_read;
 
-  std::cout << "read " << spVec.size() << " SP from file " << file << " in "
-            << elapsed_read.count() << "s" << std::endl;
+  // Config
+  Acts::SpacePointContainerConfig spConfig;
+  // Options
+  Acts::SpacePointContainerOptions spOptions;
+  spOptions.beamPos = {-.5_mm, -.5_mm};
 
-  Acts::SeedFinderConfig<SpacePoint> config;
+  // Prepare interface SpacePoint backend-ACTS
+  ActsExamples::SpacePointContainer container(spVec);
+  // Prepare Acts API
+  Acts::SpacePointContainer<decltype(container), Acts::detail::RefHolder>
+      spContainer(spConfig, spOptions, container);
+
+  std::cout << "read " << spContainer.size() << " SP from file " << file
+            << " in " << elapsed_read.count() << "s" << std::endl;
+
+  using value_type = typename decltype(spContainer)::SpacePointProxyType;
+  using seed_type = Acts::Seed<value_type>;
+
+  Acts::SeedFinderConfig<value_type> config;
   // silicon detector max
   config.rMax = 160._mm;
+  config.rMin = 0._mm;
   config.deltaRMin = 5._mm;
   config.deltaRMax = 160._mm;
   config.deltaRMinTopSP = config.deltaRMin;
@@ -151,40 +168,31 @@ int main(int argc, char** argv) {
   config.useVariableMiddleSPRange = false;
 
   Acts::SeedFinderOptions options;
-  options.beamPos = {-.5_mm, -.5_mm};
+  options.beamPos = spOptions.beamPos;
   options.bFieldInZ = 2_T;
 
   int numPhiNeighbors = 1;
 
-  // extent used to store r range for middle spacepoint
-  Acts::Extent rRangeSPExtent;
-
   config.useVariableMiddleSPRange = false;
   const Acts::Range1D<float> rMiddleSPRange;
 
   std::vector<std::pair<int, int>> zBinNeighborsTop;
   std::vector<std::pair<int, int>> zBinNeighborsBottom;
 
-  auto bottomBinFinder = std::make_unique<Acts::GridBinFinder<2ul>>(
-      Acts::GridBinFinder<2ul>(numPhiNeighbors, zBinNeighborsBottom));
-  auto topBinFinder = std::make_unique<Acts::GridBinFinder<2ul>>(
-      Acts::GridBinFinder<2ul>(numPhiNeighbors, zBinNeighborsTop));
+  auto bottomBinFinder = std::make_unique<Acts::GridBinFinder<3ul>>(
+      numPhiNeighbors, zBinNeighborsBottom, 0);
+  auto topBinFinder = std::make_unique<Acts::GridBinFinder<3ul>>(
+      numPhiNeighbors, zBinNeighborsTop, 0);
   Acts::SeedFilterConfig sfconf;
-  Acts::ATLASCuts<SpacePoint> atlasCuts = Acts::ATLASCuts<SpacePoint>();
-  config.seedFilter = std::make_unique<Acts::SeedFilter<SpacePoint>>(
-      Acts::SeedFilter<SpacePoint>(sfconf, &atlasCuts));
-  Acts::SeedFinder<SpacePoint, Acts::CylindricalSpacePointGrid<SpacePoint>>
+
+  Acts::ATLASCuts<value_type> atlasCuts = Acts::ATLASCuts<value_type>();
+  config.seedFilter =
+      std::make_unique<Acts::SeedFilter<value_type>>(sfconf, &atlasCuts);
+  Acts::SeedFinder<value_type, Acts::CylindricalSpacePointGrid<value_type>>
       a;  // test creation of unconfigured finder
-  a = Acts::SeedFinder<SpacePoint, Acts::CylindricalSpacePointGrid<SpacePoint>>(
+  a = Acts::SeedFinder<value_type, Acts::CylindricalSpacePointGrid<value_type>>(
       config);
 
-  // covariance tool, sets covariances per spacepoint as required
-  auto ct = [=](const SpacePoint& sp, float, float, float) {
-    Acts::Vector3 position(sp.x(), sp.y(), sp.z());
-    Acts::Vector2 covariance(sp.varianceR, sp.varianceZ);
-    return std::make_tuple(position, covariance, sp.t());
-  };
-
   // setup spacepoint grid config
   Acts::CylindricalSpacePointGridConfig gridConf;
   gridConf.minPt = config.minPt;
@@ -198,15 +206,16 @@ int main(int argc, char** argv) {
   gridOpts.bFieldInZ = options.bFieldInZ;
   // create grid with bin sizes according to the configured geometry
 
-  Acts::CylindricalSpacePointGrid<SpacePoint> grid =
-      Acts::CylindricalSpacePointGridCreator::createGrid<SpacePoint>(gridConf,
+  Acts::CylindricalSpacePointGrid<value_type> grid =
+      Acts::CylindricalSpacePointGridCreator::createGrid<value_type>(gridConf,
                                                                      gridOpts);
   Acts::CylindricalSpacePointGridCreator::fillGrid(
-      config, options, grid, spVec.begin(), spVec.end(), ct, rRangeSPExtent);
-  auto spGroup = Acts::CylindricalBinnedGroup<SpacePoint>(
+      config, options, grid, spContainer.begin(), spContainer.end());
+
+  auto spGroup = Acts::CylindricalBinnedGroup<value_type>(
       std::move(grid), *bottomBinFinder, *topBinFinder);
 
-  std::vector<std::vector<Acts::Seed<SpacePoint>>> seedVector;
+  std::vector<std::vector<seed_type>> seedVector;
   decltype(a)::SeedingState state;
   auto start = std::chrono::system_clock::now();
   for (auto [bottom, middle, top] : spGroup) {
@@ -226,19 +235,20 @@ int main(int argc, char** argv) {
   if (!quiet) {
     for (auto& regionVec : seedVector) {
       for (std::size_t i = 0; i < regionVec.size(); i++) {
-        const Acts::Seed<SpacePoint>* seed = &regionVec[i];
-        const SpacePoint* sp = seed->sp()[0];
+        const seed_type* seed = &regionVec[i];
+        const value_type* sp = seed->sp()[0];
         std::cout << " (" << sp->x() << ", " << sp->y() << ", " << sp->z()
                   << ") ";
         sp = seed->sp()[1];
-        std::cout << sp->layer << " (" << sp->x() << ", " << sp->y() << ", "
-                  << sp->z() << ") ";
+        std::cout << sp->externalSpacePoint()->layer << " (" << sp->x() << ", "
+                  << sp->y() << ", " << sp->z() << ") ";
         sp = seed->sp()[2];
-        std::cout << sp->layer << " (" << sp->x() << ", " << sp->y() << ", "
-                  << sp->z() << ") ";
+        std::cout << sp->externalSpacePoint()->layer << " (" << sp->x() << ", "
+                  << sp->y() << ", " << sp->z() << ") ";
         std::cout << std::endl;
       }
     }
   }
+
   return 0;
 }
diff --git a/Tests/UnitTests/Core/Seeding/SpacePoint.hpp b/Tests/UnitTests/Core/Seeding/SpacePoint.hpp
index 43fa6d0818f..e24f3cd4135 100644
--- a/Tests/UnitTests/Core/Seeding/SpacePoint.hpp
+++ b/Tests/UnitTests/Core/Seeding/SpacePoint.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2018-2023 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include <cmath>
 #include <optional>
diff --git a/Tests/UnitTests/Core/Seeding/SpacePointContainer.hpp b/Tests/UnitTests/Core/Seeding/SpacePointContainer.hpp
new file mode 100644
index 00000000000..cc264666f0f
--- /dev/null
+++ b/Tests/UnitTests/Core/Seeding/SpacePointContainer.hpp
@@ -0,0 +1,124 @@
+// This file is part of the ACTS project.
+//
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
+//
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
+
+#pragma once
+
+#include "Acts/EventData/SpacePointContainer.hpp"
+#include "Acts/Utilities/Holders.hpp"
+
+#include <any>
+
+namespace ActsExamples {
+
+template <typename collection_t>
+class SpacePointContainer {
+ public:
+  using CollectionType = collection_t;
+  using ValueType = typename CollectionType::value_type;
+
+  friend Acts::SpacePointContainer<
+      ActsExamples::SpacePointContainer<collection_t>, Acts::detail::RefHolder>;
+
+  // default constructor is of no use. It cannot be used, so why bother?
+  SpacePointContainer() = delete;
+  // we never get the ownership. In both read-only and read-and-write mode
+  // the memory backend is independetly handled. This is only interfacing it to
+  // ACTS
+  SpacePointContainer(CollectionType&& container) = delete;
+  SpacePointContainer(CollectionType& container) : m_storage(container) {}
+  SpacePointContainer(CollectionType* container) : m_storage(container) {}
+
+  // No copy constructor or copy operation allowed
+  SpacePointContainer(const SpacePointContainer<collection_t>&) = delete;
+  SpacePointContainer<collection_t>& operator=(
+      const SpacePointContainer<collection_t>&) = delete;
+
+  // only move operation allowed
+  SpacePointContainer(SpacePointContainer<collection_t>&& other) noexcept
+      : m_storage(std::exchange(other.m_storage.ptr, nullptr)) {}
+  SpacePointContainer<collection_t>& operator=(
+      SpacePointContainer<collection_t>&& other) noexcept {
+    m_storage = std::exchange(other.m_storage.ptr, nullptr);
+    return *this;
+  }
+
+  ~SpacePointContainer() = default;
+
+ private:
+  std::size_t size_impl() const;
+
+  float x_impl(std::size_t idx) const;
+  float y_impl(std::size_t idx) const;
+  float z_impl(std::size_t idx) const;
+  float varianceR_impl(std::size_t idx) const;
+  float varianceZ_impl(std::size_t idx) const;
+
+  const ValueType& get_impl(std::size_t idx) const { return storage()[idx]; }
+
+  std::any component_impl(Acts::HashedString key, std::size_t /*n*/) const {
+    using namespace Acts::HashedStringLiteral;
+    switch (key) {
+      case "TopStripVector"_hash:
+      case "BottomStripVector"_hash:
+      case "StripCenterDistance"_hash:
+      case "TopStripCenterPosition"_hash:
+        return Acts::Vector3(0, 0, 0);
+      default:
+        throw std::runtime_error("no such component " + std::to_string(key));
+    }
+  }
+
+ private:
+  const CollectionType& storage() const;
+
+ private:
+  Acts::detail::RefHolder<CollectionType> m_storage;
+};
+
+template <typename collection_t>
+inline std::size_t SpacePointContainer<collection_t>::size_impl() const {
+  return storage().size();
+}
+
+// TO-DO
+// Be smart here... collection_t can container values or pointers ...
+
+template <typename collection_t>
+inline float SpacePointContainer<collection_t>::x_impl(std::size_t idx) const {
+  return storage()[idx]->x();
+}
+
+template <typename collection_t>
+inline float SpacePointContainer<collection_t>::y_impl(std::size_t idx) const {
+  return storage()[idx]->y();
+}
+
+template <typename collection_t>
+inline float SpacePointContainer<collection_t>::z_impl(std::size_t idx) const {
+  return storage()[idx]->z();
+}
+
+template <typename collection_t>
+inline float SpacePointContainer<collection_t>::varianceR_impl(
+    std::size_t idx) const {
+  return storage()[idx]->varianceR;
+}
+
+template <typename collection_t>
+inline float SpacePointContainer<collection_t>::varianceZ_impl(
+    std::size_t idx) const {
+  return storage()[idx]->varianceZ;
+}
+
+template <typename collection_t>
+const typename SpacePointContainer<collection_t>::CollectionType&
+SpacePointContainer<collection_t>::storage() const {
+  return *m_storage;
+}
+
+}  // namespace ActsExamples
diff --git a/Tests/UnitTests/Core/Seeding/UtilityFunctionsTests.cpp b/Tests/UnitTests/Core/Seeding/UtilityFunctionsTests.cpp
index 31085adaa63..963e16a1774 100644
--- a/Tests/UnitTests/Core/Seeding/UtilityFunctionsTests.cpp
+++ b/Tests/UnitTests/Core/Seeding/UtilityFunctionsTests.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2024 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include <boost/test/unit_test.hpp>
 
@@ -62,9 +62,9 @@ BOOST_AUTO_TEST_CASE(pushBackOrInsertAtEnd_set) {
   Acts::detail::pushBackOrInsertAtEnd(coll, val);
   BOOST_CHECK(coll.size() == 3ul);
 
-  BOOST_CHECK(coll.find(2ul) != coll.end());
-  BOOST_CHECK(coll.find(5ul) != coll.end());
-  BOOST_CHECK(coll.find(1ul) != coll.end());
+  BOOST_CHECK(coll.contains(2ul));
+  BOOST_CHECK(coll.contains(5ul));
+  BOOST_CHECK(coll.contains(1ul));
 }
 
 BOOST_AUTO_TEST_CASE(pushBackOrInsertAtEnd_unordered_set) {
@@ -77,9 +77,9 @@ BOOST_AUTO_TEST_CASE(pushBackOrInsertAtEnd_unordered_set) {
   Acts::detail::pushBackOrInsertAtEnd(coll, val);
   BOOST_CHECK(coll.size() == 3ul);
 
-  BOOST_CHECK(coll.find(2ul) != coll.end());
-  BOOST_CHECK(coll.find(5ul) != coll.end());
-  BOOST_CHECK(coll.find(1ul) != coll.end());
+  BOOST_CHECK(coll.contains(2ul));
+  BOOST_CHECK(coll.contains(5ul));
+  BOOST_CHECK(coll.contains(1ul));
 }
 
 }  // namespace Acts::Test
diff --git a/Tests/UnitTests/Core/SpacePointFormation/SpacePointBuilderTests.cpp b/Tests/UnitTests/Core/SpacePointFormation/SpacePointBuilderTests.cpp
index 37fced5bf35..8eb2a8b9a32 100644
--- a/Tests/UnitTests/Core/SpacePointFormation/SpacePointBuilderTests.cpp
+++ b/Tests/UnitTests/Core/SpacePointFormation/SpacePointBuilderTests.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2022 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include <boost/test/data/test_case.hpp>
 #include <boost/test/unit_test.hpp>
diff --git a/Tests/UnitTests/Core/Surfaces/AlignmentHelperTests.cpp b/Tests/UnitTests/Core/Surfaces/AlignmentHelperTests.cpp
index 3f1f2d8e5fb..3688d49a28b 100644
--- a/Tests/UnitTests/Core/Surfaces/AlignmentHelperTests.cpp
+++ b/Tests/UnitTests/Core/Surfaces/AlignmentHelperTests.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2020 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include <boost/test/unit_test.hpp>
 
@@ -14,6 +14,7 @@
 
 #include <algorithm>
 #include <cmath>
+#include <numbers>
 #include <utility>
 
 namespace Acts::Test {
@@ -23,9 +24,9 @@ namespace Acts::Test {
 BOOST_AUTO_TEST_CASE(alignment_helper_test) {
   // (a) Test with non-identity rotation matrix
   // Rotation angle parameters
-  const double alpha = M_PI;
-  const double beta = 0;
-  const double gamma = M_PI / 2;
+  const double alpha = std::numbers::pi;
+  const double beta = 0.;
+  const double gamma = std::numbers::pi / 2.;
   // rotation around x axis
   AngleAxis3 rotX(alpha, Vector3(1., 0., 0.));
   // rotation around y axis
diff --git a/Tests/UnitTests/Core/Surfaces/AnnulusBoundsTests.cpp b/Tests/UnitTests/Core/Surfaces/AnnulusBoundsTests.cpp
index 225770f0f76..60ecc7f84e4 100644
--- a/Tests/UnitTests/Core/Surfaces/AnnulusBoundsTests.cpp
+++ b/Tests/UnitTests/Core/Surfaces/AnnulusBoundsTests.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2017-2018 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include <boost/test/unit_test.hpp>
 
@@ -23,12 +23,12 @@ namespace Acts::Test {
 
 BOOST_AUTO_TEST_SUITE(Surfaces)
 
-double minRadius = 7.2;
-double maxRadius = 12.0;
-double minPhi = 0.74195;
-double maxPhi = 1.33970;
+const ActsScalar minRadius = 7.2;
+const ActsScalar maxRadius = 12.0;
+const ActsScalar minPhi = 0.74195;
+const ActsScalar maxPhi = 1.33970;
 
-Vector2 offset(-2., 2.);
+const Vector2 offset(-2., 2.);
 
 // Unit tests for AnnulusBounds constructors
 BOOST_AUTO_TEST_CASE(AnnulusBoundsConstruction) {
@@ -60,13 +60,13 @@ BOOST_AUTO_TEST_CASE(AnnulusBoundsExcpetion) {
   // Exception for swapped radii
   BOOST_CHECK_THROW(AnnulusBounds(maxRadius, minRadius, minPhi, maxPhi, offset),
                     std::logic_error);
-  // Exception for out of range  min phi
+  // Exception for out of range min phi
   BOOST_CHECK_THROW(AnnulusBounds(minRadius, maxRadius, -4., maxPhi, offset),
                     std::logic_error);
-  // Exception for out of range  max phi
+  // Exception for out of range max phi
   BOOST_CHECK_THROW(AnnulusBounds(minRadius, maxRadius, minPhi, 4., offset),
                     std::logic_error);
-  // Exception for out of range  max phi
+  // Exception for out of range max phi
   BOOST_CHECK_THROW(AnnulusBounds(minRadius, maxRadius, maxPhi, minPhi, offset),
                     std::logic_error);
 }
@@ -76,7 +76,6 @@ BOOST_AUTO_TEST_CASE(AnnulusBoundsProperties) {
   /// Test construction with radii and default sector
   AnnulusBounds aBounds(minRadius, maxRadius, minPhi, maxPhi, offset);
 
-  //
   /// Test type() (redundant; already used in constructor confirmation)
   BOOST_CHECK_EQUAL(aBounds.type(), SurfaceBounds::eAnnulus);
 
@@ -123,6 +122,25 @@ BOOST_AUTO_TEST_CASE(AnnulusBoundsProperties) {
   BOOST_CHECK_EQUAL(aBounds.get(AnnulusBounds::eMaxPhiRel), maxPhi);
 }
 
+/// Unit tests for AnnulusBounds vertices
+BOOST_AUTO_TEST_CASE(AnnulusBoundsVertices) {
+  /// Test construction with radii and default sector
+  AnnulusBounds aBounds(minRadius, maxRadius, minPhi, maxPhi, offset);
+
+  // Retrieve the corners
+  auto corners = aBounds.corners();
+  BOOST_CHECK_EQUAL(corners.size(), 4);
+
+  // Retrieve the vertices
+  auto vertices = aBounds.vertices(0u);
+  BOOST_CHECK_EQUAL(vertices.size(), 4);
+
+  // Now generate with more segments
+  unsigned int nQuarterSegments = 12;
+  vertices = aBounds.vertices(nQuarterSegments);
+  BOOST_CHECK_EQUAL(vertices.size(), 14u);
+}
+
 BOOST_AUTO_TEST_SUITE_END()
 
 }  // namespace Acts::Test
diff --git a/Tests/UnitTests/Core/Surfaces/BoundaryToleranceTests.cpp b/Tests/UnitTests/Core/Surfaces/BoundaryToleranceTests.cpp
index 8d2d99ba360..edc401e9b83 100644
--- a/Tests/UnitTests/Core/Surfaces/BoundaryToleranceTests.cpp
+++ b/Tests/UnitTests/Core/Surfaces/BoundaryToleranceTests.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2017-2024 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include <boost/test/execution_monitor.hpp>
 #include <boost/test/unit_test.hpp>
@@ -20,8 +20,6 @@
 #include <optional>
 #include <vector>
 
-#include "BoundaryToleranceTestsRefs.hpp"
-
 namespace Acts::Test {
 
 BOOST_AUTO_TEST_SUITE(Surfaces)
@@ -42,6 +40,7 @@ BOOST_AUTO_TEST_CASE(BoundaryCheckBoxSimple) {
   BOOST_CHECK(
       !detail::insideAlignedBox(ll, ur, tolerance, {2, 0}, std::nullopt));
 }
+
 // Aligned box w/ tolerance check along first axis
 BOOST_AUTO_TEST_CASE(BoundaryCheckBoxToleranceLoc0) {
   boost::execution_monitor em;
@@ -73,7 +72,7 @@ BOOST_AUTO_TEST_CASE(BoundaryCheckBoxCovariance) {
   cov << 1, 0.5, 0.5, 2;
   Vector2 ll(-1, -1);
   Vector2 ur(1, 1);
-  auto tolerance = BoundaryTolerance::Chi2Bound(cov.inverse(), 3.0);
+  auto tolerance = BoundaryTolerance::Chi2Bound(cov.inverse(), 3.);
   BOOST_CHECK(
       detail::insideAlignedBox(ll, ur, tolerance, {0, 0}, std::nullopt));
   BOOST_CHECK(
@@ -190,7 +189,7 @@ BOOST_AUTO_TEST_CASE(BoundaryCheckDifferentTolerances) {
 
   {
     auto tolerance =
-        BoundaryTolerance::Chi2Bound(SquareMatrix2::Identity(), 1.0);
+        BoundaryTolerance::Chi2Bound(SquareMatrix2::Identity(), 1.);
     BOOST_CHECK(
         detail::insideAlignedBox(ll, ur, tolerance, {0, 0}, std::nullopt));
     BOOST_CHECK(
diff --git a/Tests/UnitTests/Core/Surfaces/BoundaryToleranceTestsRefs.hpp b/Tests/UnitTests/Core/Surfaces/BoundaryToleranceTestsRefs.hpp
deleted file mode 100644
index 361dd461282..00000000000
--- a/Tests/UnitTests/Core/Surfaces/BoundaryToleranceTestsRefs.hpp
+++ /dev/null
@@ -1,216 +0,0 @@
-// This file is part of the Acts project.
-//
-// Copyright (C) 2018 CERN for the benefit of the Acts project
-//
-// This Source Code Form is subject to the terms of the Mozilla Public
-// License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-#pragma once
-
-#include "Acts/Definitions/Algebra.hpp"
-
-// clang-format off
-const std::vector<Acts::Vector2> rectVertices = {
-    {-2.000000, -1.000000},
-    {2.000000, -1.000000},
-    {2.000000, 1.000000},
-    {-2.000000, 1.000000}
-};
-
-const struct {
-  double xmin = -2;
-  double xmax = 2;
-  double ymin = -1;
-  double ymax = 1;
-} rectDimensions;
-
-const std::vector<Acts::Vector2> rectTestPoints = {
-    {-3.00, -2.00}, {-3.00, -1.60}, {-3.00, -1.20}, {-3.00, -0.80}, {-3.00, -0.40},
-    {-3.00, 0.00}, {-3.00, 0.40}, {-3.00, 0.80}, {-3.00, 1.20}, {-3.00, 1.60},
-    {-3.00, 2.00}, {-2.40, -2.00}, {-2.40, -1.60}, {-2.40, -1.20}, {-2.40, -0.80},
-    {-2.40, -0.40}, {-2.40, 0.00}, {-2.40, 0.40}, {-2.40, 0.80}, {-2.40, 1.20},
-    {-2.40, 1.60}, {-2.40, 2.00}, {-1.80, -2.00}, {-1.80, -1.60}, {-1.80, -1.20},
-    {-1.80, -0.80}, {-1.80, -0.40}, {-1.80, 0.00}, {-1.80, 0.40}, {-1.80, 0.80},
-    {-1.80, 1.20}, {-1.80, 1.60}, {-1.80, 2.00}, {-1.20, -2.00}, {-1.20, -1.60},
-    {-1.20, -1.20}, {-1.20, -0.80}, {-1.20, -0.40}, {-1.20, 0.00}, {-1.20, 0.40},
-    {-1.20, 0.80}, {-1.20, 1.20}, {-1.20, 1.60}, {-1.20, 2.00}, {-0.60, -2.00},
-    {-0.60, -1.60}, {-0.60, -1.20}, {-0.60, -0.80}, {-0.60, -0.40}, {-0.60, 0.00},
-    {-0.60, 0.40}, {-0.60, 0.80}, {-0.60, 1.20}, {-0.60, 1.60}, {-0.60, 2.00},
-    {0.00, -2.00}, {0.00, -1.60}, {0.00, -1.20}, {0.00, -0.80}, {0.00, -0.40},
-    {0.00, 0.00}, {0.00, 0.40}, {0.00, 0.80}, {0.00, 1.20}, {0.00, 1.60},
-    {0.00, 2.00}, {0.60, -2.00}, {0.60, -1.60}, {0.60, -1.20}, {0.60, -0.80},
-    {0.60, -0.40}, {0.60, 0.00}, {0.60, 0.40}, {0.60, 0.80}, {0.60, 1.20},
-    {0.60, 1.60}, {0.60, 2.00}, {1.20, -2.00}, {1.20, -1.60}, {1.20, -1.20},
-    {1.20, -0.80}, {1.20, -0.40}, {1.20, 0.00}, {1.20, 0.40}, {1.20, 0.80},
-    {1.20, 1.20}, {1.20, 1.60}, {1.20, 2.00}, {1.80, -2.00}, {1.80, -1.60},
-    {1.80, -1.20}, {1.80, -0.80}, {1.80, -0.40}, {1.80, 0.00}, {1.80, 0.40},
-    {1.80, 0.80}, {1.80, 1.20}, {1.80, 1.60}, {1.80, 2.00}, {2.40, -2.00},
-    {2.40, -1.60}, {2.40, -1.20}, {2.40, -0.80}, {2.40, -0.40}, {2.40, 0.00},
-    {2.40, 0.40}, {2.40, 0.80}, {2.40, 1.20}, {2.40, 1.60}, {2.40, 2.00},
-    {3.00, -2.00}, {3.00, -1.60}, {3.00, -1.20}, {3.00, -0.80}, {3.00, -0.40},
-    {3.00, 0.00}, {3.00, 0.40}, {3.00, 0.80}, {3.00, 1.20}, {3.00, 1.60},
-    {3.00, 2.00}
-};
-//const std::vector<Acts::Vector2> rectClosestPoints = {
-//    {-2.00, -1.00}, {-2.00, -1.00}, {-2.00, -1.00}, {-2.00, -0.80}, {-2.00, -0.40},
-//    {-2.00, 0.00}, {-2.00, 0.40}, {-2.00, 0.80}, {-2.00, 1.00}, {-2.00, 1.00},
-//    {-2.00, 1.00}, {-2.00, -1.00}, {-2.00, -1.00}, {-2.00, -1.00}, {-2.00, -0.80},
-//    {-2.00, -0.40}, {-2.00, 0.00}, {-2.00, 0.40}, {-2.00, 0.80}, {-2.00, 1.00},
-//    {-2.00, 1.00}, {-2.00, 1.00}, {-1.80, -1.00}, {-1.80, -1.00}, {-1.80, -1.00},
-//    {-2.00, -0.80}, {-2.00, -0.40}, {-2.00, 0.00}, {-2.00, 0.40}, {-1.80, 1.00},
-//    {-1.80, 1.00}, {-1.80, 1.00}, {-1.80, 1.00}, {-1.20, -1.00}, {-1.20, -1.00},
-//    {-1.20, -1.00}, {-1.20, -1.00}, {-1.20, -1.00}, {-2.00, 0.00}, {-1.20, 1.00},
-//    {-1.20, 1.00}, {-1.20, 1.00}, {-1.20, 1.00}, {-1.20, 1.00}, {-0.60, -1.00},
-//    {-0.60, -1.00}, {-0.60, -1.00}, {-0.60, -1.00}, {-0.60, -1.00}, {-0.60, -1.00},
-//    {-0.60, 1.00}, {-0.60, 1.00}, {-0.60, 1.00}, {-0.60, 1.00}, {-0.60, 1.00},
-//    {0.00, -1.00}, {0.00, -1.00}, {0.00, -1.00}, {0.00, -1.00}, {0.00, -1.00},
-//    {0.00, -1.00}, {0.00, 1.00}, {0.00, 1.00}, {0.00, 1.00}, {0.00, 1.00},
-//    {0.00, 1.00}, {0.60, -1.00}, {0.60, -1.00}, {0.60, -1.00}, {0.60, -1.00},
-//    {0.60, -1.00}, {0.60, -1.00}, {0.60, 1.00}, {0.60, 1.00}, {0.60, 1.00},
-//    {0.60, 1.00}, {0.60, 1.00}, {1.20, -1.00}, {1.20, -1.00}, {1.20, -1.00},
-//    {1.20, -1.00}, {1.20, -1.00}, {2.00, 0.00}, {1.20, 1.00}, {1.20, 1.00},
-//    {1.20, 1.00}, {1.20, 1.00}, {1.20, 1.00}, {1.80, -1.00}, {1.80, -1.00},
-//    {1.80, -1.00}, {1.80, -1.00}, {2.00, -0.40}, {2.00, 0.00}, {2.00, 0.40},
-//    {1.80, 1.00}, {1.80, 1.00}, {1.80, 1.00}, {1.80, 1.00}, {2.00, -1.00},
-//    {2.00, -1.00}, {2.00, -1.00}, {2.00, -0.80}, {2.00, -0.40}, {2.00, 0.00},
-//    {2.00, 0.40}, {2.00, 0.80}, {2.00, 1.00}, {2.00, 1.00}, {2.00, 1.00},
-//    {2.00, -1.00}, {2.00, -1.00}, {2.00, -1.00}, {2.00, -0.80}, {2.00, -0.40},
-//    {2.00, 0.00}, {2.00, 0.40}, {2.00, 0.80}, {2.00, 1.00}, {2.00, 1.00},
-//    {2.00, 1.00}
-//};
-const std::vector<double> rectDistances = {
-    1.4142135623730951, 1.1661903789690602, 1.019803902718557, 1.0, 1.0, 1.0, 1.0,
-    1.0, 1.019803902718557, 1.1661903789690602, 1.4142135623730951,
-    1.0770329614269007, 0.7211102550927979, 0.4472135954999578, 0.3999999999999999,
-    0.3999999999999999, 0.3999999999999999, 0.3999999999999999, 0.3999999999999999,
-    0.4472135954999579, 0.7211102550927979, 1.0770329614269007, 1.0,
-    0.6000000000000001, 0.19999999999999996, -0.19999999999999996,
-    -0.19999999999999996, -0.19999999999999996, -0.19999999999999996,
-    -0.19999999999999973, 0.20000000000000018, 0.6000000000000001, 1.0, 1.0,
-    0.6000000000000001, 0.19999999999999996, -0.20000000000000018,
-    -0.6000000000000001, -0.7999999999999998, -0.5999999999999996,
-    -0.19999999999999973, 0.20000000000000018, 0.6000000000000001, 1.0, 1.0,
-    0.6000000000000001, 0.19999999999999996, -0.20000000000000018,
-    -0.6000000000000001, -1.0, -0.5999999999999996, -0.19999999999999973,
-    0.20000000000000018, 0.6000000000000001, 1.0, 1.0, 0.6000000000000001,
-    0.19999999999999996, -0.20000000000000018, -0.6000000000000001, -1.0,
-    -0.5999999999999996, -0.19999999999999973, 0.20000000000000018,
-    0.6000000000000001, 1.0, 1.0, 0.6000000000000001, 0.19999999999999996,
-    -0.20000000000000018, -0.6000000000000001, -1.0, -0.5999999999999996,
-    -0.19999999999999973, 0.20000000000000018, 0.6000000000000001, 1.0, 1.0,
-    0.6000000000000001, 0.19999999999999996, -0.20000000000000018,
-    -0.6000000000000001, -0.7999999999999998, -0.5999999999999996,
-    -0.19999999999999973, 0.20000000000000018, 0.6000000000000001, 1.0, 1.0,
-    0.6000000000000001, 0.19999999999999996, -0.20000000000000018,
-    -0.20000000000000018, -0.20000000000000018, -0.20000000000000018,
-    -0.19999999999999973, 0.20000000000000018, 0.6000000000000001, 1.0,
-    1.0770329614269007, 0.7211102550927977, 0.44721359549995743,
-    0.39999999999999947, 0.39999999999999947, 0.39999999999999947,
-    0.39999999999999947, 0.39999999999999947, 0.44721359549995754,
-    0.7211102550927977, 1.0770329614269007, 1.4142135623730951, 1.1661903789690602,
-    1.019803902718557, 1.0, 1.0, 1.0, 1.0, 1.0, 1.019803902718557,
-    1.1661903789690602, 1.4142135623730951
-};
-
-const std::vector<Acts::Vector2> rectShiftedVertices = {
-    {1.000000, 2.000000},
-    {3.000000, 2.000000},
-    {3.000000, 4.000000},
-    {1.000000, 4.000000}
-};
-
-const struct {
-  double xmin = 1;
-  double xmax = 3;
-  double ymin = 2;
-  double ymax = 4;
-} rectShiftedDimensions;
-
-const std::vector<Acts::Vector2> rectShiftedTestPoints = {
-    {0.00, 1.50}, {0.00, 1.80}, {0.00, 2.10}, {0.00, 2.40}, {0.00, 2.70},
-    {0.00, 3.00}, {0.00, 3.30}, {0.00, 3.60}, {0.00, 3.90}, {0.00, 4.20},
-    {0.00, 4.50}, {0.40, 1.50}, {0.40, 1.80}, {0.40, 2.10}, {0.40, 2.40},
-    {0.40, 2.70}, {0.40, 3.00}, {0.40, 3.30}, {0.40, 3.60}, {0.40, 3.90},
-    {0.40, 4.20}, {0.40, 4.50}, {0.80, 1.50}, {0.80, 1.80}, {0.80, 2.10},
-    {0.80, 2.40}, {0.80, 2.70}, {0.80, 3.00}, {0.80, 3.30}, {0.80, 3.60},
-    {0.80, 3.90}, {0.80, 4.20}, {0.80, 4.50}, {1.20, 1.50}, {1.20, 1.80},
-    {1.20, 2.10}, {1.20, 2.40}, {1.20, 2.70}, {1.20, 3.00}, {1.20, 3.30},
-    {1.20, 3.60}, {1.20, 3.90}, {1.20, 4.20}, {1.20, 4.50}, {1.60, 1.50},
-    {1.60, 1.80}, {1.60, 2.10}, {1.60, 2.40}, {1.60, 2.70}, {1.60, 3.00},
-    {1.60, 3.30}, {1.60, 3.60}, {1.60, 3.90}, {1.60, 4.20}, {1.60, 4.50},
-    {2.00, 1.50}, {2.00, 1.80}, {2.00, 2.10}, {2.00, 2.40}, {2.00, 2.70},
-    {2.00, 3.00}, {2.00, 3.30}, {2.00, 3.60}, {2.00, 3.90}, {2.00, 4.20},
-    {2.00, 4.50}, {2.40, 1.50}, {2.40, 1.80}, {2.40, 2.10}, {2.40, 2.40},
-    {2.40, 2.70}, {2.40, 3.00}, {2.40, 3.30}, {2.40, 3.60}, {2.40, 3.90},
-    {2.40, 4.20}, {2.40, 4.50}, {2.80, 1.50}, {2.80, 1.80}, {2.80, 2.10},
-    {2.80, 2.40}, {2.80, 2.70}, {2.80, 3.00}, {2.80, 3.30}, {2.80, 3.60},
-    {2.80, 3.90}, {2.80, 4.20}, {2.80, 4.50}, {3.20, 1.50}, {3.20, 1.80},
-    {3.20, 2.10}, {3.20, 2.40}, {3.20, 2.70}, {3.20, 3.00}, {3.20, 3.30},
-    {3.20, 3.60}, {3.20, 3.90}, {3.20, 4.20}, {3.20, 4.50}, {3.60, 1.50},
-    {3.60, 1.80}, {3.60, 2.10}, {3.60, 2.40}, {3.60, 2.70}, {3.60, 3.00},
-    {3.60, 3.30}, {3.60, 3.60}, {3.60, 3.90}, {3.60, 4.20}, {3.60, 4.50},
-    {4.00, 1.50}, {4.00, 1.80}, {4.00, 2.10}, {4.00, 2.40}, {4.00, 2.70},
-    {4.00, 3.00}, {4.00, 3.30}, {4.00, 3.60}, {4.00, 3.90}, {4.00, 4.20},
-    {4.00, 4.50}
-};
-//const std::vector<Acts::Vector2> rectShiftedClosestPoints = {
-//    {1.00, 2.00}, {1.00, 2.00}, {1.00, 2.10}, {1.00, 2.40}, {1.00, 2.70},
-//    {1.00, 3.00}, {1.00, 3.30}, {1.00, 3.60}, {1.00, 3.90}, {1.00, 4.00},
-//    {1.00, 4.00}, {1.00, 2.00}, {1.00, 2.00}, {1.00, 2.10}, {1.00, 2.40},
-//    {1.00, 2.70}, {1.00, 3.00}, {1.00, 3.30}, {1.00, 3.60}, {1.00, 3.90},
-//    {1.00, 4.00}, {1.00, 4.00}, {1.00, 2.00}, {1.00, 2.00}, {1.00, 2.10},
-//    {1.00, 2.40}, {1.00, 2.70}, {1.00, 3.00}, {1.00, 3.30}, {1.00, 3.60},
-//    {1.00, 3.90}, {1.00, 4.00}, {1.00, 4.00}, {1.20, 2.00}, {1.20, 2.00},
-//    {1.20, 2.00}, {1.00, 2.40}, {1.00, 2.70}, {1.00, 3.00}, {1.00, 3.30},
-//    {1.00, 3.60}, {1.20, 4.00}, {1.20, 4.00}, {1.20, 4.00}, {1.60, 2.00},
-//    {1.60, 2.00}, {1.60, 2.00}, {1.60, 2.00}, {1.00, 2.70}, {1.00, 3.00},
-//    {1.00, 3.30}, {1.60, 4.00}, {1.60, 4.00}, {1.60, 4.00}, {1.60, 4.00},
-//    {2.00, 2.00}, {2.00, 2.00}, {2.00, 2.00}, {2.00, 2.00}, {2.00, 2.00},
-//    {2.00, 2.00}, {2.00, 4.00}, {2.00, 4.00}, {2.00, 4.00}, {2.00, 4.00},
-//    {2.00, 4.00}, {2.40, 2.00}, {2.40, 2.00}, {2.40, 2.00}, {2.40, 2.00},
-//    {3.00, 2.70}, {3.00, 3.00}, {3.00, 3.30}, {2.40, 4.00}, {2.40, 4.00},
-//    {2.40, 4.00}, {2.40, 4.00}, {2.80, 2.00}, {2.80, 2.00}, {2.80, 2.00},
-//    {3.00, 2.40}, {3.00, 2.70}, {3.00, 3.00}, {3.00, 3.30}, {3.00, 3.60},
-//    {2.80, 4.00}, {2.80, 4.00}, {2.80, 4.00}, {3.00, 2.00}, {3.00, 2.00},
-//    {3.00, 2.10}, {3.00, 2.40}, {3.00, 2.70}, {3.00, 3.00}, {3.00, 3.30},
-//    {3.00, 3.60}, {3.00, 3.90}, {3.00, 4.00}, {3.00, 4.00}, {3.00, 2.00},
-//    {3.00, 2.00}, {3.00, 2.10}, {3.00, 2.40}, {3.00, 2.70}, {3.00, 3.00},
-//    {3.00, 3.30}, {3.00, 3.60}, {3.00, 3.90}, {3.00, 4.00}, {3.00, 4.00},
-//    {3.00, 2.00}, {3.00, 2.00}, {3.00, 2.10}, {3.00, 2.40}, {3.00, 2.70},
-//    {3.00, 3.00}, {3.00, 3.30}, {3.00, 3.60}, {3.00, 3.90}, {3.00, 4.00},
-//    {3.00, 4.00}
-//};
-const std::vector<double> rectShiftedDistances = {
-    1.118033988749895, 1.019803902718557, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0,
-    1.0198039027185568, 1.118033988749895, 0.7810249675906654, 0.6324555320336759,
-    0.6, 0.6, 0.6, 0.6, 0.6, 0.6, 0.6, 0.6324555320336757, 0.7810249675906654,
-    0.5385164807134504, 0.28284271247461895, 0.19999999999999996,
-    0.19999999999999996, 0.19999999999999996, 0.19999999999999996,
-    0.19999999999999996, 0.19999999999999996, 0.19999999999999996,
-    0.28284271247461845, 0.5385164807134504, 0.5, 0.19999999999999996,
-    -0.10000000000000009, -0.20000000000000018, -0.20000000000000018,
-    -0.20000000000000018, -0.20000000000000018, -0.20000000000000018,
-    -0.10000000000000009, 0.1999999999999993, 0.5, 0.5, 0.19999999999999996,
-    -0.10000000000000009, -0.3999999999999999, -0.6000000000000001,
-    -0.6000000000000001, -0.6000000000000001, -0.3999999999999999,
-    -0.10000000000000009, 0.1999999999999993, 0.5, 0.5, 0.19999999999999996,
-    -0.10000000000000009, -0.3999999999999999, -0.7000000000000002, -1.0,
-    -0.7000000000000002, -0.3999999999999999, -0.10000000000000009,
-    0.1999999999999993, 0.5, 0.5, 0.19999999999999996, -0.10000000000000009,
-    -0.3999999999999999, -0.5999999999999996, -0.5999999999999996,
-    -0.5999999999999996, -0.3999999999999999, -0.10000000000000009,
-    0.1999999999999993, 0.5, 0.5, 0.19999999999999996, -0.10000000000000009,
-    -0.19999999999999973, -0.19999999999999973, -0.19999999999999973,
-    -0.19999999999999973, -0.19999999999999973, -0.10000000000000009,
-    0.1999999999999993, 0.5, 0.5385164807134505, 0.28284271247461906,
-    0.20000000000000018, 0.20000000000000018, 0.20000000000000018,
-    0.20000000000000018, 0.20000000000000018, 0.20000000000000018,
-    0.20000000000000018, 0.2828427124746186, 0.5385164807134505, 0.7810249675906655,
-    0.6324555320336759, 0.6000000000000001, 0.6000000000000001, 0.6000000000000001,
-    0.6000000000000001, 0.6000000000000001, 0.6000000000000001, 0.6000000000000001,
-    0.6324555320336757, 0.7810249675906655, 1.118033988749895, 1.019803902718557,
-    1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0198039027185568, 1.118033988749895
-};
-
-// clang-format on
diff --git a/Tests/UnitTests/Core/Surfaces/ConeBoundsTests.cpp b/Tests/UnitTests/Core/Surfaces/ConeBoundsTests.cpp
index 63e4fb64ff2..057f4164514 100644
--- a/Tests/UnitTests/Core/Surfaces/ConeBoundsTests.cpp
+++ b/Tests/UnitTests/Core/Surfaces/ConeBoundsTests.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2017-2018 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include <boost/test/tools/output_test_stream.hpp>
 #include <boost/test/unit_test.hpp>
@@ -17,132 +17,140 @@
 #include <algorithm>
 #include <array>
 #include <cmath>
+#include <numbers>
 #include <stdexcept>
 #include <vector>
 
-/* Note on nomenclature:
-  alpha = cone opening half angle
-  z is the axis of symmetry
-  zmin, zmax define limits for truncated cone
-  phi is clock angle around cone, with x axis corresponding to phi=0
-  Cone segments may be defined with the avphi (central position of segment) and
-    halfphi (extent in phi of cone segment either side of the avphi)
-  Local coords are z, rphi
-*/
+// Note on nomenclature:
+// - alpha = cone opening half angle
+// - z is the axis of symmetry
+// - zMin, zMax define limits for truncated cone
+// - phi is clock angle around cone, with x axis corresponding to phi=0
+// - Cone segments may be defined with the averagePhi (central position of
+// segment) and halfPhi (extent in phi of cone segment either side of the
+// averagePhi)
+// - Local coords are z, rphi
+
 namespace Acts::Test {
 
 BOOST_AUTO_TEST_SUITE(Surfaces)
 
+const double alpha = std::numbers::pi / 8.;
+const double zMin = 3.;
+const double zMax = 6.;
+const double halfPhi = std::numbers::pi / 4.;
+const double averagePhi = 0.;
+const bool symmetric = false;
+
 /// Unit test for creating compliant/non-compliant ConeBounds object
 BOOST_AUTO_TEST_CASE(ConeBoundsConstruction) {
-  // test default construction
-  // ConeBounds defaultConstructedConeBounds;  // deleted
-  double alpha(M_PI / 8.0), zMin(3.), zMax(6.), halfPhi(M_PI / 4.0),
-      averagePhi(0.);
-  const bool symmetric(false);
+  /// Test default construction
+  // default construction is deleted
+
   BOOST_TEST_CHECKPOINT("Four parameter constructor (last two at default)");
   ConeBounds defaultConeBounds(alpha, symmetric);
   BOOST_CHECK_EQUAL(defaultConeBounds.type(), SurfaceBounds::eCone);
+
   BOOST_TEST_CHECKPOINT("Four parameter constructor");
   ConeBounds fourParameterConstructed(alpha, symmetric, halfPhi, averagePhi);
   BOOST_CHECK_EQUAL(fourParameterConstructed.type(), SurfaceBounds::eCone);
+
   BOOST_TEST_CHECKPOINT("Five parameter constructor (last two at default)");
   ConeBounds defaulted5ParamConeBounds(alpha, zMin, zMax);
   BOOST_CHECK_EQUAL(defaulted5ParamConeBounds.type(), SurfaceBounds::eCone);
+
   BOOST_TEST_CHECKPOINT("Five parameter constructor)");
   ConeBounds fiveParamConstructedConeBounds(alpha, zMin, zMax, halfPhi,
                                             averagePhi);
   BOOST_CHECK_EQUAL(fiveParamConstructedConeBounds.type(),
                     SurfaceBounds::eCone);
+
   BOOST_TEST_CHECKPOINT("Copy constructor");
   ConeBounds copyConstructedConeBounds(fiveParamConstructedConeBounds);
   BOOST_CHECK_EQUAL(copyConstructedConeBounds, fiveParamConstructedConeBounds);
 }
 
-// Streaning and recreation test
+/// Streaning and recreation test
 BOOST_AUTO_TEST_CASE(ConeBoundsRecreation) {
-  double alpha(M_PI / 8.0), zMin(3.), zMax(6.), halfPhi(M_PI / 4.0),
-      averagePhi(0.);
-  // const bool symmetric(false);
   ConeBounds original(alpha, zMin, zMax, halfPhi, averagePhi);
   auto valvector = original.values();
   std::array<double, ConeBounds::eSize> values{};
   std::copy_n(valvector.begin(), ConeBounds::eSize, values.begin());
   ConeBounds recreated(values);
+
   BOOST_CHECK_EQUAL(recreated, original);
 }
 
-// Unit tests for AnnulusBounds exception throwing
+/// Unit tests for AnnulusBounds exception throwing
 BOOST_AUTO_TEST_CASE(ConeBoundsExceptions) {
-  double alpha(M_PI / 8.0), zMin(3.), zMax(6.), halfPhi(M_PI / 4.0),
-      averagePhi(0.);
-
   // Exception for opening angle smaller 0
   BOOST_CHECK_THROW(ConeBounds(-alpha, zMin, zMax, halfPhi, averagePhi),
                     std::logic_error);
-  // Exception for opening angle bigger M_PI
-  BOOST_CHECK_THROW(ConeBounds(M_PI, zMin, zMax, halfPhi, averagePhi),
-                    std::logic_error);
+
+  // Exception for opening angle bigger pi
+  BOOST_CHECK_THROW(
+      ConeBounds(std::numbers::pi, zMin, zMax, halfPhi, averagePhi),
+      std::logic_error);
+
   // Exception for swapped zMin and zMax
   BOOST_CHECK_THROW(ConeBounds(alpha, zMax, zMin, halfPhi, averagePhi),
                     std::logic_error);
+
   // Exception for negative half sector phi
   BOOST_CHECK_THROW(ConeBounds(alpha, zMin, zMax, -halfPhi, averagePhi),
                     std::logic_error);
-  // Exception for out of range  phi positioning
-  BOOST_CHECK_THROW(ConeBounds(alpha, zMin, zMax, halfPhi, 2 * M_PI),
-                    std::logic_error);
+
+  // Exception for out of range phi positioning
+  BOOST_CHECK_THROW(
+      ConeBounds(alpha, zMin, zMax, halfPhi, 2 * std::numbers::pi),
+      std::logic_error);
 }
 
 /// Unit tests for properties of ConeBounds object
 BOOST_AUTO_TEST_CASE(ConeBoundsProperties) {
-  double alpha(M_PI / 8.0), zMin(3.), zMax(6.), halfPhi(M_PI / 4.0),
-      averagePhi(0.);
-  // const bool symmetric(false);
   const Vector2 origin(0, 0);
   const Vector2 somewhere(4., 4.);
   ConeBounds coneBoundsObject(alpha, zMin, zMax, halfPhi, averagePhi);
-  //
-  /// test for type (redundant)
+
+  /// Test for type (redundant)
   BOOST_CHECK_EQUAL(coneBoundsObject.type(), SurfaceBounds::eCone);
-  //
-  /// test for inside
+
+  /// Test for inside
   BOOST_CHECK(!coneBoundsObject.inside(origin));
-  //
-  /// test for r
+
+  /// Test for r
   CHECK_CLOSE_REL(coneBoundsObject.r(zMin), zMin * std::tan(alpha), 1e-6);
-  //
-  /// test for tanAlpha
+
+  /// Test for tanAlpha
   CHECK_CLOSE_REL(coneBoundsObject.tanAlpha(), std::tan(alpha), 1e-6);
-  //
-  /// test for alpha
+
+  /// Test for alpha
   CHECK_CLOSE_REL(coneBoundsObject.get(ConeBounds::eAlpha), alpha, 1e-6);
-  //
-  /// test for minZ
+
+  /// Test for minZ
   CHECK_CLOSE_REL(coneBoundsObject.get(ConeBounds::eMinZ), zMin, 1e-6);
-  //
-  /// test for maxZ
+
+  /// Test for maxZ
   CHECK_CLOSE_REL(coneBoundsObject.get(ConeBounds::eMaxZ), zMax, 1e-6);
-  //
-  /// test for averagePhi
+
+  /// Test for averagePhi
   CHECK_CLOSE_REL(coneBoundsObject.get(ConeBounds::eHalfPhiSector), halfPhi,
                   1e-6);
-  /// test for dump
-  boost::test_tools::output_test_stream dumpOuput;
-  coneBoundsObject.toStream(dumpOuput);
-  BOOST_CHECK(dumpOuput.is_equal(
+
+  /// Test for dump
+  boost::test_tools::output_test_stream dumpOutput;
+  coneBoundsObject.toStream(dumpOutput);
+  BOOST_CHECK(dumpOutput.is_equal(
       "Acts::ConeBounds: (tanAlpha, minZ, maxZ, halfPhiSector, averagePhi) = "
       "(0.4142136, 3.0000000, 6.0000000, 0.7853982, 0.0000000)"));
 }
 
 // Unit test for testing ConeBounds assignment
 BOOST_AUTO_TEST_CASE(ConeBoundsAssignment) {
-  double alpha(M_PI / 8.0), zMin(3.), zMax(6.), halfPhi(M_PI / 4.0),
-      averagePhi(0.);
-  // const bool symmetric(false);
   ConeBounds originalConeBounds(alpha, zMin, zMax, halfPhi, averagePhi);
   ConeBounds assignedConeBounds(0.1, 2.3, 4.5, 1.2, 2.1);
   assignedConeBounds = originalConeBounds;
+
   BOOST_CHECK_EQUAL(assignedConeBounds, originalConeBounds);
 }
 
diff --git a/Tests/UnitTests/Core/Surfaces/ConeSurfaceTests.cpp b/Tests/UnitTests/Core/Surfaces/ConeSurfaceTests.cpp
index b4351175a74..5d0102653b2 100644
--- a/Tests/UnitTests/Core/Surfaces/ConeSurfaceTests.cpp
+++ b/Tests/UnitTests/Core/Surfaces/ConeSurfaceTests.cpp
@@ -1,12 +1,13 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2017-2018 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include <boost/test/data/test_case.hpp>
+#include <boost/test/tools/output_test_stream.hpp>
 #include <boost/test/unit_test.hpp>
 
 #include "Acts/Definitions/Algebra.hpp"
@@ -25,6 +26,7 @@
 #include <algorithm>
 #include <cmath>
 #include <memory>
+#include <numbers>
 #include <string>
 
 namespace Acts::Test {
@@ -36,13 +38,17 @@ BOOST_AUTO_TEST_SUITE(ConeSurfaces)
 
 /// Unit test for creating compliant/non-compliant ConeSurface object
 BOOST_AUTO_TEST_CASE(ConeSurfaceConstruction) {
-  // ConeSurface default constructor is deleted
-  //
-  /// Constructor with transform, alpha and symmetry
-  /// indicator
-  double alpha{M_PI / 8.}, halfPhiSector{M_PI / 16.}, zMin{1.0}, zMax{10.};
-  bool symmetric(false);
-  Translation3 translation{0., 1., 2.};
+  /// Test default construction
+  // default construction is deleted
+
+  /// Constructor with transform, alpha and symmetry indicator
+  const double alpha = std::numbers::pi / 8.;
+  const double halfPhiSector = std::numbers::pi / 16.;
+  const double zMin = 1.;
+  const double zMax = 10.;
+  const bool symmetric = false;
+  const Translation3 translation{0., 1., 2.};
+
   auto pTransform = Transform3(translation);
   BOOST_CHECK_EQUAL(
       Surface::makeShared<ConeSurface>(Transform3::Identity(), alpha, symmetric)
@@ -51,7 +57,7 @@ BOOST_AUTO_TEST_CASE(ConeSurfaceConstruction) {
   BOOST_CHECK_EQUAL(
       Surface::makeShared<ConeSurface>(pTransform, alpha, symmetric)->type(),
       Surface::Cone);
-  //
+
   /// Constructor with transform pointer, alpha,z min and max, halfPhiSector
   BOOST_CHECK_EQUAL(Surface::makeShared<ConeSurface>(pTransform, alpha, zMin,
                                                      zMax, halfPhiSector)
@@ -59,22 +65,19 @@ BOOST_AUTO_TEST_CASE(ConeSurfaceConstruction) {
                     Surface::Cone);
 
   /// Constructor with transform and ConeBounds pointer
-  // ConeBounds (double alpha, double zmin, double zmax, double halfphi=M_PI,
-  // double avphi=0.)
   auto pConeBounds =
       std::make_shared<const ConeBounds>(alpha, zMin, zMax, halfPhiSector, 0.);
   BOOST_CHECK_EQUAL(
       Surface::makeShared<ConeSurface>(pTransform, pConeBounds)->type(),
       Surface::Cone);
-  //
-  //
+
   /// Copy constructor
   auto coneSurfaceObject =
       Surface::makeShared<ConeSurface>(pTransform, alpha, symmetric);
   auto copiedConeSurface = Surface::makeShared<ConeSurface>(*coneSurfaceObject);
   BOOST_CHECK_EQUAL(copiedConeSurface->type(), Surface::Cone);
   BOOST_CHECK(*copiedConeSurface == *coneSurfaceObject);
-  //
+
   /// Copied and transformed
   auto copiedTransformedConeSurface = Surface::makeShared<ConeSurface>(
       tgContext, *coneSurfaceObject, pTransform);
@@ -85,28 +88,29 @@ BOOST_AUTO_TEST_CASE(ConeSurfaceConstruction) {
                         Transform3::Identity(), nullptr),
                     AssertionFailureException);
 }
-//
+
 /// Unit test for testing ConeSurface properties
 BOOST_AUTO_TEST_CASE(ConeSurfaceProperties) {
   /// Test clone method
-  double alpha{M_PI / 8.} /*,halfPhiSector{M_PI/16.}, zMin{1.0}, zMax{10.}*/;
-  bool symmetric(false);
-  Translation3 translation{0., 1., 2.};
+  const double alpha = std::numbers::pi / 8.;
+  const bool symmetric = false;
+  const Translation3 translation{0., 1., 2.};
+
   auto pTransform = Transform3(translation);
   auto coneSurfaceObject =
       Surface::makeShared<ConeSurface>(pTransform, alpha, symmetric);
-  //
+
   /// Test type (redundant)
   BOOST_CHECK_EQUAL(coneSurfaceObject->type(), Surface::Cone);
-  //
+
   /// Test binningPosition
   Vector3 binningPosition{0., 1., 2.};
   CHECK_CLOSE_ABS(
       coneSurfaceObject->binningPosition(tgContext, BinningValue::binPhi),
       binningPosition, 1e-6);
-  //
+
   /// Test referenceFrame
-  Vector3 globalPosition{2.0, 2.0, 2.0};
+  Vector3 globalPosition{2., 2., 2.};
   Vector3 momentum{1.e6, 1.e6, 1.e6};
   double rootHalf = std::sqrt(0.5);
   RotationMatrix3 expectedFrame;
@@ -114,45 +118,43 @@ BOOST_AUTO_TEST_CASE(ConeSurfaceProperties) {
   CHECK_CLOSE_OR_SMALL(
       coneSurfaceObject->referenceFrame(tgContext, globalPosition, momentum),
       expectedFrame, 1e-6, 1e-9);
-  //
+
   /// Test normal, given 3D position
   Vector3 origin{0., 0., 0.};
   Vector3 normal3D = {0., -1., 0.};
   CHECK_CLOSE_ABS(coneSurfaceObject->normal(tgContext, origin), normal3D, 1e-6);
-  //
+
   /// Test normal given 2D rphi position
-  Vector2 positionPiBy2(1.0, M_PI / 2.);
+  Vector2 positionPiBy2(1., std::numbers::pi / 2.);
   Vector3 normalAtPiBy2{0.0312768, 0.92335, -0.382683};
 
   CHECK_CLOSE_OR_SMALL(coneSurfaceObject->normal(tgContext, positionPiBy2),
                        normalAtPiBy2, 1e-2, 1e-9);
-  //
+
   /// Test rotational symmetry axis
   Vector3 symmetryAxis{0., 0., 1.};
   CHECK_CLOSE_ABS(coneSurfaceObject->rotSymmetryAxis(tgContext), symmetryAxis,
                   1e-6);
-  //
+
   /// Test bounds
   BOOST_CHECK_EQUAL(coneSurfaceObject->bounds().type(), SurfaceBounds::eCone);
-  //
+
   /// Test localToGlobal
-  Vector2 localPosition{1.0, M_PI / 2.0};
+  Vector2 localPosition{1., std::numbers::pi / 2.};
   globalPosition =
       coneSurfaceObject->localToGlobal(tgContext, localPosition, momentum);
-  // std::cout<<globalPosition<<std::endl;
   Vector3 expectedPosition{0.0220268, 1.65027, 3.5708};
 
   CHECK_CLOSE_REL(globalPosition, expectedPosition, 1e-2);
-  //
+
   /// Testing globalToLocal
   localPosition =
       coneSurfaceObject->globalToLocal(tgContext, globalPosition, momentum)
           .value();
-  // std::cout<<localPosition<<std::endl;
-  Vector2 expectedLocalPosition{1.0, M_PI / 2.0};
+  Vector2 expectedLocalPosition{1., std::numbers::pi / 2.};
 
   CHECK_CLOSE_REL(localPosition, expectedLocalPosition, 1e-6);
-  //
+
   /// Test isOnSurface
   Vector3 offSurface{100, 1, 2};
   BOOST_CHECK(coneSurfaceObject->isOnSurface(
@@ -164,40 +166,41 @@ BOOST_AUTO_TEST_CASE(ConeSurfaceProperties) {
   CHECK_CLOSE_REL(coneSurfaceObject->pathCorrection(tgContext, offSurface,
                                                     momentum.normalized()),
                   0.40218866453252877, 0.01);
-  //
+
   /// Test name
   BOOST_CHECK_EQUAL(coneSurfaceObject->name(),
                     std::string("Acts::ConeSurface"));
-  //
+
   /// Test dump
-  // TODO 2017-04-12 msmk: check how to correctly check output
-  //    boost::test_tools::output_test_stream dumpOuput;
-  //    coneSurfaceObject.toStream(dumpOuput);
-  //    BOOST_CHECK(dumpOuput.is_equal(
-  //      "Acts::ConeSurface\n"
-  //      "    Center position  (x, y, z) = (0.0000, 1.0000, 2.0000)\n"
-  //      "    Rotation:             colX = (1.000000, 0.000000, 0.000000)\n"
-  //      "                          colY = (0.000000, 1.000000, 0.000000)\n"
-  //      "                          colZ = (0.000000, 0.000000, 1.000000)\n"
-  //      "    Bounds  : Acts::ConeBounds: (tanAlpha, minZ, maxZ, averagePhi,
-  //      halfPhiSector) = (0.4142136, 0.0000000, inf, 0.0000000,
-  //      3.1415927)"));
+  boost::test_tools::output_test_stream dumpOutput;
+  dumpOutput << coneSurfaceObject->toStream(tgContext);
+  BOOST_CHECK(dumpOutput.is_equal(
+      "Acts::ConeSurface\n"
+      "     Center position  (x, y, z) = (0.0000, 1.0000, 2.0000)\n"
+      "     Rotation:             colX = (1.000000, 0.000000, 0.000000)\n"
+      "                           colY = (0.000000, 1.000000, 0.000000)\n"
+      "                           colZ = (0.000000, 0.000000, 1.000000)\n"
+      "     Bounds  : Acts::ConeBounds: (tanAlpha, minZ, maxZ, halfPhiSector, "
+      "averagePhi) = (0.4142136, 0.0000000, inf, 3.1415927, 0.0000000)"
+
+      ));
 }
 
 BOOST_AUTO_TEST_CASE(ConeSurfaceEqualityOperators) {
-  double alpha{M_PI / 8.} /*, halfPhiSector{M_PI/16.}, zMin{1.0}, zMax{10.}*/;
-  bool symmetric(false);
-  Translation3 translation{0., 1., 2.};
+  const double alpha = std::numbers::pi / 8.;
+  const bool symmetric = false;
+  const Translation3 translation{0., 1., 2.};
+
   auto pTransform = Transform3(translation);
   auto coneSurfaceObject =
       Surface::makeShared<ConeSurface>(pTransform, alpha, symmetric);
-  //
+
   auto coneSurfaceObject2 =
       Surface::makeShared<ConeSurface>(pTransform, alpha, symmetric);
-  //
+
   /// Test equality operator
   BOOST_CHECK(*coneSurfaceObject == *coneSurfaceObject2);
-  //
+
   BOOST_TEST_CHECKPOINT(
       "Create and then assign a ConeSurface object to the existing one");
   /// Test assignment
@@ -209,11 +212,13 @@ BOOST_AUTO_TEST_CASE(ConeSurfaceEqualityOperators) {
 }
 
 BOOST_AUTO_TEST_CASE(ConeSurfaceExtent) {
-  double alpha{M_PI / 8.}, zMin{0.}, zMax{10.};
-
-  Translation3 translation{0., 0., 0.};
+  const double alpha = std::numbers::pi / 8.;
+  const double halfPhiSector = std::numbers::pi / 8.;  // != pi/16
+  const double zMin = 0.;                              // != 1.
+  const double zMax = 10.;
+  const Translation3 translation{0., 0., 0.};  // != {0., 1., 2.}
 
-  // Testing a Full cone
+  /// Testing a Full cone
   auto pTransform = Transform3(translation);
   auto pConeBounds = std::make_shared<const ConeBounds>(alpha, zMin, zMax);
   auto pCone = Surface::makeShared<ConeSurface>(pTransform, pConeBounds);
@@ -237,8 +242,7 @@ BOOST_AUTO_TEST_CASE(ConeSurfaceExtent) {
   CHECK_CLOSE_ABS(rMax, pConeExtent.max(BinningValue::binY),
                   s_onSurfaceTolerance);
 
-  // Now a sector
-  double halfPhiSector = M_PI / 8.;
+  /// Now a sector
   pConeBounds =
       std::make_shared<const ConeBounds>(alpha, zMin, zMax, halfPhiSector, 0.);
   pCone = Surface::makeShared<ConeSurface>(pTransform, pConeBounds);
@@ -256,9 +260,10 @@ BOOST_AUTO_TEST_CASE(ConeSurfaceExtent) {
 
 /// Unit test for testing ConeSurface alignment derivatives
 BOOST_AUTO_TEST_CASE(ConeSurfaceAlignment) {
-  double alpha{M_PI / 8.};
-  bool symmetric(false);
-  Translation3 translation{0., 1., 2.};
+  const double alpha = std::numbers::pi / 8.;
+  const bool symmetric = false;
+  const Translation3 translation{0., 1., 2.};
+
   auto pTransform = Transform3(translation);
   auto coneSurfaceObject =
       Surface::makeShared<ConeSurface>(pTransform, alpha, symmetric);
@@ -279,7 +284,7 @@ BOOST_AUTO_TEST_CASE(ConeSurfaceAlignment) {
                                                               globalPosition);
   // Check if the result is as expected
   ActsMatrix<2, 3> expLoc3DToLocBound = ActsMatrix<2, 3>::Zero();
-  expLoc3DToLocBound << -1, 0, M_PI / 2. * std::tan(alpha), 0, 0, 1;
+  expLoc3DToLocBound << -1, 0, std::numbers::pi / 2. * std::tan(alpha), 0, 0, 1;
   CHECK_CLOSE_ABS(loc3DToLocBound, expLoc3DToLocBound, 1e-10);
 }
 
diff --git a/Tests/UnitTests/Core/Surfaces/ConvexPolygonBoundsTests.cpp b/Tests/UnitTests/Core/Surfaces/ConvexPolygonBoundsTests.cpp
index 22136a369fa..6b6712c230b 100644
--- a/Tests/UnitTests/Core/Surfaces/ConvexPolygonBoundsTests.cpp
+++ b/Tests/UnitTests/Core/Surfaces/ConvexPolygonBoundsTests.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2019 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include <boost/test/unit_test.hpp>
 
@@ -101,6 +101,10 @@ BOOST_AUTO_TEST_CASE(ConvexPolygonBoundsRecreation) {
   std::copy_n(valvector.begin(), poly<4>::eSize, values.begin());
   poly<4> recreated(values);
   BOOST_CHECK_EQUAL(original, recreated);
+
+  // Get the vertices back
+  auto rvertices = original.vertices();
+  BOOST_CHECK_EQUAL(rvertices.size(), 4u);
 }
 
 BOOST_AUTO_TEST_CASE(ConvexPolygonBoundsDynamicTest) {
diff --git a/Tests/UnitTests/Core/Surfaces/CurvilinearSurfaceTests.cpp b/Tests/UnitTests/Core/Surfaces/CurvilinearSurfaceTests.cpp
index 3af7e84d528..9816bb2a8e7 100644
--- a/Tests/UnitTests/Core/Surfaces/CurvilinearSurfaceTests.cpp
+++ b/Tests/UnitTests/Core/Surfaces/CurvilinearSurfaceTests.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2023 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include <boost/test/unit_test.hpp>
 
diff --git a/Tests/UnitTests/Core/Surfaces/CylinderBoundsTests.cpp b/Tests/UnitTests/Core/Surfaces/CylinderBoundsTests.cpp
index aa08a3155b6..14cafdd045b 100644
--- a/Tests/UnitTests/Core/Surfaces/CylinderBoundsTests.cpp
+++ b/Tests/UnitTests/Core/Surfaces/CylinderBoundsTests.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2017-2018 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include <boost/test/tools/output_test_stream.hpp>
 #include <boost/test/unit_test.hpp>
@@ -18,6 +18,7 @@
 #include <algorithm>
 #include <array>
 #include <cmath>
+#include <numbers>
 #include <stdexcept>
 #include <vector>
 
@@ -27,34 +28,42 @@ BOOST_AUTO_TEST_SUITE(Surfaces)
 /// Unit test for creating compliant/non-compliant CylinderBounds object
 
 BOOST_AUTO_TEST_CASE(CylinderBoundsConstruction) {
-  /// test default construction
-  // CylinderBounds defaultConstructedCylinderBounds;  // deleted
-  double radius(0.5), halfz(10.), halfphi(M_PI / 2.0), averagePhi(M_PI / 2.0),
-      minBevelZ(-M_PI / 4), maxBevelZ(M_PI / 6);
-  BOOST_CHECK_EQUAL(CylinderBounds(radius, halfz).type(),
-                    SurfaceBounds::eCylinder);
-  BOOST_CHECK_EQUAL(CylinderBounds(radius, halfz, halfphi).type(),
+  /// Test default construction
+  // default construction is deleted
+
+  const double radius = 0.5;
+  const double halfZ = 10.;
+  const double halfPhi = std::numbers::pi / 2.;
+  const double averagePhi = std::numbers::pi / 2.;
+  const double bevelMinZ = -std::numbers::pi / 4.;
+  const double bevelMaxZ = std::numbers::pi / 6.;
+
+  BOOST_CHECK_EQUAL(CylinderBounds(radius, halfZ).type(),
                     SurfaceBounds::eCylinder);
-  BOOST_CHECK_EQUAL(CylinderBounds(radius, halfz, halfphi, averagePhi).type(),
+  BOOST_CHECK_EQUAL(CylinderBounds(radius, halfZ, halfPhi).type(),
                     SurfaceBounds::eCylinder);
-  BOOST_CHECK_EQUAL(CylinderBounds(radius, halfz, M_PI, 0., minBevelZ).type(),
+  BOOST_CHECK_EQUAL(CylinderBounds(radius, halfZ, halfPhi, averagePhi).type(),
                     SurfaceBounds::eCylinder);
   BOOST_CHECK_EQUAL(
-      CylinderBounds(radius, halfz, M_PI, 0., minBevelZ, maxBevelZ).type(),
+      CylinderBounds(radius, halfZ, std::numbers::pi, 0., bevelMinZ).type(),
       SurfaceBounds::eCylinder);
-  //
-  /// test copy construction;
-  CylinderBounds cylinderBounds(radius, halfz);
+  BOOST_CHECK_EQUAL(
+      CylinderBounds(radius, halfZ, std::numbers::pi, 0., bevelMinZ, bevelMaxZ)
+          .type(),
+      SurfaceBounds::eCylinder);
+
+  /// Test copy construction;
+  CylinderBounds cylinderBounds(radius, halfZ);
   CylinderBounds copyConstructedCylinderBounds(cylinderBounds);
   BOOST_CHECK_EQUAL(copyConstructedCylinderBounds, cylinderBounds);
 }
 
 BOOST_AUTO_TEST_CASE(CylinderBoundsRecreation) {
-  /// test default construction
-  // CylinderBounds defaultConstructedCylinderBounds;  // deleted
-  double radius(0.5), halfz(10.);
+  const double radius = 0.5;
+  const double halfZ = 10.;
+
   // Test construction with radii and default sector
-  auto original = CylinderBounds(radius, halfz);
+  auto original = CylinderBounds(radius, halfZ);
   auto valvector = original.values();
   std::array<double, CylinderBounds::eSize> values{};
   std::copy_n(valvector.begin(), CylinderBounds::eSize, values.begin());
@@ -63,60 +72,64 @@ BOOST_AUTO_TEST_CASE(CylinderBoundsRecreation) {
 }
 
 BOOST_AUTO_TEST_CASE(CylinderBoundsException) {
-  double radius(0.5), halfz(10.), halfphi(M_PI / 2.0), averagePhi(M_PI / 2.0);
+  const double radius = 0.5;
+  const double halfZ = 10.;
+  const double halfPhi = std::numbers::pi / 2.;
+  const double averagePhi = std::numbers::pi / 2.;
 
-  // Negative radius
-  BOOST_CHECK_THROW(CylinderBounds(-radius, halfz, halfphi, averagePhi),
+  /// Negative radius
+  BOOST_CHECK_THROW(CylinderBounds(-radius, halfZ, halfPhi, averagePhi),
                     std::logic_error);
 
-  // Negative half length in z
-  BOOST_CHECK_THROW(CylinderBounds(radius, -halfz, halfphi, averagePhi),
+  /// Negative half length in z
+  BOOST_CHECK_THROW(CylinderBounds(radius, -halfZ, halfPhi, averagePhi),
                     std::logic_error);
 
-  // Negative half sector in phi
-  BOOST_CHECK_THROW(CylinderBounds(radius, halfz, -halfphi, averagePhi),
+  /// Negative half sector in phi
+  BOOST_CHECK_THROW(CylinderBounds(radius, halfZ, -halfPhi, averagePhi),
                     std::logic_error);
 
-  // Half sector in phi out of bounds
-  BOOST_CHECK_THROW(CylinderBounds(radius, halfz, 4., averagePhi),
+  /// Half sector in phi out of bounds
+  BOOST_CHECK_THROW(CylinderBounds(radius, halfZ, 4., averagePhi),
                     std::logic_error);
 
-  // Phi position out of bounds
-  BOOST_CHECK_THROW(CylinderBounds(radius, halfz, halfphi, 4.),
+  /// Phi position out of bounds
+  BOOST_CHECK_THROW(CylinderBounds(radius, halfZ, halfPhi, 4.),
                     std::logic_error);
 }
 
 /// Unit tests for CylinderBounds properties
 BOOST_AUTO_TEST_CASE(CylinderBoundsProperties) {
-  // CylinderBounds object of radius 0.5 and halfz 20
-  double nominalRadius{0.5};
-  double nominalHalfLength{20.};
-  double halfphi(M_PI / 4.0);
-  double averagePhi(0.0);
-  double bevelMinZ(M_PI / 4);
-  double bevelMaxZ(M_PI / 6);
-  CylinderBounds cylinderBoundsObject(nominalRadius, nominalHalfLength);
-  CylinderBounds cylinderBoundsSegment(nominalRadius, nominalHalfLength,
-                                       halfphi, averagePhi);
-  CylinderBounds cylinderBoundsBeveledObject(nominalRadius, nominalHalfLength,
-                                             M_PI, 0., bevelMinZ, bevelMaxZ);
-
-  /// test for type()
+  // CylinderBounds object of radius 0.5 and halfZ 20
+  const double radius = 0.5;
+  const double halfZ = 20.;                        // != 10.
+  const double halfPhi = std::numbers::pi / 4.;    // != pi/2
+  const double averagePhi = 0.;                    // != pi/2
+  const double bevelMinZ = std::numbers::pi / 4.;  // != -pi/4
+  const double bevelMaxZ = std::numbers::pi / 6.;
+
+  CylinderBounds cylinderBoundsObject(radius, halfZ);
+  CylinderBounds cylinderBoundsSegment(radius, halfZ, halfPhi, averagePhi);
+  CylinderBounds cylinderBoundsBeveledObject(radius, halfZ, std::numbers::pi,
+                                             0., bevelMinZ, bevelMaxZ);
+
+  /// Test for type()
   BOOST_CHECK_EQUAL(cylinderBoundsObject.type(), SurfaceBounds::eCylinder);
 
-  /// test for inside(), 2D coords are r or phi ,z? : needs clarification
+  /// Test for inside(), 2D coords are r or phi ,z? : needs clarification
   const Vector2 origin{0., 0.};
-  const Vector2 atPiBy2{M_PI / 2., 0.0};
-  const Vector2 atPi{M_PI, 0.0};
-  const Vector2 beyondEnd{0, 30.0};
-  const Vector2 unitZ{0.0, 1.0};
-  const Vector2 unitPhi{1.0, 0.0};
+  const Vector2 atPiBy2{std::numbers::pi / 2., 0.};
+  const Vector2 atPi{std::numbers::pi, 0.};
+  const Vector2 beyondEnd{0, 30.};
+  const Vector2 unitZ{0., 1.};
+  const Vector2 unitPhi{1., 0.};
   const Vector2 withinBevelMin{0.5, -20.012};
   const Vector2 outsideBevelMin{0.5, -40.};
   const BoundaryTolerance tolerance =
       BoundaryTolerance::AbsoluteBound(0.1, 0.1);
   const BoundaryTolerance lessTolerance =
       BoundaryTolerance::AbsoluteBound(0.01, 0.01);
+
   BOOST_CHECK(cylinderBoundsObject.inside(atPiBy2, tolerance));
   BOOST_CHECK(!cylinderBoundsSegment.inside(unitPhi, tolerance));
   BOOST_CHECK(cylinderBoundsObject.inside(origin, tolerance));
@@ -127,44 +140,46 @@ BOOST_AUTO_TEST_CASE(CylinderBoundsProperties) {
   BOOST_CHECK(
       !cylinderBoundsBeveledObject.inside(outsideBevelMin, lessTolerance));
 
-  /// test for r()
-  CHECK_CLOSE_REL(cylinderBoundsObject.get(CylinderBounds::eR), nominalRadius,
-                  1e-6);
+  /// Test for r()
+  CHECK_CLOSE_REL(cylinderBoundsObject.get(CylinderBounds::eR), radius, 1e-6);
 
-  /// test for averagePhi
+  /// Test for averagePhi
   CHECK_CLOSE_OR_SMALL(cylinderBoundsObject.get(CylinderBounds::eAveragePhi),
                        averagePhi, 1e-6, 1e-6);
 
-  /// test for halfPhiSector
+  /// Test for halfPhiSector
   CHECK_CLOSE_REL(cylinderBoundsSegment.get(CylinderBounds::eHalfPhiSector),
-                  halfphi,
+                  halfPhi,
                   1e-6);  // fail
 
-  /// test for halflengthZ (NOTE: Naming violation)
-  CHECK_CLOSE_REL(cylinderBoundsObject.get(CylinderBounds::eHalfLengthZ),
-                  nominalHalfLength, 1e-6);
+  /// Test for halflengthZ (NOTE: Naming violation)
+  CHECK_CLOSE_REL(cylinderBoundsObject.get(CylinderBounds::eHalfLengthZ), halfZ,
+                  1e-6);
 
-  /// test for bevelMinZ/MaxZ
+  /// Test for bevelMinZ/MaxZ
   CHECK_CLOSE_REL(cylinderBoundsBeveledObject.get(CylinderBounds::eBevelMinZ),
                   bevelMinZ, 1e-6);
   CHECK_CLOSE_REL(cylinderBoundsBeveledObject.get(CylinderBounds::eBevelMaxZ),
                   bevelMaxZ, 1e-6);
 
-  /// test for dump
-  boost::test_tools::output_test_stream dumpOuput;
-  cylinderBoundsObject.toStream(dumpOuput);
-  BOOST_CHECK(dumpOuput.is_equal(
+  /// Test for dump
+  boost::test_tools::output_test_stream dumpOutput;
+  cylinderBoundsObject.toStream(dumpOutput);
+  BOOST_CHECK(dumpOutput.is_equal(
       "Acts::CylinderBounds: (radius, halfLengthZ, halfPhiSector, "
       "averagePhi, bevelMinZ, bevelMaxZ) = (0.5000000, 20.0000000, 3.1415927, "
       "0.0000000, 0.0000000, 0.0000000)"));
 }
+
 /// Unit test for testing CylinderBounds assignment
 BOOST_AUTO_TEST_CASE(CylinderBoundsAssignment) {
-  double nominalRadius{0.5};
-  double nominalHalfLength{20.};
-  CylinderBounds cylinderBoundsObject(nominalRadius, nominalHalfLength);
+  const double radius = 0.5;
+  const double halfZ = 20.;  // != 10.
+
+  CylinderBounds cylinderBoundsObject(radius, halfZ);
   CylinderBounds assignedCylinderBounds(10.5, 6.6);
   assignedCylinderBounds = cylinderBoundsObject;
+
   BOOST_CHECK_EQUAL(assignedCylinderBounds.get(CylinderBounds::eR),
                     cylinderBoundsObject.get(CylinderBounds::eR));
   BOOST_CHECK_EQUAL(assignedCylinderBounds, cylinderBoundsObject);
diff --git a/Tests/UnitTests/Core/Surfaces/CylinderSurfaceTests.cpp b/Tests/UnitTests/Core/Surfaces/CylinderSurfaceTests.cpp
index 131e257c491..4dd6f7f6905 100644
--- a/Tests/UnitTests/Core/Surfaces/CylinderSurfaceTests.cpp
+++ b/Tests/UnitTests/Core/Surfaces/CylinderSurfaceTests.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2017-2018 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include <boost/test/data/test_case.hpp>
 #include <boost/test/tools/output_test_stream.hpp>
@@ -34,6 +34,7 @@
 #include <cmath>
 #include <initializer_list>
 #include <memory>
+#include <numbers>
 #include <ostream>
 #include <string>
 #include <utility>
@@ -54,16 +55,20 @@ GeometryContext testContext = GeometryContext();
 BOOST_AUTO_TEST_SUITE(CylinderSurfaces)
 /// Unit test for creating compliant/non-compliant CylinderSurface object
 BOOST_AUTO_TEST_CASE(CylinderSurfaceConstruction) {
-  // CylinderSurface default constructor is deleted
-  //
+  /// Test default construction
+  // default construction is deleted
+
   /// Constructor with transform, radius and halfZ
-  double radius(1.0), halfZ(10.), halfPhiSector(M_PI / 8.);
-  Translation3 translation{0., 1., 2.};
+  const double radius = 1.;
+  const double halfZ = 10.;
+  const double halfPhiSector = std::numbers::pi / 8.;
+  const Translation3 translation{0., 1., 2.};
+
   auto pTransform = Transform3(translation);
   BOOST_CHECK_EQUAL(
       Surface::makeShared<CylinderSurface>(pTransform, radius, halfZ)->type(),
       Surface::Cylinder);
-  //
+
   /// Constructor with transform pointer, radius, halfZ and halfPhiSector
   BOOST_CHECK_EQUAL(Surface::makeShared<CylinderSurface>(pTransform, radius,
                                                          halfZ, halfPhiSector)
@@ -75,8 +80,7 @@ BOOST_AUTO_TEST_CASE(CylinderSurfaceConstruction) {
   BOOST_CHECK_EQUAL(
       Surface::makeShared<CylinderSurface>(pTransform, pCylinderBounds)->type(),
       Surface::Cylinder);
-  //
-  //
+
   /// Copy constructor
   auto cylinderSurfaceObject =
       Surface::makeShared<CylinderSurface>(pTransform, radius, halfZ);
@@ -84,7 +88,7 @@ BOOST_AUTO_TEST_CASE(CylinderSurfaceConstruction) {
       Surface::makeShared<CylinderSurface>(*cylinderSurfaceObject);
   BOOST_CHECK_EQUAL(copiedCylinderSurface->type(), Surface::Cylinder);
   BOOST_CHECK(*copiedCylinderSurface == *cylinderSurfaceObject);
-  //
+
   /// Copied and transformed
   auto copiedTransformedCylinderSurface = Surface::makeShared<CylinderSurface>(
       testContext, *cylinderSurfaceObject, pTransform);
@@ -96,33 +100,35 @@ BOOST_AUTO_TEST_CASE(CylinderSurfaceConstruction) {
                         Transform3::Identity(), nullptr),
                     AssertionFailureException);
 }
-//
+
 /// Unit test for testing CylinderSurface properties
 BOOST_AUTO_TEST_CASE(CylinderSurfaceProperties) {
   /// Test clone method
-  double radius(1.0), halfZ(10.);
-  Translation3 translation{0., 1., 2.};
+  const double radius = 1.;
+  const double halfZ = 10.;
+  const Translation3 translation{0., 1., 2.};
+
   auto pTransform = Transform3(translation);
   auto cylinderSurfaceObject =
       Surface::makeShared<CylinderSurface>(pTransform, radius, halfZ);
-  //
+
   /// Test type (redundant)
   BOOST_CHECK_EQUAL(cylinderSurfaceObject->type(), Surface::Cylinder);
-  //
+
   /// Test binningPosition
   Vector3 binningPosition{0., 1., 2.};
   CHECK_CLOSE_ABS(
       cylinderSurfaceObject->binningPosition(testContext, BinningValue::binPhi),
       binningPosition, 1e-9);
-  //
+
   /// Test referenceFrame
-  double rootHalf = std::sqrt(0.5);
-  Vector3 globalPosition{rootHalf, 1. - rootHalf, 0.};
-  Vector3 globalPositionZ{rootHalf, 1. - rootHalf, 2.0};
+  const double invSqrt2 = 1. / std::numbers::sqrt2;
+  Vector3 globalPosition{invSqrt2, 1. - invSqrt2, 0.};
+  Vector3 globalPositionZ{invSqrt2, 1. - invSqrt2, 2.};
   Vector3 momentum{15., 15., 15.};
   Vector3 momentum2{6.6, -3., 2.};
   RotationMatrix3 expectedFrame;
-  expectedFrame << rootHalf, 0., rootHalf, rootHalf, 0., -rootHalf, 0., 1., 0.;
+  expectedFrame << invSqrt2, 0., invSqrt2, invSqrt2, 0., -invSqrt2, 0., 1., 0.;
   // check without shift
   CHECK_CLOSE_OR_SMALL(cylinderSurfaceObject->referenceFrame(
                            testContext, globalPosition, momentum),
@@ -131,53 +137,52 @@ BOOST_AUTO_TEST_CASE(CylinderSurfaceProperties) {
   CHECK_CLOSE_OR_SMALL(cylinderSurfaceObject->referenceFrame(
                            testContext, globalPositionZ, momentum2),
                        expectedFrame, 1e-6, 1e-9);
-  //
+
   /// Test normal, given 3D position
   Vector3 origin{0., 0., 0.};
   Vector3 normal3D = {0., -1., 0.};
   CHECK_CLOSE_ABS(cylinderSurfaceObject->normal(testContext, origin), normal3D,
                   1e-9);
 
-  Vector3 pos45deg = {rootHalf, 1 + rootHalf, 0.};
-  Vector3 pos45degZ = {rootHalf, 1 + rootHalf, 4.};
-  Vector3 normal45deg = {rootHalf, rootHalf, 0.};
+  Vector3 pos45deg = {invSqrt2, 1 + invSqrt2, 0.};
+  Vector3 pos45degZ = {invSqrt2, 1 + invSqrt2, 4.};
+  Vector3 normal45deg = {invSqrt2, invSqrt2, 0.};
   // test the normal vector
   CHECK_CLOSE_ABS(cylinderSurfaceObject->normal(testContext, pos45deg),
-                  normal45deg, 1e-6 * rootHalf);
+                  normal45deg, 1e-6 * invSqrt2);
   // test that the normal vector is independent of z coordinate
   CHECK_CLOSE_ABS(cylinderSurfaceObject->normal(testContext, pos45degZ),
-                  normal45deg, 1e-6 * rootHalf);
-  //
+                  normal45deg, 1e-6 * invSqrt2);
+
   /// Test normal given 2D rphi position
-  Vector2 positionPiBy2(1.0, 0.);
+  Vector2 positionPiBy2(1., 0.);
   Vector3 normalAtPiBy2{std::cos(1.), std::sin(1.), 0.};
   CHECK_CLOSE_ABS(cylinderSurfaceObject->normal(testContext, positionPiBy2),
                   normalAtPiBy2, 1e-9);
 
-  //
   /// Test rotational symmetry axis
   Vector3 symmetryAxis{0., 0., 1.};
   CHECK_CLOSE_ABS(cylinderSurfaceObject->rotSymmetryAxis(testContext),
                   symmetryAxis, 1e-9);
-  //
+
   /// Test bounds
   BOOST_CHECK_EQUAL(cylinderSurfaceObject->bounds().type(),
                     SurfaceBounds::eCylinder);
-  //
+
   /// Test localToGlobal
   Vector2 localPosition{0., 0.};
   globalPosition = cylinderSurfaceObject->localToGlobal(
       testContext, localPosition, momentum);
   Vector3 expectedPosition{1, 1, 2};
   BOOST_CHECK_EQUAL(globalPosition, expectedPosition);
-  //
+
   /// Testing globalToLocal
   localPosition = cylinderSurfaceObject
                       ->globalToLocal(testContext, globalPosition, momentum)
                       .value();
   Vector2 expectedLocalPosition{0., 0.};
   BOOST_CHECK_EQUAL(localPosition, expectedLocalPosition);
-  //
+
   /// Test isOnSurface
   Vector3 offSurface{100, 1, 2};
   BOOST_CHECK(cylinderSurfaceObject->isOnSurface(
@@ -188,36 +193,35 @@ BOOST_AUTO_TEST_CASE(CylinderSurfaceProperties) {
       testContext, offSurface, momentum, BoundaryTolerance::None()));
   BOOST_CHECK(!cylinderSurfaceObject->isOnSurface(testContext, offSurface,
                                                   BoundaryTolerance::None()));
-  //
-  /// intersection test
+
+  /// Intersection test
   Vector3 direction{-1., 0, 0};
   auto sfIntersection = cylinderSurfaceObject->intersect(
       testContext, offSurface, direction, BoundaryTolerance::Infinite());
   Intersection3D expectedIntersect{Vector3{1, 1, 2}, 99.,
                                    Intersection3D::Status::reachable};
-  BOOST_CHECK(sfIntersection[0]);
+  BOOST_CHECK(sfIntersection[0].isValid());
   CHECK_CLOSE_ABS(sfIntersection[0].position(), expectedIntersect.position(),
                   1e-9);
   CHECK_CLOSE_ABS(sfIntersection[0].pathLength(),
                   expectedIntersect.pathLength(), 1e-9);
   // there is a second solution & and it should be valid
-  BOOST_CHECK(sfIntersection[1]);
+  BOOST_CHECK(sfIntersection[1].isValid());
   // And it's path should be further away then the primary solution
   double pn = sfIntersection[0].pathLength();
   double pa = sfIntersection[1].pathLength();
   BOOST_CHECK_LT(std::abs(pn), std::abs(pa));
   BOOST_CHECK_EQUAL(sfIntersection.object(), cylinderSurfaceObject.get());
 
-  //
   /// Test pathCorrection
   CHECK_CLOSE_REL(cylinderSurfaceObject->pathCorrection(testContext, offSurface,
                                                         momentum.normalized()),
-                  std::sqrt(3.), 0.01);
-  //
+                  std::numbers::sqrt3, 0.01);
+
   /// Test name
   BOOST_CHECK_EQUAL(cylinderSurfaceObject->name(),
                     std::string("Acts::CylinderSurface"));
-  //
+
   /// Test dump
   boost::test_tools::output_test_stream dumpOutput;
   std::string expected =
@@ -232,18 +236,20 @@ BOOST_AUTO_TEST_CASE(CylinderSurfaceProperties) {
 }
 
 BOOST_AUTO_TEST_CASE(CylinderSurfaceEqualityOperators) {
-  double radius(1.0), halfZ(10.);
-  Translation3 translation{0., 1., 2.};
+  const double radius = 1.;
+  const double halfZ = 10.;
+  const Translation3 translation{0., 1., 2.};
+
   auto pTransform = Transform3(translation);
   auto cylinderSurfaceObject =
       Surface::makeShared<CylinderSurface>(pTransform, radius, halfZ);
-  //
+
   auto cylinderSurfaceObject2 =
       Surface::makeShared<CylinderSurface>(pTransform, radius, halfZ);
-  //
+
   /// Test equality operator
   BOOST_CHECK(*cylinderSurfaceObject == *cylinderSurfaceObject2);
-  //
+
   BOOST_TEST_CHECKPOINT(
       "Create and then assign a CylinderSurface object to the existing one");
   /// Test assignment
@@ -257,8 +263,10 @@ BOOST_AUTO_TEST_CASE(CylinderSurfaceEqualityOperators) {
 /// Unit test for testing CylinderSurface properties
 BOOST_AUTO_TEST_CASE(CylinderSurfaceExtent) {
   // Some radius and half length
-  double radius(1.0), halfZ(10.);
-  Translation3 translation{0., 0., 2.};
+  const double radius = 1.;
+  const double halfZ = 10.;
+  const Translation3 translation{0., 0., 2.};  // != {0., 1., 2.}
+
   auto pTransform = Transform3(translation);
   auto cylinderSurface =
       Surface::makeShared<CylinderSurface>(pTransform, radius, halfZ);
@@ -286,8 +294,10 @@ BOOST_AUTO_TEST_CASE(CylinderSurfaceExtent) {
 
 /// Unit test for testing CylinderSurface alignment derivatives
 BOOST_AUTO_TEST_CASE(CylinderSurfaceAlignment) {
-  double radius(1.0), halfZ(10.);
-  Translation3 translation{0., 1., 2.};
+  const double radius = 1.;
+  const double halfZ = 10.;
+  const Translation3 translation{0., 1., 2.};
+
   auto pTransform = Transform3(translation);
   auto cylinderSurfaceObject =
       Surface::makeShared<CylinderSurface>(pTransform, radius, halfZ);
@@ -322,8 +332,8 @@ BOOST_AUTO_TEST_CASE(CylinderSurfaceBinningPosition) {
   double halfZ = 330;
   double averagePhi = 0.1;
 
-  auto bounds =
-      std::make_shared<CylinderBounds>(r, halfZ, M_PI / 8, averagePhi);
+  auto bounds = std::make_shared<CylinderBounds>(r, halfZ, std::numbers::pi / 8,
+                                                 averagePhi);
   auto cylinder = Acts::Surface::makeShared<CylinderSurface>(trf, bounds);
 
   Vector3 exp = Vector3{r * std::cos(averagePhi), r * std::sin(averagePhi), 0};
@@ -409,15 +419,15 @@ BOOST_DATA_TEST_CASE(IncompatibleZDirection,
 
   // Cylinder with bevel
   auto cyl4 = Surface::makeShared<CylinderSurface>(
-      base * Translation3{Vector3::UnitZ() * 200_mm}, 30_mm, 100_mm, M_PI, 0,
-      M_PI / 8.0);
+      base * Translation3{Vector3::UnitZ() * 200_mm}, 30_mm, 100_mm,
+      std::numbers::pi, 0, std::numbers::pi / 8.);
   BOOST_CHECK_THROW(
       cyl->mergedWith(*cyl4, Acts::BinningValue::binZ, false, *logger),
       SurfaceMergingException);
 
   auto cyl5 = Surface::makeShared<CylinderSurface>(
-      base * Translation3{Vector3::UnitZ() * 200_mm}, 30_mm, 100_mm, M_PI, 0, 0,
-      M_PI / 8.0);
+      base * Translation3{Vector3::UnitZ() * 200_mm}, 30_mm, 100_mm,
+      std::numbers::pi, 0, 0, std::numbers::pi / 8.);
   BOOST_CHECK_THROW(
       cyl->mergedWith(*cyl5, Acts::BinningValue::binZ, false, *logger),
       SurfaceMergingException);
@@ -605,7 +615,7 @@ BOOST_DATA_TEST_CASE(RPhiDirection,
 
     BOOST_CHECK_SMALL(
         detail::difference_periodic(bounds.get(CylinderBounds::eAveragePhi),
-                                    a(85_degree), 2 * M_PI),
+                                    a(85_degree), 2 * std::numbers::pi),
         1e-6);
     BOOST_CHECK_CLOSE(bounds.get(CylinderBounds::eHalfPhiSector), 55_degree,
                       0.1);
@@ -629,7 +639,7 @@ BOOST_DATA_TEST_CASE(RPhiDirection,
 
     BOOST_CHECK_SMALL(detail::difference_periodic(
                           cyl45->bounds().get(CylinderBounds::eAveragePhi),
-                          a(180_degree), 2 * M_PI),
+                          a(180_degree), 2 * std::numbers::pi),
                       1e-6);
     BOOST_CHECK_CLOSE(cyl45->bounds().get(CylinderBounds::eHalfPhiSector),
                       30_degree, 1e-6);
@@ -656,7 +666,7 @@ BOOST_DATA_TEST_CASE(RPhiDirection,
 
     BOOST_CHECK_SMALL(detail::difference_periodic(
                           cyl67->bounds().get(CylinderBounds::eAveragePhi),
-                          a(180_degree), 2 * M_PI),
+                          a(180_degree), 2 * std::numbers::pi),
                       1e-6);
     BOOST_CHECK_CLOSE(cyl67->bounds().get(CylinderBounds::eHalfPhiSector),
                       180_degree, 1e-6);
diff --git a/Tests/UnitTests/Core/Surfaces/DiamondBoundsTests.cpp b/Tests/UnitTests/Core/Surfaces/DiamondBoundsTests.cpp
index 866f15459c8..1869cde057d 100644
--- a/Tests/UnitTests/Core/Surfaces/DiamondBoundsTests.cpp
+++ b/Tests/UnitTests/Core/Surfaces/DiamondBoundsTests.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2017-2018 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include <boost/test/tools/output_test_stream.hpp>
 #include <boost/test/unit_test.hpp>
@@ -24,22 +24,26 @@ namespace Acts::Test {
 BOOST_AUTO_TEST_SUITE(Surfaces)
 /// Unit test for creating compliant/non-compliant DiamondBounds object
 BOOST_AUTO_TEST_CASE(DiamondBoundsConstruction) {
-  double minHalfX(10.), midHalfX(20.), maxHalfX(15.), halfY1(5.), halfY2(7.);
-  // test default construction
-  // DiamondBounds defaultConstructedDiamondBounds;  //deleted
-  //
+  /// Test default construction
+  // default construction is deleted
+
+  const double minHalfX = 10.;
+  const double midHalfX = 20.;
+  const double maxHalfX = 15.;
+  const double halfY1 = 5.;
+  const double halfY2 = 7.;
+
   /// Test construction with dimensions
-  // DiamondBounds d(minHalfX, midHalfX, maxHalfX, halfY1, halfY2);
   BOOST_CHECK_EQUAL(
       DiamondBounds(minHalfX, midHalfX, maxHalfX, halfY1, halfY2).type(),
       SurfaceBounds::eDiamond);
-  //
+
   /// Copy constructor
   DiamondBounds original(minHalfX, midHalfX, maxHalfX, halfY1, halfY2);
   DiamondBounds copied(original);
   BOOST_CHECK_EQUAL(copied.type(), SurfaceBounds::eDiamond);
 
-  // invalid inputs
+  /// Test invalid inputs
   BOOST_CHECK_THROW(
       DiamondBounds db(midHalfX, minHalfX, maxHalfX, halfY1, halfY2),
       std::logic_error);
@@ -47,66 +51,66 @@ BOOST_AUTO_TEST_CASE(DiamondBoundsConstruction) {
       DiamondBounds db(minHalfX, maxHalfX, midHalfX, halfY1, halfY2),
       std::logic_error);
 }
+
 /// Unit tests for DiamondBounds properties
 BOOST_AUTO_TEST_CASE(DiamondBoundsProperties) {
-  double minHalfX(10.), midHalfX(50.), maxHalfX(30.), halfY1(10.), halfY2(20.);
+  const double minHalfX = 10.;
+  const double midHalfX = 50.;  // != 20.
+  const double maxHalfX = 30.;  // != 15.
+  const double halfY1 = 10.;    // != 5.
+  const double halfY2 = 20.;    // != 7.
+
   /// Test clone
   DiamondBounds diamondBoundsObject(minHalfX, midHalfX, maxHalfX, halfY1,
                                     halfY2);
-  //
+
   /// Test type() (redundant; already used in constructor confirmation)
   BOOST_CHECK_EQUAL(diamondBoundsObject.type(), SurfaceBounds::eDiamond);
-  // //redundant test
-  //
+
   /// Test the half length at negative y
   BOOST_CHECK_EQUAL(diamondBoundsObject.get(DiamondBounds::eHalfLengthXnegY),
                     minHalfX);
-  //
+
   /// Test the half length at the x axis
   BOOST_CHECK_EQUAL(diamondBoundsObject.get(DiamondBounds::eHalfLengthXzeroY),
                     midHalfX);
-  //
+
   /// Test the half length at positive y
   BOOST_CHECK_EQUAL(diamondBoundsObject.get(DiamondBounds::eHalfLengthXposY),
                     maxHalfX);
-  //
+
   /// Test half length into the negative side
   BOOST_CHECK_EQUAL(diamondBoundsObject.get(DiamondBounds::eHalfLengthYneg),
                     halfY1);
-  //
+
   /// Test half length into the positive side
   BOOST_CHECK_EQUAL(diamondBoundsObject.get(DiamondBounds::eHalfLengthYpos),
                     halfY2);
-  //
+
   /// Test boundingBox
   BOOST_CHECK_EQUAL(diamondBoundsObject.boundingBox(),
                     RectangleBounds(Vector2{-50., -10.}, Vector2{50., 20.}));
-  //
-  // clone already tested
-  //
+
   /// Test distanceToBoundary
   Vector2 origin(0., 0.);
   Vector2 outsideBy10(0., 30.);
   Vector2 inRectangle(15., 0.);
 
   /// Test dump
-  // Acts::DiamondBounds:  (minHlengthX, medHlengthX, maxHlengthX, hlengthY1,
-  // hlengthY2 ) = (30.0000000, 10.0000000, 50.0000000, 10.0000000,
-  // 20.0000000)
   diamondBoundsObject.toStream(std::cout);
-  boost::test_tools::output_test_stream dumpOuput;
-  diamondBoundsObject.toStream(dumpOuput);
+  boost::test_tools::output_test_stream dumpOutput;
+  diamondBoundsObject.toStream(dumpOutput);
   BOOST_CHECK(
-      dumpOuput.is_equal("Acts::DiamondBounds: (halfXatYneg, halfXatYzero, "
-                         "halfXatYpos, halfYneg, halfYpos) = (10.0000000, "
-                         "50.0000000, 30.0000000, 10.0000000, 20.0000000)"));
-  //
+      dumpOutput.is_equal("Acts::DiamondBounds: (halfXatYneg, halfXatYzero, "
+                          "halfXatYpos, halfYneg, halfYpos) = (10.0000000, "
+                          "50.0000000, 30.0000000, 10.0000000, 20.0000000)"));
+
   /// Test inside
   BOOST_CHECK(diamondBoundsObject.inside(origin, BoundaryTolerance::None()));
   // dont understand why this is so:
   BOOST_CHECK(
       !diamondBoundsObject.inside(outsideBy10, BoundaryTolerance::None()));
-  //
+
   /// Test vertices (does this need to be implemented in this class??
   // auto v=diamondBoundsObject.vertices();
   std::vector<Vector2> referenceVertices{
@@ -117,20 +121,28 @@ BOOST_AUTO_TEST_CASE(DiamondBoundsProperties) {
                                 referenceVertices.cbegin(),
                                 referenceVertices.cend());
 }
+
 /// Unit test for testing DiamondBounds assignment
 BOOST_AUTO_TEST_CASE(DiamondBoundsAssignment) {
-  double minHalfX(10.), midHalfX(20.), maxHalfX(15.), halfY1(5.), halfY2(7.);
+  const double minHalfX = 10.;
+  const double midHalfX = 20.;
+  const double maxHalfX = 15.;
+  const double halfY1 = 5.;
+  const double halfY2 = 7.;
+
   DiamondBounds diamondBoundsObject(minHalfX, midHalfX, maxHalfX, halfY1,
                                     halfY2);
   DiamondBounds similarlyConstructeDiamondBoundsObject(
       minHalfX, midHalfX, maxHalfX, halfY1, halfY2);
+
   /// Test operator ==
   BOOST_CHECK_EQUAL(diamondBoundsObject,
                     similarlyConstructeDiamondBoundsObject);
-  //
+
   /// Test assignment
   DiamondBounds assignedDiamondBoundsObject(
       2 * minHalfX, 2 * midHalfX, 2 * maxHalfX, 2 * halfY1, 2 * halfY2);
+
   // object, in some sense
   assignedDiamondBoundsObject = diamondBoundsObject;
   BOOST_CHECK_EQUAL(assignedDiamondBoundsObject, diamondBoundsObject);
diff --git a/Tests/UnitTests/Core/Surfaces/DiscSurfaceTests.cpp b/Tests/UnitTests/Core/Surfaces/DiscSurfaceTests.cpp
index 8c07348b80e..b5d1eec5f43 100644
--- a/Tests/UnitTests/Core/Surfaces/DiscSurfaceTests.cpp
+++ b/Tests/UnitTests/Core/Surfaces/DiscSurfaceTests.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2017-2021 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include <boost/test/data/test_case.hpp>
 #include <boost/test/tools/output_test_stream.hpp>
@@ -35,6 +35,7 @@
 #include <cmath>
 #include <initializer_list>
 #include <memory>
+#include <numbers>
 #include <ostream>
 #include <string>
 #include <utility>
@@ -53,30 +54,32 @@ auto logger = Acts::getDefaultLogger("UnitTests", Acts::Logging::VERBOSE);
 BOOST_AUTO_TEST_SUITE(Surfaces)
 /// Unit tests for creating DiscSurface object
 BOOST_AUTO_TEST_CASE(DiscSurfaceConstruction) {
-  // default constructor is deleted
-  // scaffolding...
-  double rMin(1.0), rMax(5.0), halfPhiSector(M_PI / 8.);
-  //
+  /// Test default construction
+  // default construction is deleted
+
+  const double rMin = 1.;
+  const double rMax = 5.;
+  const double halfPhiSector = std::numbers::pi / 8.;
+
   /// Test DiscSurface constructor with default halfPhiSector
   BOOST_CHECK_NO_THROW(
       Surface::makeShared<DiscSurface>(Transform3::Identity(), rMin, rMax));
-  //
+
   /// Test DiscSurface constructor with a transform specified
   Translation3 translation{0., 1., 2.};
   auto pTransform = Transform3(translation);
   BOOST_CHECK_NO_THROW(
       Surface::makeShared<DiscSurface>(pTransform, rMin, rMax, halfPhiSector));
-  //
+
   /// Copy constructed DiscSurface
   auto anotherDiscSurface =
       Surface::makeShared<DiscSurface>(pTransform, rMin, rMax, halfPhiSector);
   // N.B. Just using
   // BOOST_CHECK_NO_THROW(Surface::makeShared<DiscSurface>(anotherDiscSurface))
-  // tries to call
-  // the (deleted) default constructor.
+  // tries to call the (deleted) default constructor.
   auto copiedSurface = Surface::makeShared<DiscSurface>(*anotherDiscSurface);
   BOOST_TEST_MESSAGE("Copy constructed DiscSurface ok");
-  //
+
   /// Copied and transformed DiscSurface
   BOOST_CHECK_NO_THROW(Surface::makeShared<DiscSurface>(
       tgContext, *anotherDiscSurface, pTransform));
@@ -90,67 +93,66 @@ BOOST_AUTO_TEST_CASE(DiscSurfaceConstruction) {
 
 /// Unit tests of all named methods
 BOOST_AUTO_TEST_CASE(DiscSurfaceProperties) {
-  Vector3 origin3D{0, 0, 0};
-  double rMin(1.0), rMax(5.0), halfPhiSector(M_PI / 8.);
+  const double rMin = 1.;
+  const double rMax = 5.;
+  const double halfPhiSector = std::numbers::pi / 8.;
+
+  const Vector3 origin3D{0, 0, 0};
+
   auto discSurfaceObject = Surface::makeShared<DiscSurface>(
       Transform3::Identity(), rMin, rMax, halfPhiSector);
-  //
+
   /// Test type
   BOOST_CHECK_EQUAL(discSurfaceObject->type(), Surface::Disc);
-  //
+
   /// Test normal, no local position specified
   Vector3 zAxis{0, 0, 1};
   BOOST_CHECK_EQUAL(discSurfaceObject->normal(tgContext), zAxis);
-  //
+
   /// Test normal, local position specified
-  Vector2 lpos(2.0, 0.05);
+  Vector2 lpos(2., 0.05);
   BOOST_CHECK_EQUAL(discSurfaceObject->normal(tgContext, lpos), zAxis);
-  //
+
   /// Test binningPosition
-  // auto binningPosition=
-  // discSurfaceObject.binningPosition(BinningValue::BinningValue::binRPhi );
-  // std::cout<<binningPosition<<std::endl;
   BOOST_CHECK_EQUAL(
       discSurfaceObject->binningPosition(tgContext, BinningValue::binRPhi),
       origin3D);
-  //
+
   /// Test bounds
   BOOST_CHECK_EQUAL(discSurfaceObject->bounds().type(), SurfaceBounds::eDisc);
-  //
+
   Vector3 ignoredMomentum{0., 0., 0.};
   /// Test isOnSurface()
-  Vector3 point3DNotInSector{0.0, 1.2, 0};
-  Vector3 point3DOnSurface{1.2, 0.0, 0};
-  BOOST_CHECK(!discSurfaceObject->isOnSurface(
-      tgContext, point3DNotInSector, ignoredMomentum,
-      BoundaryTolerance::None()));  // passes
-  BOOST_CHECK(
-      !discSurfaceObject->isOnSurface(tgContext, point3DNotInSector,
-                                      BoundaryTolerance::None()));  // passes
+  Vector3 point3DNotInSector{0., 1.2, 0};
+  Vector3 point3DOnSurface{1.2, 0., 0};
+  BOOST_CHECK(!discSurfaceObject->isOnSurface(tgContext, point3DNotInSector,
+                                              ignoredMomentum,
+                                              BoundaryTolerance::None()));
+  BOOST_CHECK(!discSurfaceObject->isOnSurface(tgContext, point3DNotInSector,
+                                              BoundaryTolerance::None()));
   BOOST_CHECK(discSurfaceObject->isOnSurface(
-      tgContext, point3DOnSurface, ignoredMomentum,
-      BoundaryTolerance::None()));  // passes
-  BOOST_CHECK(
-      discSurfaceObject->isOnSurface(tgContext, point3DOnSurface,
-                                     BoundaryTolerance::None()));  // passes
-  //
+      tgContext, point3DOnSurface, ignoredMomentum, BoundaryTolerance::None()));
+  BOOST_CHECK(discSurfaceObject->isOnSurface(tgContext, point3DOnSurface,
+                                             BoundaryTolerance::None()));
+
   /// Test localToGlobal
   Vector3 returnedPosition{10.9, 8.7, 6.5};
   Vector3 expectedPosition{1.2, 0, 0};
-  Vector2 rPhiOnDisc{1.2, 0.0};
-  Vector2 rPhiNotInSector{1.2, M_PI};  // outside sector at Phi=0, +/- pi/8
+  Vector2 rPhiOnDisc{1.2, 0.};
+  Vector2 rPhiNotInSector{
+      1.2, std::numbers::pi};  // outside sector at Phi=0, +/- pi/8
   returnedPosition =
       discSurfaceObject->localToGlobal(tgContext, rPhiOnDisc, ignoredMomentum);
   CHECK_CLOSE_ABS(returnedPosition, expectedPosition, 1e-6);
-  //
+
   returnedPosition = discSurfaceObject->localToGlobal(
       tgContext, rPhiNotInSector, ignoredMomentum);
   Vector3 expectedNonPosition{-1.2, 0, 0};
   CHECK_CLOSE_ABS(returnedPosition, expectedNonPosition, 1e-6);
-  //
+
   /// Test globalToLocal
   Vector2 returnedLocalPosition{33., 44.};
-  Vector2 expectedLocalPosition{1.2, 0.0};
+  Vector2 expectedLocalPosition{1.2, 0.};
   returnedLocalPosition =
       discSurfaceObject
           ->globalToLocal(tgContext, point3DOnSurface, ignoredMomentum)
@@ -162,51 +164,51 @@ BOOST_AUTO_TEST_CASE(DiscSurfaceProperties) {
       discSurfaceObject
           ->globalToLocal(tgContext, point3DNotInSector, ignoredMomentum)
           .value();
-  //
-  Vector3 pointOutsideR{0.0, 100., 0};
+
+  Vector3 pointOutsideR{0., 100., 0};
   returnedLocalPosition =
       discSurfaceObject
           ->globalToLocal(tgContext, pointOutsideR, ignoredMomentum)
           .value();
-  //
+
   /// Test localPolarToCartesian
-  Vector2 rPhi1_1{std::sqrt(2.), M_PI / 4.};
+  Vector2 rPhi1_1{std::numbers::sqrt2, std::numbers::pi / 4.};
   Vector2 cartesian1_1{1., 1.};
   CHECK_CLOSE_REL(discSurfaceObject->localPolarToCartesian(rPhi1_1),
                   cartesian1_1, 1e-6);
-  //
+
   /// Test localCartesianToPolar
   CHECK_CLOSE_REL(discSurfaceObject->localCartesianToPolar(cartesian1_1),
                   rPhi1_1, 1e-6);
-  //
+
   /// Test localPolarToLocalCartesian
   CHECK_CLOSE_REL(discSurfaceObject->localPolarToLocalCartesian(rPhi1_1),
                   cartesian1_1, 1e-6);
-  //
+
   /// Test localCartesianToGlobal
   Vector3 cartesian3D1_1{1., 1., 0.};
   CHECK_CLOSE_ABS(
       discSurfaceObject->localCartesianToGlobal(tgContext, cartesian1_1),
       cartesian3D1_1, 1e-6);
-  //
+
   /// Test globalToLocalCartesian
   CHECK_CLOSE_REL(
       discSurfaceObject->globalToLocalCartesian(tgContext, cartesian3D1_1),
       cartesian1_1, 1e-6);
-  //
+
   /// Test pathCorrection
-  double projected3DMomentum = std::sqrt(3.) * 1.e6;
+  double projected3DMomentum = std::numbers::sqrt3 * 1.e6;
   Vector3 momentum{projected3DMomentum, projected3DMomentum,
                    projected3DMomentum};
   Vector3 ignoredPosition = discSurfaceObject->center(tgContext);
   CHECK_CLOSE_REL(discSurfaceObject->pathCorrection(tgContext, ignoredPosition,
                                                     momentum.normalized()),
-                  std::sqrt(3), 0.01);
-  //
+                  std::numbers::sqrt3, 0.01);
+
   /// intersection test
-  Vector3 globalPosition{1.2, 0.0, -10.};
+  Vector3 globalPosition{1.2, 0., -10.};
   Vector3 direction{0., 0., 1.};  // must be normalised
-  Vector3 expected{1.2, 0.0, 0.0};
+  Vector3 expected{1.2, 0., 0.};
 
   // intersect is a struct of (Vector3) position, pathLength, distance and
   // (bool) valid, it's contained in a Surface intersection
@@ -223,29 +225,31 @@ BOOST_AUTO_TEST_CASE(DiscSurfaceProperties) {
                   1e-9);
   BOOST_CHECK_EQUAL(sfIntersection.object(), discSurfaceObject.get());
 
-  //
   /// Test name
   boost::test_tools::output_test_stream nameOuput;
   nameOuput << discSurfaceObject->name();
   BOOST_CHECK(nameOuput.is_equal("Acts::DiscSurface"));
 }
-//
+
 /// Unit test for testing DiscSurface assignment and equality
 BOOST_AUTO_TEST_CASE(DiscSurfaceAssignment) {
-  Vector3 origin3D{0, 0, 0};
-  double rMin(1.0), rMax(5.0), halfPhiSector(M_PI / 8.);
+  const double rMin = 1.;
+  const double rMax = 5.;
+  const double halfPhiSector = std::numbers::pi / 8.;
+
   auto discSurfaceObject = Surface::makeShared<DiscSurface>(
       Transform3::Identity(), rMin, rMax, halfPhiSector);
   auto assignedDisc =
       Surface::makeShared<DiscSurface>(Transform3::Identity(), 2.2, 4.4, 0.07);
-  //
+
   BOOST_CHECK_NO_THROW(*assignedDisc = *discSurfaceObject);
   BOOST_CHECK((*assignedDisc) == (*discSurfaceObject));
 }
 
 /// Unit test for testing DiscSurface assignment and equality
 BOOST_AUTO_TEST_CASE(DiscSurfaceExtent) {
-  double rMin(1.0), rMax(5.0);
+  const double rMin = 1.;
+  const double rMax = 5.;
 
   auto pDisc =
       Surface::makeShared<DiscSurface>(Transform3::Identity(), 0., rMax);
@@ -267,9 +271,9 @@ BOOST_AUTO_TEST_CASE(DiscSurfaceExtent) {
                   s_onSurfaceTolerance);
   CHECK_CLOSE_ABS(rMax, pDiscExtent.max(BinningValue::binY),
                   s_onSurfaceTolerance);
-  CHECK_CLOSE_ABS(-M_PI, pDiscExtent.min(BinningValue::binPhi),
+  CHECK_CLOSE_ABS(-std::numbers::pi, pDiscExtent.min(BinningValue::binPhi),
                   s_onSurfaceTolerance);
-  CHECK_CLOSE_ABS(M_PI, pDiscExtent.max(BinningValue::binPhi),
+  CHECK_CLOSE_ABS(std::numbers::pi, pDiscExtent.max(BinningValue::binPhi),
                   s_onSurfaceTolerance);
 
   auto pRing =
@@ -298,7 +302,10 @@ BOOST_AUTO_TEST_CASE(DiscSurfaceExtent) {
 BOOST_AUTO_TEST_CASE(DiscSurfaceAlignment) {
   Translation3 translation{0., 1., 2.};
   Transform3 transform(translation);
-  double rMin(1.0), rMax(5.0), halfPhiSector(M_PI / 8.);
+  const double rMin = 1.;
+  const double rMax = 5.;
+  const double halfPhiSector = std::numbers::pi / 8.;
+
   auto discSurfaceObject =
       Surface::makeShared<DiscSurface>(transform, rMin, rMax, halfPhiSector);
 
@@ -330,7 +337,7 @@ BOOST_AUTO_TEST_CASE(DiscSurfaceAlignment) {
                                                               globalPosition);
   // Check if the result is as expected
   ActsMatrix<2, 3> expLoc3DToLocBound = ActsMatrix<2, 3>::Zero();
-  expLoc3DToLocBound << 0, 1, 0, -1.0 / 3, 0, 0;
+  expLoc3DToLocBound << 0, 1, 0, -1. / 3, 0, 0;
   CHECK_CLOSE_ABS(loc3DToLocBound, expLoc3DToLocBound, 1e-10);
 }
 
@@ -345,7 +352,8 @@ BOOST_AUTO_TEST_CASE(DiscSurfaceBinningPosition) {
 
   {
     // Radial Bounds
-    auto bounds = std::make_shared<RadialBounds>(minR, maxR, M_PI / 8, 0.1);
+    auto bounds =
+        std::make_shared<RadialBounds>(minR, maxR, std::numbers::pi / 8, 0.1);
     auto disc = Acts::Surface::makeShared<Acts::DiscSurface>(trf, bounds);
 
     Vector3 bp = disc->binningPosition(tgContext, BinningValue::binR);
@@ -409,11 +417,12 @@ BOOST_AUTO_TEST_CASE(DiscSurfaceBinningPosition) {
 BOOST_AUTO_TEST_SUITE(DiscSurfaceMerging)
 
 namespace {
-std::shared_ptr<DiscSurface> makeDisc(const Transform3& transform, double rmin,
-                                      double rmax, double halfPhi = M_PI,
+std::shared_ptr<DiscSurface> makeDisc(const Transform3& transform, double rMin,
+                                      double rMax,
+                                      double halfPhi = std::numbers::pi,
                                       double avgPhi = 0) {
   return Surface::makeShared<DiscSurface>(
-      transform, std::make_shared<RadialBounds>(rmin, rmax, halfPhi, avgPhi));
+      transform, std::make_shared<RadialBounds>(rMin, rMax, halfPhi, avgPhi));
 }
 
 }  // namespace
@@ -657,7 +666,7 @@ BOOST_DATA_TEST_CASE(PhiDirection,
 
     BOOST_CHECK_SMALL(
         detail::difference_periodic(bounds->get(RadialBounds::eAveragePhi),
-                                    a(85_degree), 2 * M_PI),
+                                    a(85_degree), 2 * std::numbers::pi),
         1e-6);
     BOOST_CHECK_CLOSE(bounds->get(RadialBounds::eHalfPhiSector), 55_degree,
                       1e-6);
@@ -682,7 +691,7 @@ BOOST_DATA_TEST_CASE(PhiDirection,
 
     BOOST_CHECK_SMALL(
         detail::difference_periodic(bounds45->get(RadialBounds::eAveragePhi),
-                                    a(180_degree), 2 * M_PI),
+                                    a(180_degree), 2 * std::numbers::pi),
         1e-6);
     BOOST_CHECK_CLOSE(bounds45->get(RadialBounds::eHalfPhiSector), 30_degree,
                       1e-6);
@@ -714,7 +723,7 @@ BOOST_DATA_TEST_CASE(PhiDirection,
     BOOST_REQUIRE_NE(bounds67, nullptr);
     BOOST_CHECK_SMALL(
         detail::difference_periodic(bounds67->get(RadialBounds::eAveragePhi),
-                                    a(90_degree), 2 * M_PI),
+                                    a(90_degree), 2 * std::numbers::pi),
         1e-6);
     BOOST_CHECK_CLOSE(bounds67->get(RadialBounds::eHalfPhiSector), 180_degree,
                       1e-6);
@@ -798,8 +807,8 @@ BOOST_DATA_TEST_CASE(PhiDirection,
     // bounds should be equal however
     BOOST_CHECK_EQUAL(disc76->bounds(), disc67->bounds());
 
-    BOOST_CHECK(!reversed76);  // not reversed either because you get the
-                               // ordering you put in
+    // not reversed either because you get the ordering you put in
+    BOOST_CHECK(!reversed76);
 
     const auto* bounds67 = dynamic_cast<const RadialBounds*>(&disc67->bounds());
     BOOST_REQUIRE_NE(bounds67, nullptr);
diff --git a/Tests/UnitTests/Core/Surfaces/DiscTrapezoidBoundsTests.cpp b/Tests/UnitTests/Core/Surfaces/DiscTrapezoidBoundsTests.cpp
index ab0e962c2d7..8f6117ef1b0 100644
--- a/Tests/UnitTests/Core/Surfaces/DiscTrapezoidBoundsTests.cpp
+++ b/Tests/UnitTests/Core/Surfaces/DiscTrapezoidBoundsTests.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2017-2018 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include <boost/test/tools/output_test_stream.hpp>
 #include <boost/test/unit_test.hpp>
@@ -24,22 +24,26 @@ namespace Acts::Test {
 
 BOOST_AUTO_TEST_SUITE(Surfaces)
 
-/// Unit tests for DiscTrapezoidBounds constrcuctors
+const double minHalfX = 1.;
+const double maxHalfX = 5.;
+const double rMin = 2.;
+const double rMax = 6.;
+const double averagePhi = 0.;
+const double stereo = 0.1;
+
+/// Unit tests for DiscTrapezoidBounds constructors
 BOOST_AUTO_TEST_CASE(DiscTrapezoidBoundsConstruction) {
-  double minHalfX(1.0), maxHalfX(5.0), rMin(2.0), rMax(6.0), averagePhi(0.0),
-      stereo(0.1);
-  //
   /// Test construction with dimensions and default stereo
   BOOST_CHECK_EQUAL(
       DiscTrapezoidBounds(minHalfX, maxHalfX, rMin, rMax, averagePhi).type(),
       SurfaceBounds::eDiscTrapezoid);
-  //
+
   /// Test construction with all dimensions
   BOOST_CHECK_EQUAL(
       DiscTrapezoidBounds(minHalfX, maxHalfX, rMin, rMax, averagePhi, stereo)
           .type(),
       SurfaceBounds::eDiscTrapezoid);
-  //
+
   /// Copy constructor
   DiscTrapezoidBounds original(minHalfX, maxHalfX, rMin, rMax, averagePhi);
   DiscTrapezoidBounds copied(original);
@@ -48,9 +52,6 @@ BOOST_AUTO_TEST_CASE(DiscTrapezoidBoundsConstruction) {
 
 // Streaning and recreation test
 BOOST_AUTO_TEST_CASE(DiscTrapezoidBoundsRecreation) {
-  double minHalfX(1.0), maxHalfX(5.0), rMin(2.0), rMax(6.0), averagePhi(0.0),
-      stereo(0.1);
-
   DiscTrapezoidBounds original(minHalfX, maxHalfX, rMin, rMax, averagePhi,
                                stereo);
   auto valvector = original.values();
@@ -62,9 +63,6 @@ BOOST_AUTO_TEST_CASE(DiscTrapezoidBoundsRecreation) {
 
 // Unit tests for AnnulusBounds exception throwing
 BOOST_AUTO_TEST_CASE(DiscTrapezoidBoundsExceptions) {
-  double minHalfX(1.0), maxHalfX(5.0), rMin(2.0), rMax(6.0), averagePhi(0.0),
-      stereo(0.1);
-
   // Exception for opening neg min half x < 0
   BOOST_CHECK_THROW(
       DiscTrapezoidBounds(-minHalfX, maxHalfX, rMin, rMax, averagePhi, stereo),
@@ -103,74 +101,72 @@ BOOST_AUTO_TEST_CASE(DiscTrapezoidBoundsExceptions) {
 
 /// Unit tests for DiscTrapezoidBounds properties
 BOOST_AUTO_TEST_CASE(DiscTrapezoidBoundsProperties) {
-  double minHalfX(1.0), maxHalfX(5.0), rMin(2.0), rMax(6.0),
-      averagePhi(0.0) /*, stereo(0.1)*/;
   /// Test clone
   DiscTrapezoidBounds DiscTrapezoidBoundsObject(minHalfX, maxHalfX, rMin, rMax,
                                                 averagePhi);
-  //
+
   /// Test type() (redundant; already used in constructor confirmation)
   BOOST_CHECK_EQUAL(DiscTrapezoidBoundsObject.type(),
                     SurfaceBounds::eDiscTrapezoid);
-  //
+
   /// Test distanceToBoundary
   Vector2 origin(0., 0.);
   Vector2 outside(30., 0.);
-  Vector2 inSurface(2.5, 0.0);
-  //
+  Vector2 inSurface(2.5, 0.);
+
   /// Test dump
-  boost::test_tools::output_test_stream dumpOuput;
-  DiscTrapezoidBoundsObject.toStream(dumpOuput);
-  BOOST_CHECK(dumpOuput.is_equal(
+  boost::test_tools::output_test_stream dumpOutput;
+  DiscTrapezoidBoundsObject.toStream(dumpOutput);
+  BOOST_CHECK(dumpOutput.is_equal(
       "Acts::DiscTrapezoidBounds: (innerRadius, outerRadius, halfLengthXminR, "
       "halfLengthXmaxR, halfLengthY, halfPhiSector, averagePhi, rCenter, "
       "stereo) = "
       "(2.0000000, 6.0000000, 1.0000000, 5.0000000, 0.7922870, 0.9851108, "
       "0.0000000, 2.5243378, 0.0000000)"));
-  //
+
   /// Test inside
   BOOST_CHECK(
       DiscTrapezoidBoundsObject.inside(inSurface, BoundaryTolerance::None()));
   BOOST_CHECK(
       !DiscTrapezoidBoundsObject.inside(outside, BoundaryTolerance::None()));
-  //
+
   /// Test rMin
   CHECK_CLOSE_REL(DiscTrapezoidBoundsObject.rMin(), rMin, 1e-6);
-  //
+
   /// Test rMax
   CHECK_CLOSE_REL(DiscTrapezoidBoundsObject.rMax(), rMax, 1e-6);
-  //
+
   /// Test averagePhi
   CHECK_SMALL(DiscTrapezoidBoundsObject.get(DiscTrapezoidBounds::eAveragePhi),
               1e-9);
-  //
+
   /// Test rCenter (redundant; not configurable)
   CHECK_CLOSE_REL(DiscTrapezoidBoundsObject.rCenter(), 2.524337798, 1e-6);
-  //
+
   /// Test halfPhiSector (redundant; not configurable)
   CHECK_SMALL(DiscTrapezoidBoundsObject.stereo(), 1e-6);
-  //
-  /// Test minHalflengthX
+
+  /// Test minHalfLengthX
   CHECK_CLOSE_REL(
       DiscTrapezoidBoundsObject.get(DiscTrapezoidBounds::eHalfLengthXminR),
       minHalfX, 1e-6);
-  //
-  /// Test maxHalflengthX
+
+  /// Test maxHalfLengthX
   CHECK_CLOSE_REL(
       DiscTrapezoidBoundsObject.get(DiscTrapezoidBounds::eHalfLengthXmaxR),
       maxHalfX, 1e-6);
-  //
-  /// Test halflengthY
+
+  /// Test halfLengthY
   CHECK_CLOSE_REL(DiscTrapezoidBoundsObject.halfLengthY(), 0.792286991, 1e-6);
 }
 /// Unit test for testing DiscTrapezoidBounds assignment
 BOOST_AUTO_TEST_CASE(DiscTrapezoidBoundsAssignment) {
-  double minHalfX(1.0), maxHalfX(5.0), rMin(2.0), rMax(6.0), averagePhi(0.0),
-      stereo(0.1);
   DiscTrapezoidBounds DiscTrapezoidBoundsObject(minHalfX, maxHalfX, rMin, rMax,
                                                 averagePhi, stereo);
-  // operator == not implemented in this class
-  //
+
+  /// Test operator ==
+  // not implemented in this class
+
   /// Test assignment
   DiscTrapezoidBounds assignedDiscTrapezoidBoundsObject(2.1, 6.6, 3.4, 4.2, 0.3,
                                                         0.);
diff --git a/Tests/UnitTests/Core/Surfaces/EllipseBoundsTests.cpp b/Tests/UnitTests/Core/Surfaces/EllipseBoundsTests.cpp
index fcc2b5db202..0ed78e656f6 100644
--- a/Tests/UnitTests/Core/Surfaces/EllipseBoundsTests.cpp
+++ b/Tests/UnitTests/Core/Surfaces/EllipseBoundsTests.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2017-2018 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include <boost/test/tools/output_test_stream.hpp>
 #include <boost/test/unit_test.hpp>
@@ -18,6 +18,7 @@
 #include <algorithm>
 #include <array>
 #include <cmath>
+#include <numbers>
 #include <stdexcept>
 #include <vector>
 
@@ -25,20 +26,25 @@ namespace Acts::Test {
 
 BOOST_AUTO_TEST_SUITE(Surfaces)
 
+const double innerRx = 10.;
+const double innerRy = 15.;
+const double phiSector = std::numbers::pi / 2.;
+const double averagePhi = 0.;
+
 /// Unit test for creating compliant/non-compliant EllipseBounds object
 BOOST_AUTO_TEST_CASE(EllipseBoundsConstruction) {
-  double innerRx(10.), innerRy(15.), outerRx(25.), outerRy(30.),
-      phiSector(M_PI / 2.), averagePhi(0.);
+  const double outerRx = 25.;
+  const double outerRy = 30.;
+
+  /// Test default construction
+  // default construction is deleted
 
-  // test default construction
-  // EllipseBounds defaultConstructedEllipseBounds;  //deleted
-  //
   /// Test construction with dimensions
   BOOST_CHECK_EQUAL(
       EllipseBounds(innerRx, innerRy, outerRx, outerRy, phiSector, averagePhi)
           .type(),
       SurfaceBounds::eEllipse);
-  //
+
   /// Copy constructor
   EllipseBounds original(innerRx, innerRy, outerRx, outerRy, phiSector,
                          averagePhi);
@@ -48,9 +54,9 @@ BOOST_AUTO_TEST_CASE(EllipseBoundsConstruction) {
 
 // Streaning and recreation test
 BOOST_AUTO_TEST_CASE(EllipseBoundsRecreation) {
-  double innerRx(10.), innerRy(15.), outerRx(25.), outerRy(30.),
-      phiSector(M_PI / 2.), averagePhi(0.);
-  // const bool symmetric(false);
+  const double outerRx = 25.;
+  const double outerRy = 30.;
+
   EllipseBounds original(innerRx, innerRy, outerRx, outerRy, phiSector,
                          averagePhi);
   auto valvector = original.values();
@@ -62,44 +68,54 @@ BOOST_AUTO_TEST_CASE(EllipseBoundsRecreation) {
 
 // Unit tests for AnnulusBounds exception throwing
 BOOST_AUTO_TEST_CASE(ConeBoundsExceptions) {
-  double innerRx(10.), innerRy(15.), outerRx(25.), outerRy(30.),
-      phiSector(M_PI / 2.), averagePhi(0.);
+  const double outerRx = 25.;
+  const double outerRy = 30.;
+
   // Exception for innerRx < 0
   BOOST_CHECK_THROW(
       EllipseBounds(-innerRx, innerRy, outerRx, outerRy, phiSector, averagePhi),
       std::logic_error);
+
   // Exception for innerRy < 0
   BOOST_CHECK_THROW(
       EllipseBounds(innerRx, -innerRy, outerRx, outerRy, phiSector, averagePhi),
       std::logic_error);
+
   // Exception for innerRx < 0 and innerRy < 0
   BOOST_CHECK_THROW(EllipseBounds(-innerRx, -innerRy, outerRx, outerRy,
                                   phiSector, averagePhi),
                     std::logic_error);
+
   // Exception for opening outerRx <= 0
   BOOST_CHECK_THROW(
       EllipseBounds(innerRx, innerRy, 0., outerRy, phiSector, averagePhi),
       std::logic_error);
+
   // Exception for opening outerRy <= 0
   BOOST_CHECK_THROW(
       EllipseBounds(innerRx, innerRy, outerRx, 0., phiSector, averagePhi),
       std::logic_error);
+
   // Exception for iouterRx < 0 and outerRy < 0
   BOOST_CHECK_THROW(EllipseBounds(innerRx, innerRy, -outerRx, -outerRy,
                                   phiSector, averagePhi),
                     std::logic_error);
+
   // Exception for innerRx > outerRx
   BOOST_CHECK_THROW(
       EllipseBounds(outerRx, innerRy, innerRx, outerRy, phiSector, averagePhi),
       std::logic_error);
+
   // Exception for innerRxy > outerRy
   BOOST_CHECK_THROW(
       EllipseBounds(innerRx, outerRy, outerRx, innerRy, phiSector, averagePhi),
       std::logic_error);
+
   // Exception for negative phiSector
   BOOST_CHECK_THROW(
       EllipseBounds(innerRx, innerRy, outerRx, outerRy, -phiSector, averagePhi),
       std::logic_error);
+
   // Exception for average phi out of bound
   BOOST_CHECK_THROW(
       EllipseBounds(innerRx, innerRy, outerRx, outerRy, phiSector, 4.),
@@ -108,74 +124,71 @@ BOOST_AUTO_TEST_CASE(ConeBoundsExceptions) {
 
 /// Unit tests for EllipseBounds properties
 BOOST_AUTO_TEST_CASE(EllipseBoundsProperties) {
-  double innerRx(10.), outerRx(15.), innerRy(15.), outerRy(20.), averagePhi(0.),
-      phiSector(M_PI / 2.);
+  const double outerRx = 15.;  // != 25
+  const double outerRy = 20.;  // != 30
+
   /// Test clone
   EllipseBounds ellipseBoundsObject(innerRx, innerRy, outerRx, outerRy,
                                     phiSector, averagePhi);
-  //
+
   /// Test type() (redundant; already used in constructor confirmation)
   BOOST_CHECK_EQUAL(ellipseBoundsObject.type(), SurfaceBounds::eEllipse);
-  //
-  // clone already tested
-  //
+
   /// Test distanceToBoundary
-  Vector2 origin(0., 0.);
-  Vector2 outsideBy15(0., 30.);
-  Vector2 inRectangle(17., 11.);
-  //
+  Vector2 origin{0., 0.};
+  Vector2 outsideBy15{0., 30.};
+  Vector2 inRectangle{17., 11.};
+
   /// Test rMinX
   BOOST_CHECK_EQUAL(ellipseBoundsObject.get(EllipseBounds::eInnerRx), innerRx);
-  //
+
   /// Test rMinY
   BOOST_CHECK_EQUAL(ellipseBoundsObject.get(EllipseBounds::eOuterRx), outerRx);
-  //
+
   /// Test rMaxX
   BOOST_CHECK_EQUAL(ellipseBoundsObject.get(EllipseBounds::eInnerRy), innerRy);
-  //
+
   /// Test rMaxY
   BOOST_CHECK_EQUAL(ellipseBoundsObject.get(EllipseBounds::eOuterRy), outerRy);
-  //
+
   /// Test averagePhi
   BOOST_CHECK_EQUAL(ellipseBoundsObject.get(EllipseBounds::eAveragePhi),
                     averagePhi);
-  //
+
   /// Test vertices
   // std::vector<Vector2> expectedVertices{{15, 0}, {0, 20}, {-15, 0}, {0,
   // -20}}; const auto& actualVertices = ellipseBoundsObject.vertices(4);
   // BOOST_CHECK_EQUAL_COLLECTIONS(actualVertices.cbegin(),
-  // actualVertices.cend(),
-  //                              expectedVertices.cbegin(),
-  //                              expectedVertices.cend());
-  //
+  // actualVertices.cend(), expectedVertices.cbegin(), expectedVertices.cend());
+
   /// Test boundingBox
   BOOST_CHECK_EQUAL(ellipseBoundsObject.boundingBox(),
                     RectangleBounds(15., 20.));
-  //
+
   /// Test halfPhiSector
   BOOST_CHECK_EQUAL(ellipseBoundsObject.get(EllipseBounds::eHalfPhiSector),
-                    M_PI / 2.);
-  //
+                    std::numbers::pi / 2.);
+
   /// Test dump
-  boost::test_tools::output_test_stream dumpOuput;
-  ellipseBoundsObject.toStream(dumpOuput);
-  BOOST_CHECK(dumpOuput.is_equal(
+  boost::test_tools::output_test_stream dumpOutput;
+  ellipseBoundsObject.toStream(dumpOutput);
+  BOOST_CHECK(dumpOutput.is_equal(
       "Acts::EllipseBounds:  (innerRadius0, outerRadius0, innerRadius1, "
       "outerRadius1, hPhiSector, averagePhi) = (10.0000000, 15.0000000, "
-      "15.0000000, "
-      "20.0000000, 0.0000000, 1.5707963, 0.0000000)"));
-  //
+      "15.0000000, 20.0000000, 0.0000000, 1.5707963, 0.0000000)"));
+
   /// Test inside
   BOOST_CHECK(
       !ellipseBoundsObject.inside(inRectangle, BoundaryTolerance::None()));
-  // dont understand why this is so:
+  // don't understand why this is so:
   BOOST_CHECK(
       !ellipseBoundsObject.inside(outsideBy15, BoundaryTolerance::None()));
 }
 /// Unit test for testing EllipseBounds assignment
 BOOST_AUTO_TEST_CASE(EllipseBoundsAssignment) {
-  double innerRx(10.), outerRx(15.), innerRy(15.), outerRy(20.), averagePhi(0.),
-      phiSector(M_PI / 2.);
+  const double outerRx = 15.;  // != 25
+  const double outerRy = 20.;  // != 30
+
   EllipseBounds ellipseBoundsObject(innerRx, outerRx, innerRy, outerRy,
                                     averagePhi, phiSector);
   EllipseBounds similarlyConstructeEllipseBoundsObject(
@@ -183,7 +196,7 @@ BOOST_AUTO_TEST_CASE(EllipseBoundsAssignment) {
   /// Test operator ==
   BOOST_CHECK_EQUAL(ellipseBoundsObject,
                     similarlyConstructeEllipseBoundsObject);
-  //
+
   /// Test assignment
   EllipseBounds assignedEllipseBoundsObject(11., 12., 17., 18., 1.);
   // object, in some sense
diff --git a/Tests/UnitTests/Core/Surfaces/InfiniteBoundsTests.cpp b/Tests/UnitTests/Core/Surfaces/InfiniteBoundsTests.cpp
index e9b608311ed..b0c7fa0c94f 100644
--- a/Tests/UnitTests/Core/Surfaces/InfiniteBoundsTests.cpp
+++ b/Tests/UnitTests/Core/Surfaces/InfiniteBoundsTests.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2017-2018 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include <boost/test/tools/output_test_stream.hpp>
 #include <boost/test/unit_test.hpp>
@@ -29,19 +29,19 @@ BOOST_AUTO_TEST_CASE(InfiniteBoundsConstruction) {
 /// Unit tests for InfiniteBounds properties
 BOOST_AUTO_TEST_CASE(InfiniteBoundsProperties) {
   InfiniteBounds infiniteBoundsObject;
-  /// test for type()
+  /// Test for type()
   BOOST_CHECK_EQUAL(infiniteBoundsObject.type(), SurfaceBounds::eBoundless);
 
-  /// test for inside()
+  /// Test for inside()
   const Vector2 anyVector{0., 1.};
   const BoundaryTolerance anyTolerance = BoundaryTolerance::None();
   BOOST_CHECK(infiniteBoundsObject.inside(anyVector, anyTolerance));
 
-  /// test for dump
-  boost::test_tools::output_test_stream dumpOuput;
-  infiniteBoundsObject.toStream(dumpOuput);
+  /// Test for dump
+  boost::test_tools::output_test_stream dumpOutput;
+  infiniteBoundsObject.toStream(dumpOutput);
   BOOST_CHECK(
-      dumpOuput.is_equal("Acts::InfiniteBounds ... boundless surface\n"));
+      dumpOutput.is_equal("Acts::InfiniteBounds ... boundless surface\n"));
 }
 
 BOOST_AUTO_TEST_SUITE_END()
diff --git a/Tests/UnitTests/Core/Surfaces/IntersectionHelper2DTests.cpp b/Tests/UnitTests/Core/Surfaces/IntersectionHelper2DTests.cpp
index 67c3d2a3555..660baa77580 100644
--- a/Tests/UnitTests/Core/Surfaces/IntersectionHelper2DTests.cpp
+++ b/Tests/UnitTests/Core/Surfaces/IntersectionHelper2DTests.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2020 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include <boost/test/unit_test.hpp>
 
@@ -117,13 +117,13 @@ BOOST_AUTO_TEST_CASE(EllipseIntersection) {
       radiusX, radiusY, start, direction);
 
   // Numerically checked / per hand calculated
-  BOOST_CHECK(solution[0]);
+  BOOST_CHECK(solution[0].isValid());
 
   CHECK_CLOSE_ABS(solution[0].position().x(), -283.68, 0.01);
   CHECK_CLOSE_ABS(solution[0].position().y(), -213.47, 0.01);
   BOOST_CHECK_GT(solution[0].pathLength(), 0.);
 
-  BOOST_CHECK(solution[1]);
+  BOOST_CHECK(solution[1].isValid());
 
   CHECK_CLOSE_ABS(solution[1].position().x(), 433.65, 0.01);
   CHECK_CLOSE_ABS(solution[1].position().y(), 73.46, 0.01);
@@ -147,13 +147,13 @@ BOOST_AUTO_TEST_CASE(CircleIntersection) {
       detail::IntersectionHelper2D::intersectCircle(radius, start, direction);
 
   // Numerically checked / per hand calculated
-  BOOST_CHECK(solution[0]);
+  BOOST_CHECK(solution[0].isValid());
 
   CHECK_CLOSE_ABS(solution[0].position().x(), -266.771, 0.001);
   CHECK_CLOSE_ABS(solution[0].position().y(), -66.771, 0.001);
   BOOST_CHECK_GT(solution[0].pathLength(), 0.);
 
-  BOOST_CHECK(solution[1]);
+  BOOST_CHECK(solution[1].isValid());
 
   CHECK_CLOSE_ABS(solution[1].position().x(), 66.771, 0.001);
   CHECK_CLOSE_ABS(solution[1].position().y(), 266.771, 0.001);
@@ -165,12 +165,12 @@ BOOST_AUTO_TEST_CASE(CircleIntersection) {
   solution =
       detail::IntersectionHelper2D::intersectCircle(radius, start, direction);
 
-  BOOST_CHECK(solution[0]);
+  BOOST_CHECK(solution[0].isValid());
   CHECK_CLOSE_ABS(solution[0].position().x(), 66.771, 0.001);
   CHECK_CLOSE_ABS(solution[0].position().y(), 266.771, 0.001);
   BOOST_CHECK_LT(solution[0].pathLength(), 0.);
 
-  BOOST_CHECK(solution[1]);
+  BOOST_CHECK(solution[1].isValid());
   CHECK_CLOSE_ABS(solution[1].position().x(), -266.771, 0.001);
   CHECK_CLOSE_ABS(solution[1].position().y(), -66.771, 0.001);
   BOOST_CHECK_LT(solution[1].pathLength(), 0.);
@@ -180,12 +180,12 @@ BOOST_AUTO_TEST_CASE(CircleIntersection) {
   solution =
       detail::IntersectionHelper2D::intersectCircle(radius, start, direction);
 
-  BOOST_CHECK(solution[0]);
+  BOOST_CHECK(solution[0].isValid());
   CHECK_CLOSE_ABS(solution[0].position().x(), 66.771, 0.001);
   CHECK_CLOSE_ABS(solution[0].position().y(), 266.771, 0.001);
   BOOST_CHECK_GT(solution[0].pathLength(), 0.);
 
-  BOOST_CHECK(solution[1]);
+  BOOST_CHECK(solution[1].isValid());
   CHECK_CLOSE_ABS(solution[1].position().x(), -266.771, 0.001);
   CHECK_CLOSE_ABS(solution[1].position().y(), -66.771, 0.001);
   BOOST_CHECK_GT(solution[1].pathLength(), 0.);
diff --git a/Tests/UnitTests/Core/Surfaces/LineBoundsTests.cpp b/Tests/UnitTests/Core/Surfaces/LineBoundsTests.cpp
index a0190049505..c8022a9174c 100644
--- a/Tests/UnitTests/Core/Surfaces/LineBoundsTests.cpp
+++ b/Tests/UnitTests/Core/Surfaces/LineBoundsTests.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2017-2018 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include <boost/test/tools/output_test_stream.hpp>
 #include <boost/test/unit_test.hpp>
@@ -24,20 +24,24 @@ namespace Acts::Test {
 BOOST_AUTO_TEST_SUITE(Surfaces)
 /// Unit test for creating compliant/non-compliant LineBounds object
 BOOST_AUTO_TEST_CASE(LineBoundsConstruction) {
-  /// test LineBounds(double, double)
-  double radius(0.5), halfz(10.);
-  LineBounds lineBounds(radius, halfz);
+  const double radius = 0.5;
+  const double halfZ = 10.;
+
+  /// Test LineBounds(double, double)
+  LineBounds lineBounds(radius, halfZ);
   BOOST_CHECK_EQUAL(lineBounds.type(), SurfaceBounds::eLine);
-  /// test copy construction;
+
+  /// Test copy construction;
   LineBounds copyConstructedLineBounds(lineBounds);  // implicit
   BOOST_CHECK_EQUAL(copyConstructedLineBounds.type(), SurfaceBounds::eLine);
 }
 
 /// Unit test for testing LineBounds recreation from streaming
 BOOST_AUTO_TEST_CASE(LineBoundsRecreation) {
-  double nominalRadius{0.5};
-  double nominalHalfLength{20.};
-  LineBounds original(nominalRadius, nominalHalfLength);
+  const double radius = 0.5;
+  const double halfZ = 20.;  // != 10.
+
+  LineBounds original(radius, halfZ);
   LineBounds recreated(original);
   auto valvector = original.values();
   std::array<double, LineBounds::eSize> values{};
@@ -47,45 +51,45 @@ BOOST_AUTO_TEST_CASE(LineBoundsRecreation) {
 
 /// Unit test for testing LineBounds exceptions
 BOOST_AUTO_TEST_CASE(LineBoundsExceptions) {
-  double nominalRadius{0.5};
-  double nominalHalfLength{20.};
+  const double radius = 0.5;
+  const double halfZ = 20.;  // != 10.
+
   // Negative radius
-  BOOST_CHECK_THROW(LineBounds(-nominalRadius, nominalHalfLength),
-                    std::logic_error);
+  BOOST_CHECK_THROW(LineBounds(-radius, halfZ), std::logic_error);
+
   // Negative half length
-  BOOST_CHECK_THROW(LineBounds(nominalRadius, -nominalHalfLength),
-                    std::logic_error);
+  BOOST_CHECK_THROW(LineBounds(radius, -halfZ), std::logic_error);
 
   // Negative radius and half length
-  BOOST_CHECK_THROW(LineBounds(-nominalRadius, -nominalHalfLength),
-                    std::logic_error);
+  BOOST_CHECK_THROW(LineBounds(-radius, -halfZ), std::logic_error);
 }
 
 /// Unit test for testing LineBounds assignment
 BOOST_AUTO_TEST_CASE(LineBoundsAssignment) {
-  double nominalRadius{0.5};
-  double nominalHalfLength{20.};
-  LineBounds lineBoundsObject(nominalRadius, nominalHalfLength);
+  const double radius = 0.5;
+  const double halfZ = 20.;  // != 10.
+
+  LineBounds lineBoundsObject(radius, halfZ);
   LineBounds assignedLineBounds = lineBoundsObject;
   BOOST_CHECK_EQUAL(assignedLineBounds, lineBoundsObject);
 }
 
 /// Unit tests for LineBounds properties
 BOOST_AUTO_TEST_CASE(LineBoundsProperties) {
-  // LineBounds object of radius 0.5 and halfz 20
-  double nominalRadius{0.5};
-  double nominalHalfLength{20.};
-  LineBounds lineBoundsObject(nominalRadius, nominalHalfLength);
+  const double radius = 0.5;
+  const double halfZ = 20.;  // != 10.
 
-  /// test for type()
+  LineBounds lineBoundsObject(radius, halfZ);
+
+  /// Test for type()
   BOOST_CHECK_EQUAL(lineBoundsObject.type(), SurfaceBounds::eLine);
 
-  /// test for inside()
+  /// Test for inside()
   const Vector2 origin{0., 0.};
   const Vector2 atRadius{0.5, 10.};
-  const Vector2 beyondEnd{0.0, 30.0};
-  const Vector2 unitZ{0.0, 1.0};
-  const Vector2 unitR{1.0, 0.0};
+  const Vector2 beyondEnd{0., 30.};
+  const Vector2 unitZ{0., 1.};
+  const Vector2 unitR{1., 0.};
   const BoundaryTolerance tolerance =
       BoundaryTolerance::AbsoluteBound(0.1, 0.1);
   // This fails because the bounds are not inclusive.
@@ -94,22 +98,20 @@ BOOST_AUTO_TEST_CASE(LineBoundsProperties) {
   BOOST_CHECK(lineBoundsObject.inside(unitZ, tolerance));
   BOOST_CHECK(!lineBoundsObject.inside(unitR, tolerance));
 
-  /// Test negative redius inside
-
+  /// Test negative radius inside
   BOOST_CHECK(lineBoundsObject.inside(Vector2{-0.2, 10}, tolerance));
   BOOST_CHECK(!lineBoundsObject.inside(Vector2{-0.8, 10}, tolerance));
 
-  /// test for r()
-  BOOST_CHECK_EQUAL(lineBoundsObject.get(LineBounds::eR), nominalRadius);
+  /// Test for r()
+  BOOST_CHECK_EQUAL(lineBoundsObject.get(LineBounds::eR), radius);
 
-  /// test for halflengthZ (NOTE: Naming violation)
-  BOOST_CHECK_EQUAL(lineBoundsObject.get(LineBounds::eHalfLengthZ),
-                    nominalHalfLength);
+  /// Test for halfLengthZ
+  BOOST_CHECK_EQUAL(lineBoundsObject.get(LineBounds::eHalfLengthZ), halfZ);
 
-  /// test for dump
-  boost::test_tools::output_test_stream dumpOuput;
-  lineBoundsObject.toStream(dumpOuput);
-  BOOST_CHECK(dumpOuput.is_equal(
+  /// Test for dump
+  boost::test_tools::output_test_stream dumpOutput;
+  lineBoundsObject.toStream(dumpOutput);
+  BOOST_CHECK(dumpOutput.is_equal(
       "Acts::LineBounds: (radius, halflengthInZ) = (0.5000000, 20.0000000)"));
 }
 
diff --git a/Tests/UnitTests/Core/Surfaces/LineSurfaceTests.cpp b/Tests/UnitTests/Core/Surfaces/LineSurfaceTests.cpp
index 90a48df6a00..15d930929af 100644
--- a/Tests/UnitTests/Core/Surfaces/LineSurfaceTests.cpp
+++ b/Tests/UnitTests/Core/Surfaces/LineSurfaceTests.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2017-2018 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include <boost/test/tools/output_test_stream.hpp>
 #include <boost/test/unit_test.hpp>
@@ -14,6 +14,7 @@
 #include "Acts/Definitions/TrackParametrization.hpp"
 #include "Acts/EventData/ParticleHypothesis.hpp"
 #include "Acts/EventData/TrackParameters.hpp"
+#include "Acts/EventData/detail/GenerateParameters.hpp"
 #include "Acts/Geometry/GeometryContext.hpp"
 #include "Acts/Material/HomogeneousSurfaceMaterial.hpp"
 #include "Acts/Propagator/Propagator.hpp"
@@ -35,6 +36,7 @@
 #include <algorithm>
 #include <cmath>
 #include <memory>
+#include <numbers>
 #include <optional>
 #include <ostream>
 #include <stdexcept>
@@ -55,28 +57,34 @@ BOOST_AUTO_TEST_SUITE(Surfaces)
 
 /// Unit test for creating compliant/non-compliant LineSurface object
 BOOST_AUTO_TEST_CASE(LineSurface_Constructors_test) {
-  // Default ctor is deleted
-  // LineSurfaceStub l;
-  // ctor with translation, radius, halfz
+  /// Test default construction
+  // default construction is deleted
+
   Translation3 translation{0., 1., 2.};
   Transform3 transform(translation);
   auto pTransform = Transform3(translation);
-  const double radius{2.0}, halfz{20.};
-  BOOST_CHECK(LineSurfaceStub(pTransform, radius, halfz).constructedOk());
-  // ctor with nullptr for LineBounds
+  const double radius = 2.;
+  const double halfZ = 20.;
+  BOOST_CHECK(LineSurfaceStub(pTransform, radius, halfZ).constructedOk());
+
+  /// ctor with nullptr for LineBounds
   BOOST_CHECK(LineSurfaceStub(pTransform).constructedOk());
-  // ctor with LineBounds
-  auto pLineBounds = std::make_shared<const LineBounds>(2., 10.0);
+
+  /// ctor with LineBounds
+  auto pLineBounds = std::make_shared<const LineBounds>(2., 10.);
   BOOST_CHECK(LineSurfaceStub(pTransform, pLineBounds).constructedOk());
-  // ctor with LineBounds, detector element, Identifier
+
+  /// ctor with LineBounds, detector element, Identifier
   auto pMaterial =
       std::make_shared<const HomogeneousSurfaceMaterial>(makePercentSlab());
   DetectorElementStub detElement{pTransform, pLineBounds, 0.2, pMaterial};
   BOOST_CHECK(LineSurfaceStub(pLineBounds, detElement).constructedOk());
-  LineSurfaceStub lineToCopy(pTransform, 2.0, 20.);
-  // Copy ctor
+  LineSurfaceStub lineToCopy(pTransform, 2., 20.);
+
+  /// Copy ctor
   BOOST_CHECK(LineSurfaceStub(lineToCopy).constructedOk());
-  // Copied and transformed ctor
+
+  /// Copied and transformed ctor
   BOOST_CHECK(
       LineSurfaceStub(tgContext, lineToCopy, transform).constructedOk());
 
@@ -94,18 +102,18 @@ BOOST_AUTO_TEST_CASE(LineSurface_allNamedMethods_test) {
   // binningPosition()
   Translation3 translation{0., 1., 2.};
   Transform3 transform(translation);
-  LineSurfaceStub line(transform, 2.0, 20.);
+  LineSurfaceStub line(transform, 2., 20.);
   Vector3 referencePosition{0., 1., 2.};
   CHECK_CLOSE_ABS(referencePosition,
                   line.binningPosition(tgContext, BinningValue::binX), 1e-6);
-  //
+
   // bounds()
-  auto pLineBounds = std::make_shared<const LineBounds>(2., 10.0);
+  auto pLineBounds = std::make_shared<const LineBounds>(2., 10.);
   LineSurfaceStub boundedLine(transform, pLineBounds);
   const LineBounds& bounds =
       dynamic_cast<const LineBounds&>(boundedLine.bounds());
-  BOOST_CHECK_EQUAL(bounds, LineBounds(2., 10.0));
-  //
+  BOOST_CHECK_EQUAL(bounds, LineBounds(2., 10.));
+
   // globalToLocal()
   Vector3 gpos{0., 1., 0.};
   const Vector3 mom{20., 0., 0.};  // needs more realistic parameters
@@ -113,7 +121,7 @@ BOOST_AUTO_TEST_CASE(LineSurface_allNamedMethods_test) {
       line.globalToLocal(tgContext, gpos, mom.normalized()).value();
   const Vector2 expectedResult{0, -2};
   CHECK_CLOSE_ABS(expectedResult, localPosition, 1e-6);
-  //
+
   // intersection
   {
     const Vector3 direction{0., 1., 2.};
@@ -121,13 +129,13 @@ BOOST_AUTO_TEST_CASE(LineSurface_allNamedMethods_test) {
         line.intersect(tgContext, {0., 0., 0.}, direction.normalized(),
                        BoundaryTolerance::Infinite())
             .closest();
-    BOOST_CHECK(sfIntersection);
+    BOOST_CHECK(sfIntersection.isValid());
     Vector3 expectedIntersection(0, 1., 2.);
     CHECK_CLOSE_ABS(sfIntersection.position(), expectedIntersection,
                     1e-6);  // need more tests..
     BOOST_CHECK_EQUAL(sfIntersection.object(), &line);
   }
-  //
+
   // isOnSurface
   const Vector3 insidePosition{0., 2.5, 0.};
   BOOST_CHECK(line.isOnSurface(
@@ -136,7 +144,7 @@ BOOST_AUTO_TEST_CASE(LineSurface_allNamedMethods_test) {
   const Vector3 outsidePosition{100., 100., 200.};
   BOOST_CHECK(!line.isOnSurface(tgContext, outsidePosition, mom,
                                 BoundaryTolerance::None()));
-  //
+
   // localToGlobal
   Vector3 returnedGlobalPosition{0., 0., 0.};
   // Vector2 localPosition{0., 0.};
@@ -145,7 +153,7 @@ BOOST_AUTO_TEST_CASE(LineSurface_allNamedMethods_test) {
       line.localToGlobal(tgContext, localPosition, momentum.normalized());
   const Vector3 expectedGlobalPosition{0, 1, 0};
   CHECK_CLOSE_ABS(returnedGlobalPosition, expectedGlobalPosition, 1e-6);
-  //
+
   // referenceFrame
   Vector3 globalPosition{0., 0., 0.};
   auto returnedRotationMatrix =
@@ -154,42 +162,38 @@ BOOST_AUTO_TEST_CASE(LineSurface_allNamedMethods_test) {
   double v1 = std::sin(std::atan(2. / 3.));
   RotationMatrix3 expectedRotationMatrix;
   expectedRotationMatrix << -v1, 0., v0, v0, 0., v1, 0., 1., -0.;
-  // std::cout<<returnedRotationMatrix<<std::endl;
-  // std::cout<<expectedRotationMatrix<<std::endl;
   CHECK_CLOSE_OR_SMALL(returnedRotationMatrix, expectedRotationMatrix, 1e-6,
                        1e-9);
-  //
+
   // name()
   boost::test_tools::output_test_stream output;
   output << line.name();
   BOOST_CHECK(output.is_equal("Acts::LineSurface"));
-  //
+
   // normal
+  // arbitrary position, because should be irrelevant
+  Vector3 position{5, 5, 5};  // should be irrelevant
   {
-    Vector3 position{5, 5, 5};  // should be irrelevant
     Vector3 direction{1, 0, 0};
     CHECK_CLOSE_ABS(line.normal(tgContext, position, direction), direction,
                     1e-6);
   }
   {
-    Vector3 position{5, 5, 5};  // should be irrelevant
     Vector3 direction = Vector3{1, 0, 0.1}.normalized();
     CHECK_CLOSE_ABS(line.normal(tgContext, position, direction),
                     Vector3::UnitX(), 1e-6);
   }
   {
-    Vector3 position{5, 5, 5};  // should be irrelevant
     Vector3 direction{-1, 0, 0};
     CHECK_CLOSE_ABS(line.normal(tgContext, position, direction), direction,
                     1e-6);
   }
   {
-    Vector3 position{5, 5, 5};  // should be irrelevant
     Vector3 direction{0, 1, 0};
     CHECK_CLOSE_ABS(line.normal(tgContext, position, direction), direction,
                     1e-6);
   }
-  //
+
   // pathCorrection
   Vector3 any3DVector = Vector3::Random();
   CHECK_CLOSE_REL(line.pathCorrection(tgContext, any3DVector, any3DVector), 1.,
@@ -200,8 +204,8 @@ BOOST_AUTO_TEST_CASE(LineSurface_allNamedMethods_test) {
 BOOST_AUTO_TEST_CASE(LineSurface_assignment_test) {
   Translation3 translation{0., 1., 2.};
   Transform3 transform(translation);
-  LineSurfaceStub originalLine(transform, 2.0, 20.);
-  LineSurfaceStub assignedLine(transform, 1.0, 1.0);
+  LineSurfaceStub originalLine(transform, 2., 20.);
+  LineSurfaceStub assignedLine(transform, 1., 1.);
   BOOST_CHECK(assignedLine != originalLine);  // operator != from base
   assignedLine = originalLine;
   BOOST_CHECK(assignedLine == originalLine);  // operator == from base
@@ -211,7 +215,7 @@ BOOST_AUTO_TEST_CASE(LineSurface_assignment_test) {
 BOOST_AUTO_TEST_CASE(LineSurfaceAlignment) {
   Translation3 translation{0., 1., 2.};
   Transform3 transform(translation);
-  LineSurfaceStub line(transform, 2.0, 20.);
+  LineSurfaceStub line(transform, 2., 20.);
 
   const auto& rotation = transform.rotation();
   // The local frame z axis
@@ -229,7 +233,7 @@ BOOST_AUTO_TEST_CASE(LineSurfaceAlignment) {
       line.alignmentToPathDerivative(tgContext, globalPosition, direction);
   // The expected results
   AlignmentToPathMatrix expAlignToPath = AlignmentToPathMatrix::Zero();
-  const double value = std::sqrt(3) / 2;
+  const double value = std::numbers::sqrt3 / 2;
   expAlignToPath << -value, value, 0, -3 * value, -value, 0;
   // Check if the calculated derivative is as expected
   CHECK_CLOSE_ABS(alignToPath, expAlignToPath, 1e-10);
@@ -240,7 +244,8 @@ BOOST_AUTO_TEST_CASE(LineSurfaceAlignment) {
       line.localCartesianToBoundLocalDerivative(tgContext, globalPosition);
   // Check if the result is as expected
   ActsMatrix<2, 3> expLoc3DToLocBound = ActsMatrix<2, 3>::Zero();
-  expLoc3DToLocBound << 1 / std::sqrt(2), 1 / std::sqrt(2), 0, 0, 0, 1;
+  expLoc3DToLocBound << 1 / std::numbers::sqrt2, 1 / std::numbers::sqrt2, 0, 0,
+      0, 1;
   CHECK_CLOSE_ABS(loc3DToLocBound, expLoc3DToLocBound, 1e-10);
 }
 
@@ -282,7 +287,7 @@ BOOST_AUTO_TEST_CASE(LineSurfaceTransformRoundTripEtaStability) {
 
   for (double eta : etas) {
     Vector3 pca = {5, 0, 0};
-    Vector3 dir = makeDirectionFromPhiEta(M_PI_2, eta);
+    Vector3 dir = makeDirectionFromPhiEta(std::numbers::pi / 2., eta);
     Vector3 pos = pca + dir;
 
     auto intersection = surface.intersect(tgContext, pos, dir).closest();
@@ -339,8 +344,9 @@ BOOST_AUTO_TEST_CASE(LineSurfaceIntersection) {
           .closest();
   CHECK_CLOSE_ABS(intersection.pathLength(), pathLimit, eps);
 
-  BoundTrackParameters endParameters{surface, BoundVector::Zero(), std::nullopt,
-                                     ParticleHypothesis::pion()};
+  BoundTrackParameters endParameters{surface,
+                                     detail::Test::someBoundParametersA(),
+                                     std::nullopt, ParticleHypothesis::pion()};
   {
     PropagatorOptions options(tgContext, {});
     options.direction = Acts::Direction::Forward;
@@ -357,4 +363,5 @@ BOOST_AUTO_TEST_CASE(LineSurfaceIntersection) {
 }
 
 BOOST_AUTO_TEST_SUITE_END()
+
 }  // namespace Acts::Test
diff --git a/Tests/UnitTests/Core/Surfaces/PerigeeSurfaceTests.cpp b/Tests/UnitTests/Core/Surfaces/PerigeeSurfaceTests.cpp
index 416ceefedbc..3ccf47b4e11 100644
--- a/Tests/UnitTests/Core/Surfaces/PerigeeSurfaceTests.cpp
+++ b/Tests/UnitTests/Core/Surfaces/PerigeeSurfaceTests.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2017-2018 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include <boost/test/tools/output_test_stream.hpp>
 #include <boost/test/unit_test.hpp>
@@ -25,45 +25,46 @@ GeometryContext tgContext = GeometryContext();
 BOOST_AUTO_TEST_SUITE(PerigeeSurfaces)
 /// Unit test for creating compliant/non-compliant PerigeeSurface object
 BOOST_AUTO_TEST_CASE(PerigeeSurfaceConstruction) {
-  // PerigeeSurface default constructor is deleted
-  //
+  /// Test default construction
+  // default construction is deleted
+
   /// Constructor with Vector3
   Vector3 unitXYZ{1., 1., 1.};
   auto perigeeSurfaceObject = Surface::makeShared<PerigeeSurface>(unitXYZ);
   BOOST_CHECK_EQUAL(Surface::makeShared<PerigeeSurface>(unitXYZ)->type(),
                     Surface::Perigee);
-  //
+
   /// Constructor with transform
   Translation3 translation{0., 1., 2.};
   auto pTransform = Transform3(translation);
   BOOST_CHECK_EQUAL(Surface::makeShared<PerigeeSurface>(pTransform)->type(),
                     Surface::Perigee);
-  //
+
   /// Copy constructor
   auto copiedPerigeeSurface =
       Surface::makeShared<PerigeeSurface>(*perigeeSurfaceObject);
   BOOST_CHECK_EQUAL(copiedPerigeeSurface->type(), Surface::Perigee);
   BOOST_CHECK(*copiedPerigeeSurface == *perigeeSurfaceObject);
-  //
+
   /// Copied and transformed
   auto copiedTransformedPerigeeSurface = Surface::makeShared<PerigeeSurface>(
       tgContext, *perigeeSurfaceObject, pTransform);
   BOOST_CHECK_EQUAL(copiedTransformedPerigeeSurface->type(), Surface::Perigee);
 }
-//
+
 /// Unit test for testing PerigeeSurface properties
 BOOST_AUTO_TEST_CASE(PerigeeSurfaceProperties) {
   /// Test clone method
   Vector3 unitXYZ{1., 1., 1.};
   auto perigeeSurfaceObject = Surface::makeShared<PerigeeSurface>(unitXYZ);
-  //
+
   /// Test type (redundant)
   BOOST_CHECK_EQUAL(perigeeSurfaceObject->type(), Surface::Perigee);
-  //
+
   /// Test name
   BOOST_CHECK_EQUAL(perigeeSurfaceObject->name(),
                     std::string("Acts::PerigeeSurface"));
-  //
+
   /// Test dump
   boost::test_tools::output_test_stream dumpOutput;
   dumpOutput << perigeeSurfaceObject->toStream(tgContext);
@@ -74,15 +75,18 @@ BOOST_AUTO_TEST_CASE(PerigeeSurfaceProperties) {
 
 BOOST_AUTO_TEST_CASE(EqualityOperators) {
   Vector3 unitXYZ{1., 1., 1.};
-  Vector3 invalidPosition{0.0, 0.0, 0.0};
+  Vector3 invalidPosition{0., 0., 0.};
   auto perigeeSurfaceObject = Surface::makeShared<PerigeeSurface>(unitXYZ);
   auto perigeeSurfaceObject2 = Surface::makeShared<PerigeeSurface>(unitXYZ);
   auto assignedPerigeeSurface =
       Surface::makeShared<PerigeeSurface>(invalidPosition);
+
   /// Test equality operator
   BOOST_CHECK(*perigeeSurfaceObject == *perigeeSurfaceObject2);
+
   /// Test assignment
   *assignedPerigeeSurface = *perigeeSurfaceObject;
+
   /// Test equality of assigned to original
   BOOST_CHECK(*assignedPerigeeSurface == *perigeeSurfaceObject);
 }
diff --git a/Tests/UnitTests/Core/Surfaces/PlaneSurfaceTests.cpp b/Tests/UnitTests/Core/Surfaces/PlaneSurfaceTests.cpp
index 96f0371735d..99d0569b9d2 100644
--- a/Tests/UnitTests/Core/Surfaces/PlaneSurfaceTests.cpp
+++ b/Tests/UnitTests/Core/Surfaces/PlaneSurfaceTests.cpp
@@ -1,12 +1,12 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2017-2018 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
-// #include <boost/test/tools/output_test_stream.hpp>
+#include <boost/test/tools/output_test_stream.hpp>
 #include <boost/test/unit_test.hpp>
 
 #include "Acts/Definitions/Algebra.hpp"
@@ -31,6 +31,7 @@
 #include <algorithm>
 #include <cmath>
 #include <memory>
+#include <numbers>
 #include <string>
 #include <utility>
 
@@ -44,16 +45,20 @@ GeometryContext tgContext = GeometryContext();
 BOOST_AUTO_TEST_SUITE(PlaneSurfaces)
 /// Unit test for creating compliant/non-compliant PlaneSurface object
 BOOST_AUTO_TEST_CASE(PlaneSurfaceConstruction) {
-  // PlaneSurface default constructor is deleted
+  /// Test default construction
+  // default construction is deleted
+
   // bounds object, rectangle type
   auto rBounds = std::make_shared<const RectangleBounds>(3., 4.);
   /// Constructor with transform and bounds
   Translation3 translation{0., 1., 2.};
   auto pTransform = Transform3(translation);
-  // constructor with transform
+
+  /// Constructor with transform
   BOOST_CHECK_EQUAL(
       Surface::makeShared<PlaneSurface>(pTransform, rBounds)->type(),
       Surface::Plane);
+
   /// Copy constructor
   auto planeSurfaceObject =
       Surface::makeShared<PlaneSurface>(pTransform, rBounds);
@@ -61,7 +66,7 @@ BOOST_AUTO_TEST_CASE(PlaneSurfaceConstruction) {
       Surface::makeShared<PlaneSurface>(*planeSurfaceObject);
   BOOST_CHECK_EQUAL(copiedPlaneSurface->type(), Surface::Plane);
   BOOST_CHECK(*copiedPlaneSurface == *planeSurfaceObject);
-  //
+
   /// Copied and transformed
   auto copiedTransformedPlaneSurface = Surface::makeShared<PlaneSurface>(
       tgContext, *planeSurfaceObject, pTransform);
@@ -73,11 +78,12 @@ BOOST_AUTO_TEST_CASE(PlaneSurfaceConstruction) {
       auto nullBounds = Surface::makeShared<PlaneSurface>(nullptr, detElem),
       AssertionFailureException);
 }
-//
+
 /// Unit test for testing PlaneSurface properties
 BOOST_AUTO_TEST_CASE(PlaneSurfaceProperties) {
   // bounds object, rectangle type
   auto rBounds = std::make_shared<const RectangleBounds>(3., 4.);
+
   /// Test clone method
   Translation3 translation{0., 1., 2.};
   auto pTransform = Transform3(translation);
@@ -88,17 +94,18 @@ BOOST_AUTO_TEST_CASE(PlaneSurfaceProperties) {
   auto pTransform2 = Transform3(translation2);
   auto planeSurfaceObject2 =
       Surface::makeShared<PlaneSurface>(pTransform2, rBounds);
+
   /// Test type (redundant)
   BOOST_CHECK_EQUAL(planeSurfaceObject->type(), Surface::Plane);
-  //
+
   /// Test binningPosition
   Vector3 binningPosition{0., 1., 2.};
   BOOST_CHECK_EQUAL(
       planeSurfaceObject->binningPosition(tgContext, BinningValue::binX),
       binningPosition);
-  //
+
   /// Test referenceFrame
-  Vector3 arbitraryGlobalPosition{2.0, 2.0, 2.0};
+  Vector3 arbitraryGlobalPosition{2., 2., 2.};
   Vector3 momentum{1.e6, 1.e6, 1.e6};
   RotationMatrix3 expectedFrame;
   expectedFrame << 1., 0., 0., 0., 1., 0., 0., 0., 1.;
@@ -106,11 +113,11 @@ BOOST_AUTO_TEST_CASE(PlaneSurfaceProperties) {
   CHECK_CLOSE_OR_SMALL(planeSurfaceObject->referenceFrame(
                            tgContext, arbitraryGlobalPosition, momentum),
                        expectedFrame, 1e-6, 1e-9);
-  //
+
   /// Test normal, given 3D position
   Vector3 normal3D(0., 0., 1.);
   BOOST_CHECK_EQUAL(planeSurfaceObject->normal(tgContext), normal3D);
-  //
+
   /// Test bounds
   BOOST_CHECK_EQUAL(planeSurfaceObject->bounds().type(),
                     SurfaceBounds::eRectangle);
@@ -119,13 +126,12 @@ BOOST_AUTO_TEST_CASE(PlaneSurfaceProperties) {
   Vector2 localPosition{1.5, 1.7};
   Vector3 globalPosition =
       planeSurfaceObject->localToGlobal(tgContext, localPosition, momentum);
-  //
   // expected position is the translated one
   Vector3 expectedPosition{1.5 + translation.x(), 1.7 + translation.y(),
                            translation.z()};
 
   CHECK_CLOSE_REL(globalPosition, expectedPosition, 1e-2);
-  //
+
   /// Testing globalToLocal
   localPosition =
       planeSurfaceObject->globalToLocal(tgContext, globalPosition, momentum)
@@ -158,8 +164,8 @@ BOOST_AUTO_TEST_CASE(PlaneSurfaceProperties) {
                                                BoundaryTolerance::None()));
   BOOST_CHECK(!planeSurfaceObject->isOnSurface(tgContext, offSurface,
                                                BoundaryTolerance::None()));
-  //
-  // Test intersection
+
+  /// Test intersection
   Vector3 direction{0., 0., 1.};
   auto sfIntersection = planeSurfaceObject
                             ->intersect(tgContext, offSurface, direction,
@@ -167,35 +173,35 @@ BOOST_AUTO_TEST_CASE(PlaneSurfaceProperties) {
                             .closest();
   Intersection3D expectedIntersect{Vector3{0, 1, 2}, 4.,
                                    Intersection3D::Status::reachable};
-  BOOST_CHECK(sfIntersection);
+  BOOST_CHECK(sfIntersection.isValid());
   BOOST_CHECK_EQUAL(sfIntersection.position(), expectedIntersect.position());
   BOOST_CHECK_EQUAL(sfIntersection.pathLength(),
                     expectedIntersect.pathLength());
   BOOST_CHECK_EQUAL(sfIntersection.object(), planeSurfaceObject.get());
-  //
 
   /// Test pathCorrection
   CHECK_CLOSE_REL(planeSurfaceObject->pathCorrection(tgContext, offSurface,
                                                      momentum.normalized()),
-                  std::sqrt(3), 0.01);
-  //
+                  std::numbers::sqrt3, 0.01);
+
   /// Test name
   BOOST_CHECK_EQUAL(planeSurfaceObject->name(),
                     std::string("Acts::PlaneSurface"));
-  //
+
   /// Test dump
-  // TODO 2017-04-12 msmk: check how to correctly check output
-  //    boost::test_tools::output_test_stream dumpOuput;
-  //    planeSurfaceObject.toStream(dumpOuput);
-  //    BOOST_CHECK(dumpOuput.is_equal(
-  //      "Acts::PlaneSurface\n"
-  //      "    Center position  (x, y, z) = (0.0000, 1.0000, 2.0000)\n"
-  //      "    Rotation:             colX = (1.000000, 0.000000, 0.000000)\n"
-  //      "                          colY = (0.000000, 1.000000, 0.000000)\n"
-  //      "                          colZ = (0.000000, 0.000000, 1.000000)\n"
-  //      "    Bounds  : Acts::ConeBounds: (tanAlpha, minZ, maxZ, averagePhi,
-  //      halfPhiSector) = (0.4142136, 0.0000000, inf, 0.0000000,
-  //      3.1415927)"));
+  boost::test_tools::output_test_stream dumpOutput;
+  dumpOutput << planeSurfaceObject->toStream(tgContext);
+  BOOST_CHECK(dumpOutput.is_equal(
+      "Acts::PlaneSurface\n"
+      "     Center position  (x, y, z) = (0.0000, 1.0000, 2.0000)\n"
+      "     Rotation:             colX = (1.000000, 0.000000, 0.000000)\n"
+      "                           colY = (0.000000, 1.000000, 0.000000)\n"
+      "                           colZ = (0.000000, 0.000000, 1.000000)\n"
+      "     Bounds  : Acts::RectangleBounds:  (hlX, hlY) = (3.0000000, "
+      "4.0000000)\n"
+      "(lower left, upper right):\n"
+      "-3.0000000 -4.0000000\n"
+      "3.0000000 4.0000000"));
 }
 
 BOOST_AUTO_TEST_CASE(PlaneSurfaceEqualityOperators) {
@@ -207,16 +213,18 @@ BOOST_AUTO_TEST_CASE(PlaneSurfaceEqualityOperators) {
       Surface::makeShared<PlaneSurface>(pTransform, rBounds);
   auto planeSurfaceObject2 =
       Surface::makeShared<PlaneSurface>(pTransform, rBounds);
-  //
+
   /// Test equality operator
   BOOST_CHECK(*planeSurfaceObject == *planeSurfaceObject2);
-  //
+
   BOOST_TEST_CHECKPOINT(
       "Create and then assign a PlaneSurface object to the existing one");
+
   /// Test assignment
   auto assignedPlaneSurface =
       Surface::makeShared<PlaneSurface>(Transform3::Identity(), nullptr);
   *assignedPlaneSurface = *planeSurfaceObject;
+
   /// Test equality of assigned to original
   BOOST_CHECK(*assignedPlaneSurface == *planeSurfaceObject);
 }
@@ -224,9 +232,10 @@ BOOST_AUTO_TEST_CASE(PlaneSurfaceEqualityOperators) {
 /// Unit test for testing PlaneSurface extent via Polyhedron representation
 BOOST_AUTO_TEST_CASE(PlaneSurfaceExtent) {
   // First test - non-rotated
-  static const Transform3 planeZX = AngleAxis3(-0.5 * M_PI, Vector3::UnitX()) *
-                                    AngleAxis3(-0.5 * M_PI, Vector3::UnitZ()) *
-                                    Transform3::Identity();
+  static const Transform3 planeZX =
+      AngleAxis3(-std::numbers::pi / 2., Vector3::UnitX()) *
+      AngleAxis3(-std::numbers::pi / 2., Vector3::UnitZ()) *
+      Transform3::Identity();
 
   double rHx = 2.;
   double rHy = 4.;
@@ -281,10 +290,10 @@ BOOST_AUTO_TEST_CASE(PlaneSurfaceExtent) {
 }
 
 BOOST_AUTO_TEST_CASE(RotatedTrapezoid) {
-  double shortHalfX{100.};
-  double longHalfX{200.};
-  double halfY{300.};
-  double rotAngle{45._degree};
+  const double shortHalfX = 100.;
+  const double longHalfX = 200.;
+  const double halfY = 300.;
+  const double rotAngle = 45._degree;
 
   Vector2 edgePoint{longHalfX - 10., halfY};
 
@@ -309,7 +318,7 @@ BOOST_AUTO_TEST_CASE(PlaneSurfaceAlignment) {
   auto rBounds = std::make_shared<const RectangleBounds>(3., 4.);
   // Test clone method
   Translation3 translation{0., 1., 2.};
-  double rotationAngle = M_PI_2;
+  const double rotationAngle = std::numbers::pi / 2.;
   AngleAxis3 rotation(rotationAngle, Vector3::UnitY());
   RotationMatrix3 rotationMat = rotation.toRotationMatrix();
 
diff --git a/Tests/UnitTests/Core/Surfaces/PolyhedronSurfacesTests.cpp b/Tests/UnitTests/Core/Surfaces/PolyhedronSurfacesTests.cpp
index b37649eebc5..184d69e341f 100644
--- a/Tests/UnitTests/Core/Surfaces/PolyhedronSurfacesTests.cpp
+++ b/Tests/UnitTests/Core/Surfaces/PolyhedronSurfacesTests.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2017-2023 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include <boost/test/unit_test.hpp>
 
@@ -42,7 +42,7 @@ namespace Acts::Test {
 const GeometryContext tgContext = GeometryContext();
 
 const std::vector<std::tuple<std::string, unsigned int>> testModes = {
-    {"Triangulate", 72}, {"Extrema", 1}};
+    {"Triangulate", 18}, {"Extrema", 1}};
 
 const Transform3 transform = Transform3::Identity();
 const double epsAbs = 1e-12;
@@ -61,9 +61,8 @@ BOOST_AUTO_TEST_CASE(ConeSurfacePolyhedrons) {
 
   const double rMax = hzPos * std::tan(alpha);
 
-  for (const auto& mode : testModes) {
-    ACTS_INFO("\tMode: " << std::get<std::string>(mode));
-    const unsigned int segments = std::get<unsigned int>(mode);
+  for (const auto& [mode, segments] : testModes) {
+    ACTS_INFO("\tMode: " << mode);
 
     /// The full cone on one side
     {
@@ -81,9 +80,10 @@ BOOST_AUTO_TEST_CASE(ConeSurfacePolyhedrons) {
       CHECK_CLOSE_ABS(extent.range(BinningValue::binZ).min(), 0_mm, epsAbs);
       CHECK_CLOSE_ABS(extent.range(BinningValue::binZ).max(), hzPos, epsAbs);
 
-      const unsigned int expectedFaces = segments < 4 ? 4 : segments;
+      const unsigned int expectedFaces = 4 * segments;
       BOOST_CHECK_EQUAL(oneConePh.faces.size(), expectedFaces);
-      BOOST_CHECK_EQUAL(oneConePh.vertices.size(), expectedFaces + 1);
+      // full segments + overlap at (pi/pi) + tip
+      BOOST_CHECK_EQUAL(oneConePh.vertices.size(), expectedFaces + 2);
     }
 
     /// The full cone on one side
@@ -106,6 +106,11 @@ BOOST_AUTO_TEST_CASE(ConeSurfacePolyhedrons) {
       CHECK_CLOSE_ABS(extent.range(BinningValue::binR).max(), rMax, epsAbs);
       CHECK_CLOSE_ABS(extent.range(BinningValue::binZ).min(), hzpMin, epsAbs);
       CHECK_CLOSE_ABS(extent.range(BinningValue::binZ).max(), hzPos, epsAbs);
+
+      const unsigned int expectedFaces = 4 * segments;
+      BOOST_CHECK_EQUAL(oneConePiecePh.faces.size(), expectedFaces);
+      BOOST_CHECK_EQUAL(oneConePiecePh.vertices.size(),
+                        (expectedFaces + 1) * 2);
     }
 
     /// The full cone on both sides
@@ -124,9 +129,11 @@ BOOST_AUTO_TEST_CASE(ConeSurfacePolyhedrons) {
       CHECK_CLOSE_ABS(extent.range(BinningValue::binZ).min(), hzNeg, epsAbs);
       CHECK_CLOSE_ABS(extent.range(BinningValue::binZ).max(), hzPos, epsAbs);
 
-      const unsigned int expectedFaces = segments < 4 ? 8 : 2 * segments;
+      const unsigned int expectedFaces = 2 * segments * 4;
+      const unsigned int expectedVertices = 2 * (4 * segments + 1) + 1;
+
       BOOST_CHECK_EQUAL(twoConesPh.faces.size(), expectedFaces);
-      BOOST_CHECK_EQUAL(twoConesPh.vertices.size(), expectedFaces + 1);
+      BOOST_CHECK_EQUAL(twoConesPh.vertices.size(), expectedVertices);
     }
 
     /// A centered sectoral cone on both sides
@@ -143,13 +150,16 @@ BOOST_AUTO_TEST_CASE(ConeSurfacePolyhedrons) {
       const auto extent = sectoralConesPh.extent();
       CHECK_CLOSE_ABS(extent.range(BinningValue::binX).min(), 0, epsAbs);
       CHECK_CLOSE_ABS(extent.range(BinningValue::binX).max(), rMax, epsAbs);
-      //      CHECK_CLOSE_ABS(extent.range(BinningValue::binY).min(), ???,
-      //      epsAbs); CHECK_CLOSE_ABS(extent.range(BinningValue::binY).max(),
-      //      ???, epsAbs);
+      CHECK_CLOSE_ABS(extent.range(BinningValue::binY).min(),
+                      -rMax * std::sin(phiSector), epsAbs);
+      CHECK_CLOSE_ABS(extent.range(BinningValue::binY).max(),
+                      rMax * std::sin(phiSector), epsAbs);
       CHECK_CLOSE_ABS(extent.range(BinningValue::binR).min(), 0_mm, epsAbs);
       CHECK_CLOSE_ABS(extent.range(BinningValue::binR).max(), rMax, epsAbs);
       CHECK_CLOSE_ABS(extent.range(BinningValue::binZ).min(), hzNeg, epsAbs);
       CHECK_CLOSE_ABS(extent.range(BinningValue::binZ).max(), hzPos, epsAbs);
+
+      // Segment numbers are further checked with the VertexHelper checks
     }
   }
 }
@@ -185,8 +195,8 @@ BOOST_AUTO_TEST_CASE(CylinderSurfacePolyhedrons) {
       CHECK_CLOSE_ABS(extent.range(BinningValue::binZ).min(), -hZ, epsAbs);
       CHECK_CLOSE_ABS(extent.range(BinningValue::binZ).max(), hZ, epsAbs);
 
-      const unsigned int expectedFaces = segments < 4 ? 4 : segments;
-      const unsigned int expectedVertices = segments < 4 ? 8 : 2 * segments;
+      const unsigned int expectedFaces = 4 * segments;
+      const unsigned int expectedVertices = (4 * segments + 1) * 2;
       BOOST_CHECK_EQUAL(fullCylinderPh.faces.size(), expectedFaces);
       BOOST_CHECK_EQUAL(fullCylinderPh.vertices.size(), expectedVertices);
     }
@@ -248,7 +258,8 @@ BOOST_AUTO_TEST_CASE(DiscSurfacePolyhedrons) {
       CHECK_CLOSE_ABS(extent.range(BinningValue::binZ).max(), 0., epsAbs);
 
       const unsigned int expectedFaces = 1;
-      const unsigned int expectedVertices = segments > 4 ? segments + 1 : 4 + 1;
+      // Segments + overlap + center
+      const unsigned int expectedVertices = 4 * segments + 1 + 1;
       BOOST_CHECK_EQUAL(fullDiscPh.faces.size(), expectedFaces);
       BOOST_CHECK_EQUAL(fullDiscPh.vertices.size(), expectedVertices);
     }
@@ -353,14 +364,7 @@ BOOST_AUTO_TEST_CASE(DiscSurfacePolyhedrons) {
       auto annulusDisc = Surface::makeShared<DiscSurface>(transform, annulus);
       auto annulusDiscPh =
           annulusDisc->polyhedronRepresentation(tgContext, segments);
-
       const auto extent = annulusDiscPh.extent();
-      //      CHECK_CLOSE_ABS(extent.range(BinningValue::binX).min(), ???,
-      //      epsAbs); CHECK_CLOSE_ABS(extent.range(BinningValue::binX).max(),
-      //      ???, epsAbs);
-      //      CHECK_CLOSE_ABS(extent.range(BinningValue::binY).min(), ???,
-      //      epsAbs); CHECK_CLOSE_ABS(extent.range(BinningValue::binY).max(),
-      //      ???, epsAbs);
       CHECK_CLOSE_ABS(extent.range(BinningValue::binR).min(), minRadius,
                       epsAbs);
       CHECK_CLOSE_ABS(extent.range(BinningValue::binR).max(), maxRadius,
diff --git a/Tests/UnitTests/Core/Surfaces/RadialBoundsTests.cpp b/Tests/UnitTests/Core/Surfaces/RadialBoundsTests.cpp
index 04d97041575..a25eeb4d352 100644
--- a/Tests/UnitTests/Core/Surfaces/RadialBoundsTests.cpp
+++ b/Tests/UnitTests/Core/Surfaces/RadialBoundsTests.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2017-2018 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include <boost/test/tools/output_test_stream.hpp>
 #include <boost/test/unit_test.hpp>
@@ -17,6 +17,7 @@
 #include <algorithm>
 #include <array>
 #include <cmath>
+#include <numbers>
 #include <stdexcept>
 #include <vector>
 
@@ -24,30 +25,32 @@ namespace Acts::Test {
 
 BOOST_AUTO_TEST_SUITE(Surfaces)
 
-/// Unit tests for RadialBounds constrcuctors
+const double rMin = 1.;
+const double rMax = 5.;
+const double halfPhiSector = std::numbers::pi / 8.;
+const double avgPhi = 0.1;
+
+/// Unit tests for RadialBounds constructors
 BOOST_AUTO_TEST_CASE(RadialBoundsConstruction) {
-  double minRadius(1.0), maxRadius(5.0), halfPhiSector(M_PI / 8.0);
-  // test default construction
-  // RadialBounds defaultConstructedRadialBounds;  should be deleted
-  //
+  /// Test default construction
+  // default construction is deleted
+
   /// Test construction with radii and default sector
-  BOOST_CHECK_EQUAL(RadialBounds(minRadius, maxRadius).type(),
-                    SurfaceBounds::eDisc);
-  //
+  BOOST_CHECK_EQUAL(RadialBounds(rMin, rMax).type(), SurfaceBounds::eDisc);
+
   /// Test construction with radii and sector half angle
-  BOOST_CHECK_EQUAL(RadialBounds(minRadius, maxRadius, halfPhiSector).type(),
+  BOOST_CHECK_EQUAL(RadialBounds(rMin, rMax, halfPhiSector).type(),
                     SurfaceBounds::eDisc);
-  //
+
   /// Copy constructor
-  RadialBounds original(minRadius, maxRadius);
+  RadialBounds original(rMin, rMax);
   RadialBounds copied(original);
   BOOST_CHECK_EQUAL(copied, original);
 }
 
 // Streaning and recreation test
 BOOST_AUTO_TEST_CASE(RadialBoundsRecreation) {
-  double minRadius(1.0), maxRadius(5.0), halfPhiSector(M_PI / 8.0), avgPhi(0.1);
-  RadialBounds original(minRadius, maxRadius, halfPhiSector, avgPhi);
+  RadialBounds original(rMin, rMax, halfPhiSector, avgPhi);
   // const bool symmetric(false);
   auto valvector = original.values();
   std::array<double, RadialBounds::eSize> values{};
@@ -58,75 +61,72 @@ BOOST_AUTO_TEST_CASE(RadialBoundsRecreation) {
 
 // Streaning and recreation test
 BOOST_AUTO_TEST_CASE(RadialBoundsException) {
-  double minRadius(1.0), maxRadius(5.0), halfPhiSector(M_PI / 8.0), avgPhi(0.1);
-
   // Negative inner radius
-  BOOST_CHECK_THROW(RadialBounds(-minRadius, maxRadius, halfPhiSector, avgPhi),
+  BOOST_CHECK_THROW(RadialBounds(-rMin, rMax, halfPhiSector, avgPhi),
                     std::logic_error);
 
   // Negative outer radius
-  BOOST_CHECK_THROW(RadialBounds(minRadius, -maxRadius, halfPhiSector, avgPhi),
+  BOOST_CHECK_THROW(RadialBounds(rMin, -rMax, halfPhiSector, avgPhi),
                     std::logic_error);
 
   // Negative inner and outer radius
-  BOOST_CHECK_THROW(RadialBounds(-minRadius, -maxRadius, halfPhiSector, avgPhi),
+  BOOST_CHECK_THROW(RadialBounds(-rMin, -rMax, halfPhiSector, avgPhi),
                     std::logic_error);
 
   // Swapped radii
-  BOOST_CHECK_THROW(RadialBounds(maxRadius, minRadius, halfPhiSector, avgPhi),
+  BOOST_CHECK_THROW(RadialBounds(rMax, rMin, halfPhiSector, avgPhi),
                     std::logic_error);
 
   // Out of bound phi sector
-  BOOST_CHECK_THROW(RadialBounds(minRadius, -maxRadius, -5., avgPhi),
-                    std::logic_error);
+  BOOST_CHECK_THROW(RadialBounds(rMin, -rMax, -5., avgPhi), std::logic_error);
 
   // Out of bound phi position
-  BOOST_CHECK_THROW(RadialBounds(minRadius, -maxRadius, halfPhiSector, 5.),
+  BOOST_CHECK_THROW(RadialBounds(rMin, -rMax, halfPhiSector, 5.),
                     std::logic_error);
 }
 
 /// Unit tests for RadialBounds properties
 BOOST_AUTO_TEST_CASE(RadialBoundsProperties) {
-  double minRadius(1.0), maxRadius(5.0), halfPhiSector(M_PI / 8.0);
   /// Test type() (redundant; already used in constructor confirmation)
-  RadialBounds radialBoundsObject(minRadius, maxRadius, halfPhiSector);
+  RadialBounds radialBoundsObject(rMin, rMax, halfPhiSector);
   BOOST_CHECK_EQUAL(radialBoundsObject.type(), SurfaceBounds::eDisc);
-  //
+
   /// Test distanceToBoundary
   Vector2 outside(30., 0.);
-  Vector2 inSurface(2., 0.0);
+  Vector2 inSurface(2., 0.);
 
   /// Test dump
-  boost::test_tools::output_test_stream dumpOuput;
-  radialBoundsObject.toStream(dumpOuput);
+  boost::test_tools::output_test_stream dumpOutput;
+  radialBoundsObject.toStream(dumpOutput);
   BOOST_CHECK(
-      dumpOuput.is_equal("Acts::RadialBounds:  (innerRadius, outerRadius, "
-                         "hPhiSector, averagePhi) = (1.0000000, "
-                         "5.0000000, 0.3926991, 0.0000000)"));
-  //
+      dumpOutput.is_equal("Acts::RadialBounds:  (innerRadius, outerRadius, "
+                          "hPhiSector, averagePhi) = (1.0000000, "
+                          "5.0000000, 0.3926991, 0.0000000)"));
+
   /// Test inside
   BOOST_CHECK(radialBoundsObject.inside(inSurface, BoundaryTolerance::None()));
   BOOST_CHECK(!radialBoundsObject.inside(outside, BoundaryTolerance::None()));
-  //
+
   /// Test rMin
-  BOOST_CHECK_EQUAL(radialBoundsObject.get(RadialBounds::eMinR), minRadius);
-  //
+  BOOST_CHECK_EQUAL(radialBoundsObject.get(RadialBounds::eMinR), rMin);
+
   /// Test rMax
-  BOOST_CHECK_EQUAL(radialBoundsObject.get(RadialBounds::eMaxR), maxRadius);
-  //
+  BOOST_CHECK_EQUAL(radialBoundsObject.get(RadialBounds::eMaxR), rMax);
+
   /// Test averagePhi (should be a redundant method, this is not configurable)
-  BOOST_CHECK_EQUAL(radialBoundsObject.get(RadialBounds::eAveragePhi), 0.0);
-  //
+  BOOST_CHECK_EQUAL(radialBoundsObject.get(RadialBounds::eAveragePhi), 0.);
+
   /// Test halfPhiSector
   BOOST_CHECK_EQUAL(radialBoundsObject.get(RadialBounds::eHalfPhiSector),
                     halfPhiSector);
 }
 /// Unit test for testing RadialBounds assignment
 BOOST_AUTO_TEST_CASE(RadialBoundsAssignment) {
-  double minRadius(1.0), maxRadius(5.0), halfPhiSector(M_PI / 8.0);
-  RadialBounds radialBoundsObject(minRadius, maxRadius, halfPhiSector);
-  // operator == not implemented in this class
-  //
+  RadialBounds radialBoundsObject(rMin, rMax, halfPhiSector);
+
+  /// Test operator ==
+  // not implemented in this class
+
   /// Test assignment
   RadialBounds assignedRadialBoundsObject(10.1, 123.);
   assignedRadialBoundsObject = radialBoundsObject;
diff --git a/Tests/UnitTests/Core/Surfaces/RectangleBoundsTests.cpp b/Tests/UnitTests/Core/Surfaces/RectangleBoundsTests.cpp
index 7c220ba31b8..ad310e393cf 100644
--- a/Tests/UnitTests/Core/Surfaces/RectangleBoundsTests.cpp
+++ b/Tests/UnitTests/Core/Surfaces/RectangleBoundsTests.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2017-2018 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include <boost/test/unit_test.hpp>
 
@@ -28,30 +28,35 @@ BOOST_AUTO_TEST_SUITE(Surfaces)
 
 /// Unit test for creating compliant/non-compliant RectangleBounds object
 BOOST_AUTO_TEST_CASE(RectangleBoundsConstruction) {
-  const double halfX(10.), halfY(5.);
+  const double halfX = 10.;
+  const double halfY = 5.;
   RectangleBounds twentyByTenRectangle(halfX, halfY);
   BOOST_CHECK_EQUAL(twentyByTenRectangle.type(),
                     Acts::SurfaceBounds::eRectangle);
-  //
+
   // nonsensical bounds are also permitted, but maybe should not be
-  const double zeroHalfX(0.), zeroHalfY(0.);
-  const double infHalfX(inf), infHalfY(inf);
-  //
-  // BOOST_TEST_MESSAGE("Initialise with zero dimensions");
+  const double zeroHalfX = 0.;
+  const double zeroHalfY = 0.;
+  const double infHalfX = inf;
+  const double infHalfY = inf;
+
+  // Initialise with zero dimensions
   RectangleBounds zeroDimensionsRectangle(zeroHalfX, zeroHalfY);
   BOOST_CHECK_EQUAL(zeroDimensionsRectangle.type(),
                     Acts::SurfaceBounds::eRectangle);
-  //
-  // BOOST_TEST_MESSAGE("Initialise with infinite dimensions");
+
+  // Initialise with infinite dimensions
   RectangleBounds infinite(infHalfX, infHalfY);
   BOOST_CHECK_EQUAL(infinite.type(), Acts::SurfaceBounds::eRectangle);
 }
 
 /// Recreation
 BOOST_AUTO_TEST_CASE(RectangleBoundsRecreation) {
-  const double halfX(10.), halfY(2.);
+  const double halfX = 10.;
+  const double halfY = 2.;  // != 5.
+
   RectangleBounds original(halfX, halfY);
-  // const bool symmetric(false);
+
   auto valvector = original.values();
   std::array<double, RectangleBounds::eSize> values{};
   std::copy_n(valvector.begin(), RectangleBounds::eSize, values.begin());
@@ -61,7 +66,8 @@ BOOST_AUTO_TEST_CASE(RectangleBoundsRecreation) {
 
 // Exception tests
 BOOST_AUTO_TEST_CASE(RadialBoundsException) {
-  const double halfX(10.), halfY(2.);
+  const double halfX = 10.;
+  const double halfY = 2.;  // != 5.
 
   // Negative x half length
   BOOST_CHECK_THROW(RectangleBounds(-halfX, halfY), std::logic_error);
@@ -73,29 +79,33 @@ BOOST_AUTO_TEST_CASE(RadialBoundsException) {
 /// Unit test for testing RectangleBounds properties
 BOOST_TEST_DECORATOR(*boost::unit_test::tolerance(1e-10))
 BOOST_AUTO_TEST_CASE(RectangleBoundsProperties) {
-  const double halfX(10.), halfY(5.);
+  const double halfX = 10.;
+  const double halfY = 5.;
+
   RectangleBounds rect(halfX, halfY);
-  BOOST_CHECK_EQUAL(rect.halfLengthX(), 10.);
-  BOOST_CHECK_EQUAL(rect.halfLengthY(), 5.);
+  BOOST_CHECK_EQUAL(rect.halfLengthX(), halfX);
+  BOOST_CHECK_EQUAL(rect.halfLengthY(), halfY);
 
   CHECK_CLOSE_ABS(rect.min(), Vector2(-halfX, -halfY), 1e-6);
   CHECK_CLOSE_ABS(rect.max(), Vector2(halfX, halfY), 1e-6);
 
   const std::vector<Vector2> coords = {
-      {-10., -5.}, {10., -5.}, {10., 5.}, {-10., 5.}};
+      {-halfX, -halfY}, {halfX, -halfY}, {halfX, halfY}, {-halfX, halfY}};
   // equality, ensure ordering is ok
   const auto& rectVertices = rect.vertices();
   BOOST_CHECK_EQUAL_COLLECTIONS(coords.cbegin(), coords.cend(),
                                 rectVertices.cbegin(), rectVertices.cend());
-  const Vector2 pointA{1.0, 1.0};
+  const Vector2 pointA{1., 1.};
   // distance is signed, from boundary to point. (doesn't seem right, given
   BoundaryTolerance tolerance = BoundaryTolerance::None();
   BOOST_CHECK(rect.inside(pointA, tolerance));
 }
 BOOST_AUTO_TEST_CASE(RectangleBoundsAssignment) {
-  const double halfX(10.), halfY(2.);
+  const double halfX = 10.;
+  const double halfY = 2.;  // != 5.
+
   RectangleBounds rectA(halfX, halfY);
-  RectangleBounds rectB(0.0, 0.0);
+  RectangleBounds rectB(0., 0.);
   rectB = rectA;
   const auto originalVertices = rectA.vertices();
   const auto assignedVertices = rectB.vertices();
diff --git a/Tests/UnitTests/Core/Surfaces/StrawSurfaceTests.cpp b/Tests/UnitTests/Core/Surfaces/StrawSurfaceTests.cpp
index 0402afcfabf..2998ad0e799 100644
--- a/Tests/UnitTests/Core/Surfaces/StrawSurfaceTests.cpp
+++ b/Tests/UnitTests/Core/Surfaces/StrawSurfaceTests.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2017-2018 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include <boost/test/tools/output_test_stream.hpp>
 #include <boost/test/unit_test.hpp>
@@ -30,13 +30,17 @@ namespace Acts::Test {
 GeometryContext tgContext = GeometryContext();
 
 BOOST_AUTO_TEST_SUITE(StrawSurfaces)
+
+const double radius = 1.;
+const double halfZ = 10.;
+Translation3 translation{0., 1., 2.};
+
 /// Unit test for creating compliant/non-compliant StrawSurface object
 BOOST_AUTO_TEST_CASE(StrawSurfaceConstruction) {
-  // StrawSurface default constructor is deleted
-  //
+  /// Test default construction
+  // default construction is deleted
+
   /// Constructor with transform, radius and halfZ
-  double radius(1.0), halfZ(10.);
-  Translation3 translation{0., 1., 2.};
   auto pTransform = Transform3(translation);
   BOOST_CHECK_EQUAL(
       Surface::makeShared<StrawSurface>(Transform3::Identity(), radius, halfZ)
@@ -45,21 +49,21 @@ BOOST_AUTO_TEST_CASE(StrawSurfaceConstruction) {
   BOOST_CHECK_EQUAL(
       Surface::makeShared<StrawSurface>(pTransform, radius, halfZ)->type(),
       Surface::Straw);
-  //
+
   /// Constructor with transform and LineBounds pointer
   auto pLineBounds = std::make_shared<const LineBounds>(radius, halfZ);
   BOOST_CHECK_EQUAL(
       Surface::makeShared<StrawSurface>(pTransform, pLineBounds)->type(),
       Surface::Straw);
-  //
+
   /// Constructor with LineBounds ptr, DetectorElement
   std::shared_ptr<const Acts::PlanarBounds> p =
       std::make_shared<const RectangleBounds>(1., 10.);
-  DetectorElementStub detElement{pTransform, p, 1.0, nullptr};
+  DetectorElementStub detElement{pTransform, p, 1., nullptr};
   BOOST_CHECK_EQUAL(
       Surface::makeShared<StrawSurface>(pLineBounds, detElement)->type(),
       Surface::Straw);
-  //
+
   /// Copy constructor
   auto strawSurfaceObject =
       Surface::makeShared<StrawSurface>(pTransform, radius, halfZ);
@@ -67,29 +71,27 @@ BOOST_AUTO_TEST_CASE(StrawSurfaceConstruction) {
       Surface::makeShared<StrawSurface>(*strawSurfaceObject);
   BOOST_CHECK_EQUAL(copiedStrawSurface->type(), Surface::Straw);
   BOOST_CHECK(*copiedStrawSurface == *strawSurfaceObject);
-  //
+
   /// Copied and transformed
   auto copiedTransformedStrawSurface = Surface::makeShared<StrawSurface>(
       tgContext, *strawSurfaceObject, pTransform);
   BOOST_CHECK_EQUAL(copiedTransformedStrawSurface->type(), Surface::Straw);
 }
-//
+
 /// Unit test for testing StrawSurface properties
 BOOST_AUTO_TEST_CASE(StrawSurfaceProperties) {
   /// Test clone method
-  double radius(1.0), halfZ(10.);
-  Translation3 translation{0., 1., 2.};
   auto pTransform = Transform3(translation);
   auto strawSurfaceObject =
       Surface::makeShared<StrawSurface>(pTransform, radius, halfZ);
-  //
+
   /// Test type (redundant)
   BOOST_CHECK_EQUAL(strawSurfaceObject->type(), Surface::Straw);
-  //
+
   /// Test name
   BOOST_CHECK_EQUAL(strawSurfaceObject->name(),
                     std::string("Acts::StrawSurface"));
-  //
+
   /// Test dump
   boost::test_tools::output_test_stream dumpOutput;
   dumpOutput << strawSurfaceObject->toStream(tgContext);
@@ -103,24 +105,24 @@ BOOST_AUTO_TEST_CASE(StrawSurfaceProperties) {
 }
 
 BOOST_AUTO_TEST_CASE(EqualityOperators) {
-  double radius(1.0), halfZ(10.);
-  Translation3 translation{0., 1., 2.};
   auto pTransform = Transform3(translation);
   auto strawSurfaceObject =
       Surface::makeShared<StrawSurface>(pTransform, radius, halfZ);
-  //
+
   auto strawSurfaceObject2 =
       Surface::makeShared<StrawSurface>(pTransform, radius, halfZ);
-  //
+
   /// Test equality operator
   BOOST_CHECK(*strawSurfaceObject == *strawSurfaceObject2);
-  //
+
   BOOST_TEST_CHECKPOINT(
       "Create and then assign a StrawSurface object to the existing one");
+
   /// Test assignment
   auto assignedStrawSurface =
       Surface::makeShared<StrawSurface>(Transform3::Identity(), 6.6, 33.33);
   *assignedStrawSurface = *strawSurfaceObject;
+
   /// Test equality of assigned to original
   BOOST_CHECK(*assignedStrawSurface == *strawSurfaceObject);
 }
diff --git a/Tests/UnitTests/Core/Surfaces/SurfaceArrayTests.cpp b/Tests/UnitTests/Core/Surfaces/SurfaceArrayTests.cpp
index 0425c91897d..2d62f29f4e4 100644
--- a/Tests/UnitTests/Core/Surfaces/SurfaceArrayTests.cpp
+++ b/Tests/UnitTests/Core/Surfaces/SurfaceArrayTests.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2017-2018 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include <boost/test/unit_test.hpp>
 
@@ -29,6 +29,7 @@
 #include <iomanip>
 #include <iostream>
 #include <memory>
+#include <numbers>
 #include <string>
 #include <tuple>
 #include <utility>
@@ -54,7 +55,7 @@ struct SurfaceArrayFixture {
                                double zbase = 0, double r = 10) {
     SrfVec res;
 
-    double phiStep = 2 * M_PI / n;
+    double phiStep = 2 * std::numbers::pi / n;
     for (std::size_t i = 0; i < n; ++i) {
       double z = zbase + ((i % 2 == 0) ? 1 : -1) * 0.2;
 
@@ -76,11 +77,11 @@ struct SurfaceArrayFixture {
   }
 
   SrfVec fullPhiTestSurfacesBRL(int n = 10, double shift = 0, double zbase = 0,
-                                double incl = M_PI / 9., double w = 2,
-                                double h = 1.5) {
+                                double incl = std::numbers::pi / 9.,
+                                double w = 2, double h = 1.5) {
     SrfVec res;
 
-    double phiStep = 2 * M_PI / n;
+    double phiStep = 2 * std::numbers::pi / n;
     for (int i = 0; i < n; ++i) {
       double z = zbase;
 
@@ -89,7 +90,7 @@ struct SurfaceArrayFixture {
       trans.rotate(Eigen::AngleAxisd(i * phiStep + shift, Vector3(0, 0, 1)));
       trans.translate(Vector3(10, 0, z));
       trans.rotate(Eigen::AngleAxisd(incl, Vector3(0, 0, 1)));
-      trans.rotate(Eigen::AngleAxisd(M_PI / 2., Vector3(0, 1, 0)));
+      trans.rotate(Eigen::AngleAxisd(std::numbers::pi / 2., Vector3(0, 1, 0)));
 
       auto bounds = std::make_shared<const RectangleBounds>(w, h);
       std::shared_ptr<const Surface> srf =
@@ -112,8 +113,8 @@ struct SurfaceArrayFixture {
       Transform3 trans;
       trans.setIdentity();
       trans.translate(origin + dir * step * i);
-      // trans.rotate(AngleAxis3(M_PI/9., Vector3(0, 0, 1)));
-      trans.rotate(AngleAxis3(M_PI / 2., Vector3(1, 0, 0)));
+      // trans.rotate(AngleAxis3(std::numbers::pi/9., Vector3(0, 0, 1)));
+      trans.rotate(AngleAxis3(std::numbers::pi / 2., Vector3(1, 0, 0)));
       trans = trans * pretrans;
 
       auto bounds = std::make_shared<const RectangleBounds>(2, 1.5);
@@ -135,8 +136,8 @@ struct SurfaceArrayFixture {
 
     for (int i = 0; i < nZ; i++) {
       double z = i * w * 2 + z0;
-      // std::cout << "z=" << z << std::endl;
-      SrfVec ring = fullPhiTestSurfacesBRL(nPhi, 0, z, M_PI / 9., w, h);
+      SrfVec ring =
+          fullPhiTestSurfacesBRL(nPhi, 0, z, std::numbers::pi / 9., w, h);
       res.insert(res.end(), ring.begin(), ring.end());
     }
 
@@ -185,11 +186,11 @@ BOOST_FIXTURE_TEST_CASE(SurfaceArray_create, SurfaceArrayFixture) {
   std::vector<const Surface*> brlRaw = unpack_shared_vector(brl);
   draw_surfaces(brl, "SurfaceArray_create_BRL_1.obj");
 
-  Axis<AxisType::Equidistant, AxisBoundaryType::Closed> phiAxis(-M_PI, M_PI,
-                                                                30u);
+  Axis<AxisType::Equidistant, AxisBoundaryType::Closed> phiAxis(
+      -std::numbers::pi, std::numbers::pi, 30u);
   Axis<AxisType::Equidistant, AxisBoundaryType::Bound> zAxis(-14, 14, 7u);
 
-  double angleShift = 2 * M_PI / 30. / 2.;
+  double angleShift = 2 * std::numbers::pi / 30. / 2.;
   auto transform = [angleShift](const Vector3& pos) {
     return Vector2(phi(pos) + angleShift, pos.z());
   };
@@ -225,7 +226,7 @@ BOOST_FIXTURE_TEST_CASE(SurfaceArray_create, SurfaceArrayFixture) {
       SurfaceArray::SurfaceGridLookup<decltype(phiAxis), decltype(zAxis)>>(
       transform, itransform,
       std::make_tuple(std::move(phiAxis), std::move(zAxis)));
-  // do NOT fill, only completebinning
+  // do NOT fill, only complete binning
   sl2->completeBinning(tgContext, brlRaw);
   SurfaceArray sa2(std::move(sl2), brl);
   sa.toStream(tgContext, std::cout);
@@ -239,7 +240,8 @@ BOOST_FIXTURE_TEST_CASE(SurfaceArray_create, SurfaceArrayFixture) {
 }
 
 BOOST_AUTO_TEST_CASE(SurfaceArray_singleElement) {
-  double w = 3, h = 4;
+  const double w = 3;
+  const double h = 4;
   auto bounds = std::make_shared<const RectangleBounds>(w, h);
   auto srf = Surface::makeShared<PlaneSurface>(Transform3::Identity(), bounds);
 
@@ -253,7 +255,8 @@ BOOST_AUTO_TEST_CASE(SurfaceArray_singleElement) {
 }
 
 BOOST_AUTO_TEST_CASE(SurfaceArray_manyElementsSingleLookup) {
-  double w = 3, h = 4;
+  const double w = 3;
+  const double h = 4;
   auto bounds = std::make_shared<const RectangleBounds>(w, h);
   auto srf0 = Surface::makeShared<PlaneSurface>(Transform3::Identity(), bounds);
   auto srf1 = Surface::makeShared<PlaneSurface>(Transform3::Identity(), bounds);
diff --git a/Tests/UnitTests/Core/Surfaces/SurfaceBoundsTests.cpp b/Tests/UnitTests/Core/Surfaces/SurfaceBoundsTests.cpp
index 5b49bd16da0..470512383a0 100644
--- a/Tests/UnitTests/Core/Surfaces/SurfaceBoundsTests.cpp
+++ b/Tests/UnitTests/Core/Surfaces/SurfaceBoundsTests.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2017-2018 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include <boost/test/unit_test.hpp>
 
@@ -27,13 +27,15 @@ class SurfaceBoundsStub : public SurfaceBounds {
     std::iota(m_values.begin(), m_values.end(), 0);
   }
 
-#if defined(__GNUC__) && __GNUC__ == 13 && !defined(__clang__)
+#if defined(__GNUC__) && (__GNUC__ == 13 || __GNUC__ == 14) && \
+    !defined(__clang__)
 #pragma GCC diagnostic push
 #pragma GCC diagnostic ignored "-Warray-bounds"
 #pragma GCC diagnostic ignored "-Wstringop-overflow"
 #endif
   SurfaceBoundsStub(const SurfaceBoundsStub& other) = default;
-#if defined(__GNUC__) && __GNUC__ == 13 && !defined(__clang__)
+#if defined(__GNUC__) && (__GNUC__ == 13 || __GNUC__ == 14) && \
+    !defined(__clang__)
 #pragma GCC diagnostic pop
 #endif
 
@@ -57,7 +59,9 @@ class SurfaceBoundsStub : public SurfaceBounds {
 }  // namespace Acts
 
 namespace Acts::Test {
+
 BOOST_AUTO_TEST_SUITE(Surfaces)
+
 /// Unit test for creating compliant/non-compliant SurfaceBounds object
 BOOST_AUTO_TEST_CASE(SurfaceBoundsConstruction) {
   SurfaceBoundsStub u;
@@ -65,6 +69,7 @@ BOOST_AUTO_TEST_CASE(SurfaceBoundsConstruction) {
   SurfaceBoundsStub t(s);
   SurfaceBoundsStub v(u);
 }
+
 BOOST_AUTO_TEST_CASE(SurfaceBoundsProperties) {
   SurfaceBoundsStub surface(5);
   std::vector<double> reference{0, 1, 2, 3, 4};
@@ -72,6 +77,7 @@ BOOST_AUTO_TEST_CASE(SurfaceBoundsProperties) {
   BOOST_CHECK_EQUAL_COLLECTIONS(reference.cbegin(), reference.cend(),
                                 boundValues.cbegin(), boundValues.cend());
 }
+
 /// Unit test for testing SurfaceBounds properties
 BOOST_AUTO_TEST_CASE(SurfaceBoundsEquality) {
   SurfaceBoundsStub surface(1);
@@ -79,15 +85,18 @@ BOOST_AUTO_TEST_CASE(SurfaceBoundsEquality) {
   SurfaceBoundsStub differentSurface(2);
   BOOST_CHECK_EQUAL(surface, copiedSurface);
   BOOST_CHECK_NE(surface, differentSurface);
+
   SurfaceBoundsStub assignedSurface;
   assignedSurface = surface;
   BOOST_CHECK_EQUAL(surface, assignedSurface);
+
   const auto& surfaceboundValues = surface.values();
   const auto& assignedboundValues = assignedSurface.values();
   BOOST_CHECK_EQUAL_COLLECTIONS(
       surfaceboundValues.cbegin(), surfaceboundValues.cend(),
       assignedboundValues.cbegin(), assignedboundValues.cend());
 }
+
 BOOST_AUTO_TEST_SUITE_END()
 
 }  // namespace Acts::Test
diff --git a/Tests/UnitTests/Core/Surfaces/SurfaceIntersectionTests.cpp b/Tests/UnitTests/Core/Surfaces/SurfaceIntersectionTests.cpp
index eb7671e6733..e6294fc27ca 100644
--- a/Tests/UnitTests/Core/Surfaces/SurfaceIntersectionTests.cpp
+++ b/Tests/UnitTests/Core/Surfaces/SurfaceIntersectionTests.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2019 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include <boost/test/unit_test.hpp>
 
@@ -23,6 +23,7 @@
 
 #include <cmath>
 #include <memory>
+#include <numbers>
 #include <utility>
 
 using namespace Acts::UnitLiterals;
@@ -42,8 +43,8 @@ BOOST_AUTO_TEST_SUITE(Surfaces)
 /// This tests the intersection with cylinders
 /// and looks for valid, non-valid, solutions
 BOOST_AUTO_TEST_CASE(CylinderIntersectionTests) {
-  double radius = 1_m;
-  double halfZ = 10_m;
+  const double radius = 1_m;
+  const double halfZ = 10_m;
 
   auto testCylinderIntersection = [&](const Transform3& transform) -> void {
     // A cylinder created aligned with a provided transform
@@ -68,14 +69,14 @@ BOOST_AUTO_TEST_CASE(CylinderIntersectionTests) {
                                               BoundaryTolerance::None());
 
     // Check the validity of the intersection
-    BOOST_CHECK(aIntersection[0]);
+    BOOST_CHECK(aIntersection[0].isValid());
     // The status of this one should be on surface
     BOOST_CHECK_EQUAL(aIntersection[0].status(),
                       Intersection3D::Status::reachable);
     // The intersection is at 2 meter distance
     CHECK_CLOSE_ABS(aIntersection[0].pathLength(), -2_m, s_onSurfaceTolerance);
     // There MUST be a second solution
-    BOOST_CHECK(aIntersection[1]);
+    BOOST_CHECK(aIntersection[1].isValid());
     // The other intersection MUST be reachable
     BOOST_CHECK_EQUAL(aIntersection[1].status(),
                       Intersection3D::Status::onSurface);
@@ -85,12 +86,12 @@ BOOST_AUTO_TEST_CASE(CylinderIntersectionTests) {
                                               BoundaryTolerance::None());
 
     // Check the validity of the intersection
-    BOOST_CHECK(cIntersection[0]);
+    BOOST_CHECK(cIntersection[0].isValid());
     // The status of this one MUST be reachable
     BOOST_CHECK_EQUAL(cIntersection[0].status(),
                       Intersection3D::Status::reachable);
     // There MUST be a second solution
-    BOOST_CHECK(cIntersection[1]);
+    BOOST_CHECK(cIntersection[1].isValid());
     // The other intersection MUST be reachable
     BOOST_CHECK_EQUAL(cIntersection[1].status(),
                       Intersection3D::Status::reachable);
@@ -103,12 +104,12 @@ BOOST_AUTO_TEST_CASE(CylinderIntersectionTests) {
                                               BoundaryTolerance::None());
 
     // Check the validity of the intersection
-    BOOST_CHECK(oIntersection[0]);
+    BOOST_CHECK(oIntersection[0].isValid());
     // The status of this one MUST be reachable
     BOOST_CHECK_EQUAL(oIntersection[0].status(),
                       Intersection3D::Status::reachable);
     // There MUST be a second solution
-    BOOST_CHECK(oIntersection[1]);
+    BOOST_CHECK(oIntersection[1].isValid());
     // The other intersection MUST be reachable
     BOOST_CHECK_EQUAL(oIntersection[1].status(),
                       Intersection3D::Status::reachable);
@@ -128,14 +129,14 @@ BOOST_AUTO_TEST_CASE(CylinderIntersectionTests) {
                                               BoundaryTolerance::Infinite());
 
     // Check the validity of the intersection
-    BOOST_CHECK(eIntersection[0]);
+    BOOST_CHECK(eIntersection[0].isValid());
     // This should be the positive one
     BOOST_CHECK_LT(eIntersection[0].pathLength(), 0.);
     // The status of this one should be reachable
     BOOST_CHECK_EQUAL(eIntersection[0].status(),
                       Intersection3D::Status::reachable);
     // There MUST be a second solution
-    BOOST_CHECK(eIntersection[1]);
+    BOOST_CHECK(eIntersection[1].isValid());
     // The other intersection MUST be reachable
     BOOST_CHECK_EQUAL(eIntersection[1].status(),
                       Intersection3D::Status::reachable);
@@ -169,7 +170,7 @@ BOOST_AUTO_TEST_CASE(CylinderIntersectionTests) {
 /// This tests the intersection with cylinders
 /// and looks for valid, non-valid, solutions
 BOOST_AUTO_TEST_CASE(ConeIntersectionTest) {
-  double alpha = 0.25 * M_PI;
+  const double alpha = std::numbers::pi / 4.;
 
   auto testConeIntersection = [&](const Transform3& transform) -> void {
     // A cone surface ready to use
@@ -179,7 +180,8 @@ BOOST_AUTO_TEST_CASE(ConeIntersectionTest) {
     auto lTransform = transform.linear();
 
     // An onCylinder solution
-    Vector3 onCone = transform * Vector3(std::sqrt(2.), std::sqrt(2.), 2.);
+    Vector3 onCone =
+        transform * Vector3(std::numbers::sqrt2, std::numbers::sqrt2, 2.);
     Vector3 outCone = transform * Vector3(std::sqrt(4.), std::sqrt(4.), 2.);
     // Simply along the x axis
     Vector3 perpXY = lTransform * Vector3(1., -1., 0.).normalized();
@@ -192,14 +194,14 @@ BOOST_AUTO_TEST_CASE(ConeIntersectionTest) {
         aCone->intersect(tgContext, onCone, transXY, BoundaryTolerance::None());
 
     // Check the validity of the intersection
-    BOOST_CHECK(aIntersection[0]);
+    BOOST_CHECK(aIntersection[0].isValid());
     // The status of this one should be on surface
     BOOST_CHECK_EQUAL(aIntersection[0].status(),
                       Intersection3D::Status::reachable);
     // The intersection is at 4 mm distance
     CHECK_CLOSE_ABS(aIntersection[0].pathLength(), -4., s_onSurfaceTolerance);
     // There MUST be a second solution
-    BOOST_CHECK(aIntersection[1]);
+    BOOST_CHECK(aIntersection[1].isValid());
     // The other intersection MUST be reachable
     BOOST_CHECK_EQUAL(aIntersection[1].status(),
                       Intersection3D::Status::onSurface);
@@ -224,8 +226,8 @@ BOOST_AUTO_TEST_CASE(ConeIntersectionTest) {
 /// sufficient
 /// - it looks for valid, non-valid, solutions
 BOOST_AUTO_TEST_CASE(PlanarIntersectionTest) {
-  double halfX = 1_m;
-  double halfY = 10_m;
+  const double halfX = 1_m;
+  const double halfY = 10_m;
 
   auto testPlanarIntersection = [&](const Transform3& transform) -> void {
     // A Plane created with a specific transform
@@ -250,7 +252,7 @@ BOOST_AUTO_TEST_CASE(PlanarIntersectionTest) {
                                            BoundaryTolerance::None());
 
     // The intersection MUST be valid
-    BOOST_CHECK(fIntersection[0]);
+    BOOST_CHECK(fIntersection[0].isValid());
     // The intersection MUST be reachable
     BOOST_CHECK_EQUAL(fIntersection[0].status(),
                       Intersection3D::Status::reachable);
@@ -263,7 +265,7 @@ BOOST_AUTO_TEST_CASE(PlanarIntersectionTest) {
     auto oIntersection = aPlane->intersect(tgContext, onit, direction,
                                            BoundaryTolerance::None());
     // The intersection MUST be valid
-    BOOST_CHECK(oIntersection[0]);
+    BOOST_CHECK(oIntersection[0].isValid());
     // The intersection MUST be reachable
     BOOST_CHECK_EQUAL(oIntersection[0].status(),
                       Intersection3D::Status::onSurface);
@@ -277,7 +279,7 @@ BOOST_AUTO_TEST_CASE(PlanarIntersectionTest) {
     auto bIntersection = aPlane->intersect(tgContext, after, direction,
                                            BoundaryTolerance::None());
     // The intersection MUST be valid
-    BOOST_CHECK(bIntersection[0]);
+    BOOST_CHECK(bIntersection[0].isValid());
     // The intersection MUST be reachable
     BOOST_CHECK_EQUAL(bIntersection[0].status(),
                       Intersection3D::Status::reachable);
@@ -323,8 +325,8 @@ BOOST_AUTO_TEST_CASE(PlanarIntersectionTest) {
 /// sufficient
 /// - it looks for valid, non-valid, solutions
 BOOST_AUTO_TEST_CASE(LineIntersectionTest) {
-  double radius = 1_m;
-  double halfZ = 10_m;
+  const double radius = 1_m;
+  const double halfZ = 10_m;
 
   auto testLineAppraoch = [&](const Transform3& transform) -> void {
     // A Plane created with a specific transform
@@ -348,7 +350,7 @@ BOOST_AUTO_TEST_CASE(LineIntersectionTest) {
     auto fIntersection = aLine->intersect(tgContext, before, direction,
                                           BoundaryTolerance::None());
     // The intersection MUST be valid
-    BOOST_CHECK(fIntersection[0]);
+    BOOST_CHECK(fIntersection[0].isValid());
     // The intersection MUST be reachable
     BOOST_CHECK_EQUAL(fIntersection[0].status(),
                       Intersection3D::Status::reachable);
@@ -361,7 +363,7 @@ BOOST_AUTO_TEST_CASE(LineIntersectionTest) {
     auto oIntersection = aLine->intersect(tgContext, onit1, direction,
                                           BoundaryTolerance::None());
     // The intersection MUST be valid
-    BOOST_CHECK(oIntersection[0]);
+    BOOST_CHECK(oIntersection[0].isValid());
     // The intersection MUST be reachable
     BOOST_CHECK_EQUAL(oIntersection[0].status(),
                       Intersection3D::Status::onSurface);
@@ -375,7 +377,7 @@ BOOST_AUTO_TEST_CASE(LineIntersectionTest) {
     oIntersection =
         aLine->intersect(tgContext, onitP, normalP, BoundaryTolerance::None());
     // The intersection MUST be valid
-    BOOST_CHECK(oIntersection[0]);
+    BOOST_CHECK(oIntersection[0].isValid());
     // The intersection MUST be reachable
     BOOST_CHECK_EQUAL(oIntersection[0].status(),
                       Intersection3D::Status::onSurface);
@@ -389,7 +391,7 @@ BOOST_AUTO_TEST_CASE(LineIntersectionTest) {
     auto bIntersection = aLine->intersect(tgContext, after, direction,
                                           BoundaryTolerance::None());
     // The intersection MUST be valid
-    BOOST_CHECK(bIntersection[0]);
+    BOOST_CHECK(bIntersection[0].isValid());
     // The intersection MUST be reachable
     BOOST_CHECK_EQUAL(bIntersection[0].status(),
                       Intersection3D::Status::reachable);
diff --git a/Tests/UnitTests/Core/Surfaces/SurfaceLocalToGlobalRoundtripTests.cpp b/Tests/UnitTests/Core/Surfaces/SurfaceLocalToGlobalRoundtripTests.cpp
index 005295928a4..11c66abf303 100644
--- a/Tests/UnitTests/Core/Surfaces/SurfaceLocalToGlobalRoundtripTests.cpp
+++ b/Tests/UnitTests/Core/Surfaces/SurfaceLocalToGlobalRoundtripTests.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2020 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 // This file contains systematic tests to verify the local->global->local
 // transformation roundtrip for all available surfaces with a large range of
@@ -17,6 +17,7 @@
 #include "Acts/Definitions/Common.hpp"
 #include "Acts/Geometry/GeometryContext.hpp"
 #include "Acts/Surfaces/ConeSurface.hpp"
+#include "Acts/Surfaces/CurvilinearSurface.hpp"
 #include "Acts/Surfaces/CylinderSurface.hpp"
 #include "Acts/Surfaces/DiscSurface.hpp"
 #include "Acts/Surfaces/PerigeeSurface.hpp"
@@ -30,6 +31,7 @@
 #include <cmath>
 #include <limits>
 #include <memory>
+#include <numbers>
 #include <ostream>
 #include <type_traits>
 #include <utility>
@@ -74,14 +76,17 @@ void runTest(const Surface& surface, double l0, double l1, double phi,
 // test datasets
 
 // local positions
-const auto posAngle = bdata::xrange(-M_PI, M_PI, 0.25);
-const auto posPositiveNonzero = bdata::xrange(0.25, 1.0, 0.25);
-const auto posPositive = bdata::make(0.0) + posPositiveNonzero;
-const auto posSymmetric = bdata::xrange(-1.0, 1.0, 0.25);
+const auto posAngle = bdata::xrange(-std::numbers::pi, std::numbers::pi, 0.25);
+const auto posPositiveNonzero = bdata::xrange(0.25, 1., 0.25);
+const auto posPositive = bdata::make(0.) + posPositiveNonzero;
+const auto posSymmetric = bdata::xrange(-1., 1., 0.25);
 // direction angles
-const auto phis = bdata::xrange(-M_PI, M_PI, M_PI_4);
-const auto thetasNoForwardBackward = bdata::xrange(M_PI_4, M_PI, M_PI_4);
-const auto thetas = bdata::make({0.0, M_PI}) + thetasNoForwardBackward;
+const auto phis =
+    bdata::xrange(-std::numbers::pi, std::numbers::pi, std::numbers::pi / 4.);
+const auto thetasNoForwardBackward = bdata::xrange(
+    std::numbers::pi / 4., std::numbers::pi, std::numbers::pi / 4.);
+const auto thetas =
+    bdata::make({0., std::numbers::pi}) + thetasNoForwardBackward;
 
 // different surfaces
 // parameters must be chosen such that all possible local positions (as defined
@@ -92,7 +97,7 @@ const auto cones = bdata::make({
 });
 const auto cylinders = bdata::make({
     Surface::makeShared<CylinderSurface>(Transform3::Identity(),
-                                         10.0 /* radius */, 100 /* half z */),
+                                         10. /* radius */, 100 /* half z */),
 });
 const auto discs = bdata::make({
     Surface::makeShared<DiscSurface>(Transform3::Identity(), 0 /* radius min */,
@@ -102,13 +107,13 @@ const auto perigees = bdata::make({
     Surface::makeShared<PerigeeSurface>(Vector3(0, 0, -1.5)),
 });
 const auto planes = bdata::make({
-    Surface::makeShared<PlaneSurface>(Vector3(1, 2, 3), Vector3::UnitX()),
-    Surface::makeShared<PlaneSurface>(Vector3(-2, -3, -4), Vector3::UnitY()),
-    Surface::makeShared<PlaneSurface>(Vector3(3, -4, 5), Vector3::UnitZ()),
+    CurvilinearSurface(Vector3(1, 2, 3), Vector3::UnitX()).planeSurface(),
+    CurvilinearSurface(Vector3(-2, -3, -4), Vector3::UnitY()).planeSurface(),
+    CurvilinearSurface(Vector3(3, -4, 5), Vector3::UnitZ()).planeSurface(),
 });
 const auto straws = bdata::make({
-    Surface::makeShared<StrawSurface>(Transform3::Identity(), 2.0 /* radius */,
-                                      200.0 /* half z */),
+    Surface::makeShared<StrawSurface>(Transform3::Identity(), 2. /* radius */,
+                                      200. /* half z */),
 });
 
 }  // namespace
@@ -122,7 +127,7 @@ BOOST_DATA_TEST_CASE(ConeSurface,
   // local parameter r*phi has limits that depend on the z position
   const auto r = lz * surface->bounds().tanAlpha();
   // local coordinates are singular at z = 0 -> normalize local phi
-  runTest(*surface, (0 < lz) ? (r * lphi) : 0.0, lz, phi, theta);
+  runTest(*surface, (0 < lz) ? (r * lphi) : 0., lz, phi, theta);
 }
 
 BOOST_DATA_TEST_CASE(CylinderSurface,
@@ -134,7 +139,7 @@ BOOST_DATA_TEST_CASE(CylinderSurface,
 BOOST_DATA_TEST_CASE(DiscSurface, discs* posPositive* posAngle* phis* thetas,
                      surface, lr, lphi, phi, theta) {
   // local coordinates are singular at r = 0 -> normalize local phi
-  runTest(*surface, lr, (0 < lr) ? lphi : 0.0, phi, theta);
+  runTest(*surface, lr, (0 < lr) ? lphi : 0., phi, theta);
 }
 
 BOOST_DATA_TEST_CASE(
diff --git a/Tests/UnitTests/Core/Surfaces/SurfaceStub.hpp b/Tests/UnitTests/Core/Surfaces/SurfaceStub.hpp
index 7c08978e4fa..c61508a6d89 100644
--- a/Tests/UnitTests/Core/Surfaces/SurfaceStub.hpp
+++ b/Tests/UnitTests/Core/Surfaces/SurfaceStub.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2017-2018 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
@@ -78,7 +78,7 @@ class SurfaceStub : public RegularSurface {
   /// Inherited from GeometryObject base
   Vector3 binningPosition(const GeometryContext& /*txt*/,
                           BinningValue /*bValue*/) const final {
-    const Vector3 v{0.0, 0.0, 0.0};
+    const Vector3 v{0., 0., 0.};
     return v;
   }
 
@@ -102,7 +102,7 @@ class SurfaceStub : public RegularSurface {
 
   /// Return a Polyhedron for the surfaces
   Polyhedron polyhedronRepresentation(const GeometryContext& /*gctx*/,
-                                      std::size_t /*lseg */) const final {
+                                      unsigned int /* ignored */) const final {
     std::vector<Vector3> vertices;
     std::vector<std::vector<std::size_t>> faces;
     std::vector<std::vector<std::size_t>> triangularMesh;
diff --git a/Tests/UnitTests/Core/Surfaces/SurfaceTests.cpp b/Tests/UnitTests/Core/Surfaces/SurfaceTests.cpp
index a5c3d54a09a..e4c214b53d8 100644
--- a/Tests/UnitTests/Core/Surfaces/SurfaceTests.cpp
+++ b/Tests/UnitTests/Core/Surfaces/SurfaceTests.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2017-2018 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include <boost/test/unit_test.hpp>
 
@@ -82,52 +82,60 @@ BOOST_AUTO_TEST_CASE(SurfaceProperties) {
       std::make_shared<const HomogeneousSurfaceMaterial>(makePercentSlab());
   DetectorElementStub detElement{pTransform, pPlanarBound, 0.2, pMaterial};
   SurfaceStub surface(detElement);
+
   // associatedDetectorElement
   BOOST_CHECK_EQUAL(surface.associatedDetectorElement(), &detElement);
-  // test  associatelayer, associatedLayer
+
+  // test associatelayer, associatedLayer
   surface.associateLayer(*pLayer);
   BOOST_CHECK_EQUAL(surface.associatedLayer(), pLayer.get());
+
   // associated Material is not set to the surface
   // it is set to the detector element surface though
   BOOST_CHECK_NE(surface.surfaceMaterial(), pMaterial.get());
+
   // center()
   CHECK_CLOSE_OR_SMALL(reference, surface.center(tgContext), 1e-6, 1e-9);
+
   // insideBounds
-  Vector2 localPosition{0.1, 3.0};
+  Vector2 localPosition{0.1, 3.};
   BOOST_CHECK(surface.insideBounds(localPosition));
   Vector2 outside{20., 20.};
   BOOST_CHECK(surface.insideBounds(
       outside));  // should return false, but doesn't because SurfaceStub has
                   // "no bounds" hard-coded
   Vector3 mom{100., 200., 300.};
+
   // isOnSurface
   BOOST_CHECK(surface.isOnSurface(tgContext, reference, mom,
                                   BoundaryTolerance::Infinite()));
   BOOST_CHECK(surface.isOnSurface(
       tgContext, reference, mom,
       BoundaryTolerance::None()));  // need to improve bounds()
+
   // referenceFrame()
   RotationMatrix3 unitary;
   unitary << 1, 0, 0, 0, 1, 0, 0, 0, 1;
   auto referenceFrame =
-      surface.referenceFrame(tgContext, Vector3{1, 2, 3}.normalized(),
-                             mom);  // need more complex case to test
+      surface.referenceFrame(tgContext, Vector3{1, 2, 3}.normalized(), mom);
   BOOST_CHECK_EQUAL(referenceFrame, unitary);
+
   // normal()
   auto normal = surface.normal(tgContext, Vector3{1, 2, 3}.normalized(),
-                               Vector3::UnitZ());  // needs more
-                                                   // complex test
+                               Vector3::UnitZ());
   Vector3 zero{0., 0., 0.};
   BOOST_CHECK_EQUAL(zero, normal);
+
   // pathCorrection is pure virtual
+
   // surfaceMaterial()
   auto pNewMaterial =
       std::make_shared<const HomogeneousSurfaceMaterial>(makePercentSlab());
   surface.assignSurfaceMaterial(pNewMaterial);
-  BOOST_CHECK_EQUAL(surface.surfaceMaterial(),
-                    pNewMaterial.get());  // passes ??
-  //
+  BOOST_CHECK_EQUAL(surface.surfaceMaterial(), pNewMaterial.get());
+
   CHECK_CLOSE_OR_SMALL(surface.transform(tgContext), pTransform, 1e-6, 1e-9);
+
   // type() is pure virtual
 }
 
@@ -140,6 +148,7 @@ BOOST_AUTO_TEST_CASE(EqualityOperators) {
   Translation3 translation2{1., 1., 2.};
   auto pTransform1 = Transform3(translation1);
   auto pTransform2 = Transform3(translation2);
+
   // build a planeSurface to be compared
   auto planeSurface =
       Surface::makeShared<PlaneSurface>(pTransform1, pPlanarBound);
@@ -149,27 +158,20 @@ BOOST_AUTO_TEST_CASE(EqualityOperators) {
   DetectorElementStub detElement1{pTransform1, pPlanarBound, 0.2, pMaterial};
   DetectorElementStub detElement2{pTransform1, pPlanarBound, 0.3, pMaterial};
   DetectorElementStub detElement3{pTransform2, pPlanarBound, 0.3, pMaterial};
-  //
+
   SurfaceStub surface1(detElement1);
   SurfaceStub surface2(detElement1);  // 1 and 2 are the same
   SurfaceStub surface3(detElement2);  // 3 differs in thickness
   SurfaceStub surface4(detElement3);  // 4 has a different transform and id
   SurfaceStub surface5(detElement1);
   surface5.assignSurfaceMaterial(pMaterial);  // 5 has non-null surface material
-  //
+
   BOOST_CHECK(surface1 == surface2);
-  //
-  // remove test for the moment,
-  // surfaces do not have a concept of thickness (only detector elements have)
-  // only thickness is different here
-  //
-  // BOOST_CHECK_NE(surface1, surface3);  // will fail
-  //
+  BOOST_CHECK(surface1 != surface3);
   BOOST_CHECK(surface1 != surface4);
-  //
   BOOST_CHECK(surface1 != surface5);
-  //
   BOOST_CHECK(surface1 != *planeSurface);
+
   // Test the getSharedPtr
   const auto surfacePtr = Surface::makeShared<const SurfaceStub>(detElement1);
   const auto sharedSurfacePtr = surfacePtr->getSharedPtr();
diff --git a/Tests/UnitTests/Core/Surfaces/TrapezoidBoundsTests.cpp b/Tests/UnitTests/Core/Surfaces/TrapezoidBoundsTests.cpp
index 6a36b889c97..0e9f1bba029 100644
--- a/Tests/UnitTests/Core/Surfaces/TrapezoidBoundsTests.cpp
+++ b/Tests/UnitTests/Core/Surfaces/TrapezoidBoundsTests.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2017-2018 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include <boost/test/data/test_case.hpp>
 #include <boost/test/tools/output_test_stream.hpp>
@@ -32,13 +32,15 @@ namespace Acts::Test {
 
 BOOST_AUTO_TEST_SUITE(Surfaces)
 
+const double minHalfX = 1.;
+const double maxHalfX = 6.;
+const double halfY = 2.;
+
 /// Unit test for creating compliant/non-compliant TrapezoidBounds object
 BOOST_AUTO_TEST_CASE(TrapezoidBoundsConstruction) {
-  double minHalfX(1.), maxHalfX(6.), halfY(2.);
-  //
-  // default construction  deleted
-  // TrapezoidBounds defaultConstructedTrapezoidBounds;
-  //
+  /// Test default construction
+  // default construction is deleted
+
   /// Test construction with defining half lengths
   BOOST_CHECK_EQUAL(TrapezoidBounds(minHalfX, maxHalfX, halfY).type(),
                     SurfaceBounds::eTrapezoid);
@@ -50,7 +52,6 @@ BOOST_AUTO_TEST_CASE(TrapezoidBoundsConstruction) {
 
 /// Unit test for creating compliant/non-compliant TrapezoidBounds object
 BOOST_AUTO_TEST_CASE(TrapezoidBoundsRecreated) {
-  double minHalfX(1.), maxHalfX(6.), halfY(2.);
   /// Copy constructor
   TrapezoidBounds original(minHalfX, maxHalfX, halfY);
   // const bool symmetric(false);
@@ -63,8 +64,6 @@ BOOST_AUTO_TEST_CASE(TrapezoidBoundsRecreated) {
 
 // Exception tests
 BOOST_AUTO_TEST_CASE(TrapezoidBoundsException) {
-  double minHalfX(1.), maxHalfX(6.), halfY(2.);
-
   // Negative x at min y
   BOOST_CHECK_THROW(TrapezoidBounds(-minHalfX, maxHalfX, halfY),
                     std::logic_error);
@@ -84,25 +83,23 @@ BOOST_AUTO_TEST_CASE(TrapezoidBoundsException) {
 
 /// Unit tests for TrapezoidBounds properties
 BOOST_AUTO_TEST_CASE(TrapezoidBoundsProperties) {
-  double minHalfX(1.), maxHalfX(6.), halfY(2.);
-  //
   TrapezoidBounds trapezoidBoundsObject(minHalfX, maxHalfX, halfY);
-  //
+
   /// Test type() (redundant; already used in constructor confirmation)
   BOOST_CHECK_EQUAL(trapezoidBoundsObject.type(), SurfaceBounds::eTrapezoid);
-  //
+
   /// Test minHalflengthX
   BOOST_CHECK_EQUAL(
       trapezoidBoundsObject.get(TrapezoidBounds::eHalfLengthXnegY), minHalfX);
-  //
+
   /// Test maxHalfLengthX
   BOOST_CHECK_EQUAL(
       trapezoidBoundsObject.get(TrapezoidBounds::eHalfLengthXposY), maxHalfX);
-  //
+
   /// Test halflengthY
   BOOST_CHECK_EQUAL(trapezoidBoundsObject.get(TrapezoidBounds::eHalfLengthY),
                     halfY);
-  //
+
   /// Test distanceToBoundary
   Vector2 outside(30., 0.);
   Vector2 inRectangle(2., 0.5);
@@ -114,24 +111,18 @@ BOOST_AUTO_TEST_CASE(TrapezoidBoundsProperties) {
   BOOST_CHECK_EQUAL_COLLECTIONS(actualVertices.cbegin(), actualVertices.cend(),
                                 expectedVertices.cbegin(),
                                 expectedVertices.cend());
-  /**
-  for (auto i: trapezoidBoundsObject.vertices()){
-    std::cout<<i[0]<<", "<<i[1]<<std::endl;
-  }**/
-  //
+
   /// Test boundingBox
   BOOST_CHECK_EQUAL(trapezoidBoundsObject.boundingBox(),
                     RectangleBounds(6., 2.));
-  //
 
-  //
   /// Test dump
-  boost::test_tools::output_test_stream dumpOuput;
-  trapezoidBoundsObject.toStream(dumpOuput);
-  BOOST_CHECK(dumpOuput.is_equal(
+  boost::test_tools::output_test_stream dumpOutput;
+  trapezoidBoundsObject.toStream(dumpOutput);
+  BOOST_CHECK(dumpOutput.is_equal(
       "Acts::TrapezoidBounds:  (halfXnegY, halfXposY, halfY, rotAngle) = "
       "(1.0000000, 6.0000000, 2.0000000, 0.0000000)"));
-  //
+
   /// Test inside
   BOOST_CHECK(
       trapezoidBoundsObject.inside(inRectangle, BoundaryTolerance::None()));
@@ -161,7 +152,7 @@ BOOST_AUTO_TEST_CASE(TrapezoidBoundsProperties) {
       {2, 2.5},
       {-2, 2.5},
       {2, -2.5},
-      {2, -2.5},
+      {-2, -2.5},
       {4, -1},
       {-4, -1},
       {-7, 0},
@@ -171,7 +162,6 @@ BOOST_AUTO_TEST_CASE(TrapezoidBoundsProperties) {
       {-5, -3},
       {-5, 3},
       {6, 2},
-
   };
 
   for (const auto& p : testPoints) {
@@ -191,16 +181,16 @@ BOOST_DATA_TEST_CASE(
         bdata::random((bdata::engine = std::mt19937(), bdata::seed = 22,
                        bdata::distribution =
                            std::uniform_real_distribution<double>(-3, 3))) ^
-        bdata::xrange(1000) * bdata::make({0.0, 0.1, 0.2, 0.3}),
+        bdata::xrange(1000) * bdata::make({0., 0.1, 0.2, 0.3}),
     x, y, index, tol) {
   (void)index;
-  double minHalfX(1.), maxHalfX(6.), halfY(2.);
+
   static const TrapezoidBounds trapezoidBoundsObject(minHalfX, maxHalfX, halfY);
   static const auto vertices = trapezoidBoundsObject.vertices();
 
   BoundaryTolerance tolerance = BoundaryTolerance::None();
 
-  if (tol != 0.0) {
+  if (tol != 0.) {
     tolerance = BoundaryTolerance::AbsoluteBound{tol, tol};
   }
 
@@ -211,10 +201,11 @@ BOOST_DATA_TEST_CASE(
 
 /// Unit test for testing TrapezoidBounds assignment
 BOOST_AUTO_TEST_CASE(TrapezoidBoundsAssignment) {
-  double minHalfX(1.), maxHalfX(6.), halfY(2.);
   TrapezoidBounds trapezoidBoundsObject(minHalfX, maxHalfX, halfY);
-  // operator == not implemented in this class
-  //
+
+  /// Test operator ==
+  // not implemented in this class
+
   /// Test assignment
   TrapezoidBounds assignedTrapezoidBoundsObject(10., 20., 14.2);
   assignedTrapezoidBoundsObject = trapezoidBoundsObject;
diff --git a/Tests/UnitTests/Core/Surfaces/VerticesHelperTests.cpp b/Tests/UnitTests/Core/Surfaces/VerticesHelperTests.cpp
index 4d59072faa8..ecd464b42d7 100644
--- a/Tests/UnitTests/Core/Surfaces/VerticesHelperTests.cpp
+++ b/Tests/UnitTests/Core/Surfaces/VerticesHelperTests.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2017-2024 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include <boost/test/unit_test.hpp>
 
@@ -12,6 +12,7 @@
 #include "Acts/Surfaces/detail/VerticesHelper.hpp"
 
 #include <algorithm>
+#include <numbers>
 #include <vector>
 
 #include <Eigen/Geometry>
@@ -92,6 +93,132 @@ BOOST_AUTO_TEST_CASE(VerticesHelperOnHyperPlane) {
   }
 }
 
+BOOST_AUTO_TEST_CASE(GeneratePhiSegments) {
+  // Case (1): a small segment is given, no cartesian maximum vertex
+  ActsScalar minPhi = 0.1;
+  ActsScalar maxPhi = 0.3;
+
+  auto phis = VerticesHelper::phiSegments(minPhi, maxPhi);
+  BOOST_CHECK_EQUAL(phis.size(), 2u);
+  BOOST_CHECK(phis[0] == minPhi);
+  BOOST_CHECK(phis[1] == maxPhi);
+
+  // Case (2) a small segment is given, with one maximum vertex at phi = 0
+  minPhi = -0.1;
+  phis = VerticesHelper::phiSegments(minPhi, maxPhi);
+  BOOST_CHECK_EQUAL(phis.size(), 3u);
+  BOOST_CHECK(phis[0] == minPhi);
+  BOOST_CHECK(phis[1] == 0.);
+  BOOST_CHECK(phis[2] == maxPhi);
+
+  // Case (3) a small segment is given, with one maximum vertex at phi = 2pi,
+  // and one extra value
+  phis = VerticesHelper::phiSegments(minPhi, maxPhi, {0.25});
+  BOOST_CHECK_EQUAL(phis.size(), 4u);
+  BOOST_CHECK(phis[0] == minPhi);
+  BOOST_CHECK(phis[1] == 0.);
+  BOOST_CHECK(phis[2] == 0.25);
+  BOOST_CHECK(phis[3] == maxPhi);
+
+  // Case (4) a small segment is given, with one maximum vertex at phi = 2pi,
+  // and two extra values, one outside & hence throw an exception
+  BOOST_CHECK_THROW(VerticesHelper::phiSegments(minPhi, maxPhi, {0.25, 0.5}),
+                    std::invalid_argument);
+
+  // Case (5) an invalid phi range is given
+  BOOST_CHECK_THROW(VerticesHelper::phiSegments(0.8, 0.2, {0.25, 0.5}),
+                    std::invalid_argument);
+
+  // Case (6) a wrong number of minimum segments is given
+  BOOST_CHECK_THROW(VerticesHelper::phiSegments(0.1, 0.3, {0.25, 0.5}, 3),
+                    std::invalid_argument);
+}
+
+BOOST_AUTO_TEST_CASE(GenerateSegmentVertices) {
+  // Case (1): a small segment is given, no cartesian maximum vertex & 1 step
+  // segment
+  ActsScalar rx = 10.;
+  ActsScalar ry = 10.;
+  ActsScalar minPhi = 0.1;
+  ActsScalar maxPhi = 0.3;
+
+  auto vertices = VerticesHelper::segmentVertices<Vector3, Transform3>(
+      {rx, ry}, minPhi, maxPhi, {}, 1);
+  std::size_t expectedVertices = 2u;
+  BOOST_CHECK_EQUAL(vertices.size(), expectedVertices);
+
+  // Now with a reference phi value
+  vertices = VerticesHelper::segmentVertices<Vector3, Transform3>(
+      {rx, ry}, minPhi, maxPhi, {0.2}, 1);
+  expectedVertices = 3u;  // the reference is inserted
+  BOOST_CHECK_EQUAL(vertices.size(), expectedVertices);
+
+  // Now with more vertices - the the two corners and the ones from the
+  // reference
+  unsigned int quarterVertices = 36;
+  vertices = VerticesHelper::segmentVertices<Vector3, Transform3>(
+      {rx, ry}, minPhi, maxPhi, {}, quarterVertices);
+  expectedVertices =
+      static_cast<unsigned int>((maxPhi - minPhi) / (std::numbers::pi / 2.) *
+                                quarterVertices) +
+      2u;
+  BOOST_CHECK_EQUAL(vertices.size(), expectedVertices);
+
+  // Case (2) a small segment is given, with one maximum vertex at phi = 0
+  minPhi = -0.1;
+  vertices = VerticesHelper::segmentVertices<Vector3, Transform3>(
+      {rx, ry}, minPhi, maxPhi, {}, 1);
+  expectedVertices = 3u;
+  BOOST_CHECK_EQUAL(vertices.size(), expectedVertices);
+
+  // Same with more segments
+  quarterVertices = 12;
+  vertices = VerticesHelper::segmentVertices<Vector3, Transform3>(
+      {rx, ry}, minPhi, maxPhi, {}, quarterVertices);
+  // Extrema will be covered by the segments
+  expectedVertices =
+      static_cast<unsigned int>((maxPhi - minPhi) / (std::numbers::pi / 2.) *
+                                quarterVertices) +
+      2u;
+  BOOST_CHECK_EQUAL(vertices.size(), expectedVertices);
+}
+
+BOOST_AUTO_TEST_CASE(GenerateCircleEllipseVertices) {
+  // Case (1): A full disc
+  ActsScalar ri = 0.;
+  ActsScalar ro = 10.;
+
+  // Extreme points in phi - only outer radius
+  auto vertices =
+      VerticesHelper::circularVertices(ri, ro, 0., std::numbers::pi, 1u);
+  unsigned int expectedVertices = 5u;
+  BOOST_CHECK_EQUAL(vertices.size(), expectedVertices);
+
+  // Case (2): A ring
+  ri = 3.;
+
+  // Extreme points in phi - only outer radius
+  vertices = VerticesHelper::circularVertices(ri, ro, 0., std::numbers::pi, 1u);
+  expectedVertices = 10u;
+  BOOST_CHECK_EQUAL(vertices.size(), expectedVertices);
+
+  // Now with 10 bins per sector
+  ri = 0.;
+
+  vertices =
+      VerticesHelper::circularVertices(ri, ro, 0., std::numbers::pi, 10u);
+  expectedVertices = 41u;  // 4 sectors + 1 overlap at (-pi/pi)
+  BOOST_CHECK_EQUAL(vertices.size(), expectedVertices);
+
+  // Now ellipsoid
+  ActsScalar riy = 4.;
+  ActsScalar roy = 14.;
+  vertices = VerticesHelper::ellipsoidVertices(ri, riy, ro, roy, 0.,
+                                               std::numbers::pi, 10u);
+  expectedVertices = 41u;  // 4 sectors + 1 overlap at (-pi/pi)
+  BOOST_CHECK_EQUAL(vertices.size(), expectedVertices);
+}
+
 BOOST_AUTO_TEST_SUITE_END()
 
 }  // namespace Acts::detail::Test
diff --git a/Tests/UnitTests/Core/TrackFinding/CombinatorialKalmanFilterTests.cpp b/Tests/UnitTests/Core/TrackFinding/CombinatorialKalmanFilterTests.cpp
index 3569f6c9a9d..6cb9559691c 100644
--- a/Tests/UnitTests/Core/TrackFinding/CombinatorialKalmanFilterTests.cpp
+++ b/Tests/UnitTests/Core/TrackFinding/CombinatorialKalmanFilterTests.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2019-2021 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include <boost/test/unit_test.hpp>
 
@@ -31,6 +31,7 @@
 #include "Acts/Propagator/Navigator.hpp"
 #include "Acts/Propagator/Propagator.hpp"
 #include "Acts/Propagator/StraightLineStepper.hpp"
+#include "Acts/Surfaces/CurvilinearSurface.hpp"
 #include "Acts/Surfaces/PlaneSurface.hpp"
 #include "Acts/Surfaces/Surface.hpp"
 #include "Acts/Tests/CommonHelpers/CubicTrackingGeometry.hpp"
@@ -133,8 +134,6 @@ struct TestContainerAccessor {
       return m_iterator == other.m_iterator;
     }
 
-    bool operator!=(const Iterator& other) const { return !(*this == other); }
-
     Acts::SourceLink operator*() const {
       const auto& sl = m_iterator->second;
       return Acts::SourceLink{sl};
@@ -307,12 +306,13 @@ BOOST_AUTO_TEST_CASE(ZeroFieldForward) {
   // this is the default option. set anyway for consistency
   options.propagatorPlainOptions.direction = Acts::Direction::Forward;
   // Construct a plane surface as the target surface
-  auto pSurface = Acts::Surface::makeShared<Acts::PlaneSurface>(
-      Acts::Vector3{-3_m, 0., 0.}, Acts::Vector3{1., 0., 0});
+  auto pSurface = Acts::CurvilinearSurface(Acts::Vector3{-3_m, 0., 0.},
+                                           Acts::Vector3{1., 0., 0})
+                      .planeSurface();
 
   Fixture::TestSourceLinkAccessor slAccessor;
   slAccessor.container = &f.sourceLinks;
-  options.sourcelinkAccessor.connect<&Fixture::TestSourceLinkAccessor::range>(
+  options.sourceLinkAccessor.connect<&Fixture::TestSourceLinkAccessor::range>(
       &slAccessor);
 
   TrackContainer tc{Acts::VectorTrackContainer{},
@@ -364,12 +364,13 @@ BOOST_AUTO_TEST_CASE(ZeroFieldBackward) {
   auto options = f.makeCkfOptions();
   options.propagatorPlainOptions.direction = Acts::Direction::Backward;
   // Construct a plane surface as the target surface
-  auto pSurface = Acts::Surface::makeShared<Acts::PlaneSurface>(
-      Acts::Vector3{3_m, 0., 0.}, Acts::Vector3{1., 0., 0});
+  auto pSurface = Acts::CurvilinearSurface(Acts::Vector3{3_m, 0., 0.},
+                                           Acts::Vector3{1., 0., 0})
+                      .planeSurface();
 
   Fixture::TestSourceLinkAccessor slAccessor;
   slAccessor.container = &f.sourceLinks;
-  options.sourcelinkAccessor.connect<&Fixture::TestSourceLinkAccessor::range>(
+  options.sourceLinkAccessor.connect<&Fixture::TestSourceLinkAccessor::range>(
       &slAccessor);
 
   TrackContainer tc{Acts::VectorTrackContainer{},
diff --git a/Tests/UnitTests/Core/TrackFinding/TrackSelectorTests.cpp b/Tests/UnitTests/Core/TrackFinding/TrackSelectorTests.cpp
index 7c7a265d4d4..d97369fbfef 100644
--- a/Tests/UnitTests/Core/TrackFinding/TrackSelectorTests.cpp
+++ b/Tests/UnitTests/Core/TrackFinding/TrackSelectorTests.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2023 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include <boost/test/data/test_case.hpp>
 #include <boost/test/unit_test.hpp>
@@ -15,16 +15,24 @@
 #include "Acts/EventData/VectorMultiTrajectory.hpp"
 #include "Acts/EventData/VectorTrackContainer.hpp"
 #include "Acts/Geometry/GeometryIdentifier.hpp"
+#include "Acts/Surfaces/CurvilinearSurface.hpp"
 #include "Acts/Surfaces/PerigeeSurface.hpp"
 #include "Acts/Surfaces/PlaneSurface.hpp"
 #include "Acts/TrackFinding/TrackSelector.hpp"
+#include "Acts/Utilities/AngleHelpers.hpp"
 
 #include <limits>
+#include <numbers>
 
 using namespace Acts;
 namespace bdata = boost::unit_test::data;
 
 struct MockTrack {
+  static constexpr bool ReadOnly = true;
+  using Container = VectorTrackContainer;
+  using Trajectory = VectorMultiTrajectory;
+  using IndexType = TrackIndexType;
+
   double m_theta;
   double m_phi;
   double m_pt;
@@ -55,7 +63,7 @@ struct MockTrack {
   struct MockTrackState {
     const Surface& referenceSurface() const {
       static const auto srf =
-          Surface::makeShared<PlaneSurface>(Vector3::Zero(), Vector3::UnitZ());
+          CurvilinearSurface(Vector3::Zero(), Vector3::UnitZ()).planeSurface();
       return *srf;
     }
 
@@ -77,10 +85,6 @@ struct MockTrack {
   TrackStateRange trackStatesReversed() const { return {}; }
 };
 
-double thetaFromEta(double eta) {
-  return 2 * std::atan(std::exp(-eta));
-}
-
 BOOST_AUTO_TEST_SUITE(TrackSelectorTests)
 
 std::vector<double> etaValues{-5.0, -4.5, -4.0, -3.5, -3.0, -2.5, -2.0, -1.5,
@@ -91,7 +95,7 @@ BOOST_DATA_TEST_CASE(TestSingleBinCase, bdata::make(etaValues), eta) {
   TrackSelector::EtaBinnedConfig cfgBase;
 
   MockTrack baseTrack{};
-  baseTrack.m_theta = thetaFromEta(eta);
+  baseTrack.m_theta = AngleHelpers::thetaFromEta(eta);
   baseTrack.m_phi = 0.5;
   baseTrack.m_pt = 0.5;
   baseTrack.m_loc0 = 0.5;
@@ -200,9 +204,9 @@ BOOST_DATA_TEST_CASE(TestSingleBinCase, bdata::make(etaValues), eta) {
     cfg.cutSets.at(0).etaMin = {-1.0};
     TrackSelector selector{cfg};
     MockTrack track = baseTrack;
-    track.m_theta = thetaFromEta(0.5);
+    track.m_theta = AngleHelpers::thetaFromEta(0.5);
     BOOST_CHECK(selector.isValidTrack(track));
-    track.m_theta = thetaFromEta(-1.1);
+    track.m_theta = AngleHelpers::thetaFromEta(-1.1);
     BOOST_CHECK(!selector.isValidTrack(track));
   }
 
@@ -212,9 +216,9 @@ BOOST_DATA_TEST_CASE(TestSingleBinCase, bdata::make(etaValues), eta) {
     cfg.cutSets.at(0).etaMax = {1.0};
     TrackSelector selector{cfg};
     MockTrack track = baseTrack;
-    track.m_theta = thetaFromEta(0.5);
+    track.m_theta = AngleHelpers::thetaFromEta(0.5);
     BOOST_CHECK(selector.isValidTrack(track));
-    track.m_theta = thetaFromEta(1.1);
+    track.m_theta = AngleHelpers::thetaFromEta(1.1);
     BOOST_CHECK(!selector.isValidTrack(track));
   }
 
@@ -225,11 +229,11 @@ BOOST_DATA_TEST_CASE(TestSingleBinCase, bdata::make(etaValues), eta) {
     cfg.cutSets.at(0).etaMax = {1.0};
     TrackSelector selector{cfg};
     MockTrack track = baseTrack;
-    track.m_theta = thetaFromEta(0.5);
+    track.m_theta = AngleHelpers::thetaFromEta(0.5);
     BOOST_CHECK(selector.isValidTrack(track));
-    track.m_theta = thetaFromEta(-1.1);
+    track.m_theta = AngleHelpers::thetaFromEta(-1.1);
     BOOST_CHECK(!selector.isValidTrack(track));
-    track.m_theta = thetaFromEta(1.1);
+    track.m_theta = AngleHelpers::thetaFromEta(1.1);
     BOOST_CHECK(!selector.isValidTrack(track));
   }
 
@@ -239,14 +243,14 @@ BOOST_DATA_TEST_CASE(TestSingleBinCase, bdata::make(etaValues), eta) {
     cfg.cutSets.at(0).absEtaMin = {0.2};
     TrackSelector selector{cfg};
     MockTrack track = baseTrack;
-    track.m_theta = thetaFromEta(0.5);
+    track.m_theta = AngleHelpers::thetaFromEta(0.5);
     BOOST_CHECK(selector.isValidTrack(track));
-    track.m_theta = thetaFromEta(-0.5);
+    track.m_theta = AngleHelpers::thetaFromEta(-0.5);
     BOOST_CHECK(selector.isValidTrack(track));
 
-    track.m_theta = thetaFromEta(0.1);
+    track.m_theta = AngleHelpers::thetaFromEta(0.1);
     BOOST_CHECK(!selector.isValidTrack(track));
-    track.m_theta = thetaFromEta(-0.1);
+    track.m_theta = AngleHelpers::thetaFromEta(-0.1);
     BOOST_CHECK(!selector.isValidTrack(track));
   }
 
@@ -256,14 +260,14 @@ BOOST_DATA_TEST_CASE(TestSingleBinCase, bdata::make(etaValues), eta) {
     cfg.cutSets.at(0).absEtaMax = {1.0};
     TrackSelector selector{cfg};
     MockTrack track = baseTrack;
-    track.m_theta = thetaFromEta(0.5);
+    track.m_theta = AngleHelpers::thetaFromEta(0.5);
     BOOST_CHECK(selector.isValidTrack(track));
-    track.m_theta = thetaFromEta(-0.5);
+    track.m_theta = AngleHelpers::thetaFromEta(-0.5);
     BOOST_CHECK(selector.isValidTrack(track));
 
-    track.m_theta = thetaFromEta(1.1);
+    track.m_theta = AngleHelpers::thetaFromEta(1.1);
     BOOST_CHECK(!selector.isValidTrack(track));
-    track.m_theta = thetaFromEta(-1.1);
+    track.m_theta = AngleHelpers::thetaFromEta(-1.1);
     BOOST_CHECK(!selector.isValidTrack(track));
   }
 
@@ -274,19 +278,19 @@ BOOST_DATA_TEST_CASE(TestSingleBinCase, bdata::make(etaValues), eta) {
     cfg.cutSets.at(0).absEtaMax = {1.0};
     TrackSelector selector{cfg};
     MockTrack track = baseTrack;
-    track.m_theta = thetaFromEta(0.5);
+    track.m_theta = AngleHelpers::thetaFromEta(0.5);
     BOOST_CHECK(selector.isValidTrack(track));
-    track.m_theta = thetaFromEta(-0.5);
+    track.m_theta = AngleHelpers::thetaFromEta(-0.5);
     BOOST_CHECK(selector.isValidTrack(track));
 
-    track.m_theta = thetaFromEta(0.1);
+    track.m_theta = AngleHelpers::thetaFromEta(0.1);
     BOOST_CHECK(!selector.isValidTrack(track));
-    track.m_theta = thetaFromEta(-0.1);
+    track.m_theta = AngleHelpers::thetaFromEta(-0.1);
     BOOST_CHECK(!selector.isValidTrack(track));
 
-    track.m_theta = thetaFromEta(1.1);
+    track.m_theta = AngleHelpers::thetaFromEta(1.1);
     BOOST_CHECK(!selector.isValidTrack(track));
-    track.m_theta = thetaFromEta(-1.1);
+    track.m_theta = AngleHelpers::thetaFromEta(-1.1);
     BOOST_CHECK(!selector.isValidTrack(track));
   }
 
@@ -367,27 +371,27 @@ BOOST_AUTO_TEST_CASE(TestSingleBinEtaCutByBinEdge) {
   BOOST_TEST_INFO_SCOPE(selector.config());
 
   MockTrack track{};
-  track.m_theta = thetaFromEta(0.0);
+  track.m_theta = AngleHelpers::thetaFromEta(0.0);
   BOOST_CHECK(!selector.isValidTrack(track));
 
-  track.m_theta = thetaFromEta(0.5);
+  track.m_theta = AngleHelpers::thetaFromEta(0.5);
   BOOST_CHECK(!selector.isValidTrack(track));
 
   // cannot easily check on-edge behavior because of floating point arithmetic
   // (it won't be exactly 1.0 in selector)
-  track.m_theta = thetaFromEta(1.01);
+  track.m_theta = AngleHelpers::thetaFromEta(1.01);
   BOOST_CHECK(selector.isValidTrack(track));
 
-  track.m_theta = thetaFromEta(1.5);
+  track.m_theta = AngleHelpers::thetaFromEta(1.5);
   BOOST_CHECK(selector.isValidTrack(track));
 
-  track.m_theta = thetaFromEta(2.0);
+  track.m_theta = AngleHelpers::thetaFromEta(2.0);
   BOOST_CHECK(!selector.isValidTrack(track));
 }
 
 BOOST_AUTO_TEST_CASE(TestMultiBinCuts) {
   MockTrack baseTrack{};
-  baseTrack.m_theta = thetaFromEta(1.0);
+  baseTrack.m_theta = AngleHelpers::thetaFromEta(1.0);
   baseTrack.m_phi = 0.5;
   baseTrack.m_pt = 0.5;
   baseTrack.m_loc0 = 0.5;
@@ -419,7 +423,7 @@ BOOST_AUTO_TEST_CASE(TestMultiBinCuts) {
       {
         // exactly at zero
         MockTrack track = baseTrack;
-        track.m_theta = thetaFromEta(0.0);
+        track.m_theta = AngleHelpers::thetaFromEta(0.0);
 
         BOOST_CHECK(selector.isValidTrack(track));
 
@@ -433,7 +437,7 @@ BOOST_AUTO_TEST_CASE(TestMultiBinCuts) {
       {
         // first bin
         MockTrack track = baseTrack;
-        track.m_theta = thetaFromEta(1.0);
+        track.m_theta = AngleHelpers::thetaFromEta(1.0);
 
         BOOST_CHECK(selector.isValidTrack(track));
 
@@ -447,8 +451,8 @@ BOOST_AUTO_TEST_CASE(TestMultiBinCuts) {
       {
         // first bin edge
         MockTrack track = baseTrack;
-        track.m_theta =
-            thetaFromEta(2.0 - std::numeric_limits<double>::epsilon());
+        track.m_theta = AngleHelpers::thetaFromEta(
+            2.0 - std::numeric_limits<double>::epsilon());
 
         BOOST_CHECK(selector.isValidTrack(track));
 
@@ -462,7 +466,7 @@ BOOST_AUTO_TEST_CASE(TestMultiBinCuts) {
       {
         // second bin lower edge
         MockTrack track = baseTrack;
-        track.m_theta = thetaFromEta(2.0);
+        track.m_theta = AngleHelpers::thetaFromEta(2.0);
 
         BOOST_CHECK(selector.isValidTrack(track));
 
@@ -482,7 +486,7 @@ BOOST_AUTO_TEST_CASE(TestMultiBinCuts) {
       {
         // second bin
         MockTrack track = baseTrack;
-        track.m_theta = thetaFromEta(666.0);
+        track.m_theta = AngleHelpers::thetaFromEta(10.0);
 
         track.*prop = -1.1;
         BOOST_CHECK(selector.isValidTrack(track));
@@ -608,7 +612,7 @@ BOOST_AUTO_TEST_CASE(TestConstructor) {
 BOOST_AUTO_TEST_CASE(SubsetHitCountCut) {
   auto makeSurface = [](GeometryIdentifier id) {
     auto srf =
-        Surface::makeShared<PlaneSurface>(Vector3::Zero(), Vector3::UnitZ());
+        CurvilinearSurface(Vector3::Zero(), Vector3::UnitZ()).planeSurface();
 
     srf->assignGeometryId(id);
     return srf;
@@ -636,7 +640,8 @@ BOOST_AUTO_TEST_CASE(SubsetHitCountCut) {
     auto track = tc.makeTrack();
 
     using namespace Acts::UnitLiterals;
-    track.parameters() << 0, 0, M_PI / 2, M_PI / 2, 1 / 1_GeV, 0;
+    track.parameters() << 0, 0, std::numbers::pi / 2., std::numbers::pi / 2.,
+        1 / 1_GeV, 0;
     auto perigee = Surface::makeShared<PerigeeSurface>(Vector3::Zero());
     track.setReferenceSurface(perigee);
     return track;
diff --git a/Tests/UnitTests/Core/TrackFitting/FitterTestsCommon.hpp b/Tests/UnitTests/Core/TrackFitting/FitterTestsCommon.hpp
index bef7ba52cd6..269370d4fc4 100644
--- a/Tests/UnitTests/Core/TrackFitting/FitterTestsCommon.hpp
+++ b/Tests/UnitTests/Core/TrackFitting/FitterTestsCommon.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2021 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
@@ -22,6 +22,7 @@
 #include "Acts/MagneticField/MagneticFieldContext.hpp"
 #include "Acts/Propagator/Navigator.hpp"
 #include "Acts/Propagator/StraightLineStepper.hpp"
+#include "Acts/Surfaces/CurvilinearSurface.hpp"
 #include "Acts/Tests/CommonHelpers/CubicTrackingGeometry.hpp"
 #include "Acts/Tests/CommonHelpers/FloatComparisons.hpp"
 #include "Acts/Tests/CommonHelpers/MeasurementsCreator.hpp"
@@ -76,7 +77,7 @@ struct TestReverseFilteringLogic {
   template <typename traj_t>
   bool operator()(typename traj_t::ConstTrackStateProxy state) const {
     // can't determine an outlier w/o a measurement or predicted parameters
-    auto momentum = fabs(1 / state.filtered()[Acts::eBoundQOverP]);
+    auto momentum = std::abs(1 / state.filtered()[Acts::eBoundQOverP]);
     std::cout << "momentum : " << momentum << std::endl;
     return (momentum <= momentumMax);
   }
@@ -89,7 +90,7 @@ auto makeStraightPropagator(std::shared_ptr<const Acts::TrackingGeometry> geo) {
   cfg.resolveMaterial = true;
   cfg.resolveSensitive = true;
   Acts::Navigator navigator(
-      cfg, Acts::getDefaultLogger("Navigator", Acts::Logging::VERBOSE));
+      cfg, Acts::getDefaultLogger("Navigator", Acts::Logging::INFO));
   Acts::StraightLineStepper stepper;
   return Acts::Propagator<Acts::StraightLineStepper, Acts::Navigator>(
       stepper, std::move(navigator));
@@ -104,7 +105,7 @@ auto makeConstantFieldPropagator(
   cfg.resolveMaterial = true;
   cfg.resolveSensitive = true;
   Acts::Navigator navigator(
-      cfg, Acts::getDefaultLogger("Navigator", Acts::Logging::VERBOSE));
+      cfg, Acts::getDefaultLogger("Navigator", Acts::Logging::INFO));
   auto field =
       std::make_shared<Acts::ConstantBField>(Acts::Vector3(0.0, 0.0, bz));
   stepper_t stepper(std::move(field));
@@ -340,7 +341,7 @@ struct FitterTester {
     Acts::Vector3 center(3._m, 0., 0.);
     Acts::Vector3 normal(1., 0., 0.);
     auto targetSurface =
-        Acts::Surface::makeShared<Acts::PlaneSurface>(center, normal);
+        Acts::CurvilinearSurface(center, normal).planeSurface();
 
     options.referenceSurface = targetSurface.get();
 
@@ -561,7 +562,7 @@ struct FitterTester {
     Acts::Vector3 center(-3._m, 0., 0.);
     Acts::Vector3 normal(1., 0., 0.);
     auto targetSurface =
-        Acts::Surface::makeShared<Acts::PlaneSurface>(center, normal);
+        Acts::CurvilinearSurface(center, normal).planeSurface();
 
     options.referenceSurface = targetSurface.get();
 
diff --git a/Tests/UnitTests/Core/TrackFitting/GainMatrixSmootherTests.cpp b/Tests/UnitTests/Core/TrackFitting/GainMatrixSmootherTests.cpp
index 47ad261b0e6..f92c8f50e87 100644
--- a/Tests/UnitTests/Core/TrackFitting/GainMatrixSmootherTests.cpp
+++ b/Tests/UnitTests/Core/TrackFitting/GainMatrixSmootherTests.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2019-2020 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include <boost/test/unit_test.hpp>
 
@@ -20,6 +20,7 @@
 
 #include <cmath>
 #include <cstddef>
+#include <numbers>
 
 namespace {
 
@@ -46,12 +47,12 @@ BOOST_AUTO_TEST_CASE(Smooth) {
   covTrk.setIdentity();
   covTrk.diagonal() << 0.08, 0.3, 1, 1, 1, 1;
   BoundVector parValues;
-  parValues << 0.3, 0.5, 0.5 * M_PI, 0., 1 / 100., 0.;
+  parValues << 0.3, 0.5, std::numbers::pi / 2., 0., 1 / 100., 0.;
 
   ts.predicted() = parValues;
   ts.predictedCovariance() = covTrk;
 
-  parValues << 0.301, 0.503, 0.5 * M_PI, 0., 1 / 100., 0.;
+  parValues << 0.301, 0.503, std::numbers::pi / 2., 0., 1 / 100., 0.;
 
   ts.filtered() = parValues;
   ts.filteredCovariance() = covTrk;
@@ -61,11 +62,11 @@ BOOST_AUTO_TEST_CASE(Smooth) {
   ts_idx = traj.addTrackState(TrackStatePropMask::All, ts_idx);
   ts = traj.getTrackState(ts_idx);
 
-  parValues << 0.2, 0.5, 0.5 * M_PI, 0., 1 / 100., 0.;
+  parValues << 0.2, 0.5, std::numbers::pi / 2., 0., 1 / 100., 0.;
   ts.predicted() = parValues;
   ts.predictedCovariance() = covTrk;
 
-  parValues << 0.27, 0.53, 0.5 * M_PI, 0., 1 / 100., 0.;
+  parValues << 0.27, 0.53, std::numbers::pi / 2., 0., 1 / 100., 0.;
   ts.filtered() = parValues;
   ts.filteredCovariance() = covTrk;
   ts.pathLength() = 2.;
@@ -74,11 +75,11 @@ BOOST_AUTO_TEST_CASE(Smooth) {
   ts_idx = traj.addTrackState(TrackStatePropMask::All, ts_idx);
   ts = traj.getTrackState(ts_idx);
 
-  parValues << 0.35, 0.49, 0.5 * M_PI, 0., 1 / 100., 0.;
+  parValues << 0.35, 0.49, std::numbers::pi / 2., 0., 1 / 100., 0.;
   ts.predicted() = parValues;
   ts.predictedCovariance() = covTrk;
 
-  parValues << 0.33, 0.43, 0.5 * M_PI, 0., 1 / 100., 0.;
+  parValues << 0.33, 0.43, std::numbers::pi / 2., 0., 1 / 100., 0.;
   ts.filtered() = parValues;
   ts.filteredCovariance() = covTrk;
   ts.pathLength() = 3.;
diff --git a/Tests/UnitTests/Core/TrackFitting/GainMatrixUpdaterTests.cpp b/Tests/UnitTests/Core/TrackFitting/GainMatrixUpdaterTests.cpp
index 3cebdd61325..57c9f49f05d 100644
--- a/Tests/UnitTests/Core/TrackFitting/GainMatrixUpdaterTests.cpp
+++ b/Tests/UnitTests/Core/TrackFitting/GainMatrixUpdaterTests.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2016-2020 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include <boost/test/unit_test.hpp>
 
@@ -24,6 +24,7 @@
 
 #include <algorithm>
 #include <cmath>
+#include <numbers>
 #include <utility>
 
 namespace {
@@ -51,7 +52,7 @@ BOOST_AUTO_TEST_CASE(Update) {
 
   // Make dummy track parameters
   ParametersVector trkPar;
-  trkPar << 0.3, 0.5, 0.5 * M_PI, 0.3 * M_PI, 0.01, 0.;
+  trkPar << 0.3, 0.5, std::numbers::pi / 2., 0.3 * std::numbers::pi, 0.01, 0.;
   CovarianceMatrix trkCov = CovarianceMatrix::Zero();
   trkCov.diagonal() << 0.08, 0.3, 1, 1, 1, 0;
 
@@ -102,7 +103,7 @@ BOOST_AUTO_TEST_CASE(UpdateFailed) {
 
   // Make dummy track parameters
   ParametersVector trkPar;
-  trkPar << 0.3, 0.5, 0.5 * M_PI, 0.3 * M_PI, 0.01, 0.;
+  trkPar << 0.3, 0.5, std::numbers::pi / 2., 0.3 * std::numbers::pi, 0.01, 0.;
   CovarianceMatrix trkCov = CovarianceMatrix::Zero();
 
   // Make trajectory w/ one state
diff --git a/Tests/UnitTests/Core/TrackFitting/GsfComponentMergingTests.cpp b/Tests/UnitTests/Core/TrackFitting/GsfComponentMergingTests.cpp
index d9fc6581dc1..8f6e9be94d3 100644
--- a/Tests/UnitTests/Core/TrackFitting/GsfComponentMergingTests.cpp
+++ b/Tests/UnitTests/Core/TrackFitting/GsfComponentMergingTests.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2022 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include <boost/test/unit_test.hpp>
 
@@ -13,6 +13,7 @@
 #include "Acts/Definitions/Units.hpp"
 #include "Acts/EventData/TransformationHelpers.hpp"
 #include "Acts/Geometry/GeometryContext.hpp"
+#include "Acts/Surfaces/CurvilinearSurface.hpp"
 #include "Acts/Surfaces/CylinderBounds.hpp"
 #include "Acts/Surfaces/CylinderSurface.hpp"
 #include "Acts/Surfaces/DiscSurface.hpp"
@@ -21,7 +22,6 @@
 #include "Acts/Surfaces/Surface.hpp"
 #include "Acts/Surfaces/SurfaceBounds.hpp"
 #include "Acts/TrackFitting/detail/GsfComponentMerging.hpp"
-#include "Acts/Utilities/Identity.hpp"
 #include "Acts/Utilities/Intersection.hpp"
 #include "Acts/Utilities/Result.hpp"
 #include "Acts/Utilities/detail/periodic.hpp"
@@ -33,6 +33,7 @@
 #include <functional>
 #include <initializer_list>
 #include <memory>
+#include <numbers>
 #include <random>
 #include <stdexcept>
 #include <tuple>
@@ -215,7 +216,7 @@ using LocPosArray = std::array<std::pair<double, double>, 4>;
 template <typename angle_description_t>
 void test_surface(const Surface &surface, const angle_description_t &desc,
                   const LocPosArray &loc_pos, double expectedError) {
-  const auto proj = Identity{};
+  const auto proj = std::identity{};
 
   for (auto phi : {-175_degree, 0_degree, 175_degree}) {
     for (auto theta : {5_degree, 90_degree, 175_degree}) {
@@ -231,8 +232,8 @@ void test_surface(const Surface &surface, const angle_description_t &desc,
           a.boundPars = BoundVector::Ones();
           a.boundPars[eBoundLoc0] *= p_it->first;
           a.boundPars[eBoundLoc1] *= p_it->second;
-          a.boundPars[eBoundPhi] =
-              detail::wrap_periodic(phi + dphi, -M_PI, 2 * M_PI);
+          a.boundPars[eBoundPhi] = detail::wrap_periodic(
+              phi + dphi, -std::numbers::pi, 2 * std::numbers::pi);
           a.boundPars[eBoundTheta] = theta + dtheta;
 
           // We don't look at covariance in this test
@@ -270,7 +271,7 @@ BOOST_AUTO_TEST_CASE(test_with_data) {
   const auto boundCov_data = boundCov(samples, mean_data);
 
   const auto [mean_test, boundCov_test] =
-      detail::gaussianMixtureMeanCov(cmps, Identity{}, std::tuple<>{});
+      detail::gaussianMixtureMeanCov(cmps, std::identity{}, std::tuple<>{});
 
   CHECK_CLOSE_MATRIX(mean_data, mean_test, 1.e-1);
   CHECK_CLOSE_MATRIX(boundCov_data, boundCov_test, 1.e-1);
@@ -293,7 +294,7 @@ BOOST_AUTO_TEST_CASE(test_with_data_circular) {
   const auto boundCov_data = boundCov(samples, mean_data, [](auto a, auto b) {
     Vector2 res = Vector2::Zero();
     for (int i = 0; i < 2; ++i) {
-      res[i] = detail::difference_periodic(a[i], b[i], 2 * M_PI);
+      res[i] = detail::difference_periodic(a[i], b[i], 2 * std::numbers::pi);
     }
     return res;
   });
@@ -301,12 +302,12 @@ BOOST_AUTO_TEST_CASE(test_with_data_circular) {
   using detail::CyclicAngle;
   const auto d = std::tuple<CyclicAngle<eBoundLoc0>, CyclicAngle<eBoundLoc1>>{};
   const auto [mean_test, boundCov_test] =
-      detail::gaussianMixtureMeanCov(cmps, Identity{}, d);
+      detail::gaussianMixtureMeanCov(cmps, std::identity{}, d);
 
-  BOOST_CHECK(std::abs(detail::difference_periodic(mean_data[0], mean_test[0],
-                                                   2 * M_PI)) < 1.e-1);
-  BOOST_CHECK(std::abs(detail::difference_periodic(mean_data[1], mean_test[1],
-                                                   2 * M_PI)) < 1.e-1);
+  BOOST_CHECK(std::abs(detail::difference_periodic(
+                  mean_data[0], mean_test[0], 2 * std::numbers::pi)) < 1.e-1);
+  BOOST_CHECK(std::abs(detail::difference_periodic(
+                  mean_data[1], mean_test[1], 2 * std::numbers::pi)) < 1.e-1);
   CHECK_CLOSE_MATRIX(boundCov_data, boundCov_test, 1.e-1);
 }
 
@@ -314,7 +315,7 @@ BOOST_AUTO_TEST_CASE(test_plane_surface) {
   const auto desc = detail::AngleDescription<Surface::Plane>::Desc{};
 
   const auto surface =
-      Surface::makeShared<PlaneSurface>(Vector3{0, 0, 0}, Vector3{1, 0, 0});
+      CurvilinearSurface(Vector3{0, 0, 0}, Vector3{1, 0, 0}).planeSurface();
 
   const LocPosArray p{{{1, 1}, {1, -1}, {-1, 1}, {-1, -1}}};
 
diff --git a/Tests/UnitTests/Core/TrackFitting/GsfMixtureReductionTests.cpp b/Tests/UnitTests/Core/TrackFitting/GsfMixtureReductionTests.cpp
index 3daa93a59f6..3791f199d66 100644
--- a/Tests/UnitTests/Core/TrackFitting/GsfMixtureReductionTests.cpp
+++ b/Tests/UnitTests/Core/TrackFitting/GsfMixtureReductionTests.cpp
@@ -1,16 +1,17 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2022-2023 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include <boost/test/unit_test.hpp>
 
 #include "Acts/Definitions/Algebra.hpp"
 #include "Acts/Definitions/TrackParametrization.hpp"
 #include "Acts/Definitions/Units.hpp"
+#include "Acts/Surfaces/CurvilinearSurface.hpp"
 #include "Acts/TrackFitting/GsfMixtureReduction.hpp"
 #include "Acts/TrackFitting/detail/SymmetricKlDistanceMatrix.hpp"
 
@@ -116,8 +117,8 @@ BOOST_AUTO_TEST_CASE(test_mixture_reduction) {
   };
 
   // Assume that the components are on a generic plane surface
-  auto surface = Acts::Surface::makeShared<PlaneSurface>(Vector3{0, 0, 0},
-                                                         Vector3{1, 0, 0});
+  auto surface = Acts::CurvilinearSurface(Vector3{0, 0, 0}, Vector3{1, 0, 0})
+                     .planeSurface();
   const std::size_t NComps = 4;
   std::vector<GsfComponent> cmps;
 
@@ -145,9 +146,8 @@ BOOST_AUTO_TEST_CASE(test_mixture_reduction) {
 
   BOOST_CHECK_EQUAL(cmps.size(), 2);
 
-  std::sort(cmps.begin(), cmps.end(), [](const auto &a, const auto &b) {
-    return a.boundPars[eBoundQOverP] < b.boundPars[eBoundQOverP];
-  });
+  std::ranges::sort(cmps, {},
+                    [](const auto &c) { return c.boundPars[eBoundQOverP]; });
   BOOST_CHECK_CLOSE(cmps[0].boundPars[eBoundQOverP], 1.0_GeV, 1.e-8);
   BOOST_CHECK_CLOSE(cmps[1].boundPars[eBoundQOverP], 4.0_GeV, 1.e-8);
 
@@ -165,8 +165,8 @@ BOOST_AUTO_TEST_CASE(test_mixture_reduction) {
 }
 
 BOOST_AUTO_TEST_CASE(test_weight_cut_reduction) {
-  auto dummy = Acts::Surface::makeShared<PlaneSurface>(Vector3{0, 0, 0},
-                                                       Vector3{1, 0, 0});
+  auto dummy = Acts::CurvilinearSurface(Vector3{0, 0, 0}, Vector3{1, 0, 0})
+                   .planeSurface();
   std::vector<GsfComponent> cmps;
 
   // weights do not need to be normalized for this test
@@ -181,8 +181,7 @@ BOOST_AUTO_TEST_CASE(test_weight_cut_reduction) {
   Acts::reduceMixtureLargestWeights(cmps, 2, *dummy);
 
   BOOST_CHECK_EQUAL(cmps.size(), 2);
-  std::sort(cmps.begin(), cmps.end(),
-            [](const auto &a, const auto &b) { return a.weight < b.weight; });
+  std::ranges::sort(cmps, {}, [](const auto &c) { return c.weight; });
 
   BOOST_CHECK_EQUAL(cmps[0].weight, 3.0);
   BOOST_CHECK_EQUAL(cmps[1].weight, 4.0);
diff --git a/Tests/UnitTests/Core/TrackFitting/GsfTests.cpp b/Tests/UnitTests/Core/TrackFitting/GsfTests.cpp
index 5549e63f631..59c1cc72867 100644
--- a/Tests/UnitTests/Core/TrackFitting/GsfTests.cpp
+++ b/Tests/UnitTests/Core/TrackFitting/GsfTests.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2022 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include <boost/test/unit_test.hpp>
 
@@ -30,6 +30,7 @@
 #include "Acts/Propagator/Navigator.hpp"
 #include "Acts/Propagator/Propagator.hpp"
 #include "Acts/Propagator/StraightLineStepper.hpp"
+#include "Acts/Surfaces/CurvilinearSurface.hpp"
 #include "Acts/Surfaces/PlaneSurface.hpp"
 #include "Acts/Surfaces/Surface.hpp"
 #include "Acts/Tests/CommonHelpers/LineSurfaceStub.hpp"
@@ -240,8 +241,7 @@ BOOST_AUTO_TEST_CASE(WithFinalMultiComponentState) {
   // create a boundless target surface near the tracker exit
   Acts::Vector3 center(-3._m, 0., 0.);
   Acts::Vector3 normal(1., 0., 0.);
-  auto targetSurface =
-      Acts::Surface::makeShared<Acts::PlaneSurface>(center, normal);
+  auto targetSurface = Acts::CurvilinearSurface(center, normal).planeSurface();
 
   options.referenceSurface = targetSurface.get();
 
diff --git a/Tests/UnitTests/Core/TrackFitting/Gx2fTests.cpp b/Tests/UnitTests/Core/TrackFitting/Gx2fTests.cpp
index 44ebc963829..71b2bf2b1f8 100644
--- a/Tests/UnitTests/Core/TrackFitting/Gx2fTests.cpp
+++ b/Tests/UnitTests/Core/TrackFitting/Gx2fTests.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2023 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include <boost/test/unit_test.hpp>
 
@@ -14,12 +14,10 @@
 #include "Acts/EventData/VectorTrackContainer.hpp"
 #include "Acts/EventData/detail/TestSourceLink.hpp"
 #include "Acts/Geometry/CuboidVolumeBuilder.hpp"
-#include "Acts/Geometry/Layer.hpp"
 #include "Acts/Geometry/TrackingGeometry.hpp"
 #include "Acts/Geometry/TrackingGeometryBuilder.hpp"
 #include "Acts/MagneticField/ConstantBField.hpp"
 #include "Acts/Material/HomogeneousSurfaceMaterial.hpp"
-#include "Acts/Material/HomogeneousVolumeMaterial.hpp"
 #include "Acts/Material/MaterialSlab.hpp"
 #include "Acts/Propagator/EigenStepper.hpp"
 #include "Acts/Propagator/Navigator.hpp"
@@ -35,6 +33,7 @@
 #include "Acts/Visualization/GeometryView3D.hpp"
 #include "Acts/Visualization/ObjVisualization3D.hpp"
 
+#include <numbers>
 #include <vector>
 
 #include "FitterTestsCommon.hpp"
@@ -124,7 +123,7 @@ std::shared_ptr<const TrackingGeometry> makeToyDetector(
   const double halfSizeSurface = 1_m;
 
   // Rotation of the surfaces around the y-axis
-  const double rotationAngle = M_PI * 0.5;
+  const double rotationAngle = std::numbers::pi / 2.;
   const Vector3 xPos(cos(rotationAngle), 0., sin(rotationAngle));
   const Vector3 yPos(0., 1., 0.);
   const Vector3 zPos(-sin(rotationAngle), 0., cos(rotationAngle));
@@ -149,7 +148,7 @@ std::shared_ptr<const TrackingGeometry> makeToyDetector(
         RectangleBounds(halfSizeSurface, halfSizeSurface));
 
     // Add material only for selected surfaces
-    if (surfaceIndexWithMaterial.count(surfPos) != 0) {
+    if (surfaceIndexWithMaterial.contains(surfPos)) {
       // Material of the surfaces
       MaterialSlab matProp(makeSilicon(), 5_mm);
       cfg.surMat = std::make_shared<HomogeneousSurfaceMaterial>(matProp);
@@ -210,117 +209,6 @@ std::shared_ptr<const TrackingGeometry> makeToyDetector(
   return detector;
 }
 
-/// @brief Create a simple telescope detector in the Y direction.
-///
-/// We cannot reuse the previous detector, since the cuboid volume builder only
-/// allows merging of YZ-faces.
-///
-/// @param geoCtx
-/// @param nSurfaces Number of surfaces
-std::shared_ptr<const TrackingGeometry> makeToyDetectorYdirection(
-    const Acts::GeometryContext& geoCtx, const std::size_t nSurfaces = 5) {
-  if (nSurfaces < 1) {
-    throw std::invalid_argument("At least 1 surfaces needs to be created.");
-  }
-
-  // Define the dimensions of the square surfaces
-  const double halfSizeSurface = 1_m;
-
-  // Rotation of the surfaces around the x-axis
-  const double rotationAngle = M_PI * 0.5;
-  const Vector3 xPos(1., 0., 0.);
-  const Vector3 yPos(0., cos(rotationAngle), sin(rotationAngle));
-  const Vector3 zPos(0., -sin(rotationAngle), cos(rotationAngle));
-
-  // Construct builder
-  CuboidVolumeBuilder cvb;
-
-  // Create configurations for surfaces
-  std::vector<CuboidVolumeBuilder::SurfaceConfig> surfaceConfig;
-  for (std::size_t surfPos = 1; surfPos <= nSurfaces; surfPos++) {
-    // Position of the surfaces
-    CuboidVolumeBuilder::SurfaceConfig cfg;
-    cfg.position = {0., surfPos * UnitConstants::m, 0.};
-
-    // Rotation of the surfaces
-    cfg.rotation.col(0) = xPos;
-    cfg.rotation.col(1) = yPos;
-    cfg.rotation.col(2) = zPos;
-
-    // Boundaries of the surfaces (shape)
-    cfg.rBounds = std::make_shared<const RectangleBounds>(
-        RectangleBounds(halfSizeSurface, halfSizeSurface));
-
-    // Thickness of the detector element
-    cfg.thickness = 1_um;
-
-    cfg.detElementConstructor =
-        [](const Transform3& trans,
-           const std::shared_ptr<const RectangleBounds>& bounds,
-           double thickness) {
-          return new DetectorElementStub(trans, bounds, thickness);
-        };
-    surfaceConfig.push_back(cfg);
-  }
-
-  // Build layer configurations
-  std::vector<CuboidVolumeBuilder::LayerConfig> layerConfig;
-  for (auto& sCfg : surfaceConfig) {
-    CuboidVolumeBuilder::LayerConfig cfg;
-    cfg.surfaceCfg = {sCfg};
-    cfg.active = true;
-    cfg.envelopeX = {-0.1_mm, 0.1_mm};
-    cfg.envelopeY = {-0.1_mm, 0.1_mm};
-    cfg.envelopeZ = {-0.1_mm, 0.1_mm};
-    cfg.binningDimension = Acts::BinningValue::binY;
-    layerConfig.push_back(cfg);
-  }
-
-  // Inner Volume - Build volume configuration
-  CuboidVolumeBuilder::VolumeConfig volumeConfig;
-  volumeConfig.length = {2 * halfSizeSurface, (nSurfaces + 1) * 1_m,
-                         2 * halfSizeSurface};
-  volumeConfig.position = {0., volumeConfig.length.y() / 2, 0.};
-  volumeConfig.layerCfg = layerConfig;
-  volumeConfig.name = "TestVolume";
-  volumeConfig.binningDimension = Acts::BinningValue::binY;
-
-  // This basically adds an empty volume in y-direction
-  // Second inner Volume - Build volume configuration
-  CuboidVolumeBuilder::VolumeConfig volumeConfig2;
-  //    volumeConfig2.length = volumeConfig.length;
-  volumeConfig2.length = {2 * halfSizeSurface, (nSurfaces + 1) * 1_m,
-                          2 * halfSizeSurface};
-  ;
-  volumeConfig2.position = {volumeConfig2.length.x(),
-                            volumeConfig2.length.y() / 2, 0.};
-  volumeConfig2.name = "AdditionalVolume";
-  volumeConfig2.binningDimension = Acts::BinningValue::binY;
-
-  // Outer volume - Build TrackingGeometry configuration and fill
-  CuboidVolumeBuilder::Config config;
-  config.length = {4 * halfSizeSurface, (nSurfaces + 1) * 1_m,
-                   2 * halfSizeSurface};
-  config.position = {volumeConfig.length.x() / 2, volumeConfig.length.y() / 2,
-                     0.};
-  config.volumeCfg = {volumeConfig, volumeConfig2};
-
-  cvb.setConfig(config);
-
-  TrackingGeometryBuilder::Config tgbCfg;
-
-  tgbCfg.trackingVolumeBuilders.push_back(
-      [=](const auto& context, const auto& inner, const auto&) {
-        return cvb.trackingVolume(context, inner, nullptr);
-      });
-
-  TrackingGeometryBuilder tgb(tgbCfg);
-
-  std::unique_ptr<const TrackingGeometry> detector =
-      tgb.trackingGeometry(geoCtx);
-  return detector;
-}
-
 struct Detector {
   // geometry
   std::shared_ptr<const TrackingGeometry> geometry;
@@ -507,7 +395,8 @@ BOOST_AUTO_TEST_CASE(Fit5Iterations) {
   BOOST_CHECK_CLOSE(track.parameters()[eBoundLoc0], -11., 7e0);
   BOOST_CHECK_CLOSE(track.parameters()[eBoundLoc1], -15., 6e0);
   BOOST_CHECK_CLOSE(track.parameters()[eBoundPhi], 1e-5, 1e3);
-  BOOST_CHECK_CLOSE(track.parameters()[eBoundTheta], M_PI / 2, 1e-3);
+  BOOST_CHECK_CLOSE(track.parameters()[eBoundTheta], std::numbers::pi / 2,
+                    1e-3);
   BOOST_CHECK_EQUAL(track.parameters()[eBoundQOverP], 1);
   BOOST_CHECK_CLOSE(track.parameters()[eBoundTime],
                     startParametersFit.parameters()[eBoundTime], 1e-6);
@@ -518,125 +407,11 @@ BOOST_AUTO_TEST_CASE(Fit5Iterations) {
       (track.template component<
           std::uint32_t,
           hashString(Experimental::Gx2fConstants::gx2fnUpdateColumn)>()),
-      5);
+      4);
 
   ACTS_INFO("*** Test: Fit5Iterations -- Finish");
 }
 
-BOOST_AUTO_TEST_CASE(UpdatePushedToNewVolume) {
-  ACTS_INFO("*** Test: UpdatePushedToNewVolume -- Start");
-
-  std::default_random_engine rng(42);
-
-  ACTS_DEBUG("Create the detector");
-  const std::size_t nSurfaces = 5;
-  Detector detector;
-  detector.geometry = makeToyDetectorYdirection(geoCtx, nSurfaces);
-
-  ACTS_DEBUG("Set the start parameters for measurement creation and fit");
-  const auto parametersMeasurements =
-      makeParameters(0_mm, 0_mm, 0_mm, 42_ns, 90_degree, 90_degree, 1_GeV, 1_e);
-  const auto startParametersFit = makeParameters(
-      1500_mm, 0_mm, 0_mm, 42_ns, -45_degree, -90_degree, 1_GeV, 1_e);
-
-  ACTS_DEBUG("Create the measurements");
-  using SimPropagator =
-      Acts::Propagator<Acts::StraightLineStepper, Acts::Navigator>;
-  const SimPropagator simPropagator = makeStraightPropagator(detector.geometry);
-  const auto measurements =
-      createMeasurements(simPropagator, geoCtx, magCtx, parametersMeasurements,
-                         resMapAllPixel, rng);
-  const auto sourceLinks = prepareSourceLinks(measurements.sourceLinks);
-  ACTS_VERBOSE("sourceLinks.size() = " << sourceLinks.size());
-
-  BOOST_REQUIRE_EQUAL(sourceLinks.size(), nSurfaces);
-
-  ACTS_DEBUG("Set up the fitter");
-  const Surface* rSurface = &parametersMeasurements.referenceSurface();
-
-  using RecoStepper = EigenStepper<>;
-  const auto recoPropagator =
-      makeConstantFieldPropagator<RecoStepper>(detector.geometry, 0_T);
-
-  using RecoPropagator = decltype(recoPropagator);
-  using Gx2Fitter =
-      Experimental::Gx2Fitter<RecoPropagator, VectorMultiTrajectory>;
-  const Gx2Fitter fitter(recoPropagator, gx2fLogger->clone());
-
-  Experimental::Gx2FitterExtensions<VectorMultiTrajectory> extensions;
-  extensions.calibrator
-      .connect<&testSourceLinkCalibrator<VectorMultiTrajectory>>();
-  TestSourceLink::SurfaceAccessor surfaceAccessor{*detector.geometry};
-  extensions.surfaceAccessor
-      .connect<&TestSourceLink::SurfaceAccessor::operator()>(&surfaceAccessor);
-
-  const Experimental::Gx2FitterOptions gx2fOptions(
-      geoCtx, magCtx, calCtx, extensions,
-      PropagatorPlainOptions(geoCtx, magCtx), rSurface, false, false,
-      FreeToBoundCorrection(false), 5, 0);
-
-  Acts::TrackContainer tracks{Acts::VectorTrackContainer{},
-                              Acts::VectorMultiTrajectory{}};
-
-  ACTS_DEBUG("Fit the track");
-  ACTS_VERBOSE("startParameter unsmeared:\n" << parametersMeasurements);
-  ACTS_VERBOSE("startParameter fit:\n" << startParametersFit);
-  const auto res = fitter.fit(sourceLinks.begin(), sourceLinks.end(),
-                              startParametersFit, gx2fOptions, tracks);
-
-  // Helper to visualise the detector
-  {
-    std::cout << "\n*** Create .obj of Detector ***\n" << std::endl;
-    // Only need for obj
-    ObjVisualization3D obj;
-
-    bool triangulate = true;
-    ViewConfig viewSensitive = ViewConfig({0, 180, 240});
-    viewSensitive.triangulate = triangulate;
-    ViewConfig viewPassive = ViewConfig({240, 280, 0});
-    viewPassive.triangulate = triangulate;
-    ViewConfig viewVolume = ViewConfig({220, 220, 0});
-    viewVolume.triangulate = triangulate;
-    ViewConfig viewContainer = ViewConfig({220, 220, 0});
-    viewContainer.triangulate = triangulate;
-    ViewConfig viewGrid = ViewConfig({220, 0, 0});
-    viewGrid.nSegments = 8;
-    viewGrid.offset = 3.;
-    viewGrid.triangulate = triangulate;
-
-    std::string tag = "gx2f_toydet";
-
-    const Acts::TrackingVolume& tgVolume =
-        *(detector.geometry->highestTrackingVolume());
-
-    GeometryView3D::drawTrackingVolume(obj, tgVolume, geoCtx, viewContainer,
-                                       viewVolume, viewPassive, viewSensitive,
-                                       viewGrid, true, tag);
-  }
-  // Helper to visualise the measurements
-  {
-    std::cout << "\n*** Create .obj of measurements ***\n" << std::endl;
-    ObjVisualization3D obj;
-
-    double localErrorScale = 10000000.;
-    ViewConfig mcolor({255, 145, 48});
-    mcolor.offset = 2;
-    //  mcolor.visible = true;
-
-    drawMeasurements(obj, measurements, detector.geometry, geoCtx,
-                     localErrorScale, mcolor);
-
-    obj.write("meas");
-  }
-
-  BOOST_REQUIRE(!res.ok());
-  BOOST_CHECK_EQUAL(
-      res.error(),
-      Acts::Experimental::GlobalChiSquareFitterError::UpdatePushedToNewVolume);
-
-  ACTS_INFO("*** Test: UpdatePushedToNewVolume -- Finish");
-}
-
 BOOST_AUTO_TEST_CASE(MixedDetector) {
   ACTS_INFO("*** Test: MixedDetector -- Start");
 
@@ -726,7 +501,8 @@ BOOST_AUTO_TEST_CASE(MixedDetector) {
   BOOST_CHECK_CLOSE(track.parameters()[eBoundLoc0], -11., 7e0);
   BOOST_CHECK_CLOSE(track.parameters()[eBoundLoc1], -15., 6e0);
   BOOST_CHECK_CLOSE(track.parameters()[eBoundPhi], 1e-5, 1e3);
-  BOOST_CHECK_CLOSE(track.parameters()[eBoundTheta], M_PI / 2, 1e-3);
+  BOOST_CHECK_CLOSE(track.parameters()[eBoundTheta], std::numbers::pi / 2,
+                    1e-3);
   BOOST_CHECK_EQUAL(track.parameters()[eBoundQOverP], 1);
   BOOST_CHECK_CLOSE(track.parameters()[eBoundTime],
                     startParametersFit.parameters()[eBoundTime], 1e-6);
@@ -737,7 +513,7 @@ BOOST_AUTO_TEST_CASE(MixedDetector) {
       (track.template component<
           std::uint32_t,
           hashString(Experimental::Gx2fConstants::gx2fnUpdateColumn)>()),
-      5);
+      4);
 
   ACTS_INFO("*** Test: MixedDetector -- Finish");
 }
@@ -823,7 +599,8 @@ BOOST_AUTO_TEST_CASE(FitWithBfield) {
   BOOST_CHECK_CLOSE(track.parameters()[eBoundLoc0], -11., 8e0);
   BOOST_CHECK_CLOSE(track.parameters()[eBoundLoc1], -15., 6e0);
   BOOST_CHECK_CLOSE(track.parameters()[eBoundPhi], 1e-4, 1e3);
-  BOOST_CHECK_CLOSE(track.parameters()[eBoundTheta], M_PI / 2, 1e-3);
+  BOOST_CHECK_CLOSE(track.parameters()[eBoundTheta], std::numbers::pi / 2,
+                    1e-3);
   BOOST_CHECK_CLOSE(track.parameters()[eBoundQOverP], 0.5, 2e-1);
   BOOST_CHECK_CLOSE(track.parameters()[eBoundTime],
                     startParametersFit.parameters()[eBoundTime], 1e-6);
@@ -834,7 +611,7 @@ BOOST_AUTO_TEST_CASE(FitWithBfield) {
       (track.template component<
           std::uint32_t,
           hashString(Experimental::Gx2fConstants::gx2fnUpdateColumn)>()),
-      5);
+      4);
 
   ACTS_INFO("*** Test: FitWithBfield -- Finish");
 }
@@ -920,7 +697,8 @@ BOOST_AUTO_TEST_CASE(relChi2changeCutOff) {
   BOOST_CHECK_CLOSE(track.parameters()[eBoundLoc0], -11., 7e0);
   BOOST_CHECK_CLOSE(track.parameters()[eBoundLoc1], -15., 6e0);
   BOOST_CHECK_CLOSE(track.parameters()[eBoundPhi], 1e-5, 1e3);
-  BOOST_CHECK_CLOSE(track.parameters()[eBoundTheta], M_PI / 2, 1e-3);
+  BOOST_CHECK_CLOSE(track.parameters()[eBoundTheta], std::numbers::pi / 2,
+                    1e-3);
   BOOST_CHECK_EQUAL(track.parameters()[eBoundQOverP], 1);
   BOOST_CHECK_CLOSE(track.parameters()[eBoundTime],
                     startParametersFit.parameters()[eBoundTime], 1e-6);
@@ -1182,7 +960,8 @@ BOOST_AUTO_TEST_CASE(FindHoles) {
   BOOST_CHECK_CLOSE(track.parameters()[eBoundLoc0], -11., 7e0);
   BOOST_CHECK_CLOSE(track.parameters()[eBoundLoc1], -15., 6e0);
   BOOST_CHECK_CLOSE(track.parameters()[eBoundPhi], 1e-5, 1e3);
-  BOOST_CHECK_CLOSE(track.parameters()[eBoundTheta], M_PI / 2, 1e-3);
+  BOOST_CHECK_CLOSE(track.parameters()[eBoundTheta], std::numbers::pi / 2,
+                    1e-3);
   BOOST_CHECK_EQUAL(track.parameters()[eBoundQOverP], 1);
   BOOST_CHECK_CLOSE(track.parameters()[eBoundTime],
                     startParametersFit.parameters()[eBoundTime], 1e-6);
@@ -1253,7 +1032,7 @@ BOOST_AUTO_TEST_CASE(Material) {
 
   const Experimental::Gx2FitterOptions gx2fOptions(
       geoCtx, magCtx, calCtx, extensions,
-      PropagatorPlainOptions(geoCtx, magCtx), rSurface, false, false,
+      PropagatorPlainOptions(geoCtx, magCtx), rSurface, true, false,
       FreeToBoundCorrection(false), 5, 0);
 
   Acts::TrackContainer tracks{Acts::VectorTrackContainer{},
@@ -1265,6 +1044,51 @@ BOOST_AUTO_TEST_CASE(Material) {
   const auto res = fitter.fit(sourceLinks.begin(), sourceLinks.end(),
                               startParametersFit, gx2fOptions, tracks);
 
+  // Helper to visualise the detector
+  {
+    std::cout << "\n*** Create .obj of Detector ***\n" << std::endl;
+    // Only need for obj
+    ObjVisualization3D obj;
+
+    bool triangulate = true;
+    ViewConfig viewSensitive = {.color = {0, 180, 240}};
+    viewSensitive.triangulate = triangulate;
+    ViewConfig viewPassive = {.color = {240, 280, 0}};
+    viewPassive.triangulate = triangulate;
+    ViewConfig viewVolume = {.color = {220, 220, 0}};
+    viewVolume.triangulate = triangulate;
+    ViewConfig viewContainer = {.color = {220, 220, 0}};
+    viewContainer.triangulate = triangulate;
+    ViewConfig viewGrid = {.color = {220, 0, 0}};
+    viewGrid.quarterSegments = 8;
+    viewGrid.offset = 3.;
+    viewGrid.triangulate = triangulate;
+
+    std::string tag = "gx2f_toydet";
+
+    const Acts::TrackingVolume& tgVolume =
+        *(detector.geometry->highestTrackingVolume());
+
+    GeometryView3D::drawTrackingVolume(obj, tgVolume, geoCtx, viewContainer,
+                                       viewVolume, viewPassive, viewSensitive,
+                                       viewGrid, true, tag);
+  }
+  // Helper to visualise the measurements
+  {
+    std::cout << "\n*** Create .obj of measurements ***\n" << std::endl;
+    ObjVisualization3D obj;
+
+    double localErrorScale = 10000000.;
+    ViewConfig mcolor{.color = {255, 145, 48}};
+    mcolor.offset = 2;
+    //  mcolor.visible = true;
+
+    drawMeasurements(obj, measurements, detector.geometry, geoCtx,
+                     localErrorScale, mcolor);
+
+    obj.write("meas");
+  }
+
   BOOST_REQUIRE(res.ok());
 
   const auto& track = *res;
@@ -1284,21 +1108,22 @@ BOOST_AUTO_TEST_CASE(Material) {
   // Parameters
   // We need quite coarse checks here, since on different builds
   // the created measurements differ in the randomness
-  //  BOOST_CHECK_CLOSE(track.parameters()[eBoundLoc0], -11., 7e0);
-  //  BOOST_CHECK_CLOSE(track.parameters()[eBoundLoc1], -15., 6e0);
-  //  BOOST_CHECK_CLOSE(track.parameters()[eBoundPhi], 1e-5, 1e3);
-  //  BOOST_CHECK_CLOSE(track.parameters()[eBoundTheta], M_PI / 2, 1e-3);
+  BOOST_CHECK_CLOSE(track.parameters()[eBoundLoc0], -11., 26e0);
+  BOOST_CHECK_CLOSE(track.parameters()[eBoundLoc1], -15., 15e0);
+  BOOST_CHECK_CLOSE(track.parameters()[eBoundPhi], 1e-5, 1.1e3);
+  BOOST_CHECK_CLOSE(track.parameters()[eBoundTheta], std::numbers::pi / 2,
+                    2e-2);
   BOOST_CHECK_EQUAL(track.parameters()[eBoundQOverP], 1);
   BOOST_CHECK_CLOSE(track.parameters()[eBoundTime],
                     startParametersFit.parameters()[eBoundTime], 1e-6);
-  //  BOOST_CHECK_CLOSE(track.covariance().determinant(), 1e-27, 4e0);
+  BOOST_CHECK_CLOSE(track.covariance().determinant(), 3.5e-27, 1e1);
 
   // Convergence
   BOOST_CHECK_EQUAL(
       (track.template component<
           std::uint32_t,
           hashString(Experimental::Gx2fConstants::gx2fnUpdateColumn)>()),
-      5);
+      4);
 
   ACTS_INFO("*** Test: Material -- Finish");
 }
diff --git a/Tests/UnitTests/Core/TrackFitting/KalmanFitterTests.cpp b/Tests/UnitTests/Core/TrackFitting/KalmanFitterTests.cpp
index 34811d7b6e8..80a40f8eaba 100644
--- a/Tests/UnitTests/Core/TrackFitting/KalmanFitterTests.cpp
+++ b/Tests/UnitTests/Core/TrackFitting/KalmanFitterTests.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2016-2020 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include <boost/test/unit_test.hpp>
 
diff --git a/Tests/UnitTests/Core/TrackFitting/MbfSmootherTests.cpp b/Tests/UnitTests/Core/TrackFitting/MbfSmootherTests.cpp
index bdd6d3acab2..21d0a347e56 100644
--- a/Tests/UnitTests/Core/TrackFitting/MbfSmootherTests.cpp
+++ b/Tests/UnitTests/Core/TrackFitting/MbfSmootherTests.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2024 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include <boost/test/unit_test.hpp>
 
@@ -18,10 +18,10 @@
 #include "Acts/Tests/CommonHelpers/FloatComparisons.hpp"
 #include "Acts/TrackFitting/MbfSmoother.hpp"
 #include "Acts/Utilities/Result.hpp"
-#include "Acts/Utilities/detail/Subspace.hpp"
 
 #include <cmath>
 #include <cstddef>
+#include <numbers>
 
 namespace {
 
@@ -41,9 +41,7 @@ BOOST_AUTO_TEST_SUITE(TrackFittingMbfSmoother)
 BOOST_AUTO_TEST_CASE(Smooth) {
   VectorMultiTrajectory traj;
 
-  auto projector = detail::FixedSizeSubspace<eBoundSize, 2>(
-                       std::array{eBoundLoc0, eBoundLoc1})
-                       .projector<double>();
+  std::array<BoundIndices, 2> projector{eBoundLoc0, eBoundLoc1};
 
   // Make dummy track parameter
   CovarianceMatrix covTrk;
@@ -55,15 +53,15 @@ BOOST_AUTO_TEST_CASE(Smooth) {
   auto ts = traj.getTrackState(ts_idx);
   ts.typeFlags().set(TrackStateFlag::MeasurementFlag);
 
-  ts.predicted() << 0.3, 0.5, 0.5 * M_PI, 0., 1 / 100., 0.;
+  ts.predicted() << 0.3, 0.5, std::numbers::pi / 2., 0., 1 / 100., 0.;
   ts.predictedCovariance() = covTrk;
 
-  ts.setProjector(projector);
   ts.allocateCalibrated(2);
   ts.calibrated<2>() << 0.351, 0.473;
   ts.calibratedCovariance<2>() << 1e+8, 0., 0., 1e+8;
+  ts.setSubspaceIndices<2>(projector);
 
-  ts.filtered() << 0.301, 0.503, 0.5 * M_PI, 0., 1 / 100., 0.;
+  ts.filtered() << 0.301, 0.503, std::numbers::pi / 2., 0., 1 / 100., 0.;
   ts.filteredCovariance() = covTrk;
   ts.pathLength() = 1.;
   ts.jacobian().setIdentity();
@@ -72,15 +70,15 @@ BOOST_AUTO_TEST_CASE(Smooth) {
   ts = traj.getTrackState(ts_idx);
   ts.typeFlags().set(TrackStateFlag::MeasurementFlag);
 
-  ts.predicted() << 0.2, 0.5, 0.5 * M_PI, 0., 1 / 100., 0.;
+  ts.predicted() << 0.2, 0.5, std::numbers::pi / 2., 0., 1 / 100., 0.;
   ts.predictedCovariance() = covTrk;
 
-  ts.setProjector(projector);
   ts.allocateCalibrated(2);
   ts.calibrated<2>() << 0.351, 0.473;
   ts.calibratedCovariance<2>() << 1e+8, 0., 0., 1e+8;
+  ts.setSubspaceIndices<2>(projector);
 
-  ts.filtered() << 0.27, 0.53, 0.5 * M_PI, 0., 1 / 100., 0.;
+  ts.filtered() << 0.27, 0.53, std::numbers::pi / 2., 0., 1 / 100., 0.;
   ts.filteredCovariance() = covTrk;
   ts.pathLength() = 2.;
   ts.jacobian().setIdentity();
@@ -89,15 +87,15 @@ BOOST_AUTO_TEST_CASE(Smooth) {
   ts = traj.getTrackState(ts_idx);
   ts.typeFlags().set(TrackStateFlag::MeasurementFlag);
 
-  ts.predicted() << 0.35, 0.49, 0.5 * M_PI, 0., 1 / 100., 0.;
+  ts.predicted() << 0.35, 0.49, std::numbers::pi / 2., 0., 1 / 100., 0.;
   ts.predictedCovariance() = covTrk;
 
-  ts.setProjector(projector);
   ts.allocateCalibrated(2);
   ts.calibrated<2>() << 0.351, 0.473;
   ts.calibratedCovariance<2>() << 1e+8, 0., 0., 1e+8;
+  ts.setSubspaceIndices<2>(projector);
 
-  ts.filtered() << 0.33, 0.43, 0.5 * M_PI, 0., 1 / 100., 0.;
+  ts.filtered() << 0.33, 0.43, std::numbers::pi / 2., 0., 1 / 100., 0.;
   ts.filteredCovariance() = covTrk;
   ts.pathLength() = 3.;
   ts.jacobian().setIdentity();
diff --git a/Tests/UnitTests/Core/Utilities/AlgebraHelpersTests.cpp b/Tests/UnitTests/Core/Utilities/AlgebraHelpersTests.cpp
index c195be14f84..86165ddb2ba 100644
--- a/Tests/UnitTests/Core/Utilities/AlgebraHelpersTests.cpp
+++ b/Tests/UnitTests/Core/Utilities/AlgebraHelpersTests.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2023 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include <boost/test/unit_test.hpp>
 
diff --git a/Tests/UnitTests/Core/Utilities/AngleHelpersTests.cpp b/Tests/UnitTests/Core/Utilities/AngleHelpersTests.cpp
new file mode 100644
index 00000000000..78e1252ad18
--- /dev/null
+++ b/Tests/UnitTests/Core/Utilities/AngleHelpersTests.cpp
@@ -0,0 +1,97 @@
+// This file is part of the ACTS project.
+//
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
+//
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
+
+#include <boost/test/data/test_case.hpp>
+#include <boost/test/unit_test.hpp>
+
+#include "Acts/Tests/CommonHelpers/FloatComparisons.hpp"
+#include "Acts/Utilities/AngleHelpers.hpp"
+
+#include <cmath>
+#include <numbers>
+
+namespace bd = boost::unit_test::data;
+
+using Acts::AngleHelpers::etaFromTheta;
+using Acts::AngleHelpers::EtaThetaConversionTraits;
+using Acts::AngleHelpers::thetaFromEta;
+
+BOOST_AUTO_TEST_SUITE(AngleHelpers)
+
+BOOST_AUTO_TEST_CASE(EtaThetaConversion) {
+  CHECK_CLOSE_ABS(0.0, etaFromTheta(std::numbers::pi / 2), 1e-6);
+  CHECK_CLOSE_ABS(1.0, etaFromTheta(thetaFromEta(1.0)), 1e-6);
+  CHECK_CLOSE_ABS(1.0, thetaFromEta(etaFromTheta(1.0)), 1e-6);
+}
+
+BOOST_DATA_TEST_CASE(EtaFromThetaRobustness, bd::xrange(0, 1000, 1), exponent) {
+  {
+    // check right
+
+    float thetaRight = exponent < 30 ? std::pow(10.0f, -1.0f * exponent) : 0.0f;
+
+    float etaRight = etaFromTheta<float>(thetaRight);
+    BOOST_CHECK(!std::isnan(etaRight));
+
+    // check left
+
+    float thetaLeft = std::numbers::pi_v<float> - thetaRight;
+
+    float etaLeft = etaFromTheta<float>(thetaLeft);
+    BOOST_CHECK(!std::isnan(etaLeft));
+  }
+
+  {
+    // check right
+
+    double thetaRight = exponent < 300 ? std::pow(10.0, -1.0 * exponent) : 0.0;
+
+    double etaRight = etaFromTheta<double>(thetaRight);
+    BOOST_CHECK(!std::isnan(etaRight));
+
+    // check left
+
+    double thetaLeft = std::numbers::pi - thetaRight;
+
+    double etaLeft = etaFromTheta<double>(thetaLeft);
+    BOOST_CHECK(!std::isnan(etaLeft));
+  }
+}
+
+BOOST_DATA_TEST_CASE(ThetaFromEtaRobustness, bd::xrange(1.0, 1000.0, 1.0),
+                     etaRight) {
+  {
+    // check right
+
+    float thetaRight = thetaFromEta<float>(etaRight);
+    BOOST_CHECK(!std::isnan(thetaRight));
+
+    // check left
+
+    float etaLeft = -etaRight;
+
+    float thetaLeft = thetaFromEta<float>(etaLeft);
+    BOOST_CHECK(!std::isnan(thetaLeft));
+  }
+
+  {
+    // check right
+
+    double thetaRight = thetaFromEta<double>(etaRight);
+    BOOST_CHECK(!std::isnan(thetaRight));
+
+    // check left
+
+    double etaLeft = -etaRight;
+
+    double thetaLeft = thetaFromEta<double>(etaLeft);
+    BOOST_CHECK(!std::isnan(thetaLeft));
+  }
+}
+
+BOOST_AUTO_TEST_SUITE_END()
diff --git a/Tests/UnitTests/Core/Utilities/AnnealingUtilityTests.cpp b/Tests/UnitTests/Core/Utilities/AnnealingUtilityTests.cpp
index 175420491c1..f8d5e53610d 100644
--- a/Tests/UnitTests/Core/Utilities/AnnealingUtilityTests.cpp
+++ b/Tests/UnitTests/Core/Utilities/AnnealingUtilityTests.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2019 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include <boost/test/unit_test.hpp>
 
diff --git a/Tests/UnitTests/Core/Utilities/AnyTests.cpp b/Tests/UnitTests/Core/Utilities/AnyTests.cpp
index 5e680389ce1..7389218e54a 100644
--- a/Tests/UnitTests/Core/Utilities/AnyTests.cpp
+++ b/Tests/UnitTests/Core/Utilities/AnyTests.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2021 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include <boost/test/unit_test.hpp>
 
diff --git a/Tests/UnitTests/Core/Utilities/AxesTests.cpp b/Tests/UnitTests/Core/Utilities/AxesTests.cpp
index b155bec7a43..5c849e777ba 100644
--- a/Tests/UnitTests/Core/Utilities/AxesTests.cpp
+++ b/Tests/UnitTests/Core/Utilities/AxesTests.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2017-2018 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include <boost/test/unit_test.hpp>
 
@@ -438,6 +438,10 @@ BOOST_AUTO_TEST_CASE(AxisVisit) {
     BOOST_CHECK(
         (std::is_same_v<std::decay_t<decltype(axis)>, Axis<Variable, Closed>>));
   });
+
+  std::vector<double> edges =
+      varClosed.visit([](const auto& axis) { return axis.getBinEdges(); });
+  BOOST_CHECK_EQUAL(edges.size(), varClosed.getBinEdges().size());
 }
 
 BOOST_AUTO_TEST_CASE(Output) {
diff --git a/Tests/UnitTests/Core/Utilities/BFieldMapUtilsTests.cpp b/Tests/UnitTests/Core/Utilities/BFieldMapUtilsTests.cpp
index b98fc10b433..5dd21ff38de 100644
--- a/Tests/UnitTests/Core/Utilities/BFieldMapUtilsTests.cpp
+++ b/Tests/UnitTests/Core/Utilities/BFieldMapUtilsTests.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2016-2018 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include <boost/test/data/test_case.hpp>
 #include <boost/test/unit_test.hpp>
diff --git a/Tests/UnitTests/Core/Utilities/BinAdjustmentTests.cpp b/Tests/UnitTests/Core/Utilities/BinAdjustmentTests.cpp
index ff21fc6659d..1db5ee9ccfe 100644
--- a/Tests/UnitTests/Core/Utilities/BinAdjustmentTests.cpp
+++ b/Tests/UnitTests/Core/Utilities/BinAdjustmentTests.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2017-2018 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include <boost/test/unit_test.hpp>
 
@@ -19,13 +19,14 @@
 
 #include <cmath>
 #include <memory>
+#include <numbers>
 #include <vector>
 
 namespace Acts::Test {
 
 // Test Radial
 BOOST_AUTO_TEST_CASE(BinAdjustment_Radial) {
-  RadialBounds bound(50, 75, M_PI, 0);
+  RadialBounds bound(50, 75, std::numbers::pi, 0);
   BinUtility bu;
   bu += BinUtility(1, 0, 1, Acts::open, Acts::BinningValue::binR);
   bu += BinUtility(1, 0, 1, Acts::closed, Acts::BinningValue::binPhi);
@@ -34,21 +35,23 @@ BOOST_AUTO_TEST_CASE(BinAdjustment_Radial) {
 
   BOOST_CHECK_EQUAL(buAdjust.binningData()[0].min, 50);
   BOOST_CHECK_EQUAL(buAdjust.binningData()[0].max, 75);
-  BOOST_CHECK_EQUAL(buAdjust.binningData()[1].min, float{-M_PI});
-  BOOST_CHECK_EQUAL(buAdjust.binningData()[1].max, float{M_PI});
+  BOOST_CHECK_EQUAL(buAdjust.binningData()[1].min, -std::numbers::pi_v<float>);
+  BOOST_CHECK_EQUAL(buAdjust.binningData()[1].max, std::numbers::pi_v<float>);
 }
 
 // Test Cylinder
 BOOST_AUTO_TEST_CASE(BinAdjustment_Cylinder) {
-  CylinderBounds bound(25, 50, M_PI / 4, 0);
+  CylinderBounds bound(25, 50, std::numbers::pi / 4, 0);
   BinUtility bu;
   bu += BinUtility(1, 0, 1, Acts::open, Acts::BinningValue::binPhi);
   bu += BinUtility(1, 0, 1, Acts::open, Acts::BinningValue::binZ);
 
   BinUtility buAdjust = adjustBinUtility(bu, bound, Transform3::Identity());
 
-  BOOST_CHECK_EQUAL(buAdjust.binningData()[0].min, float{-M_PI / 4});
-  BOOST_CHECK_EQUAL(buAdjust.binningData()[0].max, float{M_PI / 4});
+  BOOST_CHECK_EQUAL(buAdjust.binningData()[0].min,
+                    -static_cast<float>(std::numbers::pi / 4.));
+  BOOST_CHECK_EQUAL(buAdjust.binningData()[0].max,
+                    static_cast<float>(std::numbers::pi / 4.));
   BOOST_CHECK_EQUAL(buAdjust.binningData()[1].min, -50);
   BOOST_CHECK_EQUAL(buAdjust.binningData()[1].max, 50);
 }
diff --git a/Tests/UnitTests/Core/Utilities/BinAdjustmentVolumeTests.cpp b/Tests/UnitTests/Core/Utilities/BinAdjustmentVolumeTests.cpp
index eab989e5e0a..1b91120dd7f 100644
--- a/Tests/UnitTests/Core/Utilities/BinAdjustmentVolumeTests.cpp
+++ b/Tests/UnitTests/Core/Utilities/BinAdjustmentVolumeTests.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2017-2018 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include <boost/test/unit_test.hpp>
 
@@ -18,13 +18,14 @@
 
 #include <cmath>
 #include <memory>
+#include <numbers>
 #include <vector>
 
 namespace Acts::Test {
 
 // Test Cylinder
 BOOST_AUTO_TEST_CASE(BinAdjustmentVolume_Cylinder) {
-  CylinderVolumeBounds bound(10, 50, 150, M_PI / 2, 0);
+  CylinderVolumeBounds bound(10, 50, 150, std::numbers::pi / 2., 0);
   BinUtility bu;
   bu += BinUtility(1, 0, 1, Acts::open, Acts::BinningValue::binR);
   bu += BinUtility(1, 0, 1, Acts::open, Acts::BinningValue::binPhi);
@@ -34,8 +35,10 @@ BOOST_AUTO_TEST_CASE(BinAdjustmentVolume_Cylinder) {
 
   BOOST_CHECK_EQUAL(buAdjust.binningData()[0].min, 10);
   BOOST_CHECK_EQUAL(buAdjust.binningData()[0].max, 50);
-  BOOST_CHECK_EQUAL(buAdjust.binningData()[1].min, float{-M_PI / 2});
-  BOOST_CHECK_EQUAL(buAdjust.binningData()[1].max, float{M_PI / 2});
+  BOOST_CHECK_EQUAL(buAdjust.binningData()[1].min,
+                    -static_cast<float>(std::numbers::pi / 2.));
+  BOOST_CHECK_EQUAL(buAdjust.binningData()[1].max,
+                    static_cast<float>(std::numbers::pi / 2.));
   BOOST_CHECK_EQUAL(buAdjust.binningData()[2].min, -150);
   BOOST_CHECK_EQUAL(buAdjust.binningData()[2].max, 150);
 }
@@ -52,8 +55,8 @@ BOOST_AUTO_TEST_CASE(BinAdjustmentVolume_CutoutCylinder) {
 
   BOOST_CHECK_EQUAL(buAdjust.binningData()[0].min, 10);
   BOOST_CHECK_EQUAL(buAdjust.binningData()[0].max, 50);
-  BOOST_CHECK_EQUAL(buAdjust.binningData()[1].min, float{-M_PI});
-  BOOST_CHECK_EQUAL(buAdjust.binningData()[1].max, float{M_PI});
+  BOOST_CHECK_EQUAL(buAdjust.binningData()[1].min, -std::numbers::pi_v<float>);
+  BOOST_CHECK_EQUAL(buAdjust.binningData()[1].max, std::numbers::pi_v<float>);
   BOOST_CHECK_EQUAL(buAdjust.binningData()[2].min, -100);
   BOOST_CHECK_EQUAL(buAdjust.binningData()[2].max, 100);
 }
diff --git a/Tests/UnitTests/Core/Utilities/BinUtilityTests.cpp b/Tests/UnitTests/Core/Utilities/BinUtilityTests.cpp
index 83b2cfc796b..b44d939831f 100644
--- a/Tests/UnitTests/Core/Utilities/BinUtilityTests.cpp
+++ b/Tests/UnitTests/Core/Utilities/BinUtilityTests.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2017-2018 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include <boost/test/unit_test.hpp>
 
@@ -15,6 +15,7 @@
 #include <array>
 #include <cmath>
 #include <cstddef>
+#include <numbers>
 #include <utility>
 #include <vector>
 
@@ -89,12 +90,14 @@ BOOST_AUTO_TEST_CASE(BinUtility_arbitrary_binning) {
 BOOST_AUTO_TEST_CASE(BinUtility_transform) {
   Transform3 transform_LtoG = Transform3::Identity();
   transform_LtoG = transform_LtoG * Translation3(0., 0., -50);
-  transform_LtoG = transform_LtoG * AngleAxis3(M_PI / 4, Vector3(0, 0, 1));
+  transform_LtoG =
+      transform_LtoG * AngleAxis3(std::numbers::pi / 4., Vector3(0, 0, 1));
 
   Transform3 transform_GtoL = transform_LtoG.inverse();
 
   BinUtility rUtil(10, 0., 100., open, BinningValue::binR);
-  BinUtility phiUtil(10, -M_PI, M_PI, closed, BinningValue::binPhi);
+  BinUtility phiUtil(10, -std::numbers::pi, std::numbers::pi, closed,
+                     BinningValue::binPhi);
   BinUtility zUtil(10, -100., 100., open, BinningValue::binZ);
 
   BinUtility noTranform;
@@ -109,9 +112,9 @@ BOOST_AUTO_TEST_CASE(BinUtility_transform) {
 
   Vector3 pos1(0, 0, 0);
   Vector3 pos2(60, 0, 0);
-  Vector3 pos3(34, M_PI / 2, 0);
+  Vector3 pos3(34, std::numbers::pi / 2., 0);
   Vector3 pos4(0, 0, -80);
-  Vector3 pos5(80, -M_PI / 4, 50);
+  Vector3 pos5(80, -std::numbers::pi / 4., 50);
 
   for (int i = 0; i < 3; i++) {
     BOOST_CHECK_EQUAL(withTranform.bin(pos1, i),
diff --git a/Tests/UnitTests/Core/Utilities/BinningDataTests.cpp b/Tests/UnitTests/Core/Utilities/BinningDataTests.cpp
index a7effbe4200..95de3899f92 100644
--- a/Tests/UnitTests/Core/Utilities/BinningDataTests.cpp
+++ b/Tests/UnitTests/Core/Utilities/BinningDataTests.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2017-2018 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include <boost/test/unit_test.hpp>
 
@@ -16,6 +16,7 @@
 #include <cmath>
 #include <cstddef>
 #include <memory>
+#include <numbers>
 #include <utility>
 #include <vector>
 
@@ -30,7 +31,7 @@ Vector3 eta0Position(0.5, 1.5, 0.);
 // the test positions in 2D
 Vector2 xyPosition(0.5, 1.5);
 Vector2 rphizPosition(0.1, 2.5);
-Vector2 rphiPosition(3.5, M_PI / 8.);
+Vector2 rphiPosition(3.5, std::numbers::pi / 8.);
 
 // the binnings - equidistant
 // x/y/zData
@@ -44,12 +45,11 @@ BinningData zData_eq(open, BinningValue::binZ, 10, 0., 10.);
 // | 0 | 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 10 |
 BinningData rData_eq(open, BinningValue::binR, 10, 0., 10.);
 // bin boundaries
-// > -M_PI | -3/5 M_PI | -1/5 M_PI | 1/5 M_PI | 3/5 M_PI | M_PI <
-BinningData phiData_eq(closed, BinningValue::binPhi, 5, -M_PI, M_PI);
-// BinningData rPhiData_eq(closed, BinningValue::binRPhi, 5, -M_PI, M_PI);
-// h/etaData
-// bin boundaries
-// | 0 | 2 | 4 | 6 | 8 | 10 |
+// > -PI | -3/5 PI | -1/5 PI | 1/5 PI | 3/5 PI | PI <
+BinningData phiData_eq(closed, BinningValue::binPhi, 5, -std::numbers::pi,
+                       std::numbers::pi);
+// BinningData rPhiData_eq(closed, BinningValue::binRPhi, 5, -std::numbers::pi,
+// std::numbers::pi); h/etaData bin boundaries | 0 | 2 | 4 | 6 | 8 | 10 |
 // BinningData hData_eq(open, BinningValue::binH, 5, 0., 10.);
 // | -2.5 | -1.5 | -0.5 | 0.5 | 1.5 | 2.5 |
 BinningData etaData_eq(open, BinningValue::binEta, 5, -2.5, 2.5);
@@ -63,15 +63,16 @@ std::vector<float> values = {0., 1., 2., 3., 4., 10.};
 // | 0 | 1 | 2 | 3 | 4 | 10 |
 BinningData xData_arb(open, BinningValue::binX, values);
 BinningData yData_arb(open, BinningValue::binY, values);
-// | -M_PI |  -2 |  -1 |  1 |  2 |  M_PI |
-std::vector<float> phiValues = {-M_PI, -2., -1., 1., 2., M_PI};
+// | -PI |  -2 |  -1 |  1 |  2 |  PI |
+std::vector<float> phiValues = {-std::numbers::pi, -2., -1., 1., 2.,
+                                std::numbers::pi};
 BinningData phiData_arb(closed, BinningValue::binPhi, phiValues);
 
 // the binnings - arbitrary when switching to binary search - for boundary
 // sizes >= 50
 std::size_t nBins_binary = 59;
 double valueMin = 0.;
-double phiMin = -M_PI;
+double phiMin = -std::numbers::pi;
 double delta = 0.5;
 double phiDelta = 0.1064;
 
@@ -146,8 +147,9 @@ BOOST_AUTO_TEST_CASE(BinningData_BinningValue) {
   CHECK_CLOSE_REL(rData_eq.value(xyzPosition), std::hypot(0.5, 1.5), 1e-5);
   BOOST_CHECK_EQUAL(rData_eq.value(rphiPosition), 3.5);
 
-  CHECK_SMALL(phiData_eq.value(phi0Position), 1e-6 * M_PI);
-  CHECK_CLOSE_REL(phiData_eq.value(phiPihPosition), M_PI / 2, 1e-5);
+  CHECK_SMALL(phiData_eq.value(phi0Position), 1e-6 * std::numbers::pi);
+  CHECK_CLOSE_REL(phiData_eq.value(phiPihPosition), std::numbers::pi / 2.,
+                  1e-5);
 
   BOOST_CHECK_EQUAL(phiData_eq.bins(), std::size_t{5});
   BOOST_CHECK_EQUAL(phiData_arb.bins(), std::size_t{5});
@@ -219,7 +221,8 @@ BOOST_AUTO_TEST_CASE(BinningData_bins) {
   BOOST_CHECK_EQUAL(rData_eq.searchLocal(rphiPosition), std::size_t{3});
   BOOST_CHECK_EQUAL(phiData_eq.searchGlobal(phi0Position), std::size_t{2});
   BOOST_CHECK_EQUAL(phiData_eq.searchGlobal(phiPihPosition), std::size_t{3});
-  BOOST_CHECK_EQUAL(phiData_arb_binary.search(M_PI), std::size_t{0});
+  BOOST_CHECK_EQUAL(phiData_arb_binary.search(std::numbers::pi),
+                    std::size_t{0});
 
   // h/etaData
   BOOST_CHECK_EQUAL(etaData_eq.searchGlobal(eta0Position), std::size_t{2});
@@ -310,14 +313,14 @@ BOOST_AUTO_TEST_CASE(BinningData_boundaries) {
                                 xData_eq.boundaries().end(), boundaries.begin(),
                                 boundaries.end());
 
-  float phiStep = M_PI * 2. / 5.;
-  std::vector<float> phiBoundaries_eq = {
-      -M_PI,
-      static_cast<float>(-M_PI + 1 * phiStep),
-      static_cast<float>(-M_PI + 2 * phiStep),
-      static_cast<float>(-M_PI + 3 * phiStep),
-      static_cast<float>(-M_PI + 4 * phiStep),
-      static_cast<float>(-M_PI + 5 * phiStep)};
+  const float phiStep = std::numbers::pi * 2. / 5.;
+  std::vector<float> phiBoundaries_eq;
+
+  for (int i = 0; i <= 5; ++i) {
+    phiBoundaries_eq.push_back(
+        static_cast<float>(-std::numbers::pi + i * phiStep));
+  }
+
   CHECK_CLOSE_REL(phiData_eq.boundaries(), phiBoundaries_eq, 1e-5);
 }
 
@@ -362,13 +365,13 @@ BOOST_AUTO_TEST_CASE(BinningData_bincenter) {
   }
 
   // running into rounding errors here
-  float phiStep = M_PI * 2. / 5.;
-  std::vector<float> phiCenters_eq = {
-      static_cast<float>(-M_PI + 0.5 * phiStep),
-      static_cast<float>(-M_PI + 1.5 * phiStep),
-      static_cast<float>(-M_PI + 2.5 * phiStep),
-      static_cast<float>(-M_PI + 3.5 * phiStep),
-      static_cast<float>(-M_PI + 4.5 * phiStep)};
+  const float phiStep = std::numbers::pi * 2. / 5.;
+  std::vector<float> phiCenters_eq;
+
+  for (int i = 0; i < 5; ++i) {
+    phiCenters_eq.push_back(
+        static_cast<float>(-std::numbers::pi + (i + 0.5) * phiStep));
+  }
 
   for (std::size_t ib = 0; ib < phiCenters_eq.size(); ++ib) {
     CHECK_CLOSE_ABS(phiData_eq.center(ib), phiCenters_eq[ib], 1e-3);
@@ -377,41 +380,43 @@ BOOST_AUTO_TEST_CASE(BinningData_bincenter) {
 
 // special test for phi binning
 BOOST_AUTO_TEST_CASE(BinningData_phi_modules) {
-  // n phi modules with phi boundary at -M_Pi/+M_PI are checked above
-  // one module expands over -M_Pi/+M_PI
-  float deltaPhi = 0.1;
-  BinningData phiData_mod(closed, BinningValue::binPhi, 5, -M_PI + deltaPhi,
-                          M_PI + deltaPhi);
-  float phiStep = M_PI * 2. / 5.;
-  std::vector<float> phiBoundaries_mod = {
-      static_cast<float>(-M_PI + deltaPhi),
-      static_cast<float>(-M_PI + 1 * phiStep) + deltaPhi,
-      static_cast<float>(-M_PI + 2 * phiStep) + deltaPhi,
-      static_cast<float>(-M_PI + 3 * phiStep) + deltaPhi,
-      static_cast<float>(-M_PI + 4 * phiStep) + deltaPhi,
-      static_cast<float>(-M_PI + 5 * phiStep) + deltaPhi};
+  // n phi modules with phi boundary at -pi/+pi are checked above one module
+  // expands over -pi/+pi
+  const float deltaPhi = 0.1;
+  BinningData phiData_mod(closed, BinningValue::binPhi, 5,
+                          -std::numbers::pi + deltaPhi,
+                          std::numbers::pi + deltaPhi);
+
+  const float phiStep = std::numbers::pi * 2. / 5.;
+  std::vector<float> phiBoundaries_mod;
+
+  for (int i = 0; i <= 5; ++i) {
+    phiBoundaries_mod.push_back(
+        static_cast<float>(-std::numbers::pi + i * phiStep) + deltaPhi);
+  }
+
   // this is the boundary test
   CHECK_CLOSE_REL(phiData_mod.boundaries(), phiBoundaries_mod, 1e-5);
 
   // now test the bin jump 0/maxbin
 
-  float firstAngle = (-M_PI + 1.5 * deltaPhi);
+  float firstAngle = (-std::numbers::pi + 1.5 * deltaPhi);
   Vector3 firstBin(cos(firstAngle), sin(firstAngle), 0.);
   BOOST_CHECK_EQUAL(phiData_mod.search(firstAngle), std::size_t{0});
   BOOST_CHECK_EQUAL(phiData_mod.searchGlobal(firstBin), std::size_t{0});
 
-  float firstAngleNeg = (-M_PI + 0.5 * deltaPhi);
+  float firstAngleNeg = (-std::numbers::pi + 0.5 * deltaPhi);
   Vector3 lastBinNeg(cos(firstAngleNeg), sin(firstAngleNeg), 0.);
   BOOST_CHECK_EQUAL(phiData_mod.search(firstAngleNeg), std::size_t{4});
   BOOST_CHECK_EQUAL(phiData_mod.searchGlobal(lastBinNeg), std::size_t{4});
 
-  float lastAnglePos = (M_PI + 0.5 * deltaPhi);
+  float lastAnglePos = (std::numbers::pi + 0.5 * deltaPhi);
   Vector3 lastBinPos(cos(lastAnglePos), sin(lastAnglePos), 0.);
   BOOST_CHECK_EQUAL(phiData_mod.search(lastAnglePos), std::size_t{4});
   BOOST_CHECK_EQUAL(phiData_mod.searchGlobal(lastBinPos), std::size_t{4});
 
   // now test the (remaining) phi scaling
-  float underscaledAngle = -M_PI - 0.5 * deltaPhi;
+  float underscaledAngle = -std::numbers::pi - 0.5 * deltaPhi;
   Vector3 underscaledPos(cos(underscaledAngle), sin(underscaledAngle), 0.);
   BOOST_CHECK_EQUAL(phiData_mod.search(underscaledAngle), std::size_t{4});
   BOOST_CHECK_EQUAL(phiData_mod.searchGlobal(underscaledPos), std::size_t{4});
diff --git a/Tests/UnitTests/Core/Utilities/BoundingBoxTest.cpp b/Tests/UnitTests/Core/Utilities/BoundingBoxTest.cpp
index 6b6dcd3847d..675d7d49320 100644
--- a/Tests/UnitTests/Core/Utilities/BoundingBoxTest.cpp
+++ b/Tests/UnitTests/Core/Utilities/BoundingBoxTest.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2018-2019 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include <boost/test/unit_test.hpp>
 
@@ -26,6 +26,7 @@
 #include <fstream>
 #include <iostream>
 #include <memory>
+#include <numbers>
 #include <set>
 #include <sstream>
 #include <string>
@@ -45,10 +46,10 @@ using Vector3F = Eigen::Matrix<BoundingBoxScalar, 3, 1>;
 using AngleAxis3F = Eigen::AngleAxis<BoundingBoxScalar>;
 
 std::filesystem::path tmp_path = []() {
-  auto p = std::filesystem::temp_directory_path() / "acts_unit_tests";
-  std::filesystem::create_directory(p);
-  std::cout << "Writing test output to: " << p << std::endl;
-  return p;
+  auto tmpPath = std::filesystem::temp_directory_path() / "acts_unit_tests";
+  std::filesystem::create_directory(tmpPath);
+  std::cout << "Writing test output to: " << tmpPath << std::endl;
+  return tmpPath;
 }();
 
 std::ofstream tmp(const std::string& path) {
@@ -62,7 +63,7 @@ BOOST_AUTO_TEST_CASE(box_construction) {
     Box bb(&o, {-1, -1}, {2, 2});
 
     typename Box::transform_type rot;
-    rot = Eigen::Rotation2D<BoundingBoxScalar>(M_PI / 7.);
+    rot = Eigen::Rotation2D<BoundingBoxScalar>(std::numbers::pi / 7.);
     Box bb_rot = bb.transformed(rot);
 
     CHECK_CLOSE_ABS(bb_rot.min(), Vector2F(-1.76874, -1.33485), 1e-4);
@@ -75,13 +76,13 @@ BOOST_AUTO_TEST_CASE(box_construction) {
     Box bb(&o, {-1, -1, -1}, {2, 2, 2});
 
     typename Box::transform_type rot;
-    rot = AngleAxis3F(M_PI / 3., Vector3F::UnitZ());
+    rot = AngleAxis3F(std::numbers::pi / 3., Vector3F::UnitZ());
     Box bb_rot = bb.transformed(rot);
 
     CHECK_CLOSE_ABS(bb_rot.min(), Vector3F(-2.23205, -1.36603, -1), 1e-4);
     CHECK_CLOSE_ABS(bb_rot.max(), Vector3F(1.86603, 2.73205, 2), 1e-4);
 
-    rot *= AngleAxis3F(M_PI / 5., Vector3F(1, 1, 0).normalized());
+    rot *= AngleAxis3F(std::numbers::pi / 5., Vector3F(1, 1, 0).normalized());
     Box bb_rot2 = bb.transformed(rot);
 
     CHECK_CLOSE_ABS(bb_rot2.min(), Vector3F(-2.40848, -1.51816, -2.0559), 1e-4);
@@ -139,7 +140,6 @@ BOOST_AUTO_TEST_CASE(intersect_points) {
 }
 
 BOOST_AUTO_TEST_CASE(intersect_rays) {
-  /* temporarily removed, fails with double precision
   BOOST_TEST_CONTEXT("2D") {
     using Box = AxisAlignedBoundingBox<Object, BoundingBoxScalar, 2>;
 
@@ -157,9 +157,9 @@ BOOST_AUTO_TEST_CASE(intersect_rays) {
     ray = {{-2, -2}, {1, 0}};
     BOOST_CHECK(!bb.intersect(ray));
 
-    // upper bound is exclusive
-    ray = {{-2, 1}, {1, 0}};
-    BOOST_CHECK(!bb.intersect(ray));
+    // upper bound is exclusive - temporarily removed, fails macOS ci
+    // ray = {{-2, 1}, {1, 0}};
+    // BOOST_CHECK(!bb.intersect(ray));
 
     // lower bound is inclusive
     ray = {{-2, -1}, {1, 0}};
@@ -180,9 +180,9 @@ BOOST_AUTO_TEST_CASE(intersect_rays) {
     ray = {{2, -2}, {-1, 0}};
     BOOST_CHECK(!bb.intersect(ray));
 
-    // upper bound is exclusive
-    ray = {{2, 1}, {-1, 0}};
-    BOOST_CHECK(!bb.intersect(ray));
+    // upper bound is exclusive - temporarily removed, fails macOS ci
+    // ray = {{2, 1}, {-1, 0}};
+    // BOOST_CHECK(!bb.intersect(ray));
 
     // lower bound is inclusive
     ray = {{2, -1}, {-1, 0}};
@@ -203,8 +203,7 @@ BOOST_AUTO_TEST_CASE(intersect_rays) {
     ray = {{1, -2}, {0, 1}};
     BOOST_CHECK(!bb.intersect(ray));
 
-    // lower bound is not inclusive,
-    // due to Eigen's NaN handling.
+    // lower bound is not inclusive, due to Eigen's NaN handling.
     ray = {{-1, -2}, {0, 1}};
     BOOST_CHECK(!bb.intersect(ray));
 
@@ -227,8 +226,7 @@ BOOST_AUTO_TEST_CASE(intersect_rays) {
     ray = {{1, 2}, {0, -1}};
     BOOST_CHECK(!bb.intersect(ray));
 
-    // lower bound is not inclusive,
-    // due to Eigen's NaN handling.
+    // lower bound is not inclusive, due to Eigen's NaN handling.
     ray = {{-1, 2}, {0, -1}};
     BOOST_CHECK(!bb.intersect(ray));
 
@@ -260,31 +258,15 @@ BOOST_AUTO_TEST_CASE(intersect_rays) {
     BOOST_CHECK(!bb.intersect(ray));
 
     // starting point inside
-    ray = {{
-               0,
-               0,
-           },
-           {-1, 0}};
+    ray = {{0, 0}, {-1, 0}};
     BOOST_CHECK(bb.intersect(ray));
-    ray = {{
-               0,
-               0,
-           },
-           {1, 0}};
+    ray = {{0, 0}, {1, 0}};
     BOOST_CHECK(bb.intersect(ray));
-    ray = {{
-               0,
-               0,
-           },
-           {0, -1}};
+    ray = {{0, 0}, {0, -1}};
     BOOST_CHECK(bb.intersect(ray));
-    ray = {{
-               0,
-               0,
-           },
-           {0, 1}};
+    ray = {{0, 0}, {0, 1}};
     BOOST_CHECK(bb.intersect(ray));
-  } */
+  }
 
   BOOST_TEST_CONTEXT("3D visualize") {
     Object o;
@@ -321,21 +303,21 @@ BOOST_AUTO_TEST_CASE(intersect_rays) {
     ray3 = {{0, -2, -2}, {0, 0, 1}};
     BOOST_CHECK(!bb3.intersect(ray3));
 
-    // right on slab - temporarily removed, fails with double precision
+    // right on slab - temporarily removed, fails macOS ci
     // ray3 = {{0, 1, -2}, {0, 0, 1}};
     // BOOST_CHECK(!bb3.intersect(ray3));
 
-    // right on slab - temporarily removed, fails with double precision
-    // ray3 = {{0, -1, -2}, {0, 0, 1}};
-    // BOOST_CHECK(bb3.intersect(ray3));
+    // right on slab
+    ray3 = {{0, -1, -2}, {0, 0, 1}};
+    BOOST_CHECK(bb3.intersect(ray3));
 
     // right on slab
     ray3 = {{-1, 0, -2}, {0, 0, 1}};
     BOOST_CHECK(!bb3.intersect(ray3));
 
-    // right on slab - temporarily removed, fails with double precision
-    // ray3 = {{1, 0, -2}, {0, 0, 1}};
-    // BOOST_CHECK(!bb3.intersect(ray3));
+    // right on slab
+    ray3 = {{1, 0, -2}, {0, 0, 1}};
+    BOOST_CHECK(!bb3.intersect(ray3));
 
     ray3 = {{-0.95, 0, -2}, {0, 0, 1}};
     BOOST_CHECK(bb3.intersect(ray3));
@@ -408,8 +390,9 @@ BOOST_AUTO_TEST_CASE(ray_obb_intersect) {
                {1.8, 1, 1},
                {0, 1, 1}}};
   auto cubo = std::make_shared<GenericCuboidVolumeBounds>(vertices);
-  auto trf = Transform3(Translation3(Vector3(0, 8, -5)) *
-                        AngleAxis3(M_PI / 3., Vector3(1, -3, 9).normalized()));
+  auto trf = Transform3(
+      Translation3(Vector3(0, 8, -5)) *
+      AngleAxis3(std::numbers::pi / 3., Vector3(1, -3, 9).normalized()));
 
   Volume vol(trf, cubo);
 
@@ -440,15 +423,15 @@ BOOST_AUTO_TEST_CASE(ray_obb_intersect) {
   for (const auto& vtx_ : vertices) {
     Vector3 vtx = trf * vtx_;
 
-    // this ray goes straight to the actual vertex, this should
-    // definitely intersect the OBB
+    // this ray goes straight to the actual vertex, this should definitely
+    // intersect the OBB
     Ray ray(origin, (vtx - origin).normalized());
     ray = ray.transformed(trf.inverse());
     BOOST_CHECK(obb.intersect(ray));
     ray.draw(ply, (vtx - origin).norm());
 
-    // now shift the target point away from the centroid
-    // this should definitely NOT intersect the OBB
+    // now shift the target point away from the centroid this should definitely
+    // NOT intersect the OBB
     vtx += (vtx - centroid);
     ray = Ray(origin, (vtx - origin).normalized());
     ray = ray.transformed(trf.inverse());
@@ -459,10 +442,11 @@ BOOST_AUTO_TEST_CASE(ray_obb_intersect) {
 
 BOOST_AUTO_TEST_CASE(frustum_intersect) {
   BOOST_TEST_CONTEXT("2D") {
-    auto make_svg = [](const std::string& fname, std::size_t w, std::size_t h) {
+    auto make_svg = [](const std::string& fname, std::size_t width,
+                       std::size_t height) {
       auto os = tmp(fname);
       os << "<?xml version=\"1.0\" standalone=\"no\"?>\n";
-      os << "<svg width=\"" << w << "\" height=\"" << h
+      os << "<svg width=\"" << width << "\" height=\"" << height
          << "\" version=\"1.1\" xmlns=\"http://www.w3.org/2000/svg\">\n";
       return os;
     };
@@ -471,111 +455,110 @@ BOOST_AUTO_TEST_CASE(frustum_intersect) {
 
     std::ofstream os;
 
-    std::size_t w = 1000;
-    std::size_t n = 10;
-
-    // BEGIN VISUAL PARAMETER TEST
-
-    // BoundingBoxScalar  min = -20, max = 20;
-    // os = make_svg("frust2d.svg", w, w);
-
-    // BoundingBoxScalar  step = (max - min) /
-    // static_cast<BoundingBoxScalar>(n); for (std::size_t i = 0; i <= n; i++) {
-    // for (std::size_t j = 0; j <= n; j++) {
-    // ActsVector<BoundingBoxScalar,2> dir    = {1, 0};
-    // ActsVector<BoundingBoxScalar,2> origin = {min + step * i, min + step *
-    // j}; origin.x() *= 1.10;  // visual Eigen::Rotation2D<BoundingBoxScalar>
-    // rot(2 * M_PI / static_cast<BoundingBoxScalar>(n) * i); BoundingBoxScalar
-    // angle = 0.5 * M_PI / n * j; Frustum2                 fr(origin, rot *
-    // dir, angle); fr.svg(os, w, w, 2);
-    //}
-    //}
-
-    // os << "</svg>";
-    // os.close();
+    const std::size_t svgWidth = 1000;
+    const std::size_t svgHeight = svgWidth;
+    const std::size_t nSteps = 10;
+
+    // Visualise the parameters
+    const BoundingBoxScalar min = -20;
+    const BoundingBoxScalar max = 20;
+    os = make_svg("frust2d_parameters.svg", svgWidth, svgHeight);
+
+    const BoundingBoxScalar step = (max - min) / nSteps;
+    for (std::size_t i = 0; i <= nSteps; i++) {
+      for (std::size_t j = 0; j <= nSteps; j++) {
+        Vector2F dir(1, 0);
+        Vector2F origin(min + step * i, min + step * j);
+        origin.x() *= 1.10;
+        Eigen::Rotation2D<BoundingBoxScalar> rot(2 * std::numbers::pi / nSteps *
+                                                 i);
+        BoundingBoxScalar angle = std::numbers::pi / 2. / nSteps * j;
+        Frustum2 fr(origin, rot * dir, angle);
+        fr.svg(os, svgWidth, svgHeight, 2);
+      }
+    }
 
-    // END VISUAL PARAMETER TEST
+    os << "</svg>";
+    os.close();
 
-    w = 1000;
-    BoundingBoxScalar unit = 20;
+    const BoundingBoxScalar unit = 20;
 
     using Box = AxisAlignedBoundingBox<Object, BoundingBoxScalar, 2>;
     Object o;
     Box::Size size(Eigen::Matrix<BoundingBoxScalar, 2, 1>(2, 2));
 
-    n = 10;
-    BoundingBoxScalar minx = -20;
-    BoundingBoxScalar miny = -20;
-    BoundingBoxScalar maxx = 20;
-    BoundingBoxScalar maxy = 20;
-    BoundingBoxScalar stepx = (maxx - minx) / static_cast<BoundingBoxScalar>(n);
-    BoundingBoxScalar stepy = (maxy - miny) / static_cast<BoundingBoxScalar>(n);
+    const BoundingBoxScalar minX = -20;
+    const BoundingBoxScalar minY = -20;
+    const BoundingBoxScalar maxX = 20;
+    const BoundingBoxScalar maxY = 20;
+    const BoundingBoxScalar stepX = (maxX - minX) / nSteps;
+    const BoundingBoxScalar stepY = (maxY - minY) / nSteps;
 
-    std::set<std::size_t> act_idxs;
+    std::set<std::size_t> idxsAct;
 
     // clang-format off
-    std::vector<std::pair<Frustum2, std::set<std::size_t>>> fr_exp;
-    fr_exp = {
-        {Frustum2({0, 0}, {1, 0}, M_PI / 2.),
+    std::vector<std::pair<Frustum2, std::set<std::size_t>>> frExp;
+    frExp = {
+        {Frustum2({0, 0}, {1, 0}, std::numbers::pi / 2.),
          {60,  70,  71,  72,  80,  81,  82,  83,  84,  90,  91,  92,
           93,  94,  95,  96,  100, 101, 102, 103, 104, 105, 106, 107,
           108, 110, 111, 112, 113, 114, 115, 116, 117, 118, 119, 120}
         },
-        {Frustum2({0, 0}, {1, 0}, 0.5 * M_PI / 2.),
+        {Frustum2({0, 0}, {1, 0}, 0.5 * std::numbers::pi / 2.),
          {60,  71,  81,  82,  83,  92,  93,  94, 102,
           103, 104, 105, 106, 113, 114, 115, 116, 117}
         },
-        {Frustum2({0, 0}, {1, 0}, 0.2 * M_PI / 2.),
+        {Frustum2({0, 0}, {1, 0}, 0.2 * std::numbers::pi / 2.),
          {60, 71, 82, 93, 104, 114, 115, 116}
         },
-        {Frustum2({0, 0}, {1, 0},  3 * M_PI / 4.),
+        {Frustum2({0, 0}, {1, 0},  3 * std::numbers::pi / 4.),
          {60, 68, 69, 70, 71, 72, 73, 74, 77, 78, 79, 80, 81, 82, 83,
           84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95, 96, 97, 98,
           99, 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111,
           112, 113, 114, 115, 116, 117, 118, 119, 120}
         },
-        {Frustum2({0, 0}, {0, 1}, 0.5 * M_PI / 2.),
+        {Frustum2({0, 0}, {0, 1}, 0.5 * std::numbers::pi / 2.),
          {42, 43, 51, 52, 53, 54, 60, 61, 62, 63, 64, 65, 73, 74, 75, 76, 86, 87}
         },
-        {Frustum2({0, 0}, {-1, 0}, 0.5 * M_PI / 2.),
+        {Frustum2({0, 0}, {-1, 0}, 0.5 * std::numbers::pi / 2.),
          {3, 4, 5, 6, 7, 14, 15, 16, 17, 18, 26, 27, 28, 37, 38, 39, 49, 60}
         },
-        {Frustum2({0, 0}, {0, -1}, 0.5 * M_PI / 2.),
+        {Frustum2({0, 0}, {0, -1}, 0.5 * std::numbers::pi / 2.),
          {33, 34, 44, 45, 46, 47, 55, 56, 57, 58, 59, 60, 66, 67, 68, 69, 77, 78}
         },
-        {Frustum2({0, 0}, {1, 1}, 0.5 * M_PI / 2.),
+        {Frustum2({0, 0}, {1, 1}, 0.5 * std::numbers::pi / 2.),
          {60, 72, 73, 74, 83, 84, 85, 86, 87, 94, 95, 96, 97, 98, 106, 107,
           108, 109, 117, 118, 119, 120}
         },
-        {Frustum2({0, 0}, {-1, 1}, 0.5 * M_PI / 2.),
+        {Frustum2({0, 0}, {-1, 1}, 0.5 * std::numbers::pi / 2.),
          {7, 8, 9, 10, 18, 19, 20, 21, 28, 29, 30, 31, 32, 39, 40, 41, 42,
           43, 50, 51, 52, 60}
         },
-        {Frustum2({0, 0}, {-1, -1}, 0.5 * M_PI / 2.),
+        {Frustum2({0, 0}, {-1, -1}, 0.5 * std::numbers::pi / 2.),
          {0, 1, 2, 3, 11, 12, 13, 14, 22, 23, 24, 25, 26, 33, 34, 35, 36,
           37, 46, 47, 48, 60}
         },
-        {Frustum2({0, 0}, {1, -1}, 0.5 * M_PI / 2.),
+        {Frustum2({0, 0}, {1, -1}, 0.5 * std::numbers::pi / 2.),
          {60, 68, 69, 70, 77, 78, 79, 80, 81, 88, 89, 90, 91, 92, 99, 100,
           101, 102, 110, 111, 112, 113}
         },
-        {Frustum2({1, 1}, {1, -1}, M_PI / 2.),
+        {Frustum2({1, 1}, {1, -1}, std::numbers::pi / 2.),
          {55, 56, 57, 58, 59, 60, 66, 67, 68, 69, 70, 71, 77, 78, 79, 80,
           81, 82, 88, 89, 90, 91, 92, 93, 99, 100, 101, 102, 103, 104, 110, 111, 112, 113, 114, 115}
         },
-        {Frustum2({-1, -1}, {1, -1}, M_PI / 2.),
+        {Frustum2({-1, -1}, {1, -1}, std::numbers::pi / 2.),
          {55, 56, 57, 58, 59, 60, 66, 67, 68, 69, 70, 71, 77, 78, 79, 80,
           81, 82, 88, 89, 90, 91, 92, 93, 99, 100, 101, 102, 103, 104, 110, 111, 112, 113, 114, 115}
         },
-        {Frustum2({10, -10}, {1, 1}, 0.5 * M_PI / 2.),
+        {Frustum2({10, -10}, {1, 1}, 0.5 * std::numbers::pi / 2.),
          {91, 92, 102, 103, 104, 105, 114, 115, 116, 117, 118, 119}
         },
-        {Frustum2({-10.3, 12.8}, {0.3, -1}, 0.5 * M_PI / 2.),
+        {Frustum2({-10.3, 12.8}, {0.3, -1}, 0.5 * std::numbers::pi / 2.),
          {22, 23, 24, 25, 26, 27, 28, 33, 34, 35, 36, 37, 38, 39, 40, 41,
           44, 45, 46, 47, 48, 49, 50, 55, 56, 57, 58, 59, 60, 66, 67, 68,
           69, 70, 77, 78, 79, 80, 88, 89, 99}
         },
-        {Frustum2({17.2, 19.45}, {-1, -0.1}, 0.5 * M_PI / 2.),
+        {Frustum2({17.2, 19.45}, {-1, -0.1}, 0.5 * std::numbers::pi / 2.),
          {5, 6, 7, 8, 9, 10, 17, 18, 19, 20, 21, 28, 29, 30, 31, 32, 40,
           41, 42, 43, 51, 52, 53, 54, 63, 64, 65, 74, 75, 76, 86, 87, 97,
           98, 109}
@@ -583,22 +566,22 @@ BOOST_AUTO_TEST_CASE(frustum_intersect) {
     };
     // clang-format on
 
-    for (std::size_t l = 0; l < fr_exp.size(); l++) {
-      const Frustum2& fr = fr_exp.at(l).first;
-      const std::set<std::size_t>& exp_idxs = fr_exp.at(l).second;
+    for (std::size_t l = 0; l < frExp.size(); l++) {
+      const Frustum2& fr = frExp.at(l).first;
+      const std::set<std::size_t>& idxsExp = frExp.at(l).second;
       std::stringstream ss;
       ss << "frust2d_test_" << l << ".svg";
-      os = make_svg(ss.str(), w, w);
+      os = make_svg(ss.str(), svgWidth, svgHeight);
 
-      act_idxs.clear();
+      idxsAct.clear();
 
       std::vector<Box> boxes;
-      boxes.reserve((n + 1) * (n + 1));
-      for (std::size_t i = 0; i <= n; i++) {
-        for (std::size_t j = 0; j <= n; j++) {
+      boxes.reserve((nSteps + 1) * (nSteps + 1));
+      for (std::size_t i = 0; i <= nSteps; i++) {
+        for (std::size_t j = 0; j <= nSteps; j++) {
           boxes.emplace_back(&o,
                              Eigen::Matrix<BoundingBoxScalar, 2, 1>{
-                                 minx + i * stepx, miny + j * stepy},
+                                 minX + i * stepX, minY + j * stepY},
                              size);
           std::stringstream st;
           st << boxes.size() - 1;
@@ -606,16 +589,16 @@ BOOST_AUTO_TEST_CASE(frustum_intersect) {
           std::string color = "red";
           if (boxes.back().intersect(fr)) {
             color = "green";
-            act_idxs.insert(boxes.size() - 1);
+            idxsAct.insert(boxes.size() - 1);
           }
 
-          boxes.back().svg(os, w, w, unit, st.str(), color);
+          boxes.back().svg(os, svgWidth, svgHeight, unit, st.str(), color);
         }
       }
 
-      BOOST_CHECK(act_idxs == exp_idxs);
+      BOOST_CHECK(idxsAct == idxsExp);
 
-      fr.svg(os, w, w, maxx, unit);
+      fr.svg(os, svgWidth, svgHeight, maxX, unit);
       os << "</svg>";
 
       os.close();
@@ -627,73 +610,65 @@ BOOST_AUTO_TEST_CASE(frustum_intersect) {
     using Frustum3 = Frustum<BoundingBoxScalar, 3, 3>;
     std::ofstream os;
     std::size_t n = 10;
-    std::size_t s = 5;
-    double min = -10, max = 10;
-    double step = (max - min) / s;
+    const std::size_t nSteps = 5;
+    double min = -10;
+    double max = 10;
+    double step = (max - min) / nSteps;
+
+    // Visualise the parameters
+    auto make = [&](double angle, const Vector3F& origin,
+                    std::ofstream& osTmp) {
+      helper.clear();
+      BoundingBoxScalar far = 1;
+      Frustum3 fr(origin, {0, 0, 1}, angle);
+      fr.draw(helper, far);
+      fr = Frustum3(origin, {0, 0, -1}, angle);
+      fr.draw(helper, far);
+      fr = Frustum3(origin, {1, 0, 0}, angle);
+      fr.draw(helper, far);
+      fr = Frustum3(origin, {-1, 0, 0}, angle);
+      fr.draw(helper, far);
+
+      fr = Frustum3(origin, {0, 1, 0}, angle);
+      fr.draw(helper, far);
+      fr = Frustum3(origin, {0, -1, 0}, angle);
+      fr.draw(helper, far);
+
+      osTmp << helper << std::flush;
+
+      helper.clear();
+    };
 
-    // BEGIN VISUAL PARAMETER TEST
-
-    // std::size_t n_vtx   = 1;
-    // auto make = [&](double angle, ActsVector<BoundingBoxScalar,3> origin,
-    // std::ofstream& os)
-    // {
-    // helper.clear();
-    // BoundingBoxScalar    far = 1;
-    // Frustum3 fr(origin, {0, 0, 1}, angle);
-    // fr.draw(helper, far);
-    // fr = Frustum3(origin, {0, 0, -1}, angle);
-    // fr.draw(helper, far);
-    // fr = Frustum3(origin, {1, 0, 0}, angle);
-    // fr.draw(helper, far);
-    // fr = Frustum3(origin, {-1, 0, 0}, angle);
-    // fr.draw(helper, far);
-
-    // fr = Frustum3(origin, {0, 1, 0}, angle);
-    // fr.draw(helper, far);
-    // fr = Frustum3(origin, {0, -1, 0}, angle);
-    // fr.draw(helper, far);
-
-    // os << helper << std::flush;
-
-    // helper.clear();
-    //};
-
-    // os = std::ofstreams("frust3d_dir.ply");
-    // for (std::size_t i = 0; i <= s; i++) {
-    // for (std::size_t j = 0; j <= s; j++) {
-    // for (std::size_t k = 0; k <= s; k++) {
-    // ActsVector<BoundingBoxScalar,3> origin(
-    // min + i * step, min + j * step, min + k * step);
-    //// std::cout << origin.transpose() << std::endl;
-    // make(M_PI / 4., origin, os);
-    //}
-    //}
-    //}
-    // os.close();
-
-    // os = tmp("frust3D_angle.ply");
-    // helper.clear();
-    // n_vtx             = 1;
-    // Eigen::Affine3f rot;
-    // for (std::size_t i = 0; i <= n; i++) {
-    // ActsVector<BoundingBoxScalar,3> origin(i * 4, 0, 0);
-    // rot = Eigen::AngleAxisf(M_PI / static_cast<BoundingBoxScalar>(n) * i,
-    // ActsVector<BoundingBoxScalar,3>::UnitY()); BoundingBoxScalar angle =
-    // (M_PI / 2.) / static_cast<BoundingBoxScalar>(n) * (1 + i);
-    // ActsVector<BoundingBoxScalar,3> dir(1, 0, 0); Frustum3 fr(origin, rot *
-    // dir, angle); fr.draw(helper, 2);
-    //}
-
-    // os << helper << std::flush;
-    // os.close();
-
-    //// END VISUAL PARAMETER TEST
-
-    std::set<std::size_t> act_idxs;
-
-    std::vector<std::pair<Frustum3, std::set<std::size_t>>> fr_exp;
-    fr_exp = {
-        {Frustum3({0, 0, 0}, {1, 0, 0}, M_PI / 2.),
+    os = std::ofstream("frust3d_dir.ply");
+    for (std::size_t i = 0; i <= nSteps; i++) {
+      for (std::size_t j = 0; j <= nSteps; j++) {
+        for (std::size_t k = 0; k <= nSteps; k++) {
+          Vector3F origin(min + i * step, min + j * step, min + k * step);
+          make(std::numbers::pi / 4., origin, os);
+        }
+      }
+    }
+    os.close();
+
+    os = tmp("frust3D_angle.ply");
+    helper.clear();
+    for (std::size_t i = 0; i <= n; i++) {
+      Vector3F origin(i * 4, 0, 0);
+      AngleAxis3F rot(std::numbers::pi / n * i, Vector3F::UnitY());
+      BoundingBoxScalar angle = (std::numbers::pi / 2.) / n * (1 + i);
+      Vector3F dir(1, 0, 0);
+      Frustum3 fr(origin, rot * dir, angle);
+      fr.draw(helper, 2);
+    }
+
+    os << helper << std::flush;
+    os.close();
+
+    std::set<std::size_t> idxsAct;
+
+    std::vector<std::pair<Frustum3, std::set<std::size_t>>> frExp;
+    frExp = {
+        {Frustum3({0, 0, 0}, {1, 0, 0}, std::numbers::pi / 2.),
          {
              665,  763,  774,  775,  785,  786,  787,  788,  796,  797,  807,
              872,  873,  883,  884,  885,  886,  894,  895,  896,  897,  898,
@@ -724,7 +699,7 @@ BOOST_AUTO_TEST_CASE(frustum_intersect) {
              1314, 1315, 1316, 1317, 1320, 1321, 1322, 1323, 1324, 1325, 1326,
              1327,
          }},
-        {Frustum3({0, 0, 0}, {0, 1, 0}, M_PI / 2.),
+        {Frustum3({0, 0, 0}, {0, 1, 0}, std::numbers::pi / 2.),
          {93,   102,  103,  104,  105,  106,  112,  113,  114,  115,  116,
           117,  118,  203,  213,  214,  215,  223,  224,  225,  226,  227,
           233,  234,  235,  236,  237,  238,  239,  324,  333,  334,  335,
@@ -753,7 +728,7 @@ BOOST_AUTO_TEST_CASE(frustum_intersect) {
           1198, 1199, 1200, 1201, 1202, 1203, 1204, 1205, 1206, 1207, 1208,
           1209, 1320, 1321, 1322, 1323, 1324, 1325, 1326, 1327, 1328, 1329,
           1330}},
-        {Frustum3({0, 0, 0}, {0, 0, 1}, M_PI / 2.),
+        {Frustum3({0, 0, 0}, {0, 0, 1}, std::numbers::pi / 2.),
          {32,   42,   43,   53,   54,   63,   64,   65,   75,   76,   86,
           87,   98,   153,  163,  164,  173,  174,  175,  183,  184,  185,
           186,  195,  196,  197,  207,  208,  219,  263,  273,  274,  283,
@@ -782,17 +757,17 @@ BOOST_AUTO_TEST_CASE(frustum_intersect) {
           1153, 1154, 1164, 1165, 1175, 1176, 1186, 1187, 1197, 1198, 1208,
           1209, 1220, 1231, 1242, 1253, 1264, 1275, 1286, 1297, 1308, 1319,
           1330}},
-        {Frustum3({0, 0, 0}, {0, 0, 1}, M_PI / 4.),
+        {Frustum3({0, 0, 0}, {0, 0, 1}, std::numbers::pi / 4.),
          {186, 305, 306, 307, 416, 417, 425, 426, 427, 428, 438, 439,
           527, 536, 537, 538, 545, 546, 547, 548, 549, 558, 559, 560,
           571, 647, 648, 656, 657, 658, 659, 665, 666, 667, 668, 669,
           670, 678, 679, 680, 681, 691, 692, 758, 767, 768, 769, 777,
           778, 779, 780, 788, 789, 790, 791, 799, 800, 801, 802, 811,
           812, 813, 824, 879, 890, 901, 912, 923, 934, 945}},
-        {Frustum3({0, 0, 0}, {0, 0, 1}, M_PI / 8.),
+        {Frustum3({0, 0, 0}, {0, 0, 1}, std::numbers::pi / 8.),
          {427, 428, 546, 547, 548, 549, 658, 659, 665, 666, 667, 668, 669, 670,
           680, 681, 780, 791, 802}},
-        {Frustum3({0, 0, 0}, {0, 0, 1}, M_PI * 3. / 4.),
+        {Frustum3({0, 0, 0}, {0, 0, 1}, std::numbers::pi * 3. / 4.),
          {8,    9,    10,   19,   20,   21,   29,   30,   31,   32,   40,
           41,   42,   43,   51,   52,   53,   54,   61,   62,   63,   64,
           65,   73,   74,   75,   76,   84,   85,   86,   87,   95,   96,
@@ -841,7 +816,7 @@ BOOST_AUTO_TEST_CASE(frustum_intersect) {
           1273, 1274, 1275, 1283, 1284, 1285, 1286, 1294, 1295, 1296, 1297,
           1305, 1306, 1307, 1308, 1316, 1317, 1318, 1319, 1327, 1328, 1329,
           1330}},
-        {Frustum3({1.3, -5.9, 3.5}, {0.2, 0.4, 1}, M_PI / 3.),
+        {Frustum3({1.3, -5.9, 3.5}, {0.2, 0.4, 1}, std::numbers::pi / 3.),
          {318,  426,  427,  428,  438,  439,  450,  538,  546,  547,  548,
           549,  558,  559,  560,  570,  571,  582,  655,  656,  657,  658,
           659,  667,  668,  669,  670,  678,  679,  680,  681,  690,  691,
@@ -855,9 +830,9 @@ BOOST_AUTO_TEST_CASE(frustum_intersect) {
           1088, 1143, 1154, 1165, 1175, 1176, 1186, 1187, 1197, 1198, 1207,
           1208, 1209, 1308, 1319, 1330}}};
 
-    for (std::size_t l = 0; l < fr_exp.size(); l++) {
-      const Frustum3& fr = fr_exp.at(l).first;
-      const std::set<std::size_t>& exp_idxs = fr_exp.at(l).second;
+    for (std::size_t l = 0; l < frExp.size(); l++) {
+      const Frustum3& fr = frExp.at(l).first;
+      const std::set<std::size_t>& idxsExp = frExp.at(l).second;
       std::stringstream ss;
       ss << "frust3d-3s_test_" << l << ".ply";
 
@@ -865,14 +840,14 @@ BOOST_AUTO_TEST_CASE(frustum_intersect) {
 
       helper.clear();
 
-      act_idxs.clear();
+      idxsAct.clear();
 
       fr.draw(helper, 50);
 
       n = 10;
       min = -33;
       max = 33;
-      step = (max - min) / static_cast<BoundingBoxScalar>(n);
+      step = (max - min) / n;
 
       Object o;
       using Box = AxisAlignedBoundingBox<Object, BoundingBoxScalar, 3>;
@@ -887,11 +862,11 @@ BOOST_AUTO_TEST_CASE(frustum_intersect) {
                 min + i * step, min + j * step, min + k * step);
             Box bb(&o, pos, size);
 
-            std::array<int, 3> color = {255, 0, 0};
+            Color color = {255, 0, 0};
 
             if (bb.intersect(fr)) {
               color = {0, 255, 0};
-              act_idxs.insert(idx);
+              idxsAct.insert(idx);
             }
 
             bb.draw(helper, color);
@@ -903,74 +878,65 @@ BOOST_AUTO_TEST_CASE(frustum_intersect) {
       os << helper << std::flush;
       os.close();
 
-      BOOST_CHECK(act_idxs == exp_idxs);
+      BOOST_CHECK(idxsAct == idxsExp);
     }
   }
 
   BOOST_TEST_CONTEXT("3D - 4 Sides") {
     using Frustum34 = Frustum<BoundingBoxScalar, 3, 4>;
-    std::size_t n = 10;
-    double min = -10, max = 10;
-    std::size_t s = 5;
+    const std::size_t n = 10;
+    double min = -10;
+    double max = 10;
+    const std::size_t s = 5;
     double step = (max - min) / s;
     std::ofstream os;
 
-    // BEGIN VISUAL PARAMETER TEST
-
-    // std::size_t n_vtx    = 1;
-
-    // helper.clear();
-    // os = tmp("frust3d-4s_dir.ply");
-
-    // double angle = M_PI / 4.;
-    // for (std::size_t i = 0; i <= s; i++) {
-    // for (std::size_t j = 0; j <= s; j++) {
-    // for (std::size_t k = 0; k <= s; k++) {
-    // ActsVector<BoundingBoxScalar,3> origin(
-    // min + i * step, min + j * step, min + k * step);
-    // ActsVector<BoundingBoxScalar,3> dir(1, 0, 0);
-
-    // Eigen::Affine3f rot;
-    // rot = Eigen::AngleAxisf(M_PI / static_cast<BoundingBoxScalar>(s) * i,
-    // ActsVector<BoundingBoxScalar,3>::UnitX())
-    //* Eigen::AngleAxisf(M_PI / static_cast<BoundingBoxScalar>(s) * j,
-    // ActsVector<BoundingBoxScalar,3>::UnitY())
-    //* Eigen::AngleAxisf(M_PI / static_cast<BoundingBoxScalar>(s) * k,
-    // ActsVector<BoundingBoxScalar,3>::UnitZ());
-
-    // Frustum34 fr(origin, rot * dir, angle);
-    // fr.draw(helper, 1);
-    //}
-    //}
-    //}
-
-    // os << helper << std::flush;
-    // os.close();
-    // os = tmp("frust3d-4s_angle.ply");
-    // helper.clear();
-
-    // n_vtx    = 1;
-    // for (std::size_t i = 0; i <= n; i++) {
-    // ActsVector<BoundingBoxScalar,3>  origin(i * 4, 0, 0);
-    // Eigen::Affine3f rot;
-    // rot   = Eigen::AngleAxisf(M_PI / static_cast<BoundingBoxScalar>(n) * i,
-    // ActsVector<BoundingBoxScalar,3>::UnitY());
-    // angle = (M_PI / 2.) / static_cast<BoundingBoxScalar>(n) * (1 + i);
-    // ActsVector<BoundingBoxScalar,3> dir(1, 0, 0);
-    // Frustum34      fr(origin, rot * dir, angle);
-    // fr.draw(helper, 2);
-    //}
-
-    // os << helper << std::flush;
-    // os.close();
-
-    // END VISUAL PARAMETER TEST
-
-    std::set<std::size_t> act_idxs;
-
-    std::vector<std::pair<Frustum34, std::set<std::size_t>>> fr_exp;
-    fr_exp = {
-        {Frustum34({0, 0, 0}, {1, 0, 0}, M_PI / 2.),
+    // Visualise the parameters
+    helper.clear();
+    os = tmp("frust3d-4s_dir.ply");
+
+    const double constAngle = std::numbers::pi / 4.;
+    for (std::size_t i = 0; i <= s; i++) {
+      for (std::size_t j = 0; j <= s; j++) {
+        for (std::size_t k = 0; k <= s; k++) {
+          Vector3F origin(min + i * step, min + j * step, min + k * step);
+          Vector3F dir(1, 0, 0);
+
+          BoundingBoxScalar piOverS = std::numbers::pi_v<BoundingBoxScalar> / s;
+          AngleAxis3F rot;
+          rot = AngleAxis3F(piOverS * i, Vector3F::UnitX()) *
+                AngleAxis3F(piOverS * j, Vector3F::UnitY()) *
+                AngleAxis3F(piOverS * k, Vector3F::UnitZ());
+
+          Frustum34 fr(origin, rot * dir, constAngle);
+          fr.draw(helper, 1);
+        }
+      }
+    }
+
+    os << helper << std::flush;
+    os.close();
+
+    os = tmp("frust3d-4s_angle.ply");
+    helper.clear();
+
+    for (std::size_t i = 0; i <= n; i++) {
+      Vector3F origin(i * 4, 0, 0);
+      AngleAxis3F rot(std::numbers::pi / n * i, Vector3F::UnitY());
+      const double angle = (std::numbers::pi / 2.) / n * (1 + i);
+      Vector3F dir(1, 0, 0);
+      Frustum34 fr(origin, rot * dir, angle);
+      fr.draw(helper, 2);
+    }
+
+    os << helper << std::flush;
+    os.close();
+
+    std::set<std::size_t> idxsAct;
+
+    std::vector<std::pair<Frustum34, std::set<std::size_t>>> frExp;
+    frExp = {
+        {Frustum34({0, 0, 0}, {1, 0, 0}, std::numbers::pi / 2.),
          {665,  774,  775,  776,  785,  786,  787,  796,  797,  798,  883,
           884,  885,  886,  887,  894,  895,  896,  897,  898,  905,  906,
           907,  908,  909,  916,  917,  918,  919,  920,  927,  928,  929,
@@ -997,7 +963,7 @@ BOOST_AUTO_TEST_CASE(frustum_intersect) {
           1298, 1299, 1300, 1301, 1302, 1303, 1304, 1305, 1306, 1307, 1308,
           1309, 1310, 1311, 1312, 1313, 1314, 1315, 1316, 1317, 1318, 1319,
           1320, 1321, 1322, 1323, 1324, 1325, 1326, 1327, 1328, 1329, 1330}},
-        {Frustum34({0, 0, 0}, {0, 1, 0}, M_PI / 2.),
+        {Frustum34({0, 0, 0}, {0, 1, 0}, std::numbers::pi / 2.),
          {110,  111,  112,  113,  114,  115,  116,  117,  118,  119,  120,
           221,  222,  223,  224,  225,  226,  227,  228,  229,  231,  232,
           233,  234,  235,  236,  237,  238,  239,  240,  241,  332,  333,
@@ -1024,7 +990,7 @@ BOOST_AUTO_TEST_CASE(frustum_intersect) {
           1087, 1088, 1189, 1190, 1191, 1192, 1193, 1194, 1195, 1196, 1197,
           1199, 1200, 1201, 1202, 1203, 1204, 1205, 1206, 1207, 1208, 1209,
           1320, 1321, 1322, 1323, 1324, 1325, 1326, 1327, 1328, 1329, 1330}},
-        {Frustum34({0, 0, 0}, {0, 0, 1}, M_PI / 2.),
+        {Frustum34({0, 0, 0}, {0, 0, 1}, std::numbers::pi / 2.),
          {10,   21,   32,   43,   54,   65,   76,   87,   98,   109,  120,
           131,  141,  142,  152,  153,  163,  164,  174,  175,  185,  186,
           196,  197,  207,  208,  218,  219,  229,  230,  241,  252,  262,
@@ -1051,15 +1017,15 @@ BOOST_AUTO_TEST_CASE(frustum_intersect) {
           1077, 1088, 1099, 1109, 1110, 1120, 1121, 1131, 1132, 1142, 1143,
           1153, 1154, 1164, 1165, 1175, 1176, 1186, 1187, 1197, 1198, 1209,
           1220, 1231, 1242, 1253, 1264, 1275, 1286, 1297, 1308, 1319, 1330}},
-        {Frustum34({0, 0, 0}, {0, 0, 1}, M_PI / 4.),
+        {Frustum34({0, 0, 0}, {0, 0, 1}, std::numbers::pi / 4.),
          {406, 417, 428, 439, 450, 527, 535, 536, 537, 538, 546, 547, 548, 549,
           557, 558, 559, 560, 571, 648, 656, 657, 658, 659, 665, 666, 667, 668,
           669, 670, 678, 679, 680, 681, 692, 769, 777, 778, 779, 780, 788, 789,
           790, 791, 799, 800, 801, 802, 813, 890, 901, 912, 923, 934}},
-        {Frustum34({0, 0, 0}, {0, 0, 1}, M_PI / 8.),
+        {Frustum34({0, 0, 0}, {0, 0, 1}, std::numbers::pi / 8.),
          {538, 549, 560, 659, 665, 666, 667, 668, 669, 670, 681, 780, 791,
           802}},
-        {Frustum34({0, 0, 0}, {0, 0, 1}, M_PI * 3. / 4.),
+        {Frustum34({0, 0, 0}, {0, 0, 1}, std::numbers::pi * 3. / 4.),
          {7,    8,    9,    10,   18,   19,   20,   21,   29,   30,   31,
           32,   40,   41,   42,   43,   51,   52,   53,   54,   62,   63,
           64,   65,   73,   74,   75,   76,   84,   85,   86,   87,   95,
@@ -1107,7 +1073,7 @@ BOOST_AUTO_TEST_CASE(frustum_intersect) {
           1263, 1264, 1272, 1273, 1274, 1275, 1283, 1284, 1285, 1286, 1294,
           1295, 1296, 1297, 1305, 1306, 1307, 1308, 1316, 1317, 1318, 1319,
           1327, 1328, 1329, 1330}},
-        {Frustum34({1.3, -5.9, 3.5}, {0.2, 0.4, 1}, M_PI / 3.),
+        {Frustum34({1.3, -5.9, 3.5}, {0.2, 0.4, 1}, std::numbers::pi / 3.),
          {461,  472,  537,  538,  548,  549,  558,  559,  560,  569,  570,
           571,  581,  582,  593,  655,  656,  657,  658,  659,  666,  667,
           668,  669,  670,  678,  679,  680,  681,  690,  691,  692,  702,
@@ -1119,9 +1085,13 @@ BOOST_AUTO_TEST_CASE(frustum_intersect) {
           1088, 1143, 1154, 1165, 1175, 1176, 1186, 1187, 1197, 1198, 1209,
           1308, 1319, 1330}}};
 
-    for (std::size_t l = 0; l < fr_exp.size(); l++) {
-      const Frustum34& fr = fr_exp.at(l).first;
-      const std::set<std::size_t>& exp_idxs = fr_exp.at(l).second;
+    min = -33;
+    max = 33;
+    step = (max - min) / n;
+
+    for (std::size_t l = 0; l < frExp.size(); l++) {
+      const Frustum34& fr = frExp.at(l).first;
+      const std::set<std::size_t>& idxsExp = frExp.at(l).second;
       std::stringstream ss;
       ss << "frust3d-4s_test_" << l << ".ply";
 
@@ -1129,15 +1099,10 @@ BOOST_AUTO_TEST_CASE(frustum_intersect) {
 
       helper.clear();
 
-      act_idxs.clear();
+      idxsAct.clear();
 
       fr.draw(helper, 50);
 
-      n = 10;
-      min = -33;
-      max = 33;
-      step = (max - min) / static_cast<BoundingBoxScalar>(n);
-
       Object o;
       using Box = AxisAlignedBoundingBox<Object, BoundingBoxScalar, 3>;
       Box::Size size(Eigen::Matrix<BoundingBoxScalar, 3, 1>(2, 2, 2));
@@ -1150,11 +1115,11 @@ BOOST_AUTO_TEST_CASE(frustum_intersect) {
                 min + i * step, min + j * step, min + k * step);
             Box bb(&o, pos, size);
 
-            std::array<int, 3> color = {255, 0, 0};
+            Color color = {255, 0, 0};
 
             if (bb.intersect(fr)) {
               color = {0, 255, 0};
-              act_idxs.insert(idx);
+              idxsAct.insert(idx);
             }
 
             bb.draw(helper, color);
@@ -1166,7 +1131,7 @@ BOOST_AUTO_TEST_CASE(frustum_intersect) {
       os << helper << std::flush;
       os.close();
 
-      BOOST_CHECK(act_idxs == exp_idxs);
+      BOOST_CHECK(idxsAct == idxsExp);
     }
   }
 
@@ -1179,7 +1144,7 @@ BOOST_AUTO_TEST_CASE(frustum_intersect) {
 
     PlyVisualization3D<BoundingBoxScalar> ply;
 
-    Frustum fr({0, 0, 0}, {0, 0, 1}, M_PI / 8.);
+    Frustum fr({0, 0, 0}, {0, 0, 1}, std::numbers::pi / 8.);
     fr.draw(ply, 10);
 
     Box bb(&o, {0, 0, 10}, size);
@@ -1202,7 +1167,6 @@ BOOST_AUTO_TEST_CASE(frustum_intersect) {
 
     PlyVisualization3D<BoundingBoxScalar> ply;
 
-    // Frustum fr({0, 0, 0}, {0, 0, 1}, M_PI/8.);
     vec3 pos = {-12.4205, 29.3578, 44.6207};
     vec3 dir = {-0.656862, 0.48138, 0.58035};
     Frustum fr(pos, dir, 0.972419);
diff --git a/Tests/UnitTests/Core/Utilities/CMakeLists.txt b/Tests/UnitTests/Core/Utilities/CMakeLists.txt
index 30bfda33fc3..955b58b31c9 100644
--- a/Tests/UnitTests/Core/Utilities/CMakeLists.txt
+++ b/Tests/UnitTests/Core/Utilities/CMakeLists.txt
@@ -25,7 +25,6 @@ add_unittest(Intersection IntersectionTests.cpp)
 add_unittest(KDTree KDTreeTests.cpp)
 add_unittest(Logger LoggerTests.cpp)
 add_unittest(MaterialMapUtils MaterialMapUtilsTests.cpp)
-add_unittest(MPL MPLTests.cpp)
 add_unittest(MultiIndex MultiIndexTests.cpp)
 add_unittest(Periodic PeriodicTests.cpp)
 add_unittest(Range1D Range1DTests.cpp)
@@ -33,11 +32,10 @@ add_unittest(RangeXD RangeXDTests.cpp)
 add_unittest(Ray RayTest.cpp)
 add_unittest(RealQuadraticEquation RealQuadraticEquationTests.cpp)
 add_unittest(Result ResultTests.cpp)
-add_unittest(Subspace SubspaceTests.cpp)
 add_unittest(TypeList TypeListTests.cpp)
-add_unittest(TypeTraits TypeTraitsTest.cpp)
 add_unittest(UnitVectors UnitVectorsTests.cpp)
 add_unittest(Delegate DelegateTests.cpp)
+add_unittest(DelegateChainBuilder DelegateChainBuilderTests.cpp)
 add_unittest(HashedString HashedStringTests.cpp)
 if(ACTS_BUILD_CUDA_FEATURES)
     add_unittest(Cuda CudaTests.cu)
@@ -57,6 +55,10 @@ target_compile_definitions(
 add_unittest(ParticleData ParticleDataTests.cpp)
 add_unittest(Zip ZipTests.cpp)
 add_unittest(TransformRange TransformRangeTests.cpp)
-add_unittest(QuickMath QuickMathTests.cpp)
+add_unittest(MathHelpers MathHelpersTests.cpp)
+add_unittest(AngleHelpers AngleHelpersTests.cpp)
+add_unittest(VectorHelpers VectorHelpersTests.cpp)
 
 add_unittest(TrackHelpers TrackHelpersTests.cpp)
+add_unittest(GraphViz GraphVizTests.cpp)
+add_unittest(ContextType ContextTypeTests.cpp)
diff --git a/Tests/UnitTests/Core/Utilities/ContextTypeTests.cpp b/Tests/UnitTests/Core/Utilities/ContextTypeTests.cpp
new file mode 100644
index 00000000000..2bd67ee1e5f
--- /dev/null
+++ b/Tests/UnitTests/Core/Utilities/ContextTypeTests.cpp
@@ -0,0 +1,38 @@
+// This file is part of the ACTS project.
+//
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
+//
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
+
+#include <boost/test/tools/old/interface.hpp>
+#include <boost/test/unit_test.hpp>
+
+#include "Acts/Utilities/detail/ContextType.hpp"
+
+using namespace Acts;
+
+BOOST_AUTO_TEST_SUITE(ContextTypeTests)
+
+BOOST_AUTO_TEST_CASE(PackUnpack) {
+  ContextType ctx;
+
+  int v = 42;
+  ctx = v;
+
+  BOOST_CHECK_EQUAL(ctx.get<int>(), 42);
+  BOOST_CHECK_THROW(ctx.get<double>(), std::bad_any_cast);
+}
+
+BOOST_AUTO_TEST_CASE(MaybeUnpack) {
+  ContextType ctx;
+
+  int v = 42;
+  ctx = v;
+
+  BOOST_CHECK_EQUAL(*ctx.maybeGet<int>(), 42);
+  BOOST_CHECK_EQUAL(ctx.maybeGet<double>(), nullptr);
+}
+
+BOOST_AUTO_TEST_SUITE_END()
diff --git a/Tests/UnitTests/Core/Utilities/DBScanTests.cpp b/Tests/UnitTests/Core/Utilities/DBScanTests.cpp
index efd502a464a..23ab2cd10ef 100644
--- a/Tests/UnitTests/Core/Utilities/DBScanTests.cpp
+++ b/Tests/UnitTests/Core/Utilities/DBScanTests.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2024 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include <boost/test/unit_test.hpp>
 
diff --git a/Tests/UnitTests/Core/Utilities/DelegateChainBuilderTests.cpp b/Tests/UnitTests/Core/Utilities/DelegateChainBuilderTests.cpp
new file mode 100644
index 00000000000..783eb9a85e2
--- /dev/null
+++ b/Tests/UnitTests/Core/Utilities/DelegateChainBuilderTests.cpp
@@ -0,0 +1,118 @@
+// This file is part of the ACTS project.
+//
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
+//
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
+
+#include <boost/test/unit_test.hpp>
+#include <boost/test/unit_test_suite.hpp>
+
+#include "Acts/Utilities/DelegateChainBuilder.hpp"
+
+using namespace Acts;
+
+struct AddTo {
+  int value = 0;
+
+  void add(int &x) const { x += value; }
+};
+
+void addFive(int &x) {
+  x += 5;
+}
+
+BOOST_AUTO_TEST_SUITE(DelegateChainBuilderTests)
+
+BOOST_AUTO_TEST_CASE(DelegateChainBuilderAdd) {
+  AddTo a1{1}, a2{2}, a3{3};
+  int x = 0;
+
+  // Basic building
+  OwningDelegate<void(int &)> chain = DelegateChainBuilder<void(int &)>{}
+                                          .add<&AddTo::add>(&a1)
+                                          .add<&addFive>()
+                                          .add<&AddTo::add>(&a2)
+                                          .add<&AddTo::add>(&a3)
+                                          .build();
+  chain(x);
+  BOOST_CHECK_EQUAL(x, 11);
+
+  chain.disconnect();
+
+  // In case of no return types, we can rebind the owning delegate with a chain
+  // of different size
+  chain = DelegateChainBuilder<void(int &)>{}
+              .add<&AddTo::add>(&a1)
+              .add<&addFive>()
+              .add<&AddTo::add>(&a3)
+              .build();
+
+  x = 0;
+
+  chain(x);
+  BOOST_CHECK_EQUAL(x, 9);
+
+  // CTAD helper from delegate type
+  chain = DelegateChainBuilder{chain}
+              .add<&AddTo::add>(&a1)
+              .add<&addFive>()
+              .add<&AddTo::add>(&a3)
+              .build();
+
+  x = 0;
+
+  chain(x);
+  BOOST_CHECK_EQUAL(x, 9);
+
+  Delegate<void(int &)> nonOwning;
+
+  // In case of a single callable, we can store it in a non-owning delegate
+  DelegateChainBuilder<void(int &)>{}.add<&AddTo::add>(&a1).store(nonOwning);
+
+  x = 0;
+  nonOwning(x);
+  BOOST_CHECK_EQUAL(x, 1);
+}
+
+struct GetInt {
+  int value;
+
+  int get() const { return value; }
+};
+
+int getSix() {
+  return 6;
+}
+
+BOOST_AUTO_TEST_CASE(DelegateChainBuilderReturn) {
+  GetInt g1{1}, g2{2}, g3{3};
+
+  Delegate<std::array<int, 4>(), void, DelegateType::Owning> chain =
+      DelegateChainBuilder<int()>{}
+          .add<&GetInt::get>(&g1)
+          .add<&getSix>()
+          .add<&GetInt::get>(&g2)
+          .add<&GetInt::get>(&g3)
+          .build();
+
+  auto results = chain();
+  std::vector<int> expected = {1, 6, 2, 3};
+  BOOST_CHECK_EQUAL_COLLECTIONS(results.begin(), results.end(),
+                                expected.begin(), expected.end());
+
+  Delegate<std::array<int, 3>(), void, DelegateType::Owning> delegate;
+  DelegateChainBuilder<int()>{}
+      .add<&GetInt::get>(&g1)
+      .add<&getSix>()
+      .add<&GetInt::get>(&g3)
+      .store(delegate);
+
+  auto results2 = delegate();
+  expected = {1, 6, 3};
+  BOOST_CHECK_EQUAL_COLLECTIONS(results2.begin(), results2.end(),
+                                expected.begin(), expected.end());
+}
+
+BOOST_AUTO_TEST_SUITE_END()
diff --git a/Tests/UnitTests/Core/Utilities/DelegateTests.cpp b/Tests/UnitTests/Core/Utilities/DelegateTests.cpp
index 1a9273871e4..c2d575b58fe 100644
--- a/Tests/UnitTests/Core/Utilities/DelegateTests.cpp
+++ b/Tests/UnitTests/Core/Utilities/DelegateTests.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2021 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include <boost/test/unit_test.hpp>
 
diff --git a/Tests/UnitTests/Core/Utilities/ExtendableTests.cpp b/Tests/UnitTests/Core/Utilities/ExtendableTests.cpp
index 92d68fae1c9..5878ebf220a 100644
--- a/Tests/UnitTests/Core/Utilities/ExtendableTests.cpp
+++ b/Tests/UnitTests/Core/Utilities/ExtendableTests.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2016-2018 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include <boost/test/unit_test.hpp>
 
@@ -33,7 +33,7 @@ BOOST_AUTO_TEST_CASE(Extendable_) {
   // Test the empty list
   detail::Extendable<> nullist{};
   (void)nullist;
-  BOOST_CHECK_EQUAL(std::tuple_size<std::tuple<>>::value, 0u);
+  BOOST_CHECK_EQUAL(std::tuple_size_v<std::tuple<>>, 0u);
 
   detail::Extendable<TypeA> alist;
   auto& a0_object = alist.get<TypeA>();
diff --git a/Tests/UnitTests/Core/Utilities/FiniteStateMachineTests.cpp b/Tests/UnitTests/Core/Utilities/FiniteStateMachineTests.cpp
index e633c2db5a1..d18df743bc0 100644
--- a/Tests/UnitTests/Core/Utilities/FiniteStateMachineTests.cpp
+++ b/Tests/UnitTests/Core/Utilities/FiniteStateMachineTests.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2019 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include <boost/test/unit_test.hpp>
 
diff --git a/Tests/UnitTests/Core/Utilities/FrustumTest.cpp b/Tests/UnitTests/Core/Utilities/FrustumTest.cpp
index f80c961c5cc..52b713349a9 100644
--- a/Tests/UnitTests/Core/Utilities/FrustumTest.cpp
+++ b/Tests/UnitTests/Core/Utilities/FrustumTest.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2019 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include <boost/test/tools/output_test_stream.hpp>
 #include <boost/test/unit_test.hpp>
@@ -16,6 +16,7 @@
 #include <algorithm>
 #include <array>
 #include <cmath>
+#include <numbers>
 #include <utility>
 #include <vector>
 
@@ -28,7 +29,7 @@ BOOST_AUTO_TEST_CASE(frustum_construction) {
   using Vector2F = Eigen::Matrix<float, 2, 1>;
 
   using Frustum2f2 = Frustum<float, 2, 2>;
-  Frustum2f2 fr({1, 0}, {0, 2}, M_PI / 2.);
+  Frustum2f2 fr({1, 0}, {0, 2}, std::numbers::pi / 2.);
 
   BOOST_CHECK_EQUAL(fr.origin(), Vector2F(1, 0));
   CHECK_CLOSE_ABS(fr.dir(), Vector2F(0, 1), 1e-6);
@@ -42,7 +43,7 @@ BOOST_AUTO_TEST_CASE(frustum_construction) {
   using Vector3F = Eigen::Matrix<float, 3, 1>;
 
   using Frustum3f3 = Frustum<float, 3, 3>;
-  Frustum3f3 fr33({1, 0, 0}, {0, 2, 1}, M_PI / 2.);
+  Frustum3f3 fr33({1, 0, 0}, {0, 2, 1}, std::numbers::pi / 2.);
 
   BOOST_CHECK_EQUAL(fr33.origin(), Vector3F(1, 0, 0));
   CHECK_CLOSE_ABS(fr33.dir(), Vector3F(0, 2, 1).normalized(), 1e-6);
@@ -55,7 +56,7 @@ BOOST_AUTO_TEST_CASE(frustum_construction) {
   // fr33.draw(hlp);
 
   using Frustum3f4 = Frustum<float, 3, 4>;
-  Frustum3f4 fr34({1, 0, 0}, {0, 2, 1}, M_PI / 2.);
+  Frustum3f4 fr34({1, 0, 0}, {0, 2, 1}, std::numbers::pi / 2.);
 
   BOOST_CHECK_EQUAL(fr34.origin(), Vector3F(1, 0, 0));
   CHECK_CLOSE_ABS(fr34.dir(), Vector3F(0, 2, 1).normalized(), 1e-6);
diff --git a/Tests/UnitTests/Core/Utilities/GraphVizTests.cpp b/Tests/UnitTests/Core/Utilities/GraphVizTests.cpp
new file mode 100644
index 00000000000..4f9a16dd778
--- /dev/null
+++ b/Tests/UnitTests/Core/Utilities/GraphVizTests.cpp
@@ -0,0 +1,54 @@
+// This file is part of the ACTS project.
+//
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
+//
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
+
+#include <boost/test/tools/output_test_stream.hpp>
+#include <boost/test/unit_test.hpp>
+
+#include "Acts/Utilities/GraphViz.hpp"
+
+namespace Acts::Test {
+
+BOOST_AUTO_TEST_SUITE(GraphViz)
+
+BOOST_AUTO_TEST_CASE(ApiTest) {
+  std::stringstream ss;
+
+  using namespace Acts::GraphViz;
+
+  Node node1{.id = "node1",
+             .label = "Node 1",
+             .shape = Shape::Ellipse,
+             .style = {Style::Filled}};
+
+  ss << node1;
+
+  std::string exp = R"(node1 [label=<Node 1>, shape=ellipse, style=filled];
+)";
+
+  BOOST_CHECK_EQUAL(ss.str(), exp);
+
+  Node node2{.id = "node2",
+             .label = "Node 2",
+             .shape = Shape::Rectangle,
+             .style = {Style::Dashed}};
+
+  Edge edge = {.from = node1, .to = node2, .style = Style::Dashed};
+
+  ss.str("");
+
+  ss << edge;
+
+  exp = R"(node1 -> node2 [style=dashed];
+)";
+
+  BOOST_CHECK_EQUAL(ss.str(), exp);
+}
+
+BOOST_AUTO_TEST_SUITE_END()
+
+}  // namespace Acts::Test
diff --git a/Tests/UnitTests/Core/Utilities/GridAccessHelpersTests.cpp b/Tests/UnitTests/Core/Utilities/GridAccessHelpersTests.cpp
index a69298fe222..09977099857 100644
--- a/Tests/UnitTests/Core/Utilities/GridAccessHelpersTests.cpp
+++ b/Tests/UnitTests/Core/Utilities/GridAccessHelpersTests.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2024 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include <boost/test/unit_test.hpp>
 
diff --git a/Tests/UnitTests/Core/Utilities/GridAxisGeneratorsTests.cpp b/Tests/UnitTests/Core/Utilities/GridAxisGeneratorsTests.cpp
index 8553ea049c6..4cfb0ea6088 100644
--- a/Tests/UnitTests/Core/Utilities/GridAxisGeneratorsTests.cpp
+++ b/Tests/UnitTests/Core/Utilities/GridAxisGeneratorsTests.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2023 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include <boost/test/unit_test.hpp>
 
@@ -15,6 +15,7 @@
 #include "Acts/Utilities/GridAxisGenerators.hpp"
 
 #include <cmath>
+#include <numbers>
 #include <tuple>
 #include <utility>
 
@@ -48,7 +49,7 @@ BOOST_AUTO_TEST_CASE(Eq1D) {
 }
 
 BOOST_AUTO_TEST_CASE(EqEq2D) {
-  EqOpenEqClosed eoec{{0, 10}, 10u, {-M_PI, M_PI}, 16u};
+  EqOpenEqClosed eoec{{0, 10}, 10u, {-std::numbers::pi, std::numbers::pi}, 16u};
   auto axisTuple = eoec();
   BOOST_CHECK_EQUAL(std::tuple_size<decltype(axisTuple)>{}, 2u);
   auto axisVar = std::get<0u>(axisTuple);
@@ -76,7 +77,8 @@ BOOST_AUTO_TEST_CASE(EqVar2D) {
 }
 
 BOOST_AUTO_TEST_CASE(VarEq2D) {
-  VarBoundEqClosed vbec{{10., 20, 30, 40}, {-M_PI, M_PI}, 12u};
+  VarBoundEqClosed vbec{
+      {10., 20, 30, 40}, {-std::numbers::pi, std::numbers::pi}, 12u};
   auto axisTuple = vbec();
   BOOST_CHECK_EQUAL(std::tuple_size<decltype(axisTuple)>{}, 2u);
   auto axisVar = std::get<0u>(axisTuple);
diff --git a/Tests/UnitTests/Core/Utilities/GridBinFinderTests.cpp b/Tests/UnitTests/Core/Utilities/GridBinFinderTests.cpp
index 7841c97d9f0..3f4190a95bc 100644
--- a/Tests/UnitTests/Core/Utilities/GridBinFinderTests.cpp
+++ b/Tests/UnitTests/Core/Utilities/GridBinFinderTests.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2024 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include <boost/test/unit_test.hpp>
 
diff --git a/Tests/UnitTests/Core/Utilities/GridIterationTests.cpp b/Tests/UnitTests/Core/Utilities/GridIterationTests.cpp
index f3e8210eb55..82a92a4be4a 100644
--- a/Tests/UnitTests/Core/Utilities/GridIterationTests.cpp
+++ b/Tests/UnitTests/Core/Utilities/GridIterationTests.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2016-2024 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include <boost/test/unit_test.hpp>
 
@@ -538,9 +538,7 @@ BOOST_AUTO_TEST_CASE(grid_iteration_test_3d_local_norepetitions) {
       for (std::size_t z : navigation[2ul]) {
         std::array<std::size_t, 3ul> locPos({x, y, z});
         std::size_t globPos = grid.globalBinFromLocalBins(locPos);
-        BOOST_CHECK_EQUAL(
-            allowed_global_bins.find(globPos) != allowed_global_bins.end(),
-            false);
+        BOOST_CHECK(!allowed_global_bins.contains(globPos));
         allowed_global_bins.insert(globPos);
       }
     }
@@ -559,10 +557,8 @@ BOOST_AUTO_TEST_CASE(grid_iteration_test_3d_local_norepetitions) {
     ++numIterations;
     std::array<std::size_t, 3ul> locPos = gridStart.localBinsIndices();
     std::size_t globPos = grid.globalBinFromLocalBins(locPos);
-    BOOST_CHECK_EQUAL(
-        visited_global_bins.find(globPos) != visited_global_bins.end(), false);
-    BOOST_CHECK_EQUAL(
-        allowed_global_bins.find(globPos) != allowed_global_bins.end(), true);
+    BOOST_CHECK(!visited_global_bins.contains(globPos));
+    BOOST_CHECK(allowed_global_bins.contains(globPos));
     visited_global_bins.insert(globPos);
   }
 
diff --git a/Tests/UnitTests/Core/Utilities/GridTests.cpp b/Tests/UnitTests/Core/Utilities/GridTests.cpp
index 60defa3fde3..eceec2e6468 100644
--- a/Tests/UnitTests/Core/Utilities/GridTests.cpp
+++ b/Tests/UnitTests/Core/Utilities/GridTests.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2017-2018 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include <boost/test/unit_test.hpp>
 
@@ -13,16 +13,15 @@
 #include "Acts/Utilities/Axis.hpp"
 #include "Acts/Utilities/AxisFwd.hpp"
 #include "Acts/Utilities/Grid.hpp"
-#include "Acts/Utilities/TypeTraits.hpp"
 #include "Acts/Utilities/detail/grid_helper.hpp"
 
 #include <algorithm>
 #include <array>
+#include <concepts>
 #include <cstddef>
 #include <set>
 #include <string>
 #include <tuple>
-#include <type_traits>
 #include <utility>
 #include <vector>
 
@@ -1309,10 +1308,10 @@ BOOST_AUTO_TEST_CASE(grid_type_conversion) {
   Grid g2(Type<double>, std::move(a), std::move(b));
   decltype(g2) g2Copy(g2.axesTuple());
 
-  static_assert(std::is_same<decltype(g2), decltype(g2Copy)>::value);
+  static_assert(std::same_as<decltype(g2), decltype(g2Copy)>);
 
   auto g2ConvertedInt = g2Copy.convertType<int>();
-  static_assert(std::is_same<decltype(g2ConvertedInt), Grid2Int>::value);
+  static_assert(std::same_as<decltype(g2ConvertedInt), Grid2Int>);
 }
 
 BOOST_AUTO_TEST_CASE(grid_full_conversion) {
diff --git a/Tests/UnitTests/Core/Utilities/HashedStringTests.cpp b/Tests/UnitTests/Core/Utilities/HashedStringTests.cpp
index d2570aa4068..f38a71cbe89 100644
--- a/Tests/UnitTests/Core/Utilities/HashedStringTests.cpp
+++ b/Tests/UnitTests/Core/Utilities/HashedStringTests.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2017-2018 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include <boost/test/unit_test.hpp>
 
diff --git a/Tests/UnitTests/Core/Utilities/HelpersTests.cpp b/Tests/UnitTests/Core/Utilities/HelpersTests.cpp
index 28390a9089c..85e8454d052 100644
--- a/Tests/UnitTests/Core/Utilities/HelpersTests.cpp
+++ b/Tests/UnitTests/Core/Utilities/HelpersTests.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2019 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include <boost/test/unit_test.hpp>
 
@@ -23,6 +23,7 @@
 #include <cstddef>
 #include <limits>
 #include <memory>
+#include <numbers>
 #include <string>
 #include <tuple>
 #include <utility>
@@ -55,7 +56,7 @@ struct MyStruct {
 
 BOOST_AUTO_TEST_CASE(phi_helper_test) {
   Vector3 v(0, 1, 0);
-  CHECK_CLOSE_ABS(phi(v), M_PI / 2., 1e-9);
+  CHECK_CLOSE_ABS(phi(v), std::numbers::pi / 2., 1e-9);
 
   MyStruct s;
   BOOST_CHECK_EQUAL(phi(s), 42u);
@@ -193,20 +194,6 @@ BOOST_AUTO_TEST_CASE_TEMPLATE(BlockedMatrixMultiplication, Matrices,
   }
 }
 
-BOOST_AUTO_TEST_CASE(min_max) {
-  std::vector<ActsScalar> ordered = {-3., -2., -1., 0., 1., 2., 3.};
-  auto [min0, max0] = Acts::min_max(ordered);
-
-  CHECK_CLOSE_ABS(min0, -3., std::numeric_limits<ActsScalar>::epsilon());
-  CHECK_CLOSE_ABS(max0, 3., std::numeric_limits<ActsScalar>::epsilon());
-
-  std::vector<ActsScalar> unordered = {3., -3., -2., -1., 0., 1., 2.};
-  auto [min1, max1] = Acts::min_max(unordered);
-
-  CHECK_CLOSE_ABS(min1, -3., std::numeric_limits<ActsScalar>::epsilon());
-  CHECK_CLOSE_ABS(max1, 3., std::numeric_limits<ActsScalar>::epsilon());
-}
-
 BOOST_AUTO_TEST_CASE(range_medium) {
   std::vector<ActsScalar> ordered = {-3., -2., -1., 0., 1., 2., 3.};
   auto [range0, medium0] = Acts::range_medium(ordered);
@@ -241,7 +228,7 @@ BOOST_AUTO_TEST_CASE(incidentAnglesTest) {
     Vector3 dir = Vector3::Zero();
     dir[i] = 1;
     std::pair<double, double> angles = incidentAngles(dir, ref);
-    double expect = (i < 2) ? 0 : M_PI_2;
+    double expect = (i < 2) ? 0 : std::numbers::pi / 2.;
     CHECK_CLOSE_ABS(angles.first, expect,
                     std::numeric_limits<ActsScalar>::epsilon());
     CHECK_CLOSE_ABS(angles.second, expect,
@@ -252,62 +239,74 @@ BOOST_AUTO_TEST_CASE(incidentAnglesTest) {
   {
     Vector3 dir = Vector3({1, 1, 1}).normalized();
     auto [a0, a1] = incidentAngles(dir, ref);
-    CHECK_CLOSE_ABS(a0, M_PI_4, std::numeric_limits<ActsScalar>::epsilon());
-    CHECK_CLOSE_ABS(a1, M_PI_4, std::numeric_limits<ActsScalar>::epsilon());
+    CHECK_CLOSE_ABS(a0, std::numbers::pi / 4.,
+                    std::numeric_limits<ActsScalar>::epsilon());
+    CHECK_CLOSE_ABS(a1, std::numbers::pi / 4.,
+                    std::numeric_limits<ActsScalar>::epsilon());
   }
 
   // 45 degree on first axis
   {
     Vector3 dir = Vector3({1, 0, 1}).normalized();
     auto [a0, a1] = incidentAngles(dir, ref);
-    CHECK_CLOSE_ABS(a0, M_PI_4, std::numeric_limits<ActsScalar>::epsilon());
-    CHECK_CLOSE_ABS(a1, M_PI_2, std::numeric_limits<ActsScalar>::epsilon());
+    CHECK_CLOSE_ABS(a0, std::numbers::pi / 4.,
+                    std::numeric_limits<ActsScalar>::epsilon());
+    CHECK_CLOSE_ABS(a1, std::numbers::pi / 2.,
+                    std::numeric_limits<ActsScalar>::epsilon());
   }
 
   // 45 degree on second axis
   {
     Vector3 dir = Vector3({0, 1, 1}).normalized();
     auto [a0, a1] = incidentAngles(dir, ref);
-    CHECK_CLOSE_ABS(a0, M_PI_2, std::numeric_limits<ActsScalar>::epsilon());
-    CHECK_CLOSE_ABS(a1, M_PI_4, std::numeric_limits<ActsScalar>::epsilon());
+    CHECK_CLOSE_ABS(a0, std::numbers::pi / 2.,
+                    std::numeric_limits<ActsScalar>::epsilon());
+    CHECK_CLOSE_ABS(a1, std::numbers::pi / 4.,
+                    std::numeric_limits<ActsScalar>::epsilon());
   }
 
   // Reverse crossing
   {
     Vector3 dir = {0, 0, -1};
     auto [a0, a1] = incidentAngles(dir, ref);
-    CHECK_CLOSE_ABS(a0, -M_PI_2, std::numeric_limits<ActsScalar>::epsilon());
-    CHECK_CLOSE_ABS(a1, -M_PI_2, std::numeric_limits<ActsScalar>::epsilon());
+    CHECK_CLOSE_ABS(a0, -std::numbers::pi / 2.,
+                    std::numeric_limits<ActsScalar>::epsilon());
+    CHECK_CLOSE_ABS(a1, -std::numbers::pi / 2.,
+                    std::numeric_limits<ActsScalar>::epsilon());
   }
 
   // 45 degree but different quadrant
   {
     Vector3 dir = {-1, -1, 1};
     auto [a0, a1] = incidentAngles(dir, ref);
-    CHECK_CLOSE_ABS(a0, 3 * M_PI_4, std::numeric_limits<ActsScalar>::epsilon());
-    CHECK_CLOSE_ABS(a1, 3 * M_PI_4, std::numeric_limits<ActsScalar>::epsilon());
+    CHECK_CLOSE_ABS(a0, 3 * std::numbers::pi / 4.,
+                    std::numeric_limits<ActsScalar>::epsilon());
+    CHECK_CLOSE_ABS(a1, 3 * std::numbers::pi / 4.,
+                    std::numeric_limits<ActsScalar>::epsilon());
   }
 
   // 45 degree but different quadrant & other side
   {
     Vector3 dir = {-1, -1, -1};
     auto [a0, a1] = incidentAngles(dir, ref);
-    CHECK_CLOSE_ABS(a0, -3 * M_PI_4,
+    CHECK_CLOSE_ABS(a0, -3 * std::numbers::pi / 4.,
                     std::numeric_limits<ActsScalar>::epsilon());
-    CHECK_CLOSE_ABS(a1, -3 * M_PI_4,
+    CHECK_CLOSE_ABS(a1, -3 * std::numbers::pi / 4.,
                     std::numeric_limits<ActsScalar>::epsilon());
   }
 
   // Rotate the reference frame instead
   {
-    double s45 = std::sin(M_PI_4);
-    double c45 = std::cos(M_PI_4);
+    double s45 = std::sin(std::numbers::pi / 4.);
+    double c45 = std::cos(std::numbers::pi / 4.);
     RotationMatrix3 ref45;
     ref45 << c45, 0, s45, 0, 1, 0, -s45, 0, c45;
     Vector3 dir = {0, 0, 1};
     auto [a0, a1] = incidentAngles(dir, ref45);
-    CHECK_CLOSE_ABS(a0, M_PI_4, std::numeric_limits<ActsScalar>::epsilon());
-    CHECK_CLOSE_ABS(a1, M_PI_2, std::numeric_limits<ActsScalar>::epsilon());
+    CHECK_CLOSE_ABS(a0, std::numbers::pi / 4.,
+                    std::numeric_limits<ActsScalar>::epsilon());
+    CHECK_CLOSE_ABS(a1, std::numbers::pi / 2.,
+                    std::numeric_limits<ActsScalar>::epsilon());
   }
 }
 
diff --git a/Tests/UnitTests/Core/Utilities/InterpolationTests.cpp b/Tests/UnitTests/Core/Utilities/InterpolationTests.cpp
index 7f955a8a360..febcc5ceed1 100644
--- a/Tests/UnitTests/Core/Utilities/InterpolationTests.cpp
+++ b/Tests/UnitTests/Core/Utilities/InterpolationTests.cpp
@@ -1,17 +1,16 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2017-2018 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include <boost/test/unit_test.hpp>
 
 #include "Acts/Definitions/Algebra.hpp"
 #include "Acts/Tests/CommonHelpers/FloatComparisons.hpp"
 #include "Acts/Utilities/Interpolation.hpp"
-#include "Acts/Utilities/TypeTraits.hpp"
 
 #include <array>
 #include <vector>
diff --git a/Tests/UnitTests/Core/Utilities/IntersectionTests.cpp b/Tests/UnitTests/Core/Utilities/IntersectionTests.cpp
index 076abbfe088..41581b08b8d 100644
--- a/Tests/UnitTests/Core/Utilities/IntersectionTests.cpp
+++ b/Tests/UnitTests/Core/Utilities/IntersectionTests.cpp
@@ -1,14 +1,15 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2018 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include <boost/test/unit_test.hpp>
 
 #include "Acts/Definitions/Algebra.hpp"
+#include "Acts/Surfaces/CurvilinearSurface.hpp"
 #include "Acts/Surfaces/PlaneSurface.hpp"
 #include "Acts/Surfaces/Surface.hpp"
 #include "Acts/Utilities/Intersection.hpp"
@@ -50,8 +51,7 @@ BOOST_AUTO_TEST_CASE(IntersectionTest) {
   std::vector<Intersection3D> tsfpIntersections = {tIp, sIp, fIp};
 
   // let's sort the tsf intersection, it should give fst
-  std::sort(tsfpIntersections.begin(), tsfpIntersections.end(),
-            Intersection3D::pathLengthOrder);
+  std::ranges::sort(tsfpIntersections, Intersection3D::pathLengthOrder);
   BOOST_CHECK_EQUAL(fstpIntersections[0].pathLength(),
                     tsfpIntersections[0].pathLength());
   BOOST_CHECK_EQUAL(fstpIntersections[1].pathLength(),
@@ -65,8 +65,7 @@ BOOST_AUTO_TEST_CASE(IntersectionTest) {
   std::vector<Intersection3D> tfnsnpIntersections = {tIp, fIp, nIp, sIp, nIp};
 
   // shuffle the intersections
-  std::sort(ntfspIntersections.begin(), ntfspIntersections.end(),
-            Intersection3D::pathLengthOrder);
+  std::ranges::sort(ntfspIntersections, Intersection3D::pathLengthOrder);
   BOOST_CHECK_EQUAL(fstpIntersections[0].pathLength(),
                     ntfspIntersections[0].pathLength());
   BOOST_CHECK_EQUAL(fstpIntersections[1].pathLength(),
@@ -74,8 +73,7 @@ BOOST_AUTO_TEST_CASE(IntersectionTest) {
   BOOST_CHECK_EQUAL(fstpIntersections[2].pathLength(),
                     ntfspIntersections[2].pathLength());
 
-  std::sort(tfnsnpIntersections.begin(), tfnsnpIntersections.end(),
-            Intersection3D::pathLengthOrder);
+  std::ranges::sort(tfnsnpIntersections, Intersection3D::pathLengthOrder);
   BOOST_CHECK_EQUAL(fstpIntersections[0].pathLength(),
                     tfnsnpIntersections[0].pathLength());
   BOOST_CHECK_EQUAL(fstpIntersections[1].pathLength(),
@@ -95,8 +93,7 @@ BOOST_AUTO_TEST_CASE(IntersectionTest) {
   std::vector<Intersection3D> fstnIntersections = {fIn, sIn, tIn};
 
   // this time around, sort the f-s-t-n to match the t-s-f-n
-  std::sort(fstnIntersections.begin(), fstnIntersections.end(),
-            Intersection3D::pathLengthOrder);
+  std::ranges::sort(fstnIntersections, Intersection3D::pathLengthOrder);
   BOOST_CHECK_EQUAL(fstnIntersections[0].pathLength(),
                     tsfnIntersections[0].pathLength());
   BOOST_CHECK_EQUAL(fstnIntersections[1].pathLength(),
@@ -106,8 +103,7 @@ BOOST_AUTO_TEST_CASE(IntersectionTest) {
 
   // shuffle negative and positive solutions
   std::vector<Intersection3D> pnsolutions = {tIp, sIn, sIp, fIn, tIn, fIp};
-  std::sort(pnsolutions.begin(), pnsolutions.end(),
-            Intersection3D::pathLengthOrder);
+  std::ranges::sort(pnsolutions, Intersection3D::pathLengthOrder);
 
   BOOST_CHECK_EQUAL(pnsolutions[0].pathLength(), -3.);
   BOOST_CHECK_EQUAL(pnsolutions[1].pathLength(), -2.);
@@ -120,8 +116,7 @@ BOOST_AUTO_TEST_CASE(IntersectionTest) {
   Intersection3D zI(Vector3(0., 0., 0.), 0., Intersection3D::Status::onSurface);
   std::vector<Intersection3D> tszfpIntersections = {tIp, sIp, zI, fIp};
 
-  std::sort(tszfpIntersections.begin(), tszfpIntersections.end(),
-            Intersection3D::pathLengthOrder);
+  std::ranges::sort(tszfpIntersections, Intersection3D::pathLengthOrder);
   BOOST_CHECK_EQUAL(tszfpIntersections[0].pathLength(), 0.);
   BOOST_CHECK_EQUAL(tszfpIntersections[1].pathLength(), 1.);
   BOOST_CHECK_EQUAL(tszfpIntersections[2].pathLength(), 2.);
@@ -130,8 +125,7 @@ BOOST_AUTO_TEST_CASE(IntersectionTest) {
   std::vector<Intersection3D> tfsznIntersections = {tIn, fIn, sIn, zI};
   std::vector<Intersection3D> ztfsnIntersections = {zI, tIn, fIn, sIn};
 
-  std::sort(tfsznIntersections.begin(), tfsznIntersections.end(),
-            Intersection3D::pathLengthOrder);
+  std::ranges::sort(tfsznIntersections, Intersection3D::pathLengthOrder);
   BOOST_CHECK_EQUAL(tfsznIntersections[0].pathLength(), -3.);
   BOOST_CHECK_EQUAL(tfsznIntersections[1].pathLength(), -2.);
   BOOST_CHECK_EQUAL(tfsznIntersections[2].pathLength(), -1.);
@@ -140,16 +134,16 @@ BOOST_AUTO_TEST_CASE(IntersectionTest) {
 
 /// test of the object intersection class
 BOOST_AUTO_TEST_CASE(ObjectIntersectionTest) {
-  auto psf6 = Surface::makeShared<PlaneSurface>(Vector3(6., 0., 0.),
-                                                Vector3(1., 0., 0.));
-  auto psf7 = Surface::makeShared<PlaneSurface>(Vector3(7., 0., 0.),
-                                                Vector3(1., 0., 0.));
-  auto psf8 = Surface::makeShared<PlaneSurface>(Vector3(8., 0., 0.),
-                                                Vector3(1., 0., 0.));
-  auto psf9 = Surface::makeShared<PlaneSurface>(Vector3(9., 0., 0.),
-                                                Vector3(1., 0., 0.));
-  auto psf10 = Surface::makeShared<PlaneSurface>(Vector3(10., 0., 0.),
-                                                 Vector3(1., 0., 0.));
+  auto psf6 = CurvilinearSurface(Vector3(6., 0., 0.), Vector3(1., 0., 0.))
+                  .planeSurface();
+  auto psf7 = CurvilinearSurface(Vector3(7., 0., 0.), Vector3(1., 0., 0.))
+                  .planeSurface();
+  auto psf8 = CurvilinearSurface(Vector3(8., 0., 0.), Vector3(1., 0., 0.))
+                  .planeSurface();
+  auto psf9 = CurvilinearSurface(Vector3(9., 0., 0.), Vector3(1., 0., 0.))
+                  .planeSurface();
+  auto psf10 = CurvilinearSurface(Vector3(10., 0., 0.), Vector3(1., 0., 0.))
+                   .planeSurface();
 
   using PlaneIntersection = ObjectIntersection<PlaneSurface>;
 
diff --git a/Tests/UnitTests/Core/Utilities/KDTreeTests.cpp b/Tests/UnitTests/Core/Utilities/KDTreeTests.cpp
index 9c4a4d2fe64..15146e2eb60 100644
--- a/Tests/UnitTests/Core/Utilities/KDTreeTests.cpp
+++ b/Tests/UnitTests/Core/Utilities/KDTreeTests.cpp
@@ -1,13 +1,14 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2021 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include <boost/test/unit_test.hpp>
 
+#include "Acts/Utilities/Helpers.hpp"
 #include "Acts/Utilities/KDTree.hpp"
 #include "Acts/Utilities/RangeXD.hpp"
 
@@ -236,12 +237,12 @@ BOOST_FIXTURE_TEST_CASE(range_search_1, TreeFixture1DDoubleInt2) {
 
   std::vector<int> result = tree.rangeSearch(range);
   BOOST_CHECK_EQUAL(result.size(), 3);
-  BOOST_CHECK((std::find(result.begin(), result.end(), 5) != result.end()));
-  BOOST_CHECK((std::find(result.begin(), result.end(), 6) != result.end()));
-  BOOST_CHECK((std::find(result.begin(), result.end(), 10) != result.end()));
-  BOOST_CHECK((std::find(result.begin(), result.end(), 7) == result.end()));
-  BOOST_CHECK((std::find(result.begin(), result.end(), 2) == result.end()));
-  BOOST_CHECK((std::find(result.begin(), result.end(), 9) == result.end()));
+  BOOST_CHECK(rangeContainsValue(result, 5));
+  BOOST_CHECK(rangeContainsValue(result, 6));
+  BOOST_CHECK(rangeContainsValue(result, 10));
+  BOOST_CHECK(!rangeContainsValue(result, 7));
+  BOOST_CHECK(!rangeContainsValue(result, 2));
+  BOOST_CHECK(!rangeContainsValue(result, 9));
 }
 
 BOOST_FIXTURE_TEST_CASE(range_search_2, TreeFixture1DDoubleInt2) {
@@ -250,13 +251,13 @@ BOOST_FIXTURE_TEST_CASE(range_search_2, TreeFixture1DDoubleInt2) {
 
   std::vector<int> result = tree.rangeSearch(range);
   BOOST_CHECK_EQUAL(result.size(), 7);
-  BOOST_CHECK((std::find(result.begin(), result.end(), 1) != result.end()));
-  BOOST_CHECK((std::find(result.begin(), result.end(), 2) != result.end()));
-  BOOST_CHECK((std::find(result.begin(), result.end(), 3) != result.end()));
-  BOOST_CHECK((std::find(result.begin(), result.end(), 5) != result.end()));
-  BOOST_CHECK((std::find(result.begin(), result.end(), 6) != result.end()));
-  BOOST_CHECK((std::find(result.begin(), result.end(), 9) != result.end()));
-  BOOST_CHECK((std::find(result.begin(), result.end(), 10) != result.end()));
+  BOOST_CHECK(rangeContainsValue(result, 1));
+  BOOST_CHECK(rangeContainsValue(result, 2));
+  BOOST_CHECK(rangeContainsValue(result, 3));
+  BOOST_CHECK(rangeContainsValue(result, 5));
+  BOOST_CHECK(rangeContainsValue(result, 6));
+  BOOST_CHECK(rangeContainsValue(result, 9));
+  BOOST_CHECK(rangeContainsValue(result, 10));
 }
 
 BOOST_FIXTURE_TEST_CASE(range_search_3, TreeFixture1DDoubleInt2) {
@@ -274,7 +275,7 @@ BOOST_FIXTURE_TEST_CASE(range_search_4, TreeFixture2DDoubleInt1) {
 
   std::vector<int> result = tree.rangeSearch(range);
   BOOST_CHECK_EQUAL(result.size(), 1);
-  BOOST_CHECK((std::find(result.begin(), result.end(), 5) != result.end()));
+  BOOST_CHECK(rangeContainsValue(result, 5));
 }
 
 BOOST_FIXTURE_TEST_CASE(range_search_5, TreeFixture2DDoubleInt1) {
@@ -284,8 +285,8 @@ BOOST_FIXTURE_TEST_CASE(range_search_5, TreeFixture2DDoubleInt1) {
 
   std::vector<int> result = tree.rangeSearch(range);
   BOOST_CHECK_EQUAL(result.size(), 2);
-  BOOST_CHECK((std::find(result.begin(), result.end(), 5) != result.end()));
-  BOOST_CHECK((std::find(result.begin(), result.end(), 6) != result.end()));
+  BOOST_CHECK(rangeContainsValue(result, 5));
+  BOOST_CHECK(rangeContainsValue(result, 6));
 }
 
 BOOST_FIXTURE_TEST_CASE(range_search_6, TreeFixture10DDoubleInt1) {
@@ -294,11 +295,11 @@ BOOST_FIXTURE_TEST_CASE(range_search_6, TreeFixture10DDoubleInt1) {
 
   std::vector<int> result = tree.rangeSearch(range);
   BOOST_CHECK_EQUAL(result.size(), 5);
-  BOOST_CHECK((std::find(result.begin(), result.end(), -66) != result.end()));
-  BOOST_CHECK((std::find(result.begin(), result.end(), -51) != result.end()));
-  BOOST_CHECK((std::find(result.begin(), result.end(), -19) != result.end()));
-  BOOST_CHECK((std::find(result.begin(), result.end(), -13) != result.end()));
-  BOOST_CHECK((std::find(result.begin(), result.end(), -83) != result.end()));
+  BOOST_CHECK(rangeContainsValue(result, -66));
+  BOOST_CHECK(rangeContainsValue(result, -51));
+  BOOST_CHECK(rangeContainsValue(result, -19));
+  BOOST_CHECK(rangeContainsValue(result, -13));
+  BOOST_CHECK(rangeContainsValue(result, -83));
 }
 
 BOOST_FIXTURE_TEST_CASE(range_search_7, TreeFixture10DDoubleInt1) {
@@ -307,8 +308,8 @@ BOOST_FIXTURE_TEST_CASE(range_search_7, TreeFixture10DDoubleInt1) {
 
   std::vector<int> result = tree.rangeSearch(range);
   BOOST_CHECK_EQUAL(result.size(), 2);
-  BOOST_CHECK((std::find(result.begin(), result.end(), 27) != result.end()));
-  BOOST_CHECK((std::find(result.begin(), result.end(), -56) != result.end()));
+  BOOST_CHECK(rangeContainsValue(result, 27));
+  BOOST_CHECK(rangeContainsValue(result, -56));
 }
 
 BOOST_FIXTURE_TEST_CASE(range_search_8, TreeFixture3DDoubleString1) {
@@ -319,8 +320,7 @@ BOOST_FIXTURE_TEST_CASE(range_search_8, TreeFixture3DDoubleString1) {
 
   std::vector<std::string> result = tree.rangeSearch(range);
   BOOST_CHECK_EQUAL(result.size(), 1);
-  BOOST_CHECK(
-      (std::find(result.begin(), result.end(), "string0") != result.end()));
+  BOOST_CHECK(rangeContainsValue(result, "string0"));
 }
 
 BOOST_FIXTURE_TEST_CASE(range_search_9, TreeFixture3DDoubleString1) {
@@ -331,14 +331,10 @@ BOOST_FIXTURE_TEST_CASE(range_search_9, TreeFixture3DDoubleString1) {
 
   std::vector<std::string> result = tree.rangeSearch(range);
   BOOST_CHECK_EQUAL(result.size(), 4);
-  BOOST_CHECK(
-      (std::find(result.begin(), result.end(), "string0") != result.end()));
-  BOOST_CHECK(
-      (std::find(result.begin(), result.end(), "string3") != result.end()));
-  BOOST_CHECK(
-      (std::find(result.begin(), result.end(), "string4") != result.end()));
-  BOOST_CHECK(
-      (std::find(result.begin(), result.end(), "string9") != result.end()));
+  BOOST_CHECK(rangeContainsValue(result, "string0"));
+  BOOST_CHECK(rangeContainsValue(result, "string3"));
+  BOOST_CHECK(rangeContainsValue(result, "string4"));
+  BOOST_CHECK(rangeContainsValue(result, "string9"));
 }
 
 BOOST_FIXTURE_TEST_CASE(range_search_10, TreeFixture1DIntInt1) {
@@ -347,8 +343,8 @@ BOOST_FIXTURE_TEST_CASE(range_search_10, TreeFixture1DIntInt1) {
 
   std::vector<int> result = tree.rangeSearch(range);
   BOOST_CHECK_EQUAL(result.size(), 2);
-  BOOST_CHECK((std::find(result.begin(), result.end(), 5) != result.end()));
-  BOOST_CHECK((std::find(result.begin(), result.end(), 6) != result.end()));
+  BOOST_CHECK(rangeContainsValue(result, 5));
+  BOOST_CHECK(rangeContainsValue(result, 6));
 }
 
 BOOST_FIXTURE_TEST_CASE(range_search_11, TreeFixture2DIntInt1) {
@@ -357,8 +353,8 @@ BOOST_FIXTURE_TEST_CASE(range_search_11, TreeFixture2DIntInt1) {
 
   std::vector<int> result = tree.rangeSearch(range);
   BOOST_CHECK_EQUAL(result.size(), 2);
-  BOOST_CHECK((std::find(result.begin(), result.end(), 5) != result.end()));
-  BOOST_CHECK((std::find(result.begin(), result.end(), 6) != result.end()));
+  BOOST_CHECK(rangeContainsValue(result, 5));
+  BOOST_CHECK(rangeContainsValue(result, 6));
 }
 
 BOOST_FIXTURE_TEST_CASE(range_search_inplace_1, TreeFixture10DDoubleInt1) {
@@ -369,11 +365,11 @@ BOOST_FIXTURE_TEST_CASE(range_search_inplace_1, TreeFixture10DDoubleInt1) {
   tree.rangeSearch(range, result);
 
   BOOST_CHECK_EQUAL(result.size(), 5);
-  BOOST_CHECK((std::find(result.begin(), result.end(), -66) != result.end()));
-  BOOST_CHECK((std::find(result.begin(), result.end(), -51) != result.end()));
-  BOOST_CHECK((std::find(result.begin(), result.end(), -19) != result.end()));
-  BOOST_CHECK((std::find(result.begin(), result.end(), -13) != result.end()));
-  BOOST_CHECK((std::find(result.begin(), result.end(), -83) != result.end()));
+  BOOST_CHECK(rangeContainsValue(result, -66));
+  BOOST_CHECK(rangeContainsValue(result, -51));
+  BOOST_CHECK(rangeContainsValue(result, -19));
+  BOOST_CHECK(rangeContainsValue(result, -13));
+  BOOST_CHECK(rangeContainsValue(result, -83));
 }
 
 BOOST_FIXTURE_TEST_CASE(range_search_inserter_1, TreeFixture10DDoubleInt1) {
@@ -384,11 +380,11 @@ BOOST_FIXTURE_TEST_CASE(range_search_inserter_1, TreeFixture10DDoubleInt1) {
   tree.rangeSearchInserter(range, std::back_inserter(result));
 
   BOOST_CHECK_EQUAL(result.size(), 5);
-  BOOST_CHECK((std::find(result.begin(), result.end(), -66) != result.end()));
-  BOOST_CHECK((std::find(result.begin(), result.end(), -51) != result.end()));
-  BOOST_CHECK((std::find(result.begin(), result.end(), -19) != result.end()));
-  BOOST_CHECK((std::find(result.begin(), result.end(), -13) != result.end()));
-  BOOST_CHECK((std::find(result.begin(), result.end(), -83) != result.end()));
+  BOOST_CHECK(rangeContainsValue(result, -66));
+  BOOST_CHECK(rangeContainsValue(result, -51));
+  BOOST_CHECK(rangeContainsValue(result, -19));
+  BOOST_CHECK(rangeContainsValue(result, -13));
+  BOOST_CHECK(rangeContainsValue(result, -83));
 }
 
 BOOST_FIXTURE_TEST_CASE(range_search_map_1, TreeFixture10DDoubleInt1) {
@@ -400,11 +396,11 @@ BOOST_FIXTURE_TEST_CASE(range_search_map_1, TreeFixture10DDoubleInt1) {
       [](const std::array<double, 10>&, const int& i) -> int { return 2 * i; });
 
   BOOST_CHECK_EQUAL(result.size(), 5);
-  BOOST_CHECK((std::find(result.begin(), result.end(), -132) != result.end()));
-  BOOST_CHECK((std::find(result.begin(), result.end(), -102) != result.end()));
-  BOOST_CHECK((std::find(result.begin(), result.end(), -38) != result.end()));
-  BOOST_CHECK((std::find(result.begin(), result.end(), -26) != result.end()));
-  BOOST_CHECK((std::find(result.begin(), result.end(), -166) != result.end()));
+  BOOST_CHECK(rangeContainsValue(result, -132));
+  BOOST_CHECK(rangeContainsValue(result, -102));
+  BOOST_CHECK(rangeContainsValue(result, -38));
+  BOOST_CHECK(rangeContainsValue(result, -26));
+  BOOST_CHECK(rangeContainsValue(result, -166));
 }
 
 BOOST_FIXTURE_TEST_CASE(range_search_map_inserter_1, TreeFixture10DDoubleInt1) {
@@ -421,11 +417,11 @@ BOOST_FIXTURE_TEST_CASE(range_search_map_inserter_1, TreeFixture10DDoubleInt1) {
       std::back_inserter(result));
 
   BOOST_CHECK_EQUAL(result.size(), 5);
-  BOOST_CHECK((std::find(result.begin(), result.end(), "-66") != result.end()));
-  BOOST_CHECK((std::find(result.begin(), result.end(), "-51") != result.end()));
-  BOOST_CHECK((std::find(result.begin(), result.end(), "-19") != result.end()));
-  BOOST_CHECK((std::find(result.begin(), result.end(), "-13") != result.end()));
-  BOOST_CHECK((std::find(result.begin(), result.end(), "-83") != result.end()));
+  BOOST_CHECK(rangeContainsValue(result, "-66"));
+  BOOST_CHECK(rangeContainsValue(result, "-51"));
+  BOOST_CHECK(rangeContainsValue(result, "-19"));
+  BOOST_CHECK(rangeContainsValue(result, "-13"));
+  BOOST_CHECK(rangeContainsValue(result, "-83"));
 }
 
 BOOST_FIXTURE_TEST_CASE(range_search_map_inserter_2, TreeFixture2DIntInt1) {
@@ -441,8 +437,8 @@ BOOST_FIXTURE_TEST_CASE(range_search_map_inserter_2, TreeFixture2DIntInt1) {
       std::back_inserter(result));
 
   BOOST_CHECK_EQUAL(result.size(), 2);
-  BOOST_CHECK((std::find(result.begin(), result.end(), 40) != result.end()));
-  BOOST_CHECK((std::find(result.begin(), result.end(), 18) != result.end()));
+  BOOST_CHECK(rangeContainsValue(result, 40));
+  BOOST_CHECK(rangeContainsValue(result, 18));
 }
 
 BOOST_FIXTURE_TEST_CASE(range_search_map_discard_1, TreeFixture2DIntInt1) {
@@ -486,12 +482,10 @@ BOOST_FIXTURE_TEST_CASE(range_search_combinatorial, TreeFixture3DDoubleInt2) {
 
               std::vector<int> valid;
 
-              for (const std::pair<std::array<double, 3>, int>& i :
-                   test_vector) {
-                const std::array<double, 3>& c = i.first;
+              for (const auto& [c, value] : test_vector) {
                 if (xmin <= c[0] && c[0] < xmax && ymin <= c[1] &&
                     c[1] < ymax && zmin <= c[2] && c[2] < zmax) {
-                  valid.push_back(i.second);
+                  valid.push_back(value);
                 }
               }
 
@@ -500,8 +494,7 @@ BOOST_FIXTURE_TEST_CASE(range_search_combinatorial, TreeFixture3DDoubleInt2) {
               BOOST_CHECK_EQUAL(result.size(), valid.size());
 
               for (int j : valid) {
-                BOOST_CHECK((std::find(result.begin(), result.end(), j) !=
-                             result.end()));
+                BOOST_CHECK(rangeContainsValue(result, j));
               }
             }
           }
@@ -517,10 +510,10 @@ BOOST_FIXTURE_TEST_CASE(range_search_dominate1, TreeFixture3DDoubleInt3) {
 
   std::vector<int> result = tree.rangeSearch(range1);
   BOOST_CHECK_EQUAL(result.size(), 4);
-  BOOST_CHECK((std::find(result.begin(), result.end(), 0) != result.end()));
-  BOOST_CHECK((std::find(result.begin(), result.end(), 1) != result.end()));
-  BOOST_CHECK((std::find(result.begin(), result.end(), 2) != result.end()));
-  BOOST_CHECK((std::find(result.begin(), result.end(), 3) != result.end()));
+  BOOST_CHECK(rangeContainsValue(result, 0));
+  BOOST_CHECK(rangeContainsValue(result, 1));
+  BOOST_CHECK(rangeContainsValue(result, 2));
+  BOOST_CHECK(rangeContainsValue(result, 3));
 }
 
 BOOST_FIXTURE_TEST_CASE(range_search_dominate2, TreeFixture3DDoubleInt3) {
@@ -529,10 +522,10 @@ BOOST_FIXTURE_TEST_CASE(range_search_dominate2, TreeFixture3DDoubleInt3) {
 
   std::vector<int> result = tree.rangeSearch(range1);
   BOOST_CHECK_EQUAL(result.size(), 4);
-  BOOST_CHECK((std::find(result.begin(), result.end(), 4) != result.end()));
-  BOOST_CHECK((std::find(result.begin(), result.end(), 5) != result.end()));
-  BOOST_CHECK((std::find(result.begin(), result.end(), 6) != result.end()));
-  BOOST_CHECK((std::find(result.begin(), result.end(), 7) != result.end()));
+  BOOST_CHECK(rangeContainsValue(result, 4));
+  BOOST_CHECK(rangeContainsValue(result, 5));
+  BOOST_CHECK(rangeContainsValue(result, 6));
+  BOOST_CHECK(rangeContainsValue(result, 7));
 }
 
 BOOST_AUTO_TEST_CASE(range_search_very_big) {
@@ -580,8 +573,7 @@ BOOST_AUTO_TEST_CASE(range_search_very_big) {
         BOOST_CHECK_EQUAL(result.size(), valid.size());
 
         for (int j : valid) {
-          BOOST_CHECK(
-              (std::find(result.begin(), result.end(), j) != result.end()));
+          BOOST_CHECK(rangeContainsValue(result, j));
         }
       }
     }
@@ -620,13 +612,11 @@ BOOST_AUTO_TEST_CASE(range_search_many_same) {
   BOOST_CHECK_EQUAL(result2.size(), 50);
 
   for (int i = 0; i < 50; ++i) {
-    BOOST_CHECK(
-        (std::find(result1.begin(), result1.end(), i) != result1.end()));
+    BOOST_CHECK(rangeContainsValue(result1, i));
   }
 
   for (int i = 50; i < 100; ++i) {
-    BOOST_CHECK(
-        (std::find(result2.begin(), result2.end(), i) != result2.end()));
+    BOOST_CHECK(rangeContainsValue(result2, i));
   }
 }
 
diff --git a/Tests/UnitTests/Core/Utilities/LoggerTests.cpp b/Tests/UnitTests/Core/Utilities/LoggerTests.cpp
index cd80456da4d..9136a8f26a6 100644
--- a/Tests/UnitTests/Core/Utilities/LoggerTests.cpp
+++ b/Tests/UnitTests/Core/Utilities/LoggerTests.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2017-2018 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include <boost/test/unit_test.hpp>
 
diff --git a/Tests/UnitTests/Core/Utilities/MPLTests.cpp b/Tests/UnitTests/Core/Utilities/MPLTests.cpp
deleted file mode 100644
index 32c3e042a87..00000000000
--- a/Tests/UnitTests/Core/Utilities/MPLTests.cpp
+++ /dev/null
@@ -1,295 +0,0 @@
-// This file is part of the Acts project.
-//
-// Copyright (C) 2017-2018 CERN for the benefit of the Acts project
-//
-// This Source Code Form is subject to the terms of the Mozilla Public
-// License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-#include <boost/test/unit_test.hpp>
-
-#include "Acts/Utilities/detail/MPL/all_of.hpp"
-#include "Acts/Utilities/detail/MPL/any_of.hpp"
-#include "Acts/Utilities/detail/MPL/are_sorted.hpp"
-#include "Acts/Utilities/detail/MPL/are_within.hpp"
-#include "Acts/Utilities/detail/MPL/at_index.hpp"
-#include "Acts/Utilities/detail/MPL/has_duplicates.hpp"
-#include "Acts/Utilities/detail/MPL/type_collector.hpp"
-
-#include <tuple>
-#include <type_traits>
-
-#include <boost/hana.hpp>
-#include <boost/hana/core/to.hpp>
-#include <boost/hana/equal.hpp>
-#include <boost/hana/ext/std/tuple.hpp>
-#include <boost/hana/integral_constant.hpp>
-#include <boost/hana/set.hpp>
-#include <boost/hana/transform.hpp>
-#include <boost/hana/tuple.hpp>
-#include <boost/hana/type.hpp>
-#include <boost/hana/union.hpp>
-
-namespace hana = boost::hana;
-
-namespace Acts::detail {
-template <bool ascending, bool strict, typename T, T... values>
-struct are_sorted;
-template <typename T, T MIN, T MAX, T... values>
-struct are_within;
-template <typename T, std::size_t index, T... values>
-struct at_index;
-}  // namespace Acts::detail
-
-namespace Acts::Test {
-
-BOOST_AUTO_TEST_CASE(all_of_test) {
-  using detail::all_of_v;
-
-  static_assert(!all_of_v<true, true, false>,
-                "all_of_v<true, true, false> failed");
-  static_assert(!all_of_v<false, true, true, false>,
-                "all_of_v<false, true, true, false> failed");
-  static_assert(all_of_v<true, true, true>,
-                "all_of_v<true, true, true> failed");
-  static_assert(all_of_v<true>, "all_of_v<true> failed");
-  static_assert(!all_of_v<false>, "all_of_v<false> failed");
-  static_assert(all_of_v<>, "all_of_v<> failed");
-}
-
-BOOST_AUTO_TEST_CASE(hana_set_union_test) {
-  // using first    = typename bm::set<float, int, char, bool>::type;
-  constexpr auto first = hana::make_set(hana::type_c<float>, hana::type_c<int>,
-                                        hana::type_c<char>, hana::type_c<bool>);
-  // using second   = typename bm::vector<long, int>::type;
-  constexpr auto second = hana::make_set(hana::type_c<long>, hana::type_c<int>);
-  constexpr auto found = hana::union_(first, second);
-  // using found    = typename detail::boost_set_merger_t<first, second>;
-  // using expected = typename bm::set<float, int, char, bool, long>::type;
-  constexpr auto expected =
-      hana::make_set(hana::type_c<float>, hana::type_c<int>, hana::type_c<char>,
-                     hana::type_c<bool>, hana::type_c<long>);
-
-  static_assert(found == expected, "union of hana::sets failed");
-}
-
-BOOST_AUTO_TEST_CASE(hana_set_to_tuple_test) {
-  constexpr auto a_set = hana::make_set(hana::type_c<float>, hana::type_c<int>,
-                                        hana::type_c<char>, hana::type_c<bool>);
-  constexpr auto h_tuple =
-      hana::make_tuple(hana::type_c<float>, hana::type_c<int>,
-                       hana::type_c<char>, hana::type_c<bool>);
-
-  static_assert(hana::to<hana::tuple_tag>(a_set) == h_tuple, "not equal");
-
-  // using std_tuple = decltype(hana::unpack(a_set,
-  // hana::template_<std::tuple>))::type; using expected = std::tuple<float,
-  // int, char>; static_assert(std::is_same<std_tuple, expected>::value,
-  // "using
-  // boost::mpl::set for variadic templates failed");
-}
-
-template <typename... args>
-struct variadic_struct {
-  using tuple = std::tuple<args...>;
-};
-
-BOOST_AUTO_TEST_CASE(unpack_boost_set_as_template_test) {
-  constexpr auto hana_set = hana::make_set(
-      hana::type_c<float>, hana::type_c<int>, hana::type_c<char>);
-  using found =
-      decltype(hana::unpack(hana_set, hana::template_<variadic_struct>))::type;
-
-  using expected = variadic_struct<float, int, char>;
-
-  static_assert(std::is_same<found, expected>::value,
-                "using boost::mpl::set for variadic templates failed");
-
-  static_assert(
-      std::is_same<expected::tuple, std::tuple<float, int, char>>::value,
-      "not equal");
-}
-
-namespace {
-struct traits1 {
-  using result_type = int;
-  using action_type = char;
-};
-
-template <bool>
-struct traits2;
-
-template <>
-struct traits2<false> {
-  using result_type = bool;
-  using action_type = float;
-};
-
-template <>
-struct traits2<true> {
-  using action_type = float;
-};
-}  // namespace
-
-template <typename... Args>
-struct tuple_helper {
-  using tuple = std::tuple<Args...>;
-};
-
-BOOST_AUTO_TEST_CASE(type_collector_test) {
-  // test some predicates
-  static_assert(detail::has_result_type_v<traits1>, "Did not find result type");
-  static_assert(detail::has_result_type_v<traits2<false>>,
-                "Did not find result type");
-  static_assert(!detail::has_result_type_v<traits2<true>>,
-                "Did find result type");
-
-  static_assert(detail::has_action_type_v<traits1>, "Did not find action type");
-  static_assert(detail::has_action_type_v<traits2<false>>,
-                "Did not find action type");
-  static_assert(detail::has_action_type_v<traits2<true>>,
-                "Did not find action type");
-
-  constexpr auto found_results =
-      detail::type_collector_t<detail::result_type_extractor, traits1,
-                               traits2<true>, traits2<false>>;
-  constexpr auto expected_results =
-      hana::make_set(hana::type_c<int>, hana::type_c<bool>);
-  static_assert(found_results == expected_results,
-                "Didn't find expected results");
-
-  // check unpack
-  using found_results_tuple = decltype(hana::unpack(
-      found_results, hana::template_<tuple_helper>))::type::tuple;
-  using expected_results_tuple = std::tuple<int, bool>;
-  static_assert(
-      std::is_same<found_results_tuple, expected_results_tuple>::value,
-      "Unpacked results tuple not correct");
-
-  constexpr auto found_actions =
-      detail::type_collector_t<detail::action_type_extractor, traits1,
-                               traits2<true>, traits2<false>>;
-  constexpr auto expected_actions =
-      hana::make_set(hana::type_c<char>, hana::type_c<float>);
-  static_assert(found_actions == expected_actions,
-                "Didn't find expected actions");
-
-  // check unpack
-  using found_actions_tuple = decltype(hana::unpack(
-      found_actions, hana::template_<tuple_helper>))::type::tuple;
-  using expected_actions_tuple = std::tuple<char, float>;
-  static_assert(
-      std::is_same<found_actions_tuple, expected_actions_tuple>::value,
-      "Unpacked actions tuple not correct");
-}
-
-BOOST_AUTO_TEST_CASE(has_duplicates_test) {
-  using detail::has_duplicates_v;
-  static_assert(has_duplicates_v<int, float, char, int>,
-                "has_duplicates_v failed");
-  static_assert(has_duplicates_v<int, int, char, float>,
-                "has_duplicates_v failed");
-  static_assert(has_duplicates_v<int, char, float, float>,
-                "has_duplicates_v failed");
-  static_assert(has_duplicates_v<int, char, char, float>,
-                "has_duplicates_v failed");
-  static_assert(!has_duplicates_v<int, bool, char, float>,
-                "has_duplicates_v failed");
-}
-
-BOOST_AUTO_TEST_CASE(any_of_test) {
-  using detail::any_of_v;
-
-  static_assert(any_of_v<true, true, false>,
-                "any_of_v<true, true, false> failed");
-  static_assert(any_of_v<false, true, true, false>,
-                "any_of_v<false, true, true, false> failed");
-  static_assert(any_of_v<true, true, true>,
-                "any_of_v<true, true, true> failed");
-  static_assert(!any_of_v<false, false>, "any_of_v<false, false> failed");
-  static_assert(any_of_v<true>, "any_of_v<true> failed");
-  static_assert(!any_of_v<false>, "any_of_v<false> failed");
-  static_assert(!any_of_v<>, "any_of_v<> failed");
-}
-
-/**
- * @brief Unit test for Acts::anonymous_namespace{ParameterSet.h}::are_sorted
- * helper
- *
- * The test checks for correct behavior in the following cases (always using
- * @c int
- * as value type):
- * -# test: ordered strictly ascending, input: ordered strictly ascending
- * -# test: ordered strictly ascending, input: unordered
- * -# test: ordered strictly ascending, input: ordered weakly ascending
- * -# test: ordered weakly ascending, input: ordered strictly ascending
- * -# test: ordered weakly ascending, input: unordered
- * -# test: ordered weakly ascending, input: ordered weakly ascending
- * -# test: ordered strictly descending, input: ordered strictly descending
- * -# test: ordered strictly descending, input: unordered
- * -# test: ordered strictly descending, input: ordered weakly descending
- * -# test: ordered weakly descending, input: ordered strictly descending
- * -# test: ordered weakly descending, input: unordered
- * -# test: ordered weakly descending, input: ordered weakly descending
- */
-BOOST_AUTO_TEST_CASE(are_sorted_helper_tests) {
-  using detail::are_sorted;
-  // strictly ascending
-  BOOST_CHECK((are_sorted<true, true, int, -1, 3, 4, 12>::value));
-  BOOST_CHECK((!are_sorted<true, true, int, -1, 13, 4>::value));
-  BOOST_CHECK((!are_sorted<true, true, int, -1, 4, 4, 7>::value));
-  // weakly ascending
-  BOOST_CHECK((are_sorted<true, false, int, -1, 3, 4, 12>::value));
-  BOOST_CHECK((!are_sorted<true, false, int, -1, 13, 4>::value));
-  BOOST_CHECK((are_sorted<true, false, int, -1, 4, 4, 7>::value));
-  // strictly descending
-  BOOST_CHECK((are_sorted<false, true, int, 1, -3, -4, -12>::value));
-  BOOST_CHECK((!are_sorted<false, true, int, 1, -13, -4>::value));
-  BOOST_CHECK((!are_sorted<false, true, int, 1, -4, -4>::value));
-  // weakly descending
-  BOOST_CHECK((are_sorted<false, false, int, 1, -3, -4, -12>::value));
-  BOOST_CHECK((!are_sorted<false, false, int, -1, -13, -4>::value));
-  BOOST_CHECK((are_sorted<false, false, int, -1, -4, -4, -7>::value));
-}
-
-/**
- * @brief Unit test for Acts::anonymous_namespace{ParameterSet.h}::are_within
- * helper
- *
- * The test checks for correct behavior in the following cases (always using
- * @c int
- * as value type):
- * -# all values within (MIN,MAX)
- * -# all values within [MIN,MAX)
- * -# one value < MIN
- * -# multiple values < MIN
- * -# one value > MAX
- * -# multiple values > Max
- * -# one value == MAX
- * -# contains values < MIN and >= MAX
- */
-BOOST_AUTO_TEST_CASE(are_within_helper_tests) {
-  using detail::are_within;
-  BOOST_CHECK((are_within<int, 0, 10, 1, 3, 7, 2>::value));
-  BOOST_CHECK((are_within<int, 0, 10, 1, 3, 0, 2>::value));
-  BOOST_CHECK((!are_within<int, 0, 10, -1, 3, 7, 2>::value));
-  BOOST_CHECK((!are_within<int, 0, 10, -1, 3, 7, -2>::value));
-  BOOST_CHECK((!are_within<int, 0, 10, 1, 3, 17, 2>::value));
-  BOOST_CHECK((!are_within<int, 0, 10, 1, 3, 17, 12>::value));
-  BOOST_CHECK((!are_within<int, 0, 10, 1, 10>::value));
-  BOOST_CHECK((!are_within<int, 0, 10, 1, -2, 10, 14>::value));
-}
-
-/**
- * @brief Unit test for Acts::details::at_index helper
- */
-BOOST_AUTO_TEST_CASE(at_index_helper_tests) {
-  using detail::at_index;
-  BOOST_CHECK_EQUAL((at_index<int, 0, 10, 1, 3, 7, 2>::value), 10);
-  BOOST_CHECK_EQUAL((at_index<int, 1, 10, 1, 3, 7, 2>::value), 1);
-  BOOST_CHECK_EQUAL((at_index<int, 2, 10, 1, 3, 7, 2>::value), 3);
-  BOOST_CHECK_EQUAL((at_index<int, 3, 10, 1, 3, 7, 2>::value), 7);
-  BOOST_CHECK_EQUAL((at_index<int, 4, 10, 1, 3, 7, 2>::value), 2);
-}
-
-}  // namespace Acts::Test
diff --git a/Tests/UnitTests/Core/Utilities/MaterialMapUtilsTests.cpp b/Tests/UnitTests/Core/Utilities/MaterialMapUtilsTests.cpp
index 7d7aef745cc..8f02a12ba68 100644
--- a/Tests/UnitTests/Core/Utilities/MaterialMapUtilsTests.cpp
+++ b/Tests/UnitTests/Core/Utilities/MaterialMapUtilsTests.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2019 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include <boost/test/unit_test.hpp>
 
diff --git a/Tests/UnitTests/Core/Utilities/MathHelpersTests.cpp b/Tests/UnitTests/Core/Utilities/MathHelpersTests.cpp
new file mode 100644
index 00000000000..32c19ed91c7
--- /dev/null
+++ b/Tests/UnitTests/Core/Utilities/MathHelpersTests.cpp
@@ -0,0 +1,44 @@
+// This file is part of the ACTS project.
+//
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
+//
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
+
+#include <boost/test/data/test_case.hpp>
+#include <boost/test/unit_test.hpp>
+
+#include "Acts/Tests/CommonHelpers/FloatComparisons.hpp"
+#include "Acts/Utilities/MathHelpers.hpp"
+
+#include <cmath>
+
+namespace bdata = boost::unit_test::data;
+
+const auto expDist = bdata::random(
+    (bdata::engine = std::mt19937{}, bdata::seed = 0,
+     bdata::distribution = std::uniform_real_distribution<double>(-4, 4)));
+
+BOOST_AUTO_TEST_SUITE(Utilities)
+
+BOOST_DATA_TEST_CASE(fastHypot, expDist ^ expDist ^ bdata::xrange(100), xExp,
+                     yExp, i) {
+  (void)i;
+
+  const double x = std::pow(10, xExp);
+  const double y = std::pow(10, yExp);
+
+  const float fastFloat =
+      Acts::fastHypot(static_cast<float>(x), static_cast<float>(y));
+  const double fastDouble = Acts::fastHypot(x, y);
+
+  const float stdFloat =
+      std::hypot(static_cast<float>(x), static_cast<float>(y));
+  const double stdDouble = std::hypot(x, y);
+
+  CHECK_CLOSE_REL(stdFloat, fastFloat, 1e-6);
+  CHECK_CLOSE_REL(stdDouble, fastDouble, 1e-6);
+}
+
+BOOST_AUTO_TEST_SUITE_END()
diff --git a/Tests/UnitTests/Core/Utilities/MultiIndexTests.cpp b/Tests/UnitTests/Core/Utilities/MultiIndexTests.cpp
index feb1e677e32..b52737e22b8 100644
--- a/Tests/UnitTests/Core/Utilities/MultiIndexTests.cpp
+++ b/Tests/UnitTests/Core/Utilities/MultiIndexTests.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2017-2018 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include <boost/test/unit_test.hpp>
 
diff --git a/Tests/UnitTests/Core/Utilities/ParticleDataTests.cpp b/Tests/UnitTests/Core/Utilities/ParticleDataTests.cpp
index aa89d78a019..41021ba3ca3 100644
--- a/Tests/UnitTests/Core/Utilities/ParticleDataTests.cpp
+++ b/Tests/UnitTests/Core/Utilities/ParticleDataTests.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2018-2020 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include <boost/test/unit_test.hpp>
 
diff --git a/Tests/UnitTests/Core/Utilities/PeriodicTests.cpp b/Tests/UnitTests/Core/Utilities/PeriodicTests.cpp
index c2e237cee23..a6f66328689 100644
--- a/Tests/UnitTests/Core/Utilities/PeriodicTests.cpp
+++ b/Tests/UnitTests/Core/Utilities/PeriodicTests.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2020 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include <boost/test/data/test_case.hpp>
 #include <boost/test/unit_test.hpp>
@@ -14,6 +14,7 @@
 
 #include <cmath>
 #include <limits>
+#include <numbers>
 #include <tuple>
 #include <utility>
 
@@ -51,9 +52,10 @@ constexpr std::tuple<double, double, double, double>
         {0.75, 5.25, 2.0, -0.5},
         {1.25, -2.5, 2.0, -0.25},
         // one of lhs,rhs is over the edge and close together
-        {-0.25, +0.25, 2 * M_PI, -0.5},
-        {+0.25, -0.25, 2 * M_PI, +0.5},
-        {2 * M_PI - 0.25, 2 * M_PI + 0.25, 2 * M_PI, -0.5},
+        {-0.25, +0.25, 2 * std::numbers::pi, -0.5},
+        {+0.25, -0.25, 2 * std::numbers::pi, +0.5},
+        {2 * std::numbers::pi - 0.25, 2 * std::numbers::pi + 0.25,
+         2 * std::numbers::pi, -0.5},
 };
 }  // namespace
 BOOST_DATA_TEST_CASE(DifferencePeriodic, bd::make(kDifferencePeriodicDataset),
@@ -62,29 +64,38 @@ BOOST_DATA_TEST_CASE(DifferencePeriodic, bd::make(kDifferencePeriodicDataset),
   CHECK_CLOSE_ABS(difference_periodic(rhs, lhs, range), -diff, tol);
 }
 
-BOOST_DATA_TEST_CASE(RadianPos, bd::xrange(0.25, M_PI, 0.5), delta) {
+BOOST_DATA_TEST_CASE(RadianPos, bd::xrange(0.25, std::numbers::pi, 0.5),
+                     delta) {
   // above upper limit folds back just above lower limit
-  CHECK_CLOSE_ABS(radian_pos(0 - delta), 2 * M_PI - delta, tol);
+  CHECK_CLOSE_ABS(radian_pos(0 - delta), 2 * std::numbers::pi - delta, tol);
   // below lower limit folds back just below upper limit
-  CHECK_CLOSE_ABS(radian_pos(2 * M_PI + delta), delta, tol);
+  CHECK_CLOSE_ABS(radian_pos(2 * std::numbers::pi + delta), delta, tol);
   // same as above but with additional 2pi shifts
-  CHECK_CLOSE_ABS(radian_pos(-2 * M_PI - delta), 2 * M_PI - delta, tol);
-  CHECK_CLOSE_ABS(radian_pos(4 * M_PI + delta), delta, tol);
+  CHECK_CLOSE_ABS(radian_pos(-2 * std::numbers::pi - delta),
+                  2 * std::numbers::pi - delta, tol);
+  CHECK_CLOSE_ABS(radian_pos(4 * std::numbers::pi + delta), delta, tol);
 }
 
-BOOST_DATA_TEST_CASE(RadianSym, bd::xrange(0.25, M_PI, 0.5), delta) {
+BOOST_DATA_TEST_CASE(RadianSym, bd::xrange(0.25, std::numbers::pi, 0.5),
+                     delta) {
   // above upper limit folds back just above lower limit
-  CHECK_CLOSE_ABS(radian_sym(-M_PI - delta), M_PI - delta, tol);
+  CHECK_CLOSE_ABS(radian_sym(-std::numbers::pi - delta),
+                  std::numbers::pi - delta, tol);
   // below lower limit folds back just below upper limit
-  CHECK_CLOSE_ABS(radian_sym(M_PI + delta), -M_PI + delta, tol);
+  CHECK_CLOSE_ABS(radian_sym(std::numbers::pi + delta),
+                  -std::numbers::pi + delta, tol);
   // same as above but with additional 2pi shifts
-  CHECK_CLOSE_ABS(radian_sym(-M_PI - delta - 2 * M_PI), M_PI - delta, tol);
-  CHECK_CLOSE_ABS(radian_sym(M_PI + delta + 2 * M_PI), -M_PI + delta, tol);
+  CHECK_CLOSE_ABS(radian_sym(-std::numbers::pi - delta - 2 * std::numbers::pi),
+                  std::numbers::pi - delta, tol);
+  CHECK_CLOSE_ABS(radian_sym(std::numbers::pi + delta + 2 * std::numbers::pi),
+                  -std::numbers::pi + delta, tol);
 }
 
 BOOST_DATA_TEST_CASE(NormalizePhiThetaInBounds,
-                     bd::xrange(-M_PI, M_PI, M_PI_2) *
-                         bd::xrange(0.0, M_PI, M_PI_4),
+                     bd::xrange(-std::numbers::pi, std::numbers::pi,
+                                std::numbers::pi / 2.) *
+                         bd::xrange(0., std::numbers::pi,
+                                    std::numbers::pi / 4.),
                      phix, thetax) {
   // both phi and theta are in bounds and should remain unchanged
   auto [phi, theta] = normalizePhiTheta(phix, thetax);
@@ -93,38 +104,41 @@ BOOST_DATA_TEST_CASE(NormalizePhiThetaInBounds,
 }
 
 BOOST_DATA_TEST_CASE(NormalizePhiThetaCyclicPhi,
-                     bd::xrange(0.25, M_PI, 0.5) *
-                         bd::xrange(0.0, M_PI, M_PI_4),
+                     bd::xrange(0.25, std::numbers::pi, 0.5) *
+                         bd::xrange(0., std::numbers::pi,
+                                    std::numbers::pi / 4.),
                      deltaPhi, thetax) {
   // phi is outside bounds, but theta is within and should remain unchanged
   {
     // phi is too large
-    auto [phi, theta] = normalizePhiTheta(M_PI + deltaPhi, thetax);
-    CHECK_CLOSE_ABS(phi, -M_PI + deltaPhi, tol);
+    auto [phi, theta] = normalizePhiTheta(std::numbers::pi + deltaPhi, thetax);
+    CHECK_CLOSE_ABS(phi, -std::numbers::pi + deltaPhi, tol);
     CHECK_CLOSE_ABS(theta, thetax, tol);
   }
   {
     // phi is too small
-    auto [phi, theta] = normalizePhiTheta(-M_PI - deltaPhi, thetax);
-    CHECK_CLOSE_ABS(phi, M_PI - deltaPhi, tol);
+    auto [phi, theta] = normalizePhiTheta(-std::numbers::pi - deltaPhi, thetax);
+    CHECK_CLOSE_ABS(phi, std::numbers::pi - deltaPhi, tol);
     CHECK_CLOSE_ABS(theta, thetax, tol);
   }
 }
 
 BOOST_DATA_TEST_CASE(NormalizePhiThetaOutOfBoundsTheta,
-                     bd::xrange(0.0, M_PI, 1.0) * bd::xrange(0.25, M_PI, 1.0),
+                     bd::xrange(0., std::numbers::pi, 1.) *
+                         bd::xrange(0.25, std::numbers::pi, 1.),
                      positivePhi, deltaTheta) {
   // theta is outside bounds, both phi and theta are updated
   {
     // theta is too large
-    auto [phi, theta] = normalizePhiTheta(positivePhi, M_PI + deltaTheta);
-    CHECK_CLOSE_ABS(phi, -M_PI + positivePhi, tol);
-    CHECK_CLOSE_ABS(theta, M_PI - deltaTheta, tol);
+    auto [phi, theta] =
+        normalizePhiTheta(positivePhi, std::numbers::pi + deltaTheta);
+    CHECK_CLOSE_ABS(phi, -std::numbers::pi + positivePhi, tol);
+    CHECK_CLOSE_ABS(theta, std::numbers::pi - deltaTheta, tol);
   }
   {
     // theta is too small
-    auto [phi, theta] = normalizePhiTheta(positivePhi, 0.0 - deltaTheta);
-    CHECK_CLOSE_ABS(phi, -M_PI + positivePhi, tol);
+    auto [phi, theta] = normalizePhiTheta(positivePhi, 0. - deltaTheta);
+    CHECK_CLOSE_ABS(phi, -std::numbers::pi + positivePhi, tol);
     CHECK_CLOSE_ABS(theta, deltaTheta, tol);
   }
 }
diff --git a/Tests/UnitTests/Core/Utilities/QuickMathTests.cpp b/Tests/UnitTests/Core/Utilities/QuickMathTests.cpp
deleted file mode 100644
index a463de371da..00000000000
--- a/Tests/UnitTests/Core/Utilities/QuickMathTests.cpp
+++ /dev/null
@@ -1,64 +0,0 @@
-// This file is part of the Acts project.
-//
-// Copyright (C) 2024 CERN for the benefit of the Acts project
-//
-// This Source Code Form is subject to the terms of the Mozilla Public
-// License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-#include <boost/test/data/test_case.hpp>
-#include <boost/test/unit_test.hpp>
-
-#include "Acts/Tests/CommonHelpers/FloatComparisons.hpp"
-#include "Acts/Utilities/QuickMath.hpp"
-
-namespace bdata = boost::unit_test::data;
-
-const auto expDist = bdata::random(
-    (bdata::engine = std::mt19937{}, bdata::seed = 0,
-     bdata::distribution = std::uniform_real_distribution<double>(-4, 4)));
-
-BOOST_AUTO_TEST_SUITE(Utilities)
-
-BOOST_DATA_TEST_CASE(fastInverseSqrt, expDist ^ bdata::xrange(100), exp, i) {
-  (void)i;
-
-  const double x = std::pow(10, exp);
-
-  const float fastFloat = Acts::fastInverseSqrt(static_cast<float>(x));
-  const double fastDouble = Acts::fastInverseSqrt(x);
-
-  const double stdFloat = 1.0 / std::sqrt(static_cast<float>(x));
-  const double stdDouble = 1.0 / std::sqrt(x);
-
-  CHECK_CLOSE_REL(stdFloat, fastFloat, 0.01);
-  CHECK_CLOSE_REL(stdDouble, fastDouble, 0.01);
-}
-
-BOOST_DATA_TEST_CASE(fastPow, expDist ^ expDist ^ bdata::xrange(100), baseExp,
-                     exp, i) {
-  (void)i;
-
-  const double base = std::pow(10, baseExp);
-
-  const double fast = Acts::fastPow(base, exp);
-  const double fastMorePrecise = Acts::fastPowMorePrecise(base, exp);
-
-  const double std = std::pow(base, exp);
-
-  CHECK_CLOSE_REL(fast, std, 0.15);
-  CHECK_CLOSE_REL(fastMorePrecise, std, 0.1);
-}
-
-// BOOST_AUTO_TEST_CASE(fastPowChart) {
-//   std::cout << "a ref obs" << std::endl;
-//   for (double aExp = -4; aExp <= 4; aExp += 0.01) {
-//     double a = std::pow(10, aExp);
-//     double ref = std::pow(a, 0.25);
-//     double obs = Acts::fastPow(a, 0.25);
-
-//     std::cout << a << " " << ref << " " << obs << std::endl;
-//   }
-// }
-
-BOOST_AUTO_TEST_SUITE_END()
diff --git a/Tests/UnitTests/Core/Utilities/Range1DTests.cpp b/Tests/UnitTests/Core/Utilities/Range1DTests.cpp
index ba08a639bdf..0788f59e7d3 100644
--- a/Tests/UnitTests/Core/Utilities/Range1DTests.cpp
+++ b/Tests/UnitTests/Core/Utilities/Range1DTests.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2021 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include <boost/test/unit_test.hpp>
 
diff --git a/Tests/UnitTests/Core/Utilities/RangeXDTests.cpp b/Tests/UnitTests/Core/Utilities/RangeXDTests.cpp
index 3e2ac063c99..bfeafff927b 100644
--- a/Tests/UnitTests/Core/Utilities/RangeXDTests.cpp
+++ b/Tests/UnitTests/Core/Utilities/RangeXDTests.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2021 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include <boost/test/unit_test.hpp>
 
diff --git a/Tests/UnitTests/Core/Utilities/RayTest.cpp b/Tests/UnitTests/Core/Utilities/RayTest.cpp
index db8b20cbb41..47f5e130049 100644
--- a/Tests/UnitTests/Core/Utilities/RayTest.cpp
+++ b/Tests/UnitTests/Core/Utilities/RayTest.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2019 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include <boost/test/tools/output_test_stream.hpp>
 #include <boost/test/unit_test.hpp>
diff --git a/Tests/UnitTests/Core/Utilities/RealQuadraticEquationTests.cpp b/Tests/UnitTests/Core/Utilities/RealQuadraticEquationTests.cpp
index d2d509a6c77..cc9a7996f83 100644
--- a/Tests/UnitTests/Core/Utilities/RealQuadraticEquationTests.cpp
+++ b/Tests/UnitTests/Core/Utilities/RealQuadraticEquationTests.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2017-2018 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include <boost/test/unit_test.hpp>
 
diff --git a/Tests/UnitTests/Core/Utilities/ResultTests.cpp b/Tests/UnitTests/Core/Utilities/ResultTests.cpp
index 519625d0785..0a873f16d4c 100644
--- a/Tests/UnitTests/Core/Utilities/ResultTests.cpp
+++ b/Tests/UnitTests/Core/Utilities/ResultTests.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2019 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include <boost/test/unit_test.hpp>
 
diff --git a/Tests/UnitTests/Core/Utilities/SubspaceTests.cpp b/Tests/UnitTests/Core/Utilities/SubspaceTests.cpp
index 2fbf0d2ffc4..1d3c615ce5b 100644
--- a/Tests/UnitTests/Core/Utilities/SubspaceTests.cpp
+++ b/Tests/UnitTests/Core/Utilities/SubspaceTests.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2020 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include <boost/test/unit_test.hpp>
 
@@ -78,7 +78,7 @@ std::array<std::size_t, kSize> selectFixedIndices(
   for (auto i = 0u; i < kSize; ++i) {
     indices[i] = fullIndices[i];
   }
-  std::sort(indices.begin(), indices.end());
+  std::ranges::sort(indices);
   return indices;
 }
 
diff --git a/Tests/UnitTests/Core/Utilities/TrackHelpersTests.cpp b/Tests/UnitTests/Core/Utilities/TrackHelpersTests.cpp
index fcba710499c..7fc0d20c991 100644
--- a/Tests/UnitTests/Core/Utilities/TrackHelpersTests.cpp
+++ b/Tests/UnitTests/Core/Utilities/TrackHelpersTests.cpp
@@ -1,57 +1,109 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2024 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include <boost/test/unit_test.hpp>
 
 #include "Acts/EventData/TrackContainer.hpp"
+#include "Acts/EventData/TrackStateType.hpp"
 #include "Acts/EventData/VectorMultiTrajectory.hpp"
 #include "Acts/EventData/VectorTrackContainer.hpp"
 #include "Acts/Utilities/TrackHelpers.hpp"
 
+#include <memory>
+#include <span>
+
 namespace Acts::Test {
 
+namespace {
+
+template <typename TrackContainer, typename FlagsPerState>
+auto createTestTrack(TrackContainer& tc, const FlagsPerState& flagsPerState) {
+  auto t = tc.makeTrack();
+
+  for (const auto& flags : flagsPerState) {
+    auto ts = t.appendTrackState();
+    for (auto f : flags) {
+      ts.typeFlags().set(f);
+    }
+  }
+
+  return t;
+}
+
+}  // namespace
+
 BOOST_AUTO_TEST_SUITE(Utilities)
 
 BOOST_AUTO_TEST_CASE(CalculateQuantities) {
   TrackContainer tc{VectorTrackContainer{}, VectorMultiTrajectory{}};
-  auto t = tc.makeTrack();
+  auto t = createTestTrack(tc, std::vector<std::vector<TrackStateFlag>>{
+                                   {MeasurementFlag},
+                                   {OutlierFlag},
+                                   {MeasurementFlag, SharedHitFlag},
+                                   {HoleFlag},
+                                   {OutlierFlag},
+                                   {HoleFlag},
+                                   {MeasurementFlag, SharedHitFlag},
+                                   {OutlierFlag},
+                               });
+
+  calculateTrackQuantities(t);
 
-  auto ts = t.appendTrackState();
-  ts.typeFlags().set(MeasurementFlag);
+  BOOST_CHECK_EQUAL(t.nHoles(), 2);
+  BOOST_CHECK_EQUAL(t.nMeasurements(), 3);
+  BOOST_CHECK_EQUAL(t.nOutliers(), 3);
+  BOOST_CHECK_EQUAL(t.nSharedHits(), 2);
+}
 
-  ts = t.appendTrackState();
-  ts.typeFlags().set(OutlierFlag);
+BOOST_AUTO_TEST_CASE(TrimTrack) {
+  TrackContainer tc{VectorTrackContainer{}, VectorMultiTrajectory{}};
+  auto t = createTestTrack(tc, std::vector<std::vector<TrackStateFlag>>{
+                                   {HoleFlag},
+                                   {MeasurementFlag},
+                                   {OutlierFlag},
+                                   {MeasurementFlag, SharedHitFlag},
+                                   {HoleFlag},
+                                   {OutlierFlag},
+                                   {HoleFlag},
+                                   {MeasurementFlag},
+                                   {OutlierFlag},
+                               });
 
-  ts = t.appendTrackState();
-  ts.typeFlags().set(MeasurementFlag);
-  ts.typeFlags().set(SharedHitFlag);
+  calculateTrackQuantities(t);
 
-  ts = t.appendTrackState();
-  ts.typeFlags().set(HoleFlag);
+  BOOST_CHECK_EQUAL(t.nHoles(), 3);
+  BOOST_CHECK_EQUAL(t.nMeasurements(), 3);
+  BOOST_CHECK_EQUAL(t.nOutliers(), 3);
+  BOOST_CHECK_EQUAL(t.nSharedHits(), 1);
 
-  ts = t.appendTrackState();
-  ts.typeFlags().set(OutlierFlag);
+  trimTrackFront(t, true, true, true);
+  calculateTrackQuantities(t);
 
-  ts = t.appendTrackState();
-  ts.typeFlags().set(HoleFlag);
+  BOOST_CHECK_EQUAL(t.nHoles(), 2);
+  BOOST_CHECK_EQUAL(t.nMeasurements(), 3);
+  BOOST_CHECK_EQUAL(t.nOutliers(), 3);
+  BOOST_CHECK_EQUAL(t.nSharedHits(), 1);
 
-  ts = t.appendTrackState();
-  ts.typeFlags().set(MeasurementFlag);
-  ts.typeFlags().set(SharedHitFlag);
+  trimTrackBack(t, true, true, true);
+  calculateTrackQuantities(t);
 
-  ts = t.appendTrackState();
-  ts.typeFlags().set(OutlierFlag);
+  BOOST_CHECK_EQUAL(t.nHoles(), 2);
+  BOOST_CHECK_EQUAL(t.nMeasurements(), 3);
+  BOOST_CHECK_EQUAL(t.nOutliers(), 2);
+  BOOST_CHECK_EQUAL(t.nSharedHits(), 1);
 
+  trimTrack(t, true, true, true);
   calculateTrackQuantities(t);
+
   BOOST_CHECK_EQUAL(t.nHoles(), 2);
   BOOST_CHECK_EQUAL(t.nMeasurements(), 3);
-  BOOST_CHECK_EQUAL(t.nOutliers(), 3);
-  BOOST_CHECK_EQUAL(t.nSharedHits(), 2);
+  BOOST_CHECK_EQUAL(t.nOutliers(), 2);
+  BOOST_CHECK_EQUAL(t.nSharedHits(), 1);
 }
 
 BOOST_AUTO_TEST_SUITE_END()
diff --git a/Tests/UnitTests/Core/Utilities/TransformRangeTests.cpp b/Tests/UnitTests/Core/Utilities/TransformRangeTests.cpp
index 99e80b369f6..d7ce6b56877 100644
--- a/Tests/UnitTests/Core/Utilities/TransformRangeTests.cpp
+++ b/Tests/UnitTests/Core/Utilities/TransformRangeTests.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2024 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include <boost/test/unit_test.hpp>
 
diff --git a/Tests/UnitTests/Core/Utilities/TypeListTests.cpp b/Tests/UnitTests/Core/Utilities/TypeListTests.cpp
index d41d8bd48ea..df80e51ee85 100644
--- a/Tests/UnitTests/Core/Utilities/TypeListTests.cpp
+++ b/Tests/UnitTests/Core/Utilities/TypeListTests.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2023 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include <boost/test/unit_test.hpp>
 
diff --git a/Tests/UnitTests/Core/Utilities/TypeTraitsTest.cpp b/Tests/UnitTests/Core/Utilities/TypeTraitsTest.cpp
deleted file mode 100644
index 4dd0d8d7d70..00000000000
--- a/Tests/UnitTests/Core/Utilities/TypeTraitsTest.cpp
+++ /dev/null
@@ -1,233 +0,0 @@
-// This file is part of the Acts project.
-//
-// Copyright (C) 2019 CERN for the benefit of the Acts project
-//
-// This Source Code Form is subject to the terms of the Mozilla Public
-// License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-#include <boost/test/unit_test.hpp>
-
-#include "Acts/Utilities/TypeTraits.hpp"
-
-#include <type_traits>
-
-using namespace Acts::Concepts;
-
-namespace Acts::Test {
-
-BOOST_AUTO_TEST_SUITE(Surfaces)
-
-// generate traits for methods named foo and bar
-METHOD_TRAIT(foo_method_t, foo);
-METHOD_TRAIT(bar_method_t, bar);
-
-struct E {
-  int bar(const double& /*unused*/) { return 5; }
-};
-
-struct E2 {
-  int bar(const double& /*unused*/) const { return 5; }
-};
-
-class E3 {
-  int bar(const double& /*unused*/) { return 5; }
-};
-
-BOOST_AUTO_TEST_CASE(TypeTraitsMethods) {
-  // E does not have a method bar without arguments
-  static_assert(!has_method<E, int, bar_method_t>, "failed");
-  // E does have a method like int bar(const double&)
-  static_assert(has_method<E, int, bar_method_t, const double&>, "failed");
-  // E does not have method bar returning double instead of int
-  static_assert(!has_method<E, double, bar_method_t, const double&>, "failed");
-  // E does not have method taking non-ref const double argument
-  static_assert(!has_method<E, int, bar_method_t, const double>, "failed");
-  // E does not have method taking non-const double ref argument
-  static_assert(!has_method<E, int, bar_method_t, double&>, "failed");
-  // E does not have method taking plain double argument
-  static_assert(!has_method<E, int, bar_method_t, double>, "failed");
-  // E does not have method const method with correct signature otherwise
-  // This test ensures a non-const method does not qualify for a
-  // check for a method on the const type
-  static_assert(!has_method<const E, int, bar_method_t, const double&>,
-                "failed");
-  // E does not have a foo method
-  static_assert(!has_method<E, int, foo_method_t, const double&>, "failed");
-
-  // E2 doesn't have method like int bar()
-  static_assert(!has_method<E2, int, bar_method_t>, "failed");
-  // E2 does not have non-const method with signature int bar(const double&)
-  // This means that a const method won't fulfill a non-const method
-  // requirement
-  static_assert(!has_method<E2, int, bar_method_t, const double&>, "failed");
-  // E2 has method of signature int bar(const double&) const
-  static_assert(has_method<const E2, int, bar_method_t, const double&>,
-                "failed");
-  // E2 does not have method taking non-ref const double
-  static_assert(!has_method<E2, int, bar_method_t, const double>, "failed");
-  // E2 does not have method taking non-const ref double
-  static_assert(!has_method<E2, int, bar_method_t, double&>, "failed");
-  // E2 does not have method taking plain double
-  static_assert(!has_method<E2, int, bar_method_t, double>, "failed");
-  // E2 does not have method with char return type
-  static_assert(!has_method<const E2, char, bar_method_t, const double&>,
-                "failed");
-  // E2 does not have foo method
-  static_assert(!has_method<const E2, int, foo_method_t, const double&>,
-                "failed");
-
-  // E3 does have a method like int bar(const double&) but is private
-  static_assert(!has_method<E3, int, bar_method_t, const double&>, "failed");
-}
-
-// trait for member named "member_a"
-template <typename T>
-using member_a_t = decltype(std::declval<T>().member_a);
-// trait for member named "member_b"
-template <typename T>
-using member_b_t = decltype(std::declval<T>().member_b);
-
-struct M {
-  int member_a;
-  double member_b;
-};
-
-struct M2 {
-  double member_a;
-};
-
-struct M3 {
-  char member_a;
-};
-
-struct M4 {
-  char member_b;
-};
-
-class M5 {
-  char member_b;
-};
-
-BOOST_AUTO_TEST_CASE(TypeTraitsMember) {
-  static_assert(has_member<M, member_a_t, int>, "!");
-  static_assert(has_member<M, member_b_t, double>, "!");
-  // incorrect type
-  static_assert(!has_member<M, member_b_t, int>, "!");
-  static_assert(!has_member<M, member_a_t, double>, "!");
-
-  static_assert(has_member<M2, member_a_t, double>, "!");
-  static_assert(!has_member<M2, member_a_t, int>, "!");
-
-  static_assert(exists<member_a_t, M>, "!");
-  static_assert(exists<member_a_t, M2>, "!");
-  static_assert(exists<member_a_t, M3>, "!");
-  static_assert(!exists<member_a_t, M4>, "!");
-
-  // private member is not detected
-  static_assert(!has_member<M5, member_b_t, char>, "!");
-
-  // private member is not detected.
-  static_assert(!exists<member_b_t, M5>, "!");
-}
-
-template <typename T>
-using nested_a_t = typename T::NestedA;
-template <typename T>
-using nested_b_t = typename T::NestedB;
-
-struct N {
-  struct NestedA;
-  class NestedB;
-};
-
-struct N2 {
-  struct NestedA;
-};
-
-struct N3 {
-  class NestedB;
-};
-
-BOOST_AUTO_TEST_CASE(TypeTraitsNestedType) {
-  static_assert(exists<nested_a_t, N>, "!");
-  static_assert(exists<nested_b_t, N>, "!");
-
-  static_assert(exists<nested_a_t, N2>, "!");
-  static_assert(!exists<nested_b_t, N2>, "!");
-
-  static_assert(!exists<nested_a_t, N3>, "!");
-  static_assert(exists<nested_b_t, N3>, "!");
-}
-
-// trait for member named "member"
-template <typename T>
-using member_t = decltype(std::declval<T>().member);
-
-// trait for nested type called "Nested"
-template <typename T>
-using nested_t = typename T::Nested;
-
-// trait for contained template "meta" with two template params
-template <typename T>
-using meta_t = typename T::template meta<void, void>;
-
-// combine it into a concept
-template <typename T>
-constexpr bool SomeConcept =
-    require<has_method<T, double, foo_method_t, double, int>,
-            has_method<const T, bool, bar_method_t, double&&>,
-            has_member<T, member_t, bool>, exists<nested_t, T>,
-            exists<meta_t, T>>;
-
-struct A {
-  bool member;
-
-  struct Nested {};
-
-  template <typename U, typename V>
-  struct meta {};
-
-  double foo(double /*unused*/, int /*unused*/) { return 5; }
-
-  bool bar(double&& /*unused*/) const { return true; }
-};
-
-struct A2 {
-  bool member;
-
-  struct Nested {};
-
-  template <typename U>
-  struct meta {};
-
-  double foo(double /*unused*/, int /*unused*/) { return 5; }
-
-  bool bar(double&& /*unused*/) const { return true; }
-};
-
-struct B {
-  bool different;
-
-  int foo(double /*unused*/) { return 5; }
-};
-
-struct C {
-  double foo(int /*unused*/) { return 5; }
-};
-
-struct D {
-  double bar(double /*unused*/) { return 5; }
-};
-
-BOOST_AUTO_TEST_CASE(TypeTraitsConcepts) {
-  static_assert(SomeConcept<A>, "A does not fulfill \"SomeConcept\"");
-  static_assert(!SomeConcept<A2>, "A2 does not fulfill \"SomeConcept\"");
-  static_assert(!SomeConcept<B>, "B does fulfill \"SomeConcept\"");
-  static_assert(!SomeConcept<C>, "C does fulfill \"SomeConcept\"");
-  static_assert(!SomeConcept<D>, "D does fulfill \"SomeConcept\"");
-}
-
-BOOST_AUTO_TEST_SUITE_END()
-
-}  // namespace Acts::Test
diff --git a/Tests/UnitTests/Core/Utilities/UnitVectorsTests.cpp b/Tests/UnitTests/Core/Utilities/UnitVectorsTests.cpp
index ac52e3654ea..150479a02b5 100644
--- a/Tests/UnitTests/Core/Utilities/UnitVectorsTests.cpp
+++ b/Tests/UnitTests/Core/Utilities/UnitVectorsTests.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2020 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include <boost/test/unit_test.hpp>
 
@@ -15,6 +15,7 @@
 #include <algorithm>
 #include <cmath>
 #include <limits>
+#include <numbers>
 
 using Acts::Vector3;
 
@@ -31,28 +32,28 @@ BOOST_AUTO_TEST_CASE(DirectionPhiEta) {
   const auto xPos1 = makeDirectionFromPhiEta(0.0, 0.0);
   CHECK_CLOSE_REL(xPos1.norm(), 1, eps);
   CHECK_CLOSE_REL(xPos1.dot(Vector3(1, 0, 0)), 1, eps);
-  const auto xPos2 = makeDirectionFromPhiEta(2 * M_PI, 0.0);
+  const auto xPos2 = makeDirectionFromPhiEta(2 * std::numbers::pi, 0.);
   CHECK_CLOSE_REL(xPos2.norm(), 1, eps);
   CHECK_CLOSE_REL(xPos2.dot(Vector3(1, 0, 0)), 1, eps);
   // along negative x
-  const auto xNeg1 = makeDirectionFromPhiEta(M_PI, 0.0);
+  const auto xNeg1 = makeDirectionFromPhiEta(std::numbers::pi, 0.);
   CHECK_CLOSE_REL(xNeg1.norm(), 1, eps);
   CHECK_CLOSE_REL(xNeg1.dot(Vector3(-1, 0, 0)), 1, eps);
-  const auto xNeg2 = makeDirectionFromPhiEta(-M_PI, 0.0);
+  const auto xNeg2 = makeDirectionFromPhiEta(-std::numbers::pi, 0.);
   CHECK_CLOSE_REL(xNeg2.norm(), 1, eps);
   CHECK_CLOSE_REL(xNeg2.dot(Vector3(-1, 0, 0)), 1, eps);
   // along positive y
-  const auto yPos1 = makeDirectionFromPhiEta(M_PI_2, 0.0);
+  const auto yPos1 = makeDirectionFromPhiEta(std::numbers::pi / 2., 0.);
   CHECK_CLOSE_REL(yPos1.norm(), 1, eps);
   CHECK_CLOSE_REL(yPos1.dot(Vector3(0, 1, 0)), 1, eps);
-  const auto yPos2 = makeDirectionFromPhiEta(-3 * M_PI_2, 0.0);
+  const auto yPos2 = makeDirectionFromPhiEta(-3 * std::numbers::pi / 2., 0.);
   CHECK_CLOSE_REL(yPos2.norm(), 1, eps);
   CHECK_CLOSE_REL(yPos2.dot(Vector3(0, 1, 0)), 1, eps);
   // along negative y
-  const auto yNeg1 = makeDirectionFromPhiEta(-M_PI_2, 0.0);
+  const auto yNeg1 = makeDirectionFromPhiEta(-std::numbers::pi / 2., 0.);
   CHECK_CLOSE_REL(yNeg1.norm(), 1, eps);
   CHECK_CLOSE_REL(yNeg1.dot(Vector3(0, -1, 0)), 1, eps);
-  const auto yNeg2 = makeDirectionFromPhiEta(3 * M_PI_2, 0.0);
+  const auto yNeg2 = makeDirectionFromPhiEta(3 * std::numbers::pi / 2., 0.);
   CHECK_CLOSE_REL(yNeg2.norm(), 1, eps);
   CHECK_CLOSE_REL(yNeg2.dot(Vector3(0, -1, 0)), 1, eps);
 
@@ -61,63 +62,74 @@ BOOST_AUTO_TEST_CASE(DirectionPhiEta) {
   const auto zPos1 = makeDirectionFromPhiEta(0.0, inf);
   CHECK_CLOSE_REL(zPos1.norm(), 1, eps);
   CHECK_CLOSE_REL(zPos1.dot(Vector3(0, 0, 1)), 1, eps);
-  const auto zPos2 = makeDirectionFromPhiEta(M_PI_2, inf);
+  const auto zPos2 = makeDirectionFromPhiEta(std::numbers::pi / 2., inf);
   CHECK_CLOSE_REL(zPos2.norm(), 1, eps);
   CHECK_CLOSE_REL(zPos2.dot(Vector3(0, 0, 1)), 1, eps);
   // along negative z
   const auto zNeg1 = makeDirectionFromPhiEta(0.0, -inf);
   CHECK_CLOSE_REL(zNeg1.norm(), 1, eps);
   CHECK_CLOSE_REL(zNeg1.dot(Vector3(0, 0, -1)), 1, eps);
-  const auto zNeg2 = makeDirectionFromPhiEta(M_PI_2, -inf);
+  const auto zNeg2 = makeDirectionFromPhiEta(std::numbers::pi / 2., -inf);
   CHECK_CLOSE_REL(zNeg2.norm(), 1, eps);
   CHECK_CLOSE_REL(zNeg2.dot(Vector3(0, 0, -1)), 1, eps);
 
   // mixed direction
-  const auto mixed1 = makeDirectionFromPhiEta(M_PI_4, 1.0);
+  const auto mixed1 = makeDirectionFromPhiEta(std::numbers::pi / 4., 1.);
   CHECK_CLOSE_REL(mixed1.norm(), 1, eps);
   CHECK_CLOSE_REL(
-      mixed1.dot(Vector3(1, 1, M_SQRT2 * std::sinh(1.0)).normalized()), 1, eps);
-  const auto mixed2 = makeDirectionFromPhiEta(M_PI_4, -1.0);
+      mixed1.dot(
+          Vector3(1, 1, std::numbers::sqrt2 * std::sinh(1.0)).normalized()),
+      1, eps);
+  const auto mixed2 = makeDirectionFromPhiEta(std::numbers::pi / 4., -1.);
   CHECK_CLOSE_REL(mixed2.norm(), 1, eps);
   CHECK_CLOSE_REL(
-      mixed2.dot(Vector3(1, 1, M_SQRT2 * std::sinh(-1.0)).normalized()), 1,
-      eps);
-  const auto mixed3 = makeDirectionFromPhiEta(-M_PI_4, -1.0);
+      mixed2.dot(
+          Vector3(1, 1, std::numbers::sqrt2 * std::sinh(-1.0)).normalized()),
+      1, eps);
+  const auto mixed3 = makeDirectionFromPhiEta(-std::numbers::pi / 4., -1.);
   CHECK_CLOSE_REL(mixed3.norm(), 1, eps);
   CHECK_CLOSE_REL(
-      mixed3.dot(Vector3(1, -1, M_SQRT2 * std::sinh(-1.0)).normalized()), 1,
-      eps);
+      mixed3.dot(
+          Vector3(1, -1, std::numbers::sqrt2 * std::sinh(-1.)).normalized()),
+      1, eps);
 }
 
 BOOST_AUTO_TEST_CASE(DirectionPhiTheta) {
   using Acts::makeDirectionFromPhiTheta;
 
   // along positive x
-  const auto xPos1 = makeDirectionFromPhiTheta(0.0, M_PI_2);
+  const auto xPos1 = makeDirectionFromPhiTheta(0., std::numbers::pi / 2.);
   CHECK_CLOSE_REL(xPos1.norm(), 1, eps);
   CHECK_CLOSE_REL(xPos1.dot(Vector3(1, 0, 0)), 1, eps);
-  const auto xPos2 = makeDirectionFromPhiTheta(2 * M_PI, M_PI_2);
+  const auto xPos2 =
+      makeDirectionFromPhiTheta(2 * std::numbers::pi, std::numbers::pi / 2.);
   CHECK_CLOSE_REL(xPos2.norm(), 1, eps);
   CHECK_CLOSE_REL(xPos2.dot(Vector3(1, 0, 0)), 1, eps);
   // along negative x
-  const auto xNeg1 = makeDirectionFromPhiTheta(M_PI, M_PI_2);
+  const auto xNeg1 =
+      makeDirectionFromPhiTheta(std::numbers::pi, std::numbers::pi / 2.);
   CHECK_CLOSE_REL(xNeg1.norm(), 1, eps);
   CHECK_CLOSE_REL(xNeg1.dot(Vector3(-1, 0, 0)), 1, eps);
-  const auto xNeg2 = makeDirectionFromPhiTheta(-M_PI, M_PI_2);
+  const auto xNeg2 =
+      makeDirectionFromPhiTheta(-std::numbers::pi, std::numbers::pi / 2.);
   CHECK_CLOSE_REL(xNeg2.norm(), 1, eps);
   CHECK_CLOSE_REL(xNeg2.dot(Vector3(-1, 0, 0)), 1, eps);
   // along positive y
-  const auto yPos1 = makeDirectionFromPhiTheta(M_PI_2, M_PI_2);
+  const auto yPos1 =
+      makeDirectionFromPhiTheta(std::numbers::pi / 2., std::numbers::pi / 2.);
   CHECK_CLOSE_REL(yPos1.norm(), 1, eps);
   CHECK_CLOSE_REL(yPos1.dot(Vector3(0, 1, 0)), 1, eps);
-  const auto yPos2 = makeDirectionFromPhiTheta(-3 * M_PI_2, M_PI_2);
+  const auto yPos2 = makeDirectionFromPhiTheta(-3 * std::numbers::pi / 2.,
+                                               std::numbers::pi / 2.);
   CHECK_CLOSE_REL(yPos2.norm(), 1, eps);
   CHECK_CLOSE_REL(yPos2.dot(Vector3(0, 1, 0)), 1, eps);
   // along negative y
-  const auto yNeg1 = makeDirectionFromPhiTheta(-M_PI_2, M_PI_2);
+  const auto yNeg1 =
+      makeDirectionFromPhiTheta(-std::numbers::pi / 2., std::numbers::pi / 2.);
   CHECK_CLOSE_REL(yNeg1.norm(), 1, eps);
   CHECK_CLOSE_REL(yNeg1.dot(Vector3(0, -1, 0)), 1, eps);
-  const auto yNeg2 = makeDirectionFromPhiTheta(3 * M_PI_2, M_PI_2);
+  const auto yNeg2 = makeDirectionFromPhiTheta(3 * std::numbers::pi / 2.,
+                                               std::numbers::pi / 2.);
   CHECK_CLOSE_REL(yNeg2.norm(), 1, eps);
   CHECK_CLOSE_REL(yNeg2.dot(Vector3(0, -1, 0)), 1, eps);
 
@@ -125,27 +137,34 @@ BOOST_AUTO_TEST_CASE(DirectionPhiTheta) {
   const auto zPos1 = makeDirectionFromPhiTheta(0.0, 0.0);
   CHECK_CLOSE_REL(zPos1.norm(), 1, eps);
   CHECK_CLOSE_REL(zPos1.dot(Vector3(0, 0, 1)), 1, eps);
-  const auto zPos2 = makeDirectionFromPhiTheta(M_PI_2, 0.0);
+  const auto zPos2 = makeDirectionFromPhiTheta(std::numbers::pi / 2., 0.);
   CHECK_CLOSE_REL(zPos2.norm(), 1, eps);
   CHECK_CLOSE_REL(zPos2.dot(Vector3(0, 0, 1)), 1, eps);
   // along negative z
-  const auto zNeg1 = makeDirectionFromPhiTheta(0.0, M_PI);
+  const auto zNeg1 = makeDirectionFromPhiTheta(0., std::numbers::pi);
   CHECK_CLOSE_REL(zNeg1.norm(), 1, eps);
   CHECK_CLOSE_REL(zNeg1.dot(Vector3(0, 0, -1)), 1, eps);
-  const auto zNeg2 = makeDirectionFromPhiTheta(M_PI_2, M_PI);
+  const auto zNeg2 =
+      makeDirectionFromPhiTheta(std::numbers::pi / 2., std::numbers::pi);
   CHECK_CLOSE_REL(zNeg2.norm(), 1, eps);
   CHECK_CLOSE_REL(zNeg2.dot(Vector3(0, 0, -1)), 1, eps);
 
   // mixed direction
-  const auto mixed1 = makeDirectionFromPhiTheta(M_PI_4, M_PI_4);
+  const auto mixed1 =
+      makeDirectionFromPhiTheta(std::numbers::pi / 4., std::numbers::pi / 4.);
   CHECK_CLOSE_REL(mixed1.norm(), 1, eps);
-  CHECK_CLOSE_REL(mixed1.dot(Vector3(1, 1, M_SQRT2).normalized()), 1, eps);
-  const auto mixed2 = makeDirectionFromPhiTheta(M_PI_4, 3 * M_PI_4);
+  CHECK_CLOSE_REL(mixed1.dot(Vector3(1, 1, std::numbers::sqrt2).normalized()),
+                  1, eps);
+  const auto mixed2 = makeDirectionFromPhiTheta(std::numbers::pi / 4.,
+                                                3 * std::numbers::pi / 4.);
   CHECK_CLOSE_REL(mixed2.norm(), 1, eps);
-  CHECK_CLOSE_REL(mixed2.dot(Vector3(1, 1, -M_SQRT2).normalized()), 1, eps);
-  const auto mixed3 = makeDirectionFromPhiTheta(-M_PI_4, 3 * M_PI_4);
+  CHECK_CLOSE_REL(mixed2.dot(Vector3(1, 1, -std::numbers::sqrt2).normalized()),
+                  1, eps);
+  const auto mixed3 = makeDirectionFromPhiTheta(-std::numbers::pi / 4.,
+                                                3 * std::numbers::pi / 4.);
   CHECK_CLOSE_REL(mixed3.norm(), 1, eps);
-  CHECK_CLOSE_REL(mixed3.dot(Vector3(1, -1, -M_SQRT2).normalized()), 1, eps);
+  CHECK_CLOSE_REL(mixed3.dot(Vector3(1, -1, -std::numbers::sqrt2).normalized()),
+                  1, eps);
 }
 
 namespace {
diff --git a/Tests/UnitTests/Core/Utilities/VectorHelpersTests.cpp b/Tests/UnitTests/Core/Utilities/VectorHelpersTests.cpp
new file mode 100644
index 00000000000..17ffe9d93a5
--- /dev/null
+++ b/Tests/UnitTests/Core/Utilities/VectorHelpersTests.cpp
@@ -0,0 +1,30 @@
+// This file is part of the ACTS project.
+//
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
+//
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
+
+#include <boost/test/unit_test.hpp>
+
+#include "Acts/Definitions/Algebra.hpp"
+#include "Acts/Tests/CommonHelpers/FloatComparisons.hpp"
+#include "Acts/Utilities/VectorHelpers.hpp"
+
+#include <numbers>
+
+using Acts::VectorHelpers::eta;
+using Acts::VectorHelpers::theta;
+
+BOOST_AUTO_TEST_SUITE(AngleHelpers)
+
+BOOST_AUTO_TEST_CASE(EtaFromVector) {
+  CHECK_CLOSE_ABS(0.0, eta(Acts::Vector3{1, 0, 0}), 1e-6);
+}
+
+BOOST_AUTO_TEST_CASE(ThetaFromVector) {
+  CHECK_CLOSE_ABS(std::numbers::pi / 2, theta(Acts::Vector3{1, 0, 0}), 1e-6);
+}
+
+BOOST_AUTO_TEST_SUITE_END()
diff --git a/Tests/UnitTests/Core/Utilities/ZipTests.cpp b/Tests/UnitTests/Core/Utilities/ZipTests.cpp
index c7c686d3d97..d0025f46c01 100644
--- a/Tests/UnitTests/Core/Utilities/ZipTests.cpp
+++ b/Tests/UnitTests/Core/Utilities/ZipTests.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2023 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include <boost/test/unit_test.hpp>
 
diff --git a/Tests/UnitTests/Core/VersionTests.cpp b/Tests/UnitTests/Core/VersionTests.cpp
index 1f9a811836b..870a1a78947 100644
--- a/Tests/UnitTests/Core/VersionTests.cpp
+++ b/Tests/UnitTests/Core/VersionTests.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2020 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 // the purpose of these tests is to ensure that the version header is valid and
 // the exported parameters are accessible. otherwise, there would is no code
diff --git a/Tests/UnitTests/Core/Vertexing/AdaptiveGridTrackDensityTests.cpp b/Tests/UnitTests/Core/Vertexing/AdaptiveGridTrackDensityTests.cpp
index 924e3a76034..337ca19a9e6 100644
--- a/Tests/UnitTests/Core/Vertexing/AdaptiveGridTrackDensityTests.cpp
+++ b/Tests/UnitTests/Core/Vertexing/AdaptiveGridTrackDensityTests.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2020-2023 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include <boost/test/unit_test.hpp>
 
@@ -19,6 +19,7 @@
 #include "Acts/Vertexing/AdaptiveGridTrackDensity.hpp"
 
 #include <memory>
+#include <numbers>
 #include <optional>
 #include <utility>
 
@@ -105,8 +106,8 @@ BOOST_AUTO_TEST_CASE(compare_to_analytical_solution_for_single_track) {
   // https://en.wikipedia.org/wiki/Full_width_at_half_maximum#Normal_distribution
   // but the calculation needs to be slightly modified in our case)
   double correctFWHM =
-      2. *
-      std::sqrt(2 * std::log(2.) * subCovMat.determinant() / subCovMat(0, 0));
+      2. * std::sqrt(2 * std::numbers::ln2 * subCovMat.determinant() /
+                     subCovMat(0, 0));
 
   // Estimate maximum z position and seed width
   auto res = grid.getMaxZTPositionAndWidth(mainDensityMap);
@@ -210,7 +211,8 @@ BOOST_AUTO_TEST_CASE(
   ActsScalar correctMaxT = tNom / denom * d0 + t0;
 
   // Analytical FWHM of the Gaussian
-  ActsScalar correctFWHM = 2. * std::sqrt(2 * std::log(2.) / ipWeights(1, 1));
+  ActsScalar correctFWHM =
+      2. * std::sqrt(2 * std::numbers::ln2 / ipWeights(1, 1));
 
   // Estimate maximum z position and seed width
   auto res = grid.getMaxZTPositionAndWidth(mainDensityMap);
diff --git a/Tests/UnitTests/Core/Vertexing/AdaptiveMultiVertexFinderTests.cpp b/Tests/UnitTests/Core/Vertexing/AdaptiveMultiVertexFinderTests.cpp
index 9723e6f4540..0b6c5982067 100644
--- a/Tests/UnitTests/Core/Vertexing/AdaptiveMultiVertexFinderTests.cpp
+++ b/Tests/UnitTests/Core/Vertexing/AdaptiveMultiVertexFinderTests.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2019-2020 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include <boost/test/unit_test.hpp>
 
@@ -45,6 +45,7 @@
 #include <iostream>
 #include <map>
 #include <memory>
+#include <numbers>
 #include <string>
 #include <system_error>
 #include <tuple>
@@ -85,7 +86,8 @@ BOOST_AUTO_TEST_CASE(adaptive_multi_vertex_finder_test) {
   ImpactPointEstimator::Config ipEstimatorCfg(bField, propagator);
   ImpactPointEstimator ipEstimator(ipEstimatorCfg);
 
-  std::vector<double> temperatures{8.0, 4.0, 2.0, 1.4142136, 1.2247449, 1.0};
+  std::vector<double> temperatures{
+      8., 4., 2., std::numbers::sqrt2, std::sqrt(3. / 2.), 1.};
   AnnealingUtility::Config annealingConfig;
   annealingConfig.setOfTemperatures = temperatures;
   AnnealingUtility annealingUtility(annealingConfig);
@@ -243,7 +245,8 @@ BOOST_AUTO_TEST_CASE(adaptive_multi_vertex_finder_usertype_test) {
   ImpactPointEstimator::Config ipEstimatorCfg(bField, propagator);
   ImpactPointEstimator ipEstimator(ipEstimatorCfg);
 
-  std::vector<double> temperatures{8.0, 4.0, 2.0, 1.4142136, 1.2247449, 1.0};
+  std::vector<double> temperatures{
+      8., 4., 2., std::numbers::sqrt2, std::sqrt(3. / 2.), 1.};
   AnnealingUtility::Config annealingConfig;
   annealingConfig.setOfTemperatures = temperatures;
   AnnealingUtility annealingUtility(annealingConfig);
@@ -386,7 +389,8 @@ BOOST_AUTO_TEST_CASE(adaptive_multi_vertex_finder_grid_seed_finder_test) {
   ImpactPointEstimator::Config ipEstCfg(bField, propagator);
   ImpactPointEstimator ipEst(ipEstCfg);
 
-  std::vector<double> temperatures{8.0, 4.0, 2.0, 1.4142136, 1.2247449, 1.0};
+  std::vector<double> temperatures{
+      8., 4., 2., std::numbers::sqrt2, std::sqrt(3. / 2.), 1.};
   AnnealingUtility::Config annealingConfig;
   annealingConfig.setOfTemperatures = temperatures;
   AnnealingUtility annealingUtility(annealingConfig);
@@ -535,7 +539,8 @@ BOOST_AUTO_TEST_CASE(
   ImpactPointEstimator::Config ipEstCfg(bField, propagator);
   ImpactPointEstimator ipEst(ipEstCfg);
 
-  std::vector<double> temperatures{8.0, 4.0, 2.0, 1.4142136, 1.2247449, 1.0};
+  std::vector<double> temperatures{
+      8., 4., 2., std::numbers::sqrt2, std::sqrt(3. / 2.), 1.};
   AnnealingUtility::Config annealingConfig;
   annealingConfig.setOfTemperatures = temperatures;
   AnnealingUtility annealingUtility(annealingConfig);
diff --git a/Tests/UnitTests/Core/Vertexing/AdaptiveMultiVertexFitterTests.cpp b/Tests/UnitTests/Core/Vertexing/AdaptiveMultiVertexFitterTests.cpp
index 7cb531d2e1f..3b3acf01bfd 100644
--- a/Tests/UnitTests/Core/Vertexing/AdaptiveMultiVertexFitterTests.cpp
+++ b/Tests/UnitTests/Core/Vertexing/AdaptiveMultiVertexFitterTests.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2019 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include <boost/test/unit_test.hpp>
 
@@ -41,6 +41,7 @@
 #include <iostream>
 #include <map>
 #include <memory>
+#include <numbers>
 #include <random>
 #include <tuple>
 #include <type_traits>
@@ -75,9 +76,10 @@ std::uniform_real_distribution<double> z0Dist(-0.2_mm, 0.2_mm);
 // Track pT distribution
 std::uniform_real_distribution<double> pTDist(1._GeV, 30._GeV);
 // Track phi distribution
-std::uniform_real_distribution<double> phiDist(-M_PI, M_PI);
+std::uniform_real_distribution<double> phiDist(-std::numbers::pi,
+                                               std::numbers::pi);
 // Track theta distribution
-std::uniform_real_distribution<double> thetaDist(1.0, M_PI - 1.0);
+std::uniform_real_distribution<double> thetaDist(1., std::numbers::pi - 1.);
 // Track charge helper distribution
 std::uniform_real_distribution<double> qDist(-1, 1);
 // Distribution of track time (relative to vertex time). Values are unrealistic
diff --git a/Tests/UnitTests/Core/Vertexing/FullBilloirVertexFitterTests.cpp b/Tests/UnitTests/Core/Vertexing/FullBilloirVertexFitterTests.cpp
index 85f1274fe43..5c4deb84a38 100644
--- a/Tests/UnitTests/Core/Vertexing/FullBilloirVertexFitterTests.cpp
+++ b/Tests/UnitTests/Core/Vertexing/FullBilloirVertexFitterTests.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2019 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include <boost/test/unit_test.hpp>
 
@@ -37,6 +37,7 @@
 #include <functional>
 #include <iostream>
 #include <memory>
+#include <numbers>
 #include <random>
 #include <tuple>
 #include <type_traits>
@@ -69,9 +70,10 @@ std::uniform_real_distribution<double> z0Dist(-0.2_mm, 0.2_mm);
 // pT
 std::uniform_real_distribution<double> pTDist(0.4_GeV, 10_GeV);
 // phi
-std::uniform_real_distribution<double> phiDist(-M_PI, M_PI);
+std::uniform_real_distribution<double> phiDist(-std::numbers::pi,
+                                               std::numbers::pi);
 // theta
-std::uniform_real_distribution<double> thetaDist(1.0, M_PI - 1.0);
+std::uniform_real_distribution<double> thetaDist(1., std::numbers::pi - 1.);
 // charge helper
 std::uniform_real_distribution<double> qDist(-1, 1);
 // time
diff --git a/Tests/UnitTests/Core/Vertexing/GaussianGridTrackDensityTests.cpp b/Tests/UnitTests/Core/Vertexing/GaussianGridTrackDensityTests.cpp
index 9de0daf696a..b9d63709569 100644
--- a/Tests/UnitTests/Core/Vertexing/GaussianGridTrackDensityTests.cpp
+++ b/Tests/UnitTests/Core/Vertexing/GaussianGridTrackDensityTests.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2020 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include <boost/test/unit_test.hpp>
 
diff --git a/Tests/UnitTests/Core/Vertexing/GridDensityVertexFinderTests.cpp b/Tests/UnitTests/Core/Vertexing/GridDensityVertexFinderTests.cpp
index 728c07cc53c..d8aa16a1c94 100644
--- a/Tests/UnitTests/Core/Vertexing/GridDensityVertexFinderTests.cpp
+++ b/Tests/UnitTests/Core/Vertexing/GridDensityVertexFinderTests.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2020 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include <boost/test/unit_test.hpp>
 
@@ -32,6 +32,7 @@
 
 #include <iostream>
 #include <memory>
+#include <numbers>
 #include <random>
 #include <system_error>
 #include <vector>
@@ -60,7 +61,8 @@ std::normal_distribution<double> z2dist(zVertexPos2 * 1_mm, 0.5_mm);
 // Track pT distribution
 std::uniform_real_distribution<double> pTDist(0.1_GeV, 100_GeV);
 // Track phi distribution
-std::uniform_real_distribution<double> phiDist(-M_PI, M_PI);
+std::uniform_real_distribution<double> phiDist(-std::numbers::pi,
+                                               std::numbers::pi);
 // Track eta distribution
 std::uniform_real_distribution<double> etaDist(-4., 4.);
 
diff --git a/Tests/UnitTests/Core/Vertexing/ImpactPointEstimatorTests.cpp b/Tests/UnitTests/Core/Vertexing/ImpactPointEstimatorTests.cpp
index 321aa852da7..279f2c1a739 100644
--- a/Tests/UnitTests/Core/Vertexing/ImpactPointEstimatorTests.cpp
+++ b/Tests/UnitTests/Core/Vertexing/ImpactPointEstimatorTests.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2019-2023 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include <boost/test/data/test_case.hpp>
 #include <boost/test/unit_test.hpp>
@@ -43,6 +43,7 @@
 #include <cmath>
 #include <limits>
 #include <memory>
+#include <numbers>
 #include <optional>
 #include <tuple>
 #include <utility>
@@ -371,6 +372,9 @@ BOOST_DATA_TEST_CASE(VertexCompatibility4D, IPs* vertices, d0, l0, vx0, vy0,
   BoundVector paramVecClose = BoundVector::Zero();
   paramVecClose[eBoundLoc0] = d0;
   paramVecClose[eBoundLoc1] = l0;
+  paramVecClose[eBoundPhi] = 0;
+  paramVecClose[eBoundTheta] = std::numbers::pi / 2;
+  paramVecClose[eBoundQOverP] = 0;
   paramVecClose[eBoundTime] = vt0 + sgnClose * timeDiffClose;
 
   BoundVector paramVecFar = paramVecClose;
diff --git a/Tests/UnitTests/Core/Vertexing/IterativeVertexFinderTests.cpp b/Tests/UnitTests/Core/Vertexing/IterativeVertexFinderTests.cpp
index 2cc09ab415c..37925947d28 100644
--- a/Tests/UnitTests/Core/Vertexing/IterativeVertexFinderTests.cpp
+++ b/Tests/UnitTests/Core/Vertexing/IterativeVertexFinderTests.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2019 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include <boost/test/unit_test.hpp>
 
@@ -43,6 +43,7 @@
 #include <iostream>
 #include <iterator>
 #include <memory>
+#include <numbers>
 #include <optional>
 #include <random>
 #include <string>
@@ -79,9 +80,10 @@ std::uniform_real_distribution<double> z0Dist(-0.2_mm, 0.2_mm);
 // Track pT distribution
 std::uniform_real_distribution<double> pTDist(0.4_GeV, 10_GeV);
 // Track phi distribution
-std::uniform_real_distribution<double> phiDist(-M_PI, M_PI);
+std::uniform_real_distribution<double> phiDist(-std::numbers::pi,
+                                               std::numbers::pi);
 // Track theta distribution
-std::uniform_real_distribution<double> thetaDist(1.0, M_PI - 1.0);
+std::uniform_real_distribution<double> thetaDist(1., std::numbers::pi - 1.);
 // Track charge helper distribution
 std::uniform_real_distribution<double> qDist(-1, 1);
 // Track IP resolution distribution
diff --git a/Tests/UnitTests/Core/Vertexing/KalmanVertexUpdaterTests.cpp b/Tests/UnitTests/Core/Vertexing/KalmanVertexUpdaterTests.cpp
index e40d94c1c1c..641d48aafb5 100644
--- a/Tests/UnitTests/Core/Vertexing/KalmanVertexUpdaterTests.cpp
+++ b/Tests/UnitTests/Core/Vertexing/KalmanVertexUpdaterTests.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2019 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include <boost/test/unit_test.hpp>
 
@@ -35,6 +35,7 @@
 #include <cmath>
 #include <iostream>
 #include <memory>
+#include <numbers>
 #include <optional>
 #include <random>
 #include <tuple>
@@ -65,9 +66,10 @@ std::uniform_real_distribution<double> z0Dist(-0.2_mm, 0.2_mm);
 // Track pT distribution
 std::uniform_real_distribution<double> pTDist(0.4_GeV, 10_GeV);
 // Track phi distribution
-std::uniform_real_distribution<double> phiDist(-M_PI, M_PI);
+std::uniform_real_distribution<double> phiDist(-std::numbers::pi,
+                                               std::numbers::pi);
 // Track theta distribution
-std::uniform_real_distribution<double> thetaDist(1.0, M_PI - 1.0);
+std::uniform_real_distribution<double> thetaDist(1., std::numbers::pi - 1.);
 // Track charge helper distribution
 std::uniform_real_distribution<double> qDist(-1, 1);
 // Track IP resolution distribution
diff --git a/Tests/UnitTests/Core/Vertexing/LinearizedTrackFactoryTests.cpp b/Tests/UnitTests/Core/Vertexing/LinearizedTrackFactoryTests.cpp
index f7fe759735d..f8e1c545373 100644
--- a/Tests/UnitTests/Core/Vertexing/LinearizedTrackFactoryTests.cpp
+++ b/Tests/UnitTests/Core/Vertexing/LinearizedTrackFactoryTests.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2019-2023 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include <boost/test/unit_test.hpp>
 
@@ -34,6 +34,7 @@
 #include <array>
 #include <cmath>
 #include <memory>
+#include <numbers>
 #include <random>
 #include <tuple>
 #include <utility>
@@ -70,9 +71,10 @@ std::uniform_real_distribution<double> z0Dist(-0.2_mm, 0.2_mm);
 // Track pT distribution
 std::uniform_real_distribution<double> pTDist(0.4_GeV, 10_GeV);
 // Track phi distribution
-std::uniform_real_distribution<double> phiDist(-M_PI, M_PI);
+std::uniform_real_distribution<double> phiDist(-std::numbers::pi,
+                                               std::numbers::pi);
 // Track theta distribution
-std::uniform_real_distribution<double> thetaDist(1.0, M_PI - 1.0);
+std::uniform_real_distribution<double> thetaDist(1., std::numbers::pi - 1.);
 // Track charge helper distribution
 std::uniform_real_distribution<double> qDist(-1, 1);
 // Track time distribution
diff --git a/Tests/UnitTests/Core/Vertexing/SingleSeedVertexFinderTests.cpp b/Tests/UnitTests/Core/Vertexing/SingleSeedVertexFinderTests.cpp
index c5be1d6bbf8..7be7e174e6a 100644
--- a/Tests/UnitTests/Core/Vertexing/SingleSeedVertexFinderTests.cpp
+++ b/Tests/UnitTests/Core/Vertexing/SingleSeedVertexFinderTests.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2023 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include <boost/test/unit_test.hpp>
 
@@ -294,10 +294,10 @@ BOOST_AUTO_TEST_CASE(single_seed_vertex_finder_full_planes_test) {
         double x1 =
             (D * dirY + sgn * dirX * std::sqrt(r * r * dirR2 - D * D)) / dirR2;
         double y1 =
-            (-D * dirX + std::fabs(dirY) * std::sqrt(r * r * dirR2 - D * D)) /
+            (-D * dirX + std::abs(dirY) * std::sqrt(r * r * dirR2 - D * D)) /
             dirR2;
         // how many units from the vertex to the intersection
-        double zDist = std::fabs((x1 - posX) / dirX);
+        double zDist = std::abs((x1 - posX) / dirX);
 
         // position of the new spacepoint
         posX = x1;
@@ -411,11 +411,11 @@ BOOST_AUTO_TEST_CASE(single_seed_vertex_finder_full_rays_test) {
         double x1 =
             (D * dirY + part * sgn * dirX * std::sqrt(r * r * dirR2 - D * D)) /
             dirR2;
-        double y1 = (-D * dirX + part * std::fabs(dirY) *
-                                     std::sqrt(r * r * dirR2 - D * D)) /
+        double y1 = (-D * dirX +
+                     part * std::abs(dirY) * std::sqrt(r * r * dirR2 - D * D)) /
                     dirR2;
         // how many units from the vertex to the intersection
-        double zDist = std::fabs((x1 - vtxX) / dirX);
+        double zDist = std::abs((x1 - vtxX) / dirX);
         // use the same amount of units for distance in Z
         inputSpacepoints.emplace_back(x1, y1, zDist * dirZ + vtxZ);
       }
diff --git a/Tests/UnitTests/Core/Vertexing/TrackDensityVertexFinderTests.cpp b/Tests/UnitTests/Core/Vertexing/TrackDensityVertexFinderTests.cpp
index 5faeaae57c9..a865a19f7ba 100644
--- a/Tests/UnitTests/Core/Vertexing/TrackDensityVertexFinderTests.cpp
+++ b/Tests/UnitTests/Core/Vertexing/TrackDensityVertexFinderTests.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2019 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include <boost/test/unit_test.hpp>
 
@@ -34,6 +34,7 @@
 #include <functional>
 #include <iostream>
 #include <memory>
+#include <numbers>
 #include <random>
 #include <string>
 #include <system_error>
@@ -204,7 +205,8 @@ std::normal_distribution<double> z2dist(-3_mm, 0.5_mm);
 // Track pT distribution
 std::uniform_real_distribution<double> pTDist(0.1_GeV, 100_GeV);
 // Track phi distribution
-std::uniform_real_distribution<double> phiDist(-M_PI, M_PI);
+std::uniform_real_distribution<double> phiDist(-std::numbers::pi,
+                                               std::numbers::pi);
 // Track eta distribution
 std::uniform_real_distribution<double> etaDist(-4., 4.);
 
diff --git a/Tests/UnitTests/Core/Vertexing/VertexingDataHelper.hpp b/Tests/UnitTests/Core/Vertexing/VertexingDataHelper.hpp
index de0963c14bd..d984b4c8c44 100644
--- a/Tests/UnitTests/Core/Vertexing/VertexingDataHelper.hpp
+++ b/Tests/UnitTests/Core/Vertexing/VertexingDataHelper.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2020 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 #pragma once
 
 #include "Acts/Definitions/Algebra.hpp"
diff --git a/Tests/UnitTests/Core/Vertexing/ZScanVertexFinderTests.cpp b/Tests/UnitTests/Core/Vertexing/ZScanVertexFinderTests.cpp
index 411ddda7cf2..01d0c033bb1 100644
--- a/Tests/UnitTests/Core/Vertexing/ZScanVertexFinderTests.cpp
+++ b/Tests/UnitTests/Core/Vertexing/ZScanVertexFinderTests.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2019 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include <boost/test/unit_test.hpp>
 
@@ -36,6 +36,7 @@
 #include <functional>
 #include <iostream>
 #include <memory>
+#include <numbers>
 #include <random>
 #include <string>
 #include <system_error>
@@ -66,9 +67,10 @@ std::uniform_real_distribution<double> z0Dist(-0.2_mm, 0.2_mm);
 // Track pT distribution
 std::uniform_real_distribution<double> pTDist(0.4_GeV, 10_GeV);
 // Track phi distribution
-std::uniform_real_distribution<double> phiDist(-M_PI, M_PI);
+std::uniform_real_distribution<double> phiDist(-std::numbers::pi,
+                                               std::numbers::pi);
 // Track theta distribution
-std::uniform_real_distribution<double> thetaDist(1.0, M_PI - 1.0);
+std::uniform_real_distribution<double> thetaDist(1., std::numbers::pi - 1.);
 // Track charge helper distribution
 std::uniform_real_distribution<double> qDist(-1, 1);
 // Track IP resolution distribution
diff --git a/Tests/UnitTests/Core/Visualization/EventDataView3DBase.hpp b/Tests/UnitTests/Core/Visualization/EventDataView3DBase.hpp
index b642b3a5ddc..57b33ba1d5c 100644
--- a/Tests/UnitTests/Core/Visualization/EventDataView3DBase.hpp
+++ b/Tests/UnitTests/Core/Visualization/EventDataView3DBase.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2020-2023 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
@@ -165,8 +165,8 @@ void createDetector(GeometryContext& tgContext,
 static inline std::string testBoundTrackParameters(IVisualization3D& helper) {
   std::stringstream ss;
 
-  ViewConfig pcolor({20, 120, 20});
-  ViewConfig scolor({235, 198, 52});
+  ViewConfig pcolor{.color = {20, 120, 20}};
+  ViewConfig scolor{.color = {235, 198, 52}};
 
   auto gctx = GeometryContext();
   auto identity = Transform3::Identity();
@@ -231,8 +231,8 @@ static inline std::string testMeasurement(IVisualization3D& helper,
   // Create measurements (assuming they are for a linear track parallel to
   // global x-axis)
   std::cout << "Creating measurements:" << std::endl;
-  std::vector<detail::Test::TestSourceLink> sourcelinks;
-  sourcelinks.reserve(nSurfaces);
+  std::vector<detail::Test::TestSourceLink> sourceLinks;
+  sourceLinks.reserve(nSurfaces);
   Vector2 lPosCenter{5_mm, 5_mm};
   Vector2 resolution{200_um, 150_um};
   SquareMatrix2 cov2D = resolution.cwiseProduct(resolution).asDiagonal();
@@ -241,17 +241,17 @@ static inline std::string testMeasurement(IVisualization3D& helper,
     Vector2 loc = lPosCenter;
     loc[0] += resolution[0] * gauss(generator);
     loc[1] += resolution[1] * gauss(generator);
-    sourcelinks.emplace_back(detail::Test::TestSourceLink{
+    sourceLinks.emplace_back(detail::Test::TestSourceLink{
         eBoundLoc0, eBoundLoc1, loc, cov2D, surface->geometryId()});
   }
 
-  ViewConfig mcolor({255, 145, 48});
+  ViewConfig mcolor{.color = {255, 145, 48}};
   mcolor.offset = 0.01;
 
   // Draw the measurements
   std::cout << "Draw the measurements" << std::endl;
-  //  auto singleMeasurement = sourcelinks[0];
-  for (auto& singleMeasurement : sourcelinks) {
+  //  auto singleMeasurement = sourceLinks[0];
+  for (auto& singleMeasurement : sourceLinks) {
     auto cov = singleMeasurement.covariance;
     auto lposition = singleMeasurement.parameters;
 
@@ -291,8 +291,8 @@ static inline std::string testMultiTrajectory(IVisualization3D& helper) {
   // Create measurements (assuming they are for a linear track parallel to
   // global x-axis)
   std::cout << "Creating measurements:" << std::endl;
-  std::vector<Acts::SourceLink> sourcelinks;
-  sourcelinks.reserve(nSurfaces);
+  std::vector<Acts::SourceLink> sourceLinks;
+  sourceLinks.reserve(nSurfaces);
   Vector2 lPosCenter{5_mm, 5_mm};
   Vector2 resolution{200_um, 150_um};
   SquareMatrix2 cov2D = resolution.cwiseProduct(resolution).asDiagonal();
@@ -301,7 +301,7 @@ static inline std::string testMultiTrajectory(IVisualization3D& helper) {
     Vector2 loc = lPosCenter;
     loc[0] += resolution[0] * gauss(generator);
     loc[1] += resolution[1] * gauss(generator);
-    sourcelinks.emplace_back(detail::Test::TestSourceLink{
+    sourceLinks.emplace_back(detail::Test::TestSourceLink{
         eBoundLoc0, eBoundLoc1, loc, cov2D, surface->geometryId()});
   }
 
@@ -364,7 +364,7 @@ static inline std::string testMultiTrajectory(IVisualization3D& helper) {
                               Acts::VectorMultiTrajectory{}};
 
   // Fit the track
-  auto fitRes = kFitter.fit(sourcelinks.begin(), sourcelinks.end(), rStart,
+  auto fitRes = kFitter.fit(sourceLinks.begin(), sourceLinks.end(), rStart,
                             kfOptions, tracks);
   if (!fitRes.ok()) {
     std::cout << "Fit failed" << std::endl;
@@ -378,14 +378,14 @@ static inline std::string testMultiTrajectory(IVisualization3D& helper) {
   double localErrorScale = 100.;
   double directionErrorScale = 100000;
 
-  ViewConfig scolor({214, 214, 214});
-  ViewConfig mcolor({255, 145, 48});
+  ViewConfig scolor{.color = {214, 214, 214}};
+  ViewConfig mcolor{.color = {255, 145, 48}};
   mcolor.offset = -0.01;
-  ViewConfig ppcolor({51, 204, 51});
+  ViewConfig ppcolor{.color = {51, 204, 51}};
   ppcolor.offset = -0.02;
-  ViewConfig fpcolor({255, 255, 0});
+  ViewConfig fpcolor{.color = {255, 255, 0}};
   fpcolor.offset = -0.03;
-  ViewConfig spcolor({0, 125, 255});
+  ViewConfig spcolor{.color = {0, 125, 255}};
   spcolor.offset = -0.04;
 
   EventDataView3D::drawMultiTrajectory(
diff --git a/Tests/UnitTests/Core/Visualization/EventDataView3DTests.cpp b/Tests/UnitTests/Core/Visualization/EventDataView3DTests.cpp
index e6f3821e40a..bac538e4b58 100644
--- a/Tests/UnitTests/Core/Visualization/EventDataView3DTests.cpp
+++ b/Tests/UnitTests/Core/Visualization/EventDataView3DTests.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2020-2023 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include <boost/test/unit_test.hpp>
 
@@ -29,7 +29,7 @@ BOOST_AUTO_TEST_CASE(BoundTrackParametersVisualizationObj) {
   for (const auto& objerr : objErrors) {
     std::cout << objerr << std::endl;
   }
-  BOOST_CHECK_EQUAL(std::count(objTest.begin(), objTest.end(), '\n'), 1458);
+  BOOST_CHECK_EQUAL(std::count(objTest.begin(), objTest.end(), '\n'), 4924);
 }
 
 BOOST_AUTO_TEST_CASE(BoundTrackParametersVisualizationPly) {
@@ -40,7 +40,7 @@ BOOST_AUTO_TEST_CASE(BoundTrackParametersVisualizationPly) {
   for (const auto& plyerr : plyErrors) {
     std::cout << plyerr << std::endl;
   }
-  BOOST_CHECK_EQUAL(std::count(plyTest.begin(), plyTest.end(), '\n'), 973);
+  BOOST_CHECK_EQUAL(std::count(plyTest.begin(), plyTest.end(), '\n'), 3143);
 }
 
 BOOST_AUTO_TEST_CASE(MeasurementVisualizationObj) {
@@ -85,7 +85,7 @@ BOOST_AUTO_TEST_CASE(MultiTrajectoryVisualizationObj) {
   for (const auto& objerr : objErrors) {
     std::cout << objerr << std::endl;
   }
-  BOOST_CHECK_EQUAL(std::count(objTest.begin(), objTest.end(), '\n'), 31010);
+  BOOST_CHECK_EQUAL(std::count(objTest.begin(), objTest.end(), '\n'), 103796);
 }
 
 BOOST_AUTO_TEST_CASE(MultiTrajectoryVisualizationPly) {
@@ -96,7 +96,7 @@ BOOST_AUTO_TEST_CASE(MultiTrajectoryVisualizationPly) {
   for (const auto& plyerr : plyErrors) {
     std::cout << plyerr << std::endl;
   }
-  BOOST_CHECK_EQUAL(std::count(plyTest.begin(), plyTest.end(), '\n'), 20521);
+  BOOST_CHECK_EQUAL(std::count(plyTest.begin(), plyTest.end(), '\n'), 66091);
 }
 
 BOOST_AUTO_TEST_SUITE_END()
diff --git a/Tests/UnitTests/Core/Visualization/PrimitivesView3DBase.hpp b/Tests/UnitTests/Core/Visualization/PrimitivesView3DBase.hpp
index 505646cfd75..4884756cbac 100644
--- a/Tests/UnitTests/Core/Visualization/PrimitivesView3DBase.hpp
+++ b/Tests/UnitTests/Core/Visualization/PrimitivesView3DBase.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2020 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
@@ -40,7 +40,7 @@ GeometryContext gctx = GeometryContext();
 static inline std::string run(IVisualization3D& helper) {
   std::stringstream ss;
 
-  ViewConfig lineView({0, 0, 255});
+  ViewConfig lineView{.color = {0, 0, 255}};
   lineView.lineThickness = 0.1;
 
   // Line visualization ------------------------------------------------
@@ -71,7 +71,7 @@ static inline std::string run(IVisualization3D& helper) {
   // Error visualization: local ---------------------------------------------
   Acts::GeometryView3D::drawSurface(helper, *plane, gctx);
 
-  ViewConfig errorVis({250, 0, 0});
+  ViewConfig errorVis{.color = {250, 0, 0}};
   errorVis.lineThickness = 0.025;
 
   SquareMatrix2 cov = SquareMatrix2::Identity();
diff --git a/Tests/UnitTests/Core/Visualization/PrimitivesView3DTests.cpp b/Tests/UnitTests/Core/Visualization/PrimitivesView3DTests.cpp
index 26e90cc7b10..ee10409261a 100644
--- a/Tests/UnitTests/Core/Visualization/PrimitivesView3DTests.cpp
+++ b/Tests/UnitTests/Core/Visualization/PrimitivesView3DTests.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2020 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include <boost/test/unit_test.hpp>
 
@@ -17,6 +17,7 @@
 #include <array>
 #include <cmath>
 #include <iostream>
+#include <numbers>
 #include <string>
 #include <vector>
 
@@ -45,7 +46,7 @@ BOOST_AUTO_TEST_CASE(Visualization3DHelpers) {
   decops = Acts::EventDataView3D::decomposeCovariance(covariance);
   BOOST_CHECK_EQUAL(decops[0], 8.);
   BOOST_CHECK_EQUAL(decops[1], 0.);
-  CHECK_CLOSE_ABS(decops[2], M_PI / 4, 0.0001);
+  CHECK_CLOSE_ABS(decops[2], std::numbers::pi / 4., 0.0001);
 
   // Fully negatively correlated
   covariance.setZero();
@@ -53,7 +54,7 @@ BOOST_AUTO_TEST_CASE(Visualization3DHelpers) {
   decops = Acts::EventDataView3D::decomposeCovariance(covariance);
   BOOST_CHECK_EQUAL(decops[0], 8.);
   BOOST_CHECK_EQUAL(decops[1], 0.);
-  CHECK_CLOSE_ABS(decops[2], 3 * M_PI / 4, 0.0001);
+  CHECK_CLOSE_ABS(decops[2], 3 * std::numbers::pi / 4., 0.0001);
 
   // Correlation coefficient 0.5 (off-diagonal: 3*2*0.5)
   covariance.setZero();
@@ -61,7 +62,7 @@ BOOST_AUTO_TEST_CASE(Visualization3DHelpers) {
   decops = Acts::EventDataView3D::decomposeCovariance(covariance);
   BOOST_CHECK_EQUAL(decops[0], 6.);
   BOOST_CHECK_EQUAL(decops[1], 2.);
-  CHECK_CLOSE_ABS(decops[2], M_PI / 4, 0.0001);
+  CHECK_CLOSE_ABS(decops[2], std::numbers::pi / 4., 0.0001);
 
   // Correlation coefficient -0.5 & different diagonal (off-diagonal: 3*2*0.5)
   covariance.setZero();
diff --git a/Tests/UnitTests/Core/Visualization/SurfaceView3DBase.hpp b/Tests/UnitTests/Core/Visualization/SurfaceView3DBase.hpp
index 8de0a7fda5a..efbabb202a3 100644
--- a/Tests/UnitTests/Core/Visualization/SurfaceView3DBase.hpp
+++ b/Tests/UnitTests/Core/Visualization/SurfaceView3DBase.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2020 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
@@ -29,6 +29,7 @@
 #include "Acts/Visualization/IVisualization3D.hpp"
 
 #include <fstream>
+#include <numbers>
 #include <sstream>
 #include <string>
 
@@ -47,8 +48,8 @@ static inline std::string run(IVisualization3D& helper, bool triangulate,
   auto identity = Transform3::Identity();
   std::stringstream cStream;
 
-  double halfPhiSector = M_PI / 4.;
-  double centralPhi = M_PI / 2.;
+  const double halfPhiSector = std::numbers::pi / 4.;
+  const double centralPhi = std::numbers::pi / 2.;
 
   ViewConfig sConfig = s_viewSensitive;
   sConfig.triangulate = triangulate;
@@ -68,7 +69,7 @@ static inline std::string run(IVisualization3D& helper, bool triangulate,
   coneSurfaces.push_back(cone);
   GeometryView3D::drawSurface(helper, *cone, gctx, Transform3::Identity(),
                               sConfig);
-  ;
+
   helper.write(std::string("Surfaces_ConeSurface") + tag);
   helper.write(cStream);
   helper.clear();
@@ -80,7 +81,7 @@ static inline std::string run(IVisualization3D& helper, bool triangulate,
   coneSurfaces.push_back(cone);
   GeometryView3D::drawSurface(helper, *cone, gctx, Transform3::Identity(),
                               sConfig);
-  ;
+
   helper.write(std::string("Surfaces_ConeSurfaceSector") + tag);
   helper.write(cStream);
   helper.clear();
@@ -92,7 +93,7 @@ static inline std::string run(IVisualization3D& helper, bool triangulate,
   coneSurfaces.push_back(cone);
   GeometryView3D::drawSurface(helper, *cone, gctx, Transform3::Identity(),
                               sConfig);
-  ;
+
   helper.write(std::string("Surfaces_ConeSurfaceSectorShifted") + tag);
   helper.write(cStream);
   helper.clear();
@@ -126,7 +127,7 @@ static inline std::string run(IVisualization3D& helper, bool triangulate,
   cylinderSurfaces.push_back(cylinder);
   GeometryView3D::drawSurface(helper, *cylinder, gctx, Transform3::Identity(),
                               sConfig);
-  ;
+
   helper.write(std::string("Surfaces_CylinderSurface") + tag);
   helper.write(cStream);
   helper.clear();
@@ -138,7 +139,7 @@ static inline std::string run(IVisualization3D& helper, bool triangulate,
   cylinderSurfaces.push_back(cylinder);
   GeometryView3D::drawSurface(helper, *cylinder, gctx, Transform3::Identity(),
                               sConfig);
-  ;
+
   helper.write(std::string("Surfaces_CylinderSurfaceSector") + tag);
   helper.write(cStream);
   helper.clear();
@@ -150,7 +151,7 @@ static inline std::string run(IVisualization3D& helper, bool triangulate,
   cylinderSurfaces.push_back(cylinder);
   GeometryView3D::drawSurface(helper, *cylinder, gctx, Transform3::Identity(),
                               sConfig);
-  ;
+
   helper.write(std::string("Surfaces_CylinderSurfaceSectorShifted") + tag);
   helper.write(cStream);
   helper.clear();
@@ -179,7 +180,7 @@ static inline std::string run(IVisualization3D& helper, bool triangulate,
     auto bbSurface = Surface::makeShared<PlaneSurface>(identity, bbBounds);
     GeometryView3D::drawSurface(helper, *bbSurface, gctx,
                                 Transform3::Identity(), sConfig);
-    ;
+
     helper.write(bbPath);
     helper.write(cStream);
     helper.clear();
@@ -199,7 +200,7 @@ static inline std::string run(IVisualization3D& helper, bool triangulate,
   radialSurfaces.push_back(disc);
   GeometryView3D::drawSurface(helper, *disc, gctx, Transform3::Identity(),
                               sConfig);
-  ;
+
   helper.write(std::string("Surfaces_DiscSurfaceFull") + tag);
   helper.write(cStream);
   helper.clear();
@@ -335,7 +336,7 @@ static inline std::string run(IVisualization3D& helper, bool triangulate,
   planarSurfaces.push_back(plane);
   GeometryView3D::drawSurface(helper, *plane, gctx, Transform3::Identity(),
                               sConfig);
-  ;
+
   helper.write(name + tag);
   helper.write(cStream);
   helper.clear();
@@ -349,7 +350,7 @@ static inline std::string run(IVisualization3D& helper, bool triangulate,
   planarSurfaces.push_back(plane);
   GeometryView3D::drawSurface(helper, *plane, gctx, Transform3::Identity(),
                               sConfig);
-  ;
+
   helper.write(name + tag);
   helper.write(cStream);
   helper.clear();
@@ -363,7 +364,7 @@ static inline std::string run(IVisualization3D& helper, bool triangulate,
   planarSurfaces.push_back(plane);
   GeometryView3D::drawSurface(helper, *plane, gctx, Transform3::Identity(),
                               sConfig);
-  ;
+
   helper.write(name + tag);
   helper.write(cStream);
   helper.clear();
@@ -377,7 +378,7 @@ static inline std::string run(IVisualization3D& helper, bool triangulate,
   planarSurfaces.push_back(plane);
   GeometryView3D::drawSurface(helper, *plane, gctx, Transform3::Identity(),
                               sConfig);
-  ;
+
   helper.write(name + tag);
   helper.write(cStream);
   helper.clear();
diff --git a/Tests/UnitTests/Core/Visualization/SurfaceView3DTests.cpp b/Tests/UnitTests/Core/Visualization/SurfaceView3DTests.cpp
index f40a2f5cbae..5dce4060e22 100644
--- a/Tests/UnitTests/Core/Visualization/SurfaceView3DTests.cpp
+++ b/Tests/UnitTests/Core/Visualization/SurfaceView3DTests.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2020 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include <boost/test/unit_test.hpp>
 
diff --git a/Tests/UnitTests/Core/Visualization/TrackingGeometryView3DBase.hpp b/Tests/UnitTests/Core/Visualization/TrackingGeometryView3DBase.hpp
index 350e08e1490..ea2e409222d 100644
--- a/Tests/UnitTests/Core/Visualization/TrackingGeometryView3DBase.hpp
+++ b/Tests/UnitTests/Core/Visualization/TrackingGeometryView3DBase.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2020 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
@@ -37,18 +37,22 @@ static inline std::string run(IVisualization3D& helper, bool triangulate,
                               const std::string& tag) {
   std::stringstream cStream;
 
-  ViewConfig viewSensitive = ViewConfig({0, 180, 240});
-  viewSensitive.triangulate = triangulate;
-  ViewConfig viewPassive = ViewConfig({240, 280, 0});
-  viewPassive.triangulate = triangulate;
-  ViewConfig viewVolume = ViewConfig({220, 220, 0});
-  viewVolume.triangulate = triangulate;
-  ViewConfig viewContainer = ViewConfig({220, 220, 0});
-  viewContainer.triangulate = triangulate;
-  ViewConfig viewGrid = ViewConfig({220, 0, 0});
-  viewGrid.nSegments = 8;
-  viewGrid.offset = 3.;
-  viewGrid.triangulate = triangulate;
+  ViewConfig viewSensitive = {.color = {0, 180, 240},
+                              .quarterSegments = 72,
+                              .triangulate = triangulate};
+  ViewConfig viewPassive = {.color = {240, 280, 0},
+                            .quarterSegments = 72,
+                            .triangulate = triangulate};
+  ViewConfig viewVolume = {.color = {220, 220, 0},
+                           .quarterSegments = 72,
+                           .triangulate = triangulate};
+  ViewConfig viewContainer = {.color = {220, 220, 0},
+                              .quarterSegments = 72,
+                              .triangulate = triangulate};
+  ViewConfig viewGrid = {.color = {220, 0, 0},
+                         .offset = 3.,
+                         .quarterSegments = 8,
+                         .triangulate = triangulate};
 
   const Acts::TrackingVolume& tgVolume = *(tGeometry->highestTrackingVolume());
 
diff --git a/Tests/UnitTests/Core/Visualization/TrackingGeometryView3DTests.cpp b/Tests/UnitTests/Core/Visualization/TrackingGeometryView3DTests.cpp
index 54faa2c8e22..8936375a353 100644
--- a/Tests/UnitTests/Core/Visualization/TrackingGeometryView3DTests.cpp
+++ b/Tests/UnitTests/Core/Visualization/TrackingGeometryView3DTests.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2020 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include <boost/test/unit_test.hpp>
 
diff --git a/Tests/UnitTests/Core/Visualization/Visualization3DTester.hpp b/Tests/UnitTests/Core/Visualization/Visualization3DTester.hpp
index 0aaa97beb3e..78f0c21e38d 100644
--- a/Tests/UnitTests/Core/Visualization/Visualization3DTester.hpp
+++ b/Tests/UnitTests/Core/Visualization/Visualization3DTester.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2020 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
diff --git a/Tests/UnitTests/Core/Visualization/Visualization3DTests.cpp b/Tests/UnitTests/Core/Visualization/Visualization3DTests.cpp
index 09bade86ae8..ea3e810d119 100644
--- a/Tests/UnitTests/Core/Visualization/Visualization3DTests.cpp
+++ b/Tests/UnitTests/Core/Visualization/Visualization3DTests.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2019 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include <boost/test/tools/output_test_stream.hpp>
 #include <boost/test/unit_test.hpp>
@@ -298,7 +298,8 @@ BOOST_AUTO_TEST_CASE(ObjOutputTest) {
 
   output << obj;
 
-  std::string exp = R"(v 1 0 0
+  std::string exp = R"(usemtl material_120_120_120
+v 1 0 0
 )";
 
   BOOST_CHECK(output.is_equal(exp));
@@ -307,15 +308,37 @@ BOOST_AUTO_TEST_CASE(ObjOutputTest) {
   obj.face({{1, 0, 0}, {1, 1, 0}, {0, 1, 0}});
   output << obj;
 
-  exp = R"(v 1 0 0
+  exp = R"(usemtl material_120_120_120
+v 1 0 0
 v 1 1 0
 v 0 1 0
+usemtl material_120_120_120
 f 1 2 3
 )";
 
   BOOST_CHECK(output.is_equal(exp));
 }
 
+BOOST_AUTO_TEST_CASE(ColorTests) {
+  Color red{"#ff0000"};
+  BOOST_CHECK_EQUAL(red, Color(255, 0, 0));
+
+  Color green{"#00ff00"};
+  BOOST_CHECK_EQUAL(green, Color(0, 255, 0));
+
+  Color blue{"#0000ff"};
+  BOOST_CHECK_EQUAL(blue, Color(0, 0, 255));
+
+  Color grey{"#808080"};
+  BOOST_CHECK_EQUAL(grey, Color(128, 128, 128));
+  BOOST_CHECK_EQUAL(grey, Color(std::array{128, 128, 128}));
+  BOOST_CHECK_EQUAL(grey,
+                    Color(std::array{128 / 255.0, 128 / 255.0, 128 / 255.0}));
+  BOOST_CHECK_EQUAL(grey, Color(128 / 255.0, 128 / 255.0, 128 / 255.0));
+
+  static_assert(Color{"#0000ff"} == Color(0, 0, 255));
+}
+
 BOOST_AUTO_TEST_SUITE_END()
 
 }  // namespace Acts::Test
diff --git a/Tests/UnitTests/Core/Visualization/VolumeView3DBase.hpp b/Tests/UnitTests/Core/Visualization/VolumeView3DBase.hpp
index 00745012f74..28620637d8d 100644
--- a/Tests/UnitTests/Core/Visualization/VolumeView3DBase.hpp
+++ b/Tests/UnitTests/Core/Visualization/VolumeView3DBase.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2020 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
@@ -18,6 +18,7 @@
 #include "Acts/Visualization/IVisualization3D.hpp"
 
 #include <fstream>
+#include <numbers>
 #include <sstream>
 #include <string>
 
@@ -37,7 +38,7 @@ static inline std::string run(IVisualization3D& helper, bool triangulate,
   auto identity = Transform3::Identity();
   std::stringstream cStream;
 
-  double halfPhiSector = M_PI / 4.;
+  const double halfPhiSector = std::numbers::pi / 4.;
 
   ViewConfig vConfig = s_viewVolume;
   vConfig.triangulate = triangulate;
@@ -55,8 +56,8 @@ static inline std::string run(IVisualization3D& helper, bool triangulate,
   //----------------------------------------------------
   // Cone volume section
   // Single solid Cone
-  auto solidCone =
-      std::make_shared<ConeVolumeBounds>(0., 0., 0.45, 5., 5., 0., M_PI);
+  auto solidCone = std::make_shared<ConeVolumeBounds>(0., 0., 0.45, 5., 5., 0.,
+                                                      std::numbers::pi);
   auto cone = std::make_shared<Volume>(identity, solidCone);
   GeometryView3D::drawVolume(helper, *cone, gctx, Transform3::Identity(),
                              vConfig);
@@ -65,8 +66,8 @@ static inline std::string run(IVisualization3D& helper, bool triangulate,
   helper.clear();
 
   // Single solid Cone - with cut off
-  auto cutOffCone =
-      std::make_shared<ConeVolumeBounds>(0., 0., 0.45, 8., 5., 0., M_PI);
+  auto cutOffCone = std::make_shared<ConeVolumeBounds>(0., 0., 0.45, 8., 5., 0.,
+                                                       std::numbers::pi);
   cone = std::make_shared<Volume>(identity, cutOffCone);
   GeometryView3D::drawVolume(helper, *cone, gctx, Transform3::Identity(),
                              vConfig);
@@ -75,8 +76,8 @@ static inline std::string run(IVisualization3D& helper, bool triangulate,
   helper.clear();
 
   // Cone - Cone inlay
-  auto cutOffHollowCone =
-      std::make_shared<ConeVolumeBounds>(0.35, 7., 0.45, 8., 5, 0., M_PI);
+  auto cutOffHollowCone = std::make_shared<ConeVolumeBounds>(
+      0.35, 7., 0.45, 8., 5, 0., std::numbers::pi);
   cone = std::make_shared<Volume>(identity, cutOffHollowCone);
   GeometryView3D::drawVolume(helper, *cone, gctx, Transform3::Identity(),
                              vConfig);
@@ -95,8 +96,8 @@ static inline std::string run(IVisualization3D& helper, bool triangulate,
   helper.clear();
 
   // Single Hollow Cone - cylindrical inlay
-  auto cutOffHollowCylCone =
-      std::make_shared<ConeVolumeBounds>(1., 0.45, 8., 5., 0., M_PI);
+  auto cutOffHollowCylCone = std::make_shared<ConeVolumeBounds>(
+      1., 0.45, 8., 5., 0., std::numbers::pi);
   cone = std::make_shared<Volume>(identity, cutOffHollowCylCone);
   GeometryView3D::drawVolume(helper, *cone, gctx, Transform3::Identity(),
                              vConfig);
@@ -105,8 +106,8 @@ static inline std::string run(IVisualization3D& helper, bool triangulate,
   helper.clear();
 
   // Single Hollow Cylinder - Cone inlay
-  auto cutOffHollowConeCyl =
-      std::make_shared<ConeVolumeBounds>(12., 0.35, 7., 5., 0., M_PI);
+  auto cutOffHollowConeCyl = std::make_shared<ConeVolumeBounds>(
+      12., 0.35, 7., 5., 0., std::numbers::pi);
   cone = std::make_shared<Volume>(identity, cutOffHollowConeCyl);
   GeometryView3D::drawVolume(helper, *cone, gctx, Transform3::Identity(),
                              vConfig);
diff --git a/Tests/UnitTests/Core/Visualization/VolumeView3DTests.cpp b/Tests/UnitTests/Core/Visualization/VolumeView3DTests.cpp
index dac1b41c539..337b8e9e5dd 100644
--- a/Tests/UnitTests/Core/Visualization/VolumeView3DTests.cpp
+++ b/Tests/UnitTests/Core/Visualization/VolumeView3DTests.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2020 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include <boost/test/unit_test.hpp>
 
diff --git a/Tests/UnitTests/Examples/Algorithms/Alignment/AlignmentGroupingTests.cpp b/Tests/UnitTests/Examples/Algorithms/Alignment/AlignmentGroupingTests.cpp
index 3c68dc94bf8..18d589be1d5 100644
--- a/Tests/UnitTests/Examples/Algorithms/Alignment/AlignmentGroupingTests.cpp
+++ b/Tests/UnitTests/Examples/Algorithms/Alignment/AlignmentGroupingTests.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2023 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include <boost/test/unit_test.hpp>
 
diff --git a/Tests/UnitTests/Examples/Algorithms/Digitization/ModuleClustersTests.cpp b/Tests/UnitTests/Examples/Algorithms/Digitization/ModuleClustersTests.cpp
index 5a72c5c8e41..a1947cde17e 100644
--- a/Tests/UnitTests/Examples/Algorithms/Digitization/ModuleClustersTests.cpp
+++ b/Tests/UnitTests/Examples/Algorithms/Digitization/ModuleClustersTests.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2023 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include <boost/test/unit_test.hpp>
 
diff --git a/Tests/UnitTests/Examples/EventData/MeasurementTests.cpp b/Tests/UnitTests/Examples/EventData/MeasurementTests.cpp
index cd9e8904a8b..2428aa2429f 100644
--- a/Tests/UnitTests/Examples/EventData/MeasurementTests.cpp
+++ b/Tests/UnitTests/Examples/EventData/MeasurementTests.cpp
@@ -1,19 +1,18 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2016-2024 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include <boost/test/data/test_case.hpp>
 #include <boost/test/unit_test.hpp>
 
 #include "Acts/Definitions/Algebra.hpp"
 #include "Acts/Definitions/TrackParametrization.hpp"
-#include "Acts/EventData/SourceLink.hpp"
 #include "Acts/EventData/detail/GenerateParameters.hpp"
-#include "Acts/EventData/detail/TestSourceLink.hpp"
+#include "Acts/Geometry/GeometryIdentifier.hpp"
 #include "Acts/Tests/CommonHelpers/FloatComparisons.hpp"
 #include "ActsExamples/EventData/Measurement.hpp"
 
@@ -30,15 +29,13 @@
 using namespace Acts;
 using namespace Acts::detail::Test;
 using namespace ActsExamples;
-using SourceLink = Acts::detail::Test::TestSourceLink;
 namespace bd = boost::unit_test::data;
 
 namespace {
 constexpr BoundIndices boundIndices[] = {
     eBoundLoc0, eBoundLoc1, eBoundTime, eBoundPhi, eBoundTheta, eBoundQOverP,
 };
-const TestSourceLink sourceOrig;
-const Acts::SourceLink source{sourceOrig};
+constexpr Acts::GeometryIdentifier geoId = 1;
 // fix seed for reproducible tests
 std::default_random_engine rng(123);
 }  // namespace
@@ -50,55 +47,114 @@ std::default_random_engine rng(123);
 BOOST_AUTO_TEST_SUITE(EventDataMeasurement)
 
 BOOST_DATA_TEST_CASE(VariableBoundOne, bd::make(boundIndices), index) {
+  MeasurementContainer container;
+
   auto [params, cov] = generateParametersCovariance<ActsScalar, 1u>(rng);
-  auto meas = makeVariableSizeMeasurement(source, params, cov, index);
+
+  FixedBoundMeasurementProxy<1> meas = container.makeMeasurement<1>(geoId);
+  meas.setSubspaceIndices(std::array{index});
+  meas.parameters() = params;
+  meas.covariance() = cov;
 
   BOOST_CHECK_EQUAL(meas.size(), 1);
   for (auto i : boundIndices) {
-    if (i == index) {
-      BOOST_CHECK(meas.contains(i));
-    } else {
-      BOOST_CHECK(!meas.contains(i));
-    }
+    BOOST_CHECK_EQUAL(meas.contains(i), i == index);
   }
-  BOOST_CHECK_EQUAL(meas.effectiveParameters(), params);
-  BOOST_CHECK_EQUAL(meas.effectiveCovariance(), cov);
-  BOOST_CHECK_EQUAL(meas.sourceLink().template get<TestSourceLink>(),
-                    sourceOrig);
+  BOOST_CHECK_EQUAL(meas.parameters(), params);
+  BOOST_CHECK_EQUAL(meas.covariance(), cov);
+  BOOST_CHECK_EQUAL(meas.geometryId(), geoId);
+}
+
+BOOST_DATA_TEST_CASE(VariableBoundOneEmplace, bd::make(boundIndices), index) {
+  MeasurementContainer container;
+
+  auto [params, cov] = generateParametersCovariance<ActsScalar, 1u>(rng);
+
+  FixedBoundMeasurementProxy<1> meas =
+      container.emplaceMeasurement<1>(geoId, std::array{index}, params, cov);
+
+  BOOST_CHECK_EQUAL(meas.size(), 1);
+  for (auto i : boundIndices) {
+    BOOST_CHECK_EQUAL(meas.contains(i), i == index);
+  }
+  BOOST_CHECK_EQUAL(meas.parameters(), params);
+  BOOST_CHECK_EQUAL(meas.covariance(), cov);
+  BOOST_CHECK_EQUAL(meas.geometryId(), geoId);
 }
 
 BOOST_AUTO_TEST_CASE(VariableBoundAll) {
-  auto [params, cov] = generateBoundParametersCovariance(rng);
-  auto meas = makeVariableSizeMeasurement(source, params, cov, eBoundLoc0,
-                                          eBoundLoc1, eBoundPhi, eBoundTheta,
-                                          eBoundQOverP, eBoundTime);
+  MeasurementContainer container;
+
+  auto [params, cov] =
+      generateParametersCovariance<ActsScalar, eBoundSize>(rng);
+
+  FixedBoundMeasurementProxy<eBoundSize> meas =
+      container.makeMeasurement<eBoundSize>(geoId);
+  meas.setSubspaceIndices(std::array{eBoundLoc0, eBoundLoc1, eBoundTime,
+                                     eBoundPhi, eBoundTheta, eBoundQOverP});
+  meas.parameters() = params;
+  meas.covariance() = cov;
 
   BOOST_CHECK_EQUAL(meas.size(), eBoundSize);
   for (auto i : boundIndices) {
     BOOST_CHECK(meas.contains(i));
   }
-  BOOST_CHECK_EQUAL(meas.effectiveParameters(), params);
-  BOOST_CHECK_EQUAL(meas.effectiveCovariance(), cov);
-  BOOST_CHECK_EQUAL(meas.sourceLink().get<TestSourceLink>(), sourceOrig);
+  BOOST_CHECK_EQUAL(meas.parameters(), params);
+  BOOST_CHECK_EQUAL(meas.covariance(), cov);
+  BOOST_CHECK_EQUAL(meas.geometryId(), geoId);
+}
+
+BOOST_AUTO_TEST_CASE(VariableBoundAllEmplace) {
+  MeasurementContainer container;
+
+  auto [params, cov] =
+      generateParametersCovariance<ActsScalar, eBoundSize>(rng);
+
+  FixedBoundMeasurementProxy<eBoundSize> meas =
+      container.emplaceMeasurement<eBoundSize>(
+          geoId,
+          std::array{eBoundLoc0, eBoundLoc1, eBoundTime, eBoundPhi, eBoundTheta,
+                     eBoundQOverP},
+          params, cov);
+
+  BOOST_CHECK_EQUAL(meas.size(), eBoundSize);
+  for (auto i : boundIndices) {
+    BOOST_CHECK(meas.contains(i));
+  }
+  BOOST_CHECK_EQUAL(meas.parameters(), params);
+  BOOST_CHECK_EQUAL(meas.covariance(), cov);
+  BOOST_CHECK_EQUAL(meas.geometryId(), geoId);
 }
 
 BOOST_AUTO_TEST_CASE(VariableBoundReassign) {
-  // generate w/ a single parameter
-  auto [par1, cov1] = generateParametersCovariance<ActsScalar, 1u>(rng);
-  auto meas = makeVariableSizeMeasurement(source, par1, cov1, eBoundTheta);
-  BOOST_CHECK_EQUAL(meas.size(), 1);
+  MeasurementContainer container;
+
+  // generate w/ two parameter
+  auto [params1, cov1] = generateParametersCovariance<ActsScalar, 2u>(rng);
+
+  VariableBoundMeasurementProxy meas = container.makeMeasurement(2, geoId);
+  meas.setSubspaceIndices(std::array{eBoundPhi, eBoundTheta});
+  meas.parameters() = params1;
+  meas.covariance() = cov1;
+
+  BOOST_CHECK_EQUAL(meas.size(), 2);
   BOOST_CHECK(!meas.contains(eBoundLoc0));
   BOOST_CHECK(!meas.contains(eBoundLoc1));
   BOOST_CHECK(!meas.contains(eBoundTime));
-  BOOST_CHECK(!meas.contains(eBoundPhi));
+  BOOST_CHECK(meas.contains(eBoundPhi));
   BOOST_CHECK(meas.contains(eBoundTheta));
   BOOST_CHECK(!meas.contains(eBoundQOverP));
 
   // reassign w/ all parameters
-  auto [parN, covN] = generateBoundParametersCovariance(rng);
-  meas = makeVariableSizeMeasurement(source, parN, covN, eBoundLoc0, eBoundLoc1,
-                                     eBoundPhi, eBoundTheta, eBoundQOverP,
-                                     eBoundTime);
+  auto [paramsN, covN] =
+      generateParametersCovariance<ActsScalar, eBoundSize>(rng);
+
+  meas = container.makeMeasurement(eBoundSize, geoId);
+  meas.setSubspaceIndices(std::array{eBoundLoc0, eBoundLoc1, eBoundTime,
+                                     eBoundPhi, eBoundTheta, eBoundQOverP});
+  meas.parameters() = paramsN;
+  meas.covariance() = covN;
+
   BOOST_CHECK_EQUAL(meas.size(), eBoundSize);
   BOOST_CHECK(meas.contains(eBoundLoc0));
   BOOST_CHECK(meas.contains(eBoundLoc1));
diff --git a/Tests/UnitTests/Examples/Io/Csv/MeasurementReaderWriterTests.cpp b/Tests/UnitTests/Examples/Io/Csv/MeasurementReaderWriterTests.cpp
index c9e9fa4126e..c9c21b0983a 100644
--- a/Tests/UnitTests/Examples/Io/Csv/MeasurementReaderWriterTests.cpp
+++ b/Tests/UnitTests/Examples/Io/Csv/MeasurementReaderWriterTests.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2023-2024 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include <boost/test/unit_test.hpp>
 
@@ -20,6 +20,7 @@
 #include "ActsExamples/Io/Csv/CsvMeasurementReader.hpp"
 #include "ActsExamples/Io/Csv/CsvMeasurementWriter.hpp"
 
+#include <algorithm>
 #include <fstream>
 #include <iostream>
 #include <random>
@@ -28,7 +29,6 @@ using namespace ActsExamples;
 using namespace Acts::Test;
 
 BOOST_AUTO_TEST_CASE(CsvMeasurementRoundTrip) {
-  IndexSourceLinkContainer sourceLinksOriginal;
   MeasurementContainer measOriginal;
   ClusterContainer clusterOriginal;
   IndexMultimap<Index> mapOriginal;
@@ -44,17 +44,14 @@ BOOST_AUTO_TEST_CASE(CsvMeasurementRoundTrip) {
   std::uniform_real_distribution<double> distf(0.0, 1.0);
 
   for (auto i = 0ul; i < nMeasurements; ++i) {
-    IndexSourceLink sl(someGeoId, static_cast<Index>(i));
-    sourceLinksOriginal.insert(sl);
-
     Acts::Vector2 p = Acts::Vector2::Random();
     Acts::SquareMatrix2 c = Acts::SquareMatrix2::Random();
 
-    BoundVariableMeasurement m(Acts::SourceLink{sl},
-                               std::array{Acts::eBoundLoc0, Acts::eBoundLoc1},
-                               p, c);
-
-    measOriginal.push_back(m);
+    FixedBoundMeasurementProxy<2> m =
+        measOriginal.makeMeasurement<2>(someGeoId);
+    m.setSubspaceIndices(std::array{Acts::eBoundLoc0, Acts::eBoundLoc1});
+    m.parameters() = p;
+    m.covariance() = c;
 
     ActsExamples::Cluster cl;
 
@@ -117,14 +114,12 @@ BOOST_AUTO_TEST_CASE(CsvMeasurementRoundTrip) {
   readerConfig.outputMeasurementSimHitsMap =
       writerConfig.inputMeasurementSimHitsMap;
   readerConfig.outputClusters = writerConfig.inputClusters;
-  readerConfig.outputSourceLinks = "sourcelinks";
 
   CsvMeasurementReader reader(readerConfig, Acts::Logging::WARNING);
 
-  auto readTool =
-      writeTool.add(readerConfig.outputSourceLinks, sourceLinksOriginal);
+  auto readTool = writeTool.add(readerConfig.outputMeasurements, measOriginal);
 
-  const auto [measRead, clusterRead, mapRead, sourceLinksRead] =
+  const auto [measRead, clusterRead, mapRead, measRead2] =
       readTool.read(reader);
 
   ///////////
@@ -135,7 +130,7 @@ BOOST_AUTO_TEST_CASE(CsvMeasurementRoundTrip) {
   BOOST_REQUIRE(measRead.size() == measOriginal.size());
   for (const auto &[a, b] : Acts::zip(measRead, measOriginal)) {
     if (a.size() == b.size()) {
-      CHECK_CLOSE_REL(a.effectiveParameters(), b.effectiveParameters(), 1e-4);
+      CHECK_CLOSE_REL(a.parameters(), b.parameters(), 1e-4);
     }
   }
 
@@ -152,7 +147,7 @@ BOOST_AUTO_TEST_CASE(CsvMeasurementRoundTrip) {
                std::abs(ca.activation - cb.activation) < 1.e-4;
       };
 
-      BOOST_CHECK(std::any_of(b.channels.begin(), b.channels.end(), match));
+      BOOST_CHECK(std::ranges::any_of(b.channels, match));
     }
   }
 
@@ -163,10 +158,10 @@ BOOST_AUTO_TEST_CASE(CsvMeasurementRoundTrip) {
     BOOST_REQUIRE(a == b);
   }
 
-  static_assert(std::is_same_v<std::decay_t<decltype(sourceLinksRead)>,
-                               decltype(sourceLinksOriginal)>);
-  BOOST_REQUIRE(sourceLinksRead.size() == sourceLinksOriginal.size());
-  for (const auto &[a, b] : Acts::zip(sourceLinksRead, sourceLinksOriginal)) {
+  static_assert(
+      std::is_same_v<std::decay_t<decltype(measRead)>, decltype(measOriginal)>);
+  BOOST_REQUIRE(measRead.size() == measOriginal.size());
+  for (const auto &[a, b] : Acts::zip(measRead, measOriginal)) {
     BOOST_REQUIRE(a.geometryId() == b.geometryId());
     BOOST_REQUIRE(a.index() == b.index());
   }
diff --git a/Tests/UnitTests/Examples/Io/Json/JsonDigitizationConfigTests.cpp b/Tests/UnitTests/Examples/Io/Json/JsonDigitizationConfigTests.cpp
index a5b29cb257b..f7c1db0f496 100644
--- a/Tests/UnitTests/Examples/Io/Json/JsonDigitizationConfigTests.cpp
+++ b/Tests/UnitTests/Examples/Io/Json/JsonDigitizationConfigTests.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2021 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include <boost/test/unit_test.hpp>
 
@@ -57,7 +57,7 @@ struct Fixture {
 
     // generate random track parameters
     auto [par, cov] =
-        Acts::detail::Test::generateBoundParametersCovariance(rng);
+        Acts::detail::Test::generateBoundParametersCovariance(rng, {});
     boundParams = par;
 
     freeParams =
diff --git a/Tests/UnitTests/Examples/Io/Root/SimhitReaderWriterTests.cpp b/Tests/UnitTests/Examples/Io/Root/SimhitReaderWriterTests.cpp
index 1391826a9fb..f36fcc3a9ee 100644
--- a/Tests/UnitTests/Examples/Io/Root/SimhitReaderWriterTests.cpp
+++ b/Tests/UnitTests/Examples/Io/Root/SimhitReaderWriterTests.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2023 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include <boost/test/unit_test.hpp>
 
diff --git a/Tests/UnitTests/Fatras/Digitization/BoundRandomValues.hpp b/Tests/UnitTests/Fatras/Digitization/BoundRandomValues.hpp
index 4c86694bcae..5e4566efe8d 100644
--- a/Tests/UnitTests/Fatras/Digitization/BoundRandomValues.hpp
+++ b/Tests/UnitTests/Fatras/Digitization/BoundRandomValues.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2020 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
diff --git a/Tests/UnitTests/Fatras/Digitization/ChannelMergerTests.cpp b/Tests/UnitTests/Fatras/Digitization/ChannelMergerTests.cpp
index d26b6d551cd..126fd2d7cfb 100644
--- a/Tests/UnitTests/Fatras/Digitization/ChannelMergerTests.cpp
+++ b/Tests/UnitTests/Fatras/Digitization/ChannelMergerTests.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2020 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include <boost/test/unit_test.hpp>
 
diff --git a/Tests/UnitTests/Fatras/Digitization/ChannelizerTests.cpp b/Tests/UnitTests/Fatras/Digitization/ChannelizerTests.cpp
index b437bd78167..b1d142cc545 100644
--- a/Tests/UnitTests/Fatras/Digitization/ChannelizerTests.cpp
+++ b/Tests/UnitTests/Fatras/Digitization/ChannelizerTests.cpp
@@ -1,14 +1,15 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2023 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include <boost/test/unit_test.hpp>
 
 #include "Acts/Definitions/Units.hpp"
+#include "Acts/Surfaces/CurvilinearSurface.hpp"
 #include "Acts/Surfaces/PlaneSurface.hpp"
 #include "Acts/Utilities/BinUtility.hpp"
 #include "ActsFatras/Digitization/Channelizer.hpp"
@@ -30,8 +31,9 @@ struct Helper {
   ActsFatras::Channelizer channelizer;
 
   Helper() {
-    surface = Acts::Surface::makeShared<Acts::PlaneSurface>(
-        Acts::Vector3::Zero(), Acts::Vector3{0.0, 0.0, 1.0});
+    surface = Acts::CurvilinearSurface(Acts::Vector3::Zero(),
+                                       Acts::Vector3{0.0, 0.0, 1.0})
+                  .planeSurface();
 
     float pitchSize = 50_um;
     float min = -200_um;
diff --git a/Tests/UnitTests/Fatras/Digitization/DigitizationCsvOutput.hpp b/Tests/UnitTests/Fatras/Digitization/DigitizationCsvOutput.hpp
index e44f4cfb6f4..4aa039b13fc 100644
--- a/Tests/UnitTests/Fatras/Digitization/DigitizationCsvOutput.hpp
+++ b/Tests/UnitTests/Fatras/Digitization/DigitizationCsvOutput.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2020 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
diff --git a/Tests/UnitTests/Fatras/Digitization/PlanarSurfaceDriftTests.cpp b/Tests/UnitTests/Fatras/Digitization/PlanarSurfaceDriftTests.cpp
index 70de42ee6c4..c574d146fea 100644
--- a/Tests/UnitTests/Fatras/Digitization/PlanarSurfaceDriftTests.cpp
+++ b/Tests/UnitTests/Fatras/Digitization/PlanarSurfaceDriftTests.cpp
@@ -1,16 +1,17 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2021 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include <boost/test/unit_test.hpp>
 
 #include "Acts/Definitions/Algebra.hpp"
 #include "Acts/Definitions/Tolerance.hpp"
 #include "Acts/Geometry/GeometryContext.hpp"
+#include "Acts/Surfaces/CurvilinearSurface.hpp"
 #include "Acts/Surfaces/PlaneSurface.hpp"
 #include "Acts/Surfaces/Surface.hpp"
 #include "Acts/Tests/CommonHelpers/FloatComparisons.hpp"
@@ -32,7 +33,7 @@ BOOST_AUTO_TEST_CASE(PlanarSurfaceDrift) {
   Acts::Vector3 cNormal = Acts::Vector3(1., 1., 1.).normalized();
 
   auto planeSurface =
-      Acts::Surface::makeShared<Acts::PlaneSurface>(cPosition, cNormal);
+      Acts::CurvilinearSurface(cPosition, cNormal).planeSurface();
 
   double depletion = 0.250;
 
diff --git a/Tests/UnitTests/Fatras/Digitization/PlanarSurfaceMaskTests.cpp b/Tests/UnitTests/Fatras/Digitization/PlanarSurfaceMaskTests.cpp
index bbf5d4bf72b..f17e4432e6b 100644
--- a/Tests/UnitTests/Fatras/Digitization/PlanarSurfaceMaskTests.cpp
+++ b/Tests/UnitTests/Fatras/Digitization/PlanarSurfaceMaskTests.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2020 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include <boost/test/data/test_case.hpp>
 #include <boost/test/unit_test.hpp>
@@ -28,6 +28,7 @@
 #include <cmath>
 #include <fstream>
 #include <memory>
+#include <numbers>
 #include <string>
 #include <tuple>
 #include <utility>
@@ -81,8 +82,8 @@ BOOST_AUTO_TEST_CASE(PlaneMaskRectangleBounds) {
 }
 
 BOOST_AUTO_TEST_CASE(DiscMaskRadialBounds) {
-  auto discRadial =
-      std::make_shared<Acts::RadialBounds>(2., 7.5, M_PI_4, M_PI_2);
+  auto discRadial = std::make_shared<Acts::RadialBounds>(
+      2., 7.5, std::numbers::pi / 4., std::numbers::pi / 2.);
   auto discSurface = Acts::Surface::makeShared<Acts::DiscSurface>(
       Acts::Transform3::Identity(), discRadial);
 
@@ -117,13 +118,14 @@ BOOST_AUTO_TEST_CASE(DiscMaskRadialBounds) {
   /// Case four: outside phi min
   segment = {Acts::Vector2(2.8, 2.5), Acts::Vector2(0., 3.5)};
   clipped = psm.apply(*discSurface, segment).value();
-  CHECK_CLOSE_ABS(Acts::VectorHelpers::phi(clipped[0]), M_PI_4,
+  CHECK_CLOSE_ABS(Acts::VectorHelpers::phi(clipped[0]), std::numbers::pi / 4.,
                   Acts::s_epsilon);
 
   /// Case five: outside phi max
   segment = {Acts::Vector2(0., 3.5), Acts::Vector2(-8., 5.)};
   clipped = psm.apply(*discSurface, segment).value();
-  CHECK_CLOSE_ABS(Acts::VectorHelpers::phi(clipped[1]), M_PI_2 + M_PI_4,
+  CHECK_CLOSE_ABS(Acts::VectorHelpers::phi(clipped[1]),
+                  std::numbers::pi / 2. + std::numbers::pi / 4.,
                   Acts::s_epsilon);
 }
 
diff --git a/Tests/UnitTests/Fatras/Digitization/PlanarSurfaceTestBeds.hpp b/Tests/UnitTests/Fatras/Digitization/PlanarSurfaceTestBeds.hpp
index 14fd079c56a..42327d7e5eb 100644
--- a/Tests/UnitTests/Fatras/Digitization/PlanarSurfaceTestBeds.hpp
+++ b/Tests/UnitTests/Fatras/Digitization/PlanarSurfaceTestBeds.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2020 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
@@ -22,6 +22,7 @@
 #include "Acts/Utilities/BinningType.hpp"
 
 #include <array>
+#include <numbers>
 #include <tuple>
 #include <vector>
 
@@ -87,23 +88,28 @@ struct PlanarSurfaceTestBeds {
         Acts::Transform3::Identity(), discTrapezoid);
     Acts::BinUtility stripsPhi(1, rmin, rmax, Acts::open,
                                Acts::BinningValue::binR);
-    stripsPhi += Acts::BinUtility(25, M_PI_2 - alpha, M_PI_2 + alpha,
-                                  Acts::open, Acts::BinningValue::binPhi);
+    stripsPhi += Acts::BinUtility(25, std::numbers::pi / 2. - alpha,
+                                  std::numbers::pi / 2. + alpha, Acts::open,
+                                  Acts::BinningValue::binPhi);
     TrapezoidRandom dtRandom(xmin * rScale, xmax * rScale, rmin * irScale,
                              ymax * rScale);
 
     // Raidal disc test
-    auto discRadial =
-        std::make_shared<Acts::RadialBounds>(rmin, rmax, M_PI_4, M_PI_2);
+    auto discRadial = std::make_shared<Acts::RadialBounds>(
+        rmin, rmax, std::numbers::pi / 4., std::numbers::pi / 2.);
     auto dSurface = Acts::Surface::makeShared<Acts::DiscSurface>(
         Acts::Transform3::Identity(), discRadial);
     Acts::BinUtility rphiseg(10, rmin, rmax, Acts::open,
                              Acts::BinningValue::binR);
-    rphiseg += Acts::BinUtility(20, (M_PI_2 - M_PI_4), (M_PI_2 + M_PI_4),
-                                Acts::open, Acts::BinningValue::binPhi);
-
-    DiscRandom dRandom(rmin * irScale, rmax * rScale,
-                       (M_PI_2 - M_PI_4) * irScale, (M_PI_2 + M_PI_4) * rScale);
+    rphiseg +=
+        Acts::BinUtility(20, (std::numbers::pi / 2. - std::numbers::pi / 4.),
+                         (std::numbers::pi / 2. + std::numbers::pi / 4.),
+                         Acts::open, Acts::BinningValue::binPhi);
+
+    DiscRandom dRandom(
+        rmin * irScale, rmax * rScale,
+        (std::numbers::pi / 2. - std::numbers::pi / 4.) * irScale,
+        (std::numbers::pi / 2. + std::numbers::pi / 4.) * rScale);
 
     // Annulus disc test
     rmin = 2.5;
diff --git a/Tests/UnitTests/Fatras/Digitization/SegmentizerTests.cpp b/Tests/UnitTests/Fatras/Digitization/SegmentizerTests.cpp
index 4680d39f974..ad74a9024d1 100644
--- a/Tests/UnitTests/Fatras/Digitization/SegmentizerTests.cpp
+++ b/Tests/UnitTests/Fatras/Digitization/SegmentizerTests.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2020 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include <boost/test/data/test_case.hpp>
 #include <boost/test/unit_test.hpp>
@@ -217,9 +217,9 @@ BOOST_DATA_TEST_CASE(
                  ".csv");
 
     /// Run the Segmentizer
-    auto cSegement = cl.segments(geoCtx, *surface, segmentation, {start, end});
+    auto cSegments = cl.segments(geoCtx, *surface, segmentation, {start, end});
 
-    for (const auto& cs : cSegement) {
+    for (const auto& cs : cSegments) {
       csvHelper.writeLine(segments, cs.path2D[0], cs.path2D[1]);
     }
 
diff --git a/Tests/UnitTests/Fatras/Digitization/UncorrelatedHitSmearerTests.cpp b/Tests/UnitTests/Fatras/Digitization/UncorrelatedHitSmearerTests.cpp
index 127dc636090..2a4ad0b2a6e 100644
--- a/Tests/UnitTests/Fatras/Digitization/UncorrelatedHitSmearerTests.cpp
+++ b/Tests/UnitTests/Fatras/Digitization/UncorrelatedHitSmearerTests.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2020 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include <boost/test/data/test_case.hpp>
 #include <boost/test/unit_test.hpp>
@@ -96,7 +96,7 @@ struct Fixture {
 
     // generate random track parameters
     auto [par, cov] =
-        Acts::detail::Test::generateBoundParametersCovariance(rng);
+        Acts::detail::Test::generateBoundParametersCovariance(rng, {});
     boundParams = par;
 
     freeParams =
diff --git a/Tests/UnitTests/Fatras/EventData/BarcodeTests.cpp b/Tests/UnitTests/Fatras/EventData/BarcodeTests.cpp
index b79be50a894..99adfab7837 100644
--- a/Tests/UnitTests/Fatras/EventData/BarcodeTests.cpp
+++ b/Tests/UnitTests/Fatras/EventData/BarcodeTests.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2018-2020 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include <boost/test/unit_test.hpp>
 
diff --git a/Tests/UnitTests/Fatras/EventData/HitTests.cpp b/Tests/UnitTests/Fatras/EventData/HitTests.cpp
index 579eada124c..765db8378a8 100644
--- a/Tests/UnitTests/Fatras/EventData/HitTests.cpp
+++ b/Tests/UnitTests/Fatras/EventData/HitTests.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2020 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include <boost/test/unit_test.hpp>
 
diff --git a/Tests/UnitTests/Fatras/EventData/ParticleTests.cpp b/Tests/UnitTests/Fatras/EventData/ParticleTests.cpp
index 69167583984..a6858dacc74 100644
--- a/Tests/UnitTests/Fatras/EventData/ParticleTests.cpp
+++ b/Tests/UnitTests/Fatras/EventData/ParticleTests.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2018-2020 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include <boost/test/unit_test.hpp>
 
diff --git a/Tests/UnitTests/Fatras/Kernel/ContinuousProcessTests.cpp b/Tests/UnitTests/Fatras/Kernel/ContinuousProcessTests.cpp
index e3b0190fde0..13430f11bcc 100644
--- a/Tests/UnitTests/Fatras/Kernel/ContinuousProcessTests.cpp
+++ b/Tests/UnitTests/Fatras/Kernel/ContinuousProcessTests.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2018-2020 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include <boost/test/unit_test.hpp>
 
diff --git a/Tests/UnitTests/Fatras/Kernel/InteractionListTests.cpp b/Tests/UnitTests/Fatras/Kernel/InteractionListTests.cpp
index c86dcf58105..167025ad739 100644
--- a/Tests/UnitTests/Fatras/Kernel/InteractionListTests.cpp
+++ b/Tests/UnitTests/Fatras/Kernel/InteractionListTests.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2018-2021 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include <boost/test/unit_test.hpp>
 
@@ -39,9 +39,9 @@ struct SterileContinuousProcess {
   }
 };
 
-static_assert(detail::IsContinuousProcess<SterileContinuousProcess>::value,
+static_assert(detail::ContinuousProcessConcept<SterileContinuousProcess>,
               "Is not a continuous process");
-static_assert(!detail::IsPointLikeProcess<SterileContinuousProcess>::value,
+static_assert(!detail::PointLikeProcessConcept<SterileContinuousProcess>,
               "Is a point-like process");
 
 /// Continuous process that DOES trigger a break
@@ -53,9 +53,9 @@ struct FatalContinuousProcess {
     return true;
   }
 };
-static_assert(detail::IsContinuousProcess<FatalContinuousProcess>::value,
+static_assert(detail::ContinuousProcessConcept<FatalContinuousProcess>,
               "Is not a continuous process");
-static_assert(!detail::IsPointLikeProcess<FatalContinuousProcess>::value,
+static_assert(!detail::PointLikeProcessConcept<FatalContinuousProcess>,
               "Is a point-like process");
 
 /// EM-like point-like process that triggers on X0 and keeps the particle alive.
@@ -77,9 +77,9 @@ struct X0PointLikeProcess {
   }
 };
 
-static_assert(!detail::IsContinuousProcess<X0PointLikeProcess>::value,
+static_assert(!detail::ContinuousProcessConcept<X0PointLikeProcess>,
               "Is a continuous process");
-static_assert(detail::IsPointLikeProcess<X0PointLikeProcess>::value,
+static_assert(detail::PointLikeProcessConcept<X0PointLikeProcess>,
               "Is not a point-like process");
 
 /// Nuclear-like point-like process that triggers on L0 and kills the particle.
@@ -103,9 +103,9 @@ struct L0PointLikeProcess {
   }
 };
 
-static_assert(!detail::IsContinuousProcess<L0PointLikeProcess>::value,
+static_assert(!detail::ContinuousProcessConcept<L0PointLikeProcess>,
               "Is a continuous process");
-static_assert(detail::IsPointLikeProcess<L0PointLikeProcess>::value,
+static_assert(detail::PointLikeProcessConcept<L0PointLikeProcess>,
               "Is not a point-like process");
 
 struct Fixture {
diff --git a/Tests/UnitTests/Fatras/Kernel/SimulationActorTests.cpp b/Tests/UnitTests/Fatras/Kernel/SimulationActorTests.cpp
index ee463e5a729..3306c5702d6 100644
--- a/Tests/UnitTests/Fatras/Kernel/SimulationActorTests.cpp
+++ b/Tests/UnitTests/Fatras/Kernel/SimulationActorTests.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2021 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include <boost/test/unit_test.hpp>
 
@@ -12,10 +12,12 @@
 #include "Acts/Definitions/PdgParticle.hpp"
 #include "Acts/Definitions/Units.hpp"
 #include "Acts/Geometry/GeometryContext.hpp"
+#include "Acts/Geometry/TrackingVolume.hpp"
 #include "Acts/Material/HomogeneousSurfaceMaterial.hpp"
 #include "Acts/Material/MaterialSlab.hpp"
 #include "Acts/Propagator/ConstrainedStep.hpp"
 #include "Acts/Propagator/Propagator.hpp"
+#include "Acts/Surfaces/CurvilinearSurface.hpp"
 #include "Acts/Surfaces/PlaneSurface.hpp"
 #include "Acts/Surfaces/Surface.hpp"
 #include "Acts/Tests/CommonHelpers/FloatComparisons.hpp"
@@ -147,6 +149,11 @@ struct MockNavigator {
     return state.currentSurface;
   }
 
+  const Acts::TrackingVolume *currentVolume(
+      const MockNavigatorState & /*state*/) const {
+    return nullptr;
+  }
+
   bool endOfWorldReached(const MockNavigatorState & /*state*/) const {
     return false;
   }
@@ -157,6 +164,10 @@ struct MockPropagatorState {
   MockStepperState stepping;
   Acts::GeometryContext geoContext;
   Acts::PropagatorStage stage = Acts::PropagatorStage::invalid;
+
+  struct {
+    std::vector<std::uint32_t> constrainToVolumeIds;
+  } options;
 };
 
 template <typename SurfaceSelector>
@@ -203,8 +214,9 @@ struct Fixture {
 
 // make a surface without material.
 std::shared_ptr<Acts::Surface> makeEmptySurface() {
-  auto surface = Acts::Surface::makeShared<Acts::PlaneSurface>(
-      Acts::Vector3(1, 2, 3), Acts::Vector3(1, 0, 0));
+  auto surface =
+      Acts::CurvilinearSurface(Acts::Vector3(1, 2, 3), Acts::Vector3(1, 0, 0))
+          .planeSurface();
   return surface;
 }
 
@@ -232,8 +244,15 @@ BOOST_AUTO_TEST_CASE(HitsOnEmptySurface) {
   BOOST_CHECK_EQUAL(f.actor.initialParticle.absoluteMomentum(), f.p);
   BOOST_CHECK_EQUAL(f.actor.initialParticle.energy(), f.e);
 
+  // call.actor: pre propagation
+  f.state.stage = Acts::PropagatorStage::prePropagation;
+  f.actor.act(f.state, f.stepper, f.navigator, f.result,
+              Acts::getDummyLogger());
+
   // call.actor: surface selection -> one hit, no material -> no secondary
-  f.actor(f.state, f.stepper, f.navigator, f.result, Acts::getDummyLogger());
+  f.state.stage = Acts::PropagatorStage::postStep;
+  f.actor.act(f.state, f.stepper, f.navigator, f.result,
+              Acts::getDummyLogger());
   BOOST_CHECK(f.result.isAlive);
   CHECK_CLOSE_REL(f.result.particle.energy(), f.e, tol);
   BOOST_CHECK_EQUAL(f.result.generatedParticles.size(), 0u);
@@ -258,7 +277,9 @@ BOOST_AUTO_TEST_CASE(HitsOnEmptySurface) {
   BOOST_CHECK_EQUAL(f.state.stepping.p, f.result.particle.absoluteMomentum());
 
   // call.actor again: one more hit, still no secondary
-  f.actor(f.state, f.stepper, f.navigator, f.result, Acts::getDummyLogger());
+  f.state.stage = Acts::PropagatorStage::postStep;
+  f.actor.act(f.state, f.stepper, f.navigator, f.result,
+              Acts::getDummyLogger());
   BOOST_CHECK(f.result.isAlive);
   CHECK_CLOSE_REL(f.result.particle.energy(), f.e, tol);
   BOOST_CHECK_EQUAL(f.result.generatedParticles.size(), 0u);
@@ -303,8 +324,15 @@ BOOST_AUTO_TEST_CASE(HitsOnMaterialSurface) {
   BOOST_CHECK_EQUAL(f.actor.initialParticle.absoluteMomentum(), f.p);
   BOOST_CHECK_EQUAL(f.actor.initialParticle.energy(), f.e);
 
+  // call.actor: pre propagation
+  f.state.stage = Acts::PropagatorStage::prePropagation;
+  f.actor.act(f.state, f.stepper, f.navigator, f.result,
+              Acts::getDummyLogger());
+
   // call.actor: surface selection -> one hit, material -> one secondary
-  f.actor(f.state, f.stepper, f.navigator, f.result, Acts::getDummyLogger());
+  f.state.stage = Acts::PropagatorStage::postStep;
+  f.actor.act(f.state, f.stepper, f.navigator, f.result,
+              Acts::getDummyLogger());
   BOOST_CHECK(f.result.isAlive);
   CHECK_CLOSE_REL(f.result.particle.energy(), f.e - 125_MeV, tol);
   BOOST_CHECK_EQUAL(f.result.generatedParticles.size(), 1u);
@@ -331,7 +359,9 @@ BOOST_AUTO_TEST_CASE(HitsOnMaterialSurface) {
                   tol);
 
   // call.actor again: one more hit, one more secondary
-  f.actor(f.state, f.stepper, f.navigator, f.result, Acts::getDummyLogger());
+  f.state.stage = Acts::PropagatorStage::postStep;
+  f.actor.act(f.state, f.stepper, f.navigator, f.result,
+              Acts::getDummyLogger());
   BOOST_CHECK(f.result.isAlive);
   CHECK_CLOSE_REL(f.result.particle.energy(), f.e - 250_MeV, tol);
   BOOST_CHECK_EQUAL(f.result.generatedParticles.size(), 2u);
@@ -376,8 +406,15 @@ BOOST_AUTO_TEST_CASE(NoHitsEmptySurface) {
   BOOST_CHECK_EQUAL(f.actor.initialParticle.absoluteMomentum(), f.p);
   BOOST_CHECK_EQUAL(f.actor.initialParticle.energy(), f.e);
 
+  // call.actor: pre propagation
+  f.state.stage = Acts::PropagatorStage::prePropagation;
+  f.actor.act(f.state, f.stepper, f.navigator, f.result,
+              Acts::getDummyLogger());
+
   // call.actor: no surface sel. -> no hit, no material -> no secondary
-  f.actor(f.state, f.stepper, f.navigator, f.result, Acts::getDummyLogger());
+  f.state.stage = Acts::PropagatorStage::postStep;
+  f.actor.act(f.state, f.stepper, f.navigator, f.result,
+              Acts::getDummyLogger());
   BOOST_CHECK(f.result.isAlive);
   CHECK_CLOSE_REL(f.result.particle.energy(), f.e, tol);
   BOOST_CHECK_EQUAL(f.result.generatedParticles.size(), 0u);
@@ -402,7 +439,9 @@ BOOST_AUTO_TEST_CASE(NoHitsEmptySurface) {
   BOOST_CHECK_EQUAL(f.state.stepping.p, f.result.particle.absoluteMomentum());
 
   // call.actor again: no hit, still no secondary
-  f.actor(f.state, f.stepper, f.navigator, f.result, Acts::getDummyLogger());
+  f.state.stage = Acts::PropagatorStage::postStep;
+  f.actor.act(f.state, f.stepper, f.navigator, f.result,
+              Acts::getDummyLogger());
   BOOST_CHECK(f.result.isAlive);
   CHECK_CLOSE_REL(f.result.particle.energy(), f.e, tol);
   BOOST_CHECK_EQUAL(f.result.generatedParticles.size(), 0u);
@@ -437,8 +476,15 @@ BOOST_AUTO_TEST_CASE(NoHitsEmptySurface) {
 BOOST_AUTO_TEST_CASE(NoHitsMaterialSurface) {
   Fixture<NoSurface> f(125_MeV, makeMaterialSurface());
 
+  // call.actor: pre propagation
+  f.state.stage = Acts::PropagatorStage::prePropagation;
+  f.actor.act(f.state, f.stepper, f.navigator, f.result,
+              Acts::getDummyLogger());
+
   // call.actor: no surface sel. -> no hit, material -> one secondary
-  f.actor(f.state, f.stepper, f.navigator, f.result, Acts::getDummyLogger());
+  f.state.stage = Acts::PropagatorStage::postStep;
+  f.actor.act(f.state, f.stepper, f.navigator, f.result,
+              Acts::getDummyLogger());
   BOOST_CHECK(f.result.isAlive);
   CHECK_CLOSE_REL(f.result.particle.energy(), f.e - 125_MeV, tol);
   BOOST_CHECK_EQUAL(f.result.generatedParticles.size(), 1u);
@@ -464,7 +510,9 @@ BOOST_AUTO_TEST_CASE(NoHitsMaterialSurface) {
                   tol);
 
   // call.actor again: still no hit, one more secondary
-  f.actor(f.state, f.stepper, f.navigator, f.result, Acts::getDummyLogger());
+  f.state.stage = Acts::PropagatorStage::postStep;
+  f.actor.act(f.state, f.stepper, f.navigator, f.result,
+              Acts::getDummyLogger());
   BOOST_CHECK(f.result.isAlive);
   CHECK_CLOSE_REL(f.result.particle.energy(), f.e - 250_MeV, tol);
   BOOST_CHECK_EQUAL(f.result.generatedParticles.size(), 2u);
@@ -503,8 +551,15 @@ BOOST_AUTO_TEST_CASE(Decay) {
   // inverse Lorentz factor for proper time dilation: 1/gamma = m/E
   const auto gammaInv = f.m / f.e;
 
+  // call.actor: pre propagation
+  f.state.stage = Acts::PropagatorStage::prePropagation;
+  f.actor.act(f.state, f.stepper, f.navigator, f.result,
+              Acts::getDummyLogger());
+
   // first step w/ defaults leaves particle alive
-  f.actor(f.state, f.stepper, f.navigator, f.result, Acts::getDummyLogger());
+  f.state.stage = Acts::PropagatorStage::postStep;
+  f.actor.act(f.state, f.stepper, f.navigator, f.result,
+              Acts::getDummyLogger());
   BOOST_CHECK(f.result.isAlive);
   BOOST_CHECK_EQUAL(f.result.particle.particleId(), f.pid);
   BOOST_CHECK_EQUAL(f.result.particle.process(), f.proc);
@@ -515,8 +570,10 @@ BOOST_AUTO_TEST_CASE(Decay) {
   BOOST_CHECK_EQUAL(f.result.particle.properTime(), 0_ns);
 
   // second step w/ defaults increases proper time
+  f.state.stage = Acts::PropagatorStage::postStep;
   f.state.stepping.time += 1_ns;
-  f.actor(f.state, f.stepper, f.navigator, f.result, Acts::getDummyLogger());
+  f.actor.act(f.state, f.stepper, f.navigator, f.result,
+              Acts::getDummyLogger());
   BOOST_CHECK(f.result.isAlive);
   BOOST_CHECK_EQUAL(f.result.particle.particleId(), f.pid);
   BOOST_CHECK_EQUAL(f.result.particle.process(), f.proc);
@@ -527,9 +584,11 @@ BOOST_AUTO_TEST_CASE(Decay) {
   CHECK_CLOSE_REL(f.result.particle.properTime(), gammaInv * 1_ns, tol);
 
   // third step w/ proper time limit decays the particle
+  f.state.stage = Acts::PropagatorStage::postStep;
   f.state.stepping.time += 1_ns;
   f.result.properTimeLimit = f.result.particle.properTime() + gammaInv * 0.5_ns;
-  f.actor(f.state, f.stepper, f.navigator, f.result, Acts::getDummyLogger());
+  f.actor.act(f.state, f.stepper, f.navigator, f.result,
+              Acts::getDummyLogger());
   BOOST_CHECK(!f.result.isAlive);
   BOOST_CHECK_EQUAL(f.result.particle.particleId(), f.pid);
   BOOST_CHECK_EQUAL(f.result.particle.process(), f.proc);
diff --git a/Tests/UnitTests/Fatras/Kernel/TupleIndexOfTests.cpp b/Tests/UnitTests/Fatras/Kernel/TupleIndexOfTests.cpp
index baf49ab6bdf..a825c9169e8 100644
--- a/Tests/UnitTests/Fatras/Kernel/TupleIndexOfTests.cpp
+++ b/Tests/UnitTests/Fatras/Kernel/TupleIndexOfTests.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2021 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include <boost/test/unit_test.hpp>
 
diff --git a/Tests/UnitTests/Fatras/Physics/BetheBlochTests.cpp b/Tests/UnitTests/Fatras/Physics/BetheBlochTests.cpp
index 7210d0b226a..d6372874c18 100644
--- a/Tests/UnitTests/Fatras/Physics/BetheBlochTests.cpp
+++ b/Tests/UnitTests/Fatras/Physics/BetheBlochTests.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2018-2021 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include <boost/test/data/test_case.hpp>
 #include <boost/test/unit_test.hpp>
diff --git a/Tests/UnitTests/Fatras/Physics/BetheHeitlerTests.cpp b/Tests/UnitTests/Fatras/Physics/BetheHeitlerTests.cpp
index 60d306f7da8..340ce91146b 100644
--- a/Tests/UnitTests/Fatras/Physics/BetheHeitlerTests.cpp
+++ b/Tests/UnitTests/Fatras/Physics/BetheHeitlerTests.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2018-2021 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include <boost/test/data/test_case.hpp>
 #include <boost/test/unit_test.hpp>
diff --git a/Tests/UnitTests/Fatras/Physics/Dataset.hpp b/Tests/UnitTests/Fatras/Physics/Dataset.hpp
index e26484e3f3a..21447656130 100644
--- a/Tests/UnitTests/Fatras/Physics/Dataset.hpp
+++ b/Tests/UnitTests/Fatras/Physics/Dataset.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2020 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
diff --git a/Tests/UnitTests/Fatras/Physics/PhotonConversionTests.cpp b/Tests/UnitTests/Fatras/Physics/PhotonConversionTests.cpp
index 00ca6248c7d..f5340ab4cc7 100644
--- a/Tests/UnitTests/Fatras/Physics/PhotonConversionTests.cpp
+++ b/Tests/UnitTests/Fatras/Physics/PhotonConversionTests.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2021 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include <boost/test/data/test_case.hpp>
 #include <boost/test/unit_test.hpp>
diff --git a/Tests/UnitTests/Fatras/Physics/ScatteringTests.cpp b/Tests/UnitTests/Fatras/Physics/ScatteringTests.cpp
index edad2c365c7..5f2015d844f 100644
--- a/Tests/UnitTests/Fatras/Physics/ScatteringTests.cpp
+++ b/Tests/UnitTests/Fatras/Physics/ScatteringTests.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2018-2024 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include <boost/test/data/test_case.hpp>
 #include <boost/test/unit_test.hpp>
@@ -19,6 +19,7 @@
 #include <cmath>
 #include <cstdint>
 #include <limits>
+#include <numbers>
 #include <random>
 
 #include "Dataset.hpp"
@@ -104,7 +105,7 @@ BOOST_AUTO_TEST_CASE(HighlandRms) {
   double rmsTheta3D = rms(theta3Ds, 0);
 
   CHECK_CLOSE_REL(rmsThetaYZ, theta0, 0.02);
-  CHECK_CLOSE_REL(rmsTheta3D, M_SQRT2 * theta0, 0.02);
+  CHECK_CLOSE_REL(rmsTheta3D, std::numbers::sqrt2 * theta0, 0.02);
 }
 
 BOOST_AUTO_TEST_SUITE_END()
diff --git a/Tests/UnitTests/Fatras/Selectors/Dataset.hpp b/Tests/UnitTests/Fatras/Selectors/Dataset.hpp
index f782f8e919e..4bf423c1fc3 100644
--- a/Tests/UnitTests/Fatras/Selectors/Dataset.hpp
+++ b/Tests/UnitTests/Fatras/Selectors/Dataset.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2020 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
diff --git a/Tests/UnitTests/Fatras/Selectors/KinematicCastsTests.cpp b/Tests/UnitTests/Fatras/Selectors/KinematicCastsTests.cpp
index 6266daad892..2483fc8e196 100644
--- a/Tests/UnitTests/Fatras/Selectors/KinematicCastsTests.cpp
+++ b/Tests/UnitTests/Fatras/Selectors/KinematicCastsTests.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2018-2020 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include <boost/test/unit_test.hpp>
 
diff --git a/Tests/UnitTests/Fatras/Selectors/ParticleSelectorsTests.cpp b/Tests/UnitTests/Fatras/Selectors/ParticleSelectorsTests.cpp
index dd48b345d59..f3478fd5c68 100644
--- a/Tests/UnitTests/Fatras/Selectors/ParticleSelectorsTests.cpp
+++ b/Tests/UnitTests/Fatras/Selectors/ParticleSelectorsTests.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2018-2021 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include <boost/test/unit_test.hpp>
 
diff --git a/Tests/UnitTests/Fatras/Selectors/SelectorHelpersTests.cpp b/Tests/UnitTests/Fatras/Selectors/SelectorHelpersTests.cpp
index c27afac7e45..a4f4ecf4511 100644
--- a/Tests/UnitTests/Fatras/Selectors/SelectorHelpersTests.cpp
+++ b/Tests/UnitTests/Fatras/Selectors/SelectorHelpersTests.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2018-2020 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include <boost/test/unit_test.hpp>
 
diff --git a/Tests/UnitTests/Plugins/ActSVG/DetectorSvgConverterTests.cpp b/Tests/UnitTests/Plugins/ActSVG/DetectorSvgConverterTests.cpp
index cb28a9766ff..15cf2f72540 100644
--- a/Tests/UnitTests/Plugins/ActSVG/DetectorSvgConverterTests.cpp
+++ b/Tests/UnitTests/Plugins/ActSVG/DetectorSvgConverterTests.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2022 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include <boost/test/unit_test.hpp>
 
@@ -27,6 +27,7 @@
 #include "Acts/Surfaces/DiscSurface.hpp"
 #include "Acts/Surfaces/RadialBounds.hpp"
 #include "Acts/Surfaces/Surface.hpp"
+#include "Acts/Tests/CommonHelpers/CylindricalDetector.hpp"
 #include "Acts/Utilities/BinningType.hpp"
 #include "Acts/Utilities/Enumerate.hpp"
 #include "Acts/Utilities/Logger.hpp"
@@ -36,139 +37,15 @@
 #include <vector>
 
 using namespace Acts;
+using namespace Acts::Test;
 using namespace Acts::Experimental;
 
 GeometryContext tContext;
 
-/// @brief A mockup volume builder, it generates volumes with
-/// a single surface filled in in order to use the CylindricalContainerBuilder
-/// infrastructure.
-template <typename surface_type, typename surface_bounds_type>
-class CylindricalVolumeBuilder : public IDetectorComponentBuilder {
- public:
-  CylindricalVolumeBuilder(const Transform3& transform,
-                           const CylinderVolumeBounds& vBounds,
-                           const surface_bounds_type& sBounds,
-                           const std::string& vName)
-      : IDetectorComponentBuilder(),
-        m_transform(transform),
-        m_volumeBounds(vBounds),
-        m_surfaceBounds(sBounds),
-        m_name(vName) {}
-
-  DetectorComponent construct(
-      [[maybe_unused]] const GeometryContext& gctx) const final {
-    // The outgoing root volumes
-    std::vector<std::shared_ptr<DetectorVolume>> rootVolumes;
-
-    // Ingredients
-    auto surface = Surface::makeShared<surface_type>(
-        (m_transform), std::make_shared<surface_bounds_type>(m_surfaceBounds));
-
-    auto bounds = std::make_unique<CylinderVolumeBounds>(m_volumeBounds);
-    auto portalGenerator = defaultPortalGenerator();
-    auto volume = DetectorVolumeFactory::construct(
-        portalGenerator, tContext, m_name, m_transform, std::move(bounds),
-        {surface}, {}, tryNoVolumes(), tryAllPortalsAndSurfaces());
-
-    // Add to the roots
-    rootVolumes.push_back(volume);
-
-    DetectorComponent::PortalContainer dContainer;
-    for (auto [ip, p] : enumerate(volume->portalPtrs())) {
-      dContainer[ip] = p;
-    }
-    return DetectorComponent{
-        {volume},
-        dContainer,
-        RootDetectorVolumes{rootVolumes, tryRootVolumes()}};
-  }
-
- private:
-  Transform3 m_transform;
-  CylinderVolumeBounds m_volumeBounds;
-  surface_bounds_type m_surfaceBounds;
-  std::string m_name;
-};
-
 BOOST_AUTO_TEST_SUITE(ActSvg)
 
 BOOST_AUTO_TEST_CASE(CylindricalDetector) {
-  // Declare a barrel sub builder
-  auto beampipe = std::make_shared<
-      CylindricalVolumeBuilder<CylinderSurface, CylinderBounds>>(
-      Transform3::Identity(), CylinderVolumeBounds(0., 50., 400.),
-      CylinderBounds(25., 380.), "BeamPipe");
-
-  // Declare a negative disc builder
-  Transform3 negZ = Transform3::Identity();
-  negZ.pretranslate(Vector3(0., 0., -300.));
-  auto endcapN =
-      std::make_shared<CylindricalVolumeBuilder<DiscSurface, RadialBounds>>(
-          negZ, CylinderVolumeBounds(50., 140., 100.), RadialBounds(60., 120.),
-          "NegativeEndcap");
-
-  // Declare a barrel sub builder
-  auto barrel0 = std::make_shared<
-      CylindricalVolumeBuilder<CylinderSurface, CylinderBounds>>(
-      Transform3::Identity(), CylinderVolumeBounds(50., 80., 200.),
-      CylinderBounds(65., 180.), "Barrel0");
-
-  // Declare a barrel sub builder
-  auto barrel1 = std::make_shared<
-      CylindricalVolumeBuilder<CylinderSurface, CylinderBounds>>(
-      Transform3::Identity(), CylinderVolumeBounds(80., 110., 200.),
-      CylinderBounds(95., 180.), "Barrel1");
-
-  // Declare a barrel sub builder
-  auto barrel2 = std::make_shared<
-      CylindricalVolumeBuilder<CylinderSurface, CylinderBounds>>(
-      Transform3::Identity(), CylinderVolumeBounds(110., 140., 200.),
-      CylinderBounds(125., 180.), "Barrel2");
-
-  // Create the barrel container builder
-  CylindricalContainerBuilder::Config barrelRCfg;
-  barrelRCfg.builders = {barrel0, barrel1, barrel2};
-  barrelRCfg.binning = {BinningValue::binR};
-
-  auto barrel = std::make_shared<CylindricalContainerBuilder>(
-      barrelRCfg, getDefaultLogger("BarrelBuilderR", Logging::VERBOSE));
-
-  Transform3 posZ = Transform3::Identity();
-  posZ.pretranslate(Vector3(0., 0., 300.));
-  auto endcapP =
-      std::make_shared<CylindricalVolumeBuilder<DiscSurface, RadialBounds>>(
-          posZ, CylinderVolumeBounds(50., 140., 100.), RadialBounds(60., 120.),
-          "PositiveEndcap");
-
-  // Create the barrel container builder
-  CylindricalContainerBuilder::Config barrelEndcapCfg;
-  barrelEndcapCfg.builders = {endcapN, barrel, endcapP};
-  barrelEndcapCfg.binning = {BinningValue::binZ};
-
-  auto barrelEndcap = std::make_shared<CylindricalContainerBuilder>(
-      barrelEndcapCfg,
-      getDefaultLogger("BarrelEndcapBuilder", Logging::VERBOSE));
-
-  // Create the barrel container builder
-  CylindricalContainerBuilder::Config detectorCfg;
-  detectorCfg.builders = {beampipe, barrelEndcap};
-  detectorCfg.binning = {BinningValue::binR};
-
-  auto containerBuilder = std::make_shared<CylindricalContainerBuilder>(
-      detectorCfg, getDefaultLogger("DetectorBuilder", Logging::VERBOSE));
-
-  // Detector builder
-  auto gigConfig = GeometryIdGenerator::Config();
-  auto gig = std::make_shared<GeometryIdGenerator>(gigConfig);
-
-  Acts::Experimental::DetectorBuilder::Config dCfg;
-  dCfg.auxiliary = "*** Test : Cylindrical Detector ***";
-  dCfg.name = "CylindricalDetector";
-  dCfg.builder = containerBuilder;
-  dCfg.geoIdGenerator = gig;
-
-  auto detector = DetectorBuilder(dCfg).construct(tContext);
+  auto detector = buildCylindricalDetector(tContext);
 
   Acts::Svg::DetectorConverter::Options detectorOptions;
   auto pDetector = Acts::Svg::DetectorConverter::convert(tContext, *detector,
diff --git a/Tests/UnitTests/Plugins/ActSVG/DetectorVolumeSvgConverterTests.cpp b/Tests/UnitTests/Plugins/ActSVG/DetectorVolumeSvgConverterTests.cpp
index 7d6241e8f4e..28b69de1050 100644
--- a/Tests/UnitTests/Plugins/ActSVG/DetectorVolumeSvgConverterTests.cpp
+++ b/Tests/UnitTests/Plugins/ActSVG/DetectorVolumeSvgConverterTests.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2022 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include <boost/test/unit_test.hpp>
 
@@ -25,6 +25,7 @@
 
 #include <fstream>
 #include <memory>
+#include <numbers>
 #include <vector>
 
 namespace {
@@ -97,7 +98,7 @@ BOOST_AUTO_TEST_CASE(TubeSectorCylindricalDetectorVolume) {
   Acts::ActsScalar rInner = 10.;
   Acts::ActsScalar rOuter = 100.;
   Acts::ActsScalar zHalfL = 300.;
-  Acts::ActsScalar phiSector = 0.25 * M_PI;
+  Acts::ActsScalar phiSector = std::numbers::pi / 4.;
   std::vector<Acts::ActsScalar> avgPhi = {0., 0.75};
   std::vector<std::string> avgPhiTag = {"zero", "nonzero"};
 
@@ -149,8 +150,8 @@ BOOST_AUTO_TEST_CASE(EndcapVolumeWithSurfaces) {
   lsConfig.auxiliary = "*** Endcap with 22 surfaces ***";
   lsConfig.surfacesProvider = endcapSurfaces;
   lsConfig.binnings = {Acts::Experimental::ProtoBinning(
-      Acts::BinningValue::binPhi, Acts::AxisBoundaryType::Closed, -M_PI, M_PI,
-      22u, 1u)};
+      Acts::BinningValue::binPhi, Acts::AxisBoundaryType::Closed,
+      -std::numbers::pi, std::numbers::pi, 22u, 1u)};
 
   auto layerBuilder =
       std::make_shared<Acts::Experimental::LayerStructureBuilder>(
@@ -158,7 +159,7 @@ BOOST_AUTO_TEST_CASE(EndcapVolumeWithSurfaces) {
                                            Acts::Logging::VERBOSE));
 
   Acts::Experimental::VolumeStructureBuilder::Config shapeConfig;
-  shapeConfig.boundValues = {10, 100, 10., M_PI, 0.};
+  shapeConfig.boundValues = {10, 100, 10., std::numbers::pi, 0.};
   shapeConfig.transform =
       Acts::Transform3{Acts::Transform3::Identity()}.pretranslate(
           Acts::Vector3(0., 0., -800.));
@@ -222,9 +223,9 @@ BOOST_AUTO_TEST_CASE(BarrelVolumeWithSurfaces) {
       Acts::Experimental::ProtoBinning{Acts::BinningValue::binZ,
                                        Acts::AxisBoundaryType::Bound, -480.,
                                        480., 14u, 1u},
-      Acts::Experimental::ProtoBinning(Acts::BinningValue::binPhi,
-                                       Acts::AxisBoundaryType::Closed, -M_PI,
-                                       M_PI, 32u, 1u)};
+      Acts::Experimental::ProtoBinning(
+          Acts::BinningValue::binPhi, Acts::AxisBoundaryType::Closed,
+          -std::numbers::pi, std::numbers::pi, 32u, 1u)};
 
   auto barrelBuilder =
       std::make_shared<Acts::Experimental::LayerStructureBuilder>(
@@ -232,7 +233,7 @@ BOOST_AUTO_TEST_CASE(BarrelVolumeWithSurfaces) {
                                            Acts::Logging::VERBOSE));
 
   Acts::Experimental::VolumeStructureBuilder::Config shapeConfig;
-  shapeConfig.boundValues = {60., 80., 800., M_PI, 0.};
+  shapeConfig.boundValues = {60., 80., 800., std::numbers::pi, 0.};
   shapeConfig.boundsType = Acts::VolumeBounds::BoundsType::eCylinder;
 
   auto shapeBuilder =
diff --git a/Tests/UnitTests/Plugins/ActSVG/GridSvgConverterTests.cpp b/Tests/UnitTests/Plugins/ActSVG/GridSvgConverterTests.cpp
index 01ee38ab44b..d1368653f23 100644
--- a/Tests/UnitTests/Plugins/ActSVG/GridSvgConverterTests.cpp
+++ b/Tests/UnitTests/Plugins/ActSVG/GridSvgConverterTests.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2023 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include <boost/test/unit_test.hpp>
 
@@ -17,6 +17,7 @@
 
 #include <fstream>
 #include <memory>
+#include <numbers>
 #include <string>
 #include <vector>
 
@@ -206,7 +207,7 @@ BOOST_AUTO_TEST_CASE(ClosedCylinderGridZPhi) {
 
   // z-phi Axes & Grid
   Axis axisZ(AxisBound, -200., 200., 3);
-  Axis axisPhi(AxisClosed, -M_PI, M_PI, 6);
+  Axis axisPhi(AxisClosed, -std::numbers::pi, std::numbers::pi, 6);
   Grid gridZPhi(Type<std::tuple<GlobalBin, LocalBin>>, axisZ, axisPhi);
 
   Svg::GridConverter::Options cOptions;
@@ -285,7 +286,7 @@ BOOST_AUTO_TEST_CASE(ClosedDiscGridRPhi) {
 
   // r-phi Axes & Grid
   Axis axisR(AxisBound, 100., 400., 3);
-  Axis axisPhi(AxisClosed, -M_PI, M_PI, 4);
+  Axis axisPhi(AxisClosed, -std::numbers::pi, std::numbers::pi, 4);
   Grid gridRPhi(Type<std::tuple<GlobalBin, LocalBin>>, axisR, axisPhi);
 
   Svg::GridConverter::Options cOptions;
diff --git a/Tests/UnitTests/Plugins/ActSVG/IndexedSurfacesSvgConverterTests.cpp b/Tests/UnitTests/Plugins/ActSVG/IndexedSurfacesSvgConverterTests.cpp
index 1f4bcebd77f..f7f7e247bbb 100644
--- a/Tests/UnitTests/Plugins/ActSVG/IndexedSurfacesSvgConverterTests.cpp
+++ b/Tests/UnitTests/Plugins/ActSVG/IndexedSurfacesSvgConverterTests.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2023 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include <boost/test/unit_test.hpp>
 
@@ -20,6 +20,7 @@
 #include "Acts/Utilities/Grid.hpp"
 #include "Acts/Utilities/GridAxisGenerators.hpp"
 
+#include <numbers>
 #include <tuple>
 
 using namespace Acts;
@@ -42,7 +43,7 @@ IndexedSurfacesConverter::Options generateDrawOptions() {
   sensitiveStyle.highlights = {"onmouseover", "onmouseout"};
   sensitiveStyle.strokeWidth = 0.5;
   sensitiveStyle.strokeColor = {0, 0, 0};
-  sensitiveStyle.nSegments = 72u;
+  sensitiveStyle.quarterSegments = 72u;
   std::pair<GeometryIdentifier, Style> allSensitives = {GeometryIdentifier(0u),
                                                         sensitiveStyle};
 
@@ -77,7 +78,8 @@ BOOST_AUTO_TEST_CASE(RingDisc1D) {
   IndexedSurfacesGenerator<decltype(rSurfaces), IndexedSurfacesNavigation>
       irSurfaces{rSurfaces, {}, {BinningValue::binPhi}};
 
-  GridAxisGenerators::EqClosed aGenerator{{-M_PI, M_PI}, 44u};
+  GridAxisGenerators::EqClosed aGenerator{{-std::numbers::pi, std::numbers::pi},
+                                          44u};
   PolyhedronReferenceGenerator<1u, true> rGenerator;
 
   auto indexedRing = irSurfaces(tContext, aGenerator, rGenerator);
@@ -102,7 +104,8 @@ BOOST_AUTO_TEST_CASE(RingDisc1DWithSupport) {
   IndexedSurfacesGenerator<decltype(rSurfaces), IndexedSurfacesNavigation>
       irSurfaces{rSurfaces, {rSurfaces.size() - 1u}, {BinningValue::binPhi}};
 
-  GridAxisGenerators::EqClosed aGenerator{{-M_PI, M_PI}, 44u};
+  GridAxisGenerators::EqClosed aGenerator{{-std::numbers::pi, std::numbers::pi},
+                                          44u};
   PolyhedronReferenceGenerator<1u, true> rGenerator;
 
   auto indexedRing = irSurfaces(tContext, aGenerator, rGenerator);
@@ -129,7 +132,7 @@ BOOST_AUTO_TEST_CASE(RingDisc2D) {
       irSurfaces{rSurfaces, {}, {BinningValue::binR, BinningValue::binPhi}};
 
   GridAxisGenerators::VarBoundEqClosed aGenerator{
-      {24., 74., 110.}, {-M_PI, M_PI}, 44u};
+      {24., 74., 110.}, {-std::numbers::pi, std::numbers::pi}, 44u};
   PolyhedronReferenceGenerator<1u, true> rGenerator;
 
   auto indexedRing = irSurfaces(tContext, aGenerator, rGenerator);
@@ -161,7 +164,7 @@ BOOST_AUTO_TEST_CASE(RingDisc2DFine) {
       irSurfaces{rSurfaces, {}, {BinningValue::binR, BinningValue::binPhi}};
 
   GridAxisGenerators::EqBoundEqClosed aGenerator{
-      {24., 152}, 8u, {-M_PI, M_PI}, 88u};
+      {24., 152}, 8u, {-std::numbers::pi, std::numbers::pi}, 88u};
 
   PolyhedronReferenceGenerator<1u, true> rGenerator;
   auto indexedRing = irSurfaces(tContext, aGenerator, rGenerator);
@@ -194,7 +197,7 @@ BOOST_AUTO_TEST_CASE(RingDisc2DFineExpanded) {
           rSurfaces, {}, {BinningValue::binR, BinningValue::binPhi}, {2u, 4u}};
 
   GridAxisGenerators::EqBoundEqClosed aGenerator{
-      {24., 152}, 8u, {-M_PI, M_PI}, 88u};
+      {24., 152}, 8u, {-std::numbers::pi, std::numbers::pi}, 88u};
   PolyhedronReferenceGenerator<1u, true> rGenerator;
 
   auto indexedRing = irSurfaces(tContext, aGenerator, rGenerator);
@@ -216,7 +219,7 @@ BOOST_AUTO_TEST_CASE(Cylinder2D) {
           surfaces, {}, {BinningValue::binZ, BinningValue::binPhi}, {1u, 1u}};
 
   GridAxisGenerators::EqBoundEqClosed aGenerator{
-      {-500., 500}, 28, {-M_PI, M_PI}, 52u};
+      {-500., 500}, 28, {-std::numbers::pi, std::numbers::pi}, 52u};
   PolyhedronReferenceGenerator<1u, true> rGenerator;
 
   auto indexedCylinder = icSurfaces(tContext, aGenerator, rGenerator);
diff --git a/Tests/UnitTests/Plugins/ActSVG/LayerSvgConverterTests.cpp b/Tests/UnitTests/Plugins/ActSVG/LayerSvgConverterTests.cpp
index 38f4a49df56..de022263c73 100644
--- a/Tests/UnitTests/Plugins/ActSVG/LayerSvgConverterTests.cpp
+++ b/Tests/UnitTests/Plugins/ActSVG/LayerSvgConverterTests.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2022 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include <boost/test/unit_test.hpp>
 
@@ -24,6 +24,7 @@
 
 #include <fstream>
 #include <memory>
+#include <numbers>
 #include <vector>
 
 BOOST_AUTO_TEST_SUITE(ActSvg)
@@ -45,16 +46,17 @@ void setupTools() {
 
 std::shared_ptr<Acts::Layer> generateDiscLayer(Acts::ActsScalar rInner,
                                                Acts::ActsScalar rOuter,
-                                               unsigned int nSegments,
+                                               unsigned int quarterSegments,
                                                unsigned int nRings,
                                                bool useTrapezoids = false) {
   // Some preparations
   setupTools();
+  unsigned int fullSegments = 4 * quarterSegments;
   std::vector<std::shared_ptr<const Acts::Surface>> moduleSurfaces;
-  Acts::ActsScalar phiStep = 2 * M_PI / nSegments;
+  Acts::ActsScalar phiStep = 2 * std::numbers::pi / fullSegments;
   Acts::ActsScalar rStep = (rOuter - rInner) / nRings;
   // Reserve & fill
-  moduleSurfaces.reserve(nSegments * nRings);
+  moduleSurfaces.reserve(fullSegments * nRings);
   // Radial disc
   if (!useTrapezoids) {
     for (unsigned int ir = 0; ir < nRings; ++ir) {
@@ -62,7 +64,7 @@ std::shared_ptr<Acts::Layer> generateDiscLayer(Acts::ActsScalar rInner,
       rBounds = std::make_shared<Acts::RadialBounds>(
           rInner + ir * rStep - 0.025 * rInner,
           rInner + (ir + 1u) * rStep + 0.025 * rInner, 0.55 * phiStep, 0.);
-      for (unsigned int is = 0; is < nSegments; ++is) {
+      for (unsigned int is = 0; is < fullSegments; ++is) {
         // Place the module
         auto placement = Acts::Transform3::Identity();
         if ((is % 2) != 0u) {
@@ -82,16 +84,16 @@ std::shared_ptr<Acts::Layer> generateDiscLayer(Acts::ActsScalar rInner,
       Acts::ActsScalar yHalf = rStep * 0.5125;
 
       Acts::ActsScalar xHalfMin =
-          1.15 * (rInner + ir * rStep) * M_PI / nSegments;
+          1.15 * (rInner + ir * rStep) * std::numbers::pi / fullSegments;
       Acts::ActsScalar xHalfMax =
-          1.15 * (rInner + (ir + 1) * rStep) * M_PI / nSegments;
+          1.15 * (rInner + (ir + 1) * rStep) * std::numbers::pi / fullSegments;
 
       std::shared_ptr<const Acts::TrapezoidBounds> tBounds =
           std::make_shared<const Acts::TrapezoidBounds>(xHalfMin, xHalfMax,
                                                         yHalf);
-      for (unsigned int is = 0; is < nSegments; ++is) {
+      for (unsigned int is = 0; is < fullSegments; ++is) {
         // Setting the phi
-        Acts::ActsScalar cphi = -M_PI + is * phiStep;
+        Acts::ActsScalar cphi = -std::numbers::pi + is * phiStep;
         Acts::Vector3 center(radius * std::cos(cphi), radius * std::sin(cphi),
                              (is % 2) * 2 + (ir % 2) * 5);
         // Local axis system
@@ -111,7 +113,7 @@ std::shared_ptr<Acts::Layer> generateDiscLayer(Acts::ActsScalar rInner,
     }
   }
   // Let's create the disc layer
-  return lCreator->discLayer(tgContext, moduleSurfaces, nRings, nSegments);
+  return lCreator->discLayer(tgContext, moduleSurfaces, nRings, fullSegments);
 }
 
 }  // namespace
@@ -125,7 +127,7 @@ BOOST_AUTO_TEST_CASE(DiscLayerRadialSvg) {
   discLayerStyle.highlights = {"mouseover", "mouseout"};
   discLayerStyle.strokeColor = {25, 25, 25};
   discLayerStyle.strokeWidth = 0.5;
-  discLayerStyle.nSegments = 72u;
+  discLayerStyle.quarterSegments = 72u;
 
   Acts::GeometryIdentifier geoID{0};
 
@@ -155,7 +157,7 @@ BOOST_AUTO_TEST_CASE(DiscLayerTrapezoidSvg) {
   discLayerStyle.highlights = {"mouseover", "mouseout"};
   discLayerStyle.strokeColor = {25, 25, 25};
   discLayerStyle.strokeWidth = 0.5;
-  discLayerStyle.nSegments = 72u;
+  discLayerStyle.quarterSegments = 72u;
 
   Acts::GeometryIdentifier geoID{0};
 
@@ -185,7 +187,7 @@ BOOST_AUTO_TEST_CASE(CylinderLayerSvg) {
   cylinderLayerStyle.highlights = {"mouseover", "mouseout"};
   cylinderLayerStyle.strokeColor = {25, 25, 25};
   cylinderLayerStyle.strokeWidth = 0.5;
-  cylinderLayerStyle.nSegments = 72u;
+  cylinderLayerStyle.quarterSegments = 72u;
 
   Acts::GeometryIdentifier geoID{0};
 
diff --git a/Tests/UnitTests/Plugins/ActSVG/PortalSvgConverterTests.cpp b/Tests/UnitTests/Plugins/ActSVG/PortalSvgConverterTests.cpp
index 9d73ebbc681..9fb1fdffa40 100644
--- a/Tests/UnitTests/Plugins/ActSVG/PortalSvgConverterTests.cpp
+++ b/Tests/UnitTests/Plugins/ActSVG/PortalSvgConverterTests.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2023 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include <boost/test/unit_test.hpp>
 
@@ -35,7 +35,7 @@ BOOST_AUTO_TEST_CASE(CylinderPortalsSvg) {
   portalStyle.highlights = {};
   portalStyle.strokeColor = {25, 25, 25};
   portalStyle.strokeWidth = 0.5;
-  portalStyle.nSegments = 72u;
+  portalStyle.quarterSegments = 72u;
 
   Acts::ActsScalar rInner = 10.;
   Acts::ActsScalar rOuter = 100.;
@@ -94,7 +94,7 @@ BOOST_AUTO_TEST_CASE(CylinderContainerPortalsSvg) {
   portalStyle.highlights = {};
   portalStyle.strokeColor = {25, 25, 25};
   portalStyle.strokeWidth = 0.5;
-  portalStyle.nSegments = 72u;
+  portalStyle.quarterSegments = 72u;
 
   Acts::ActsScalar rInner = 10.;
   Acts::ActsScalar rMiddle = 100.;
diff --git a/Tests/UnitTests/Plugins/ActSVG/SurfaceSvgConverterTests.cpp b/Tests/UnitTests/Plugins/ActSVG/SurfaceSvgConverterTests.cpp
index 08c973230e1..686f7bbb765 100644
--- a/Tests/UnitTests/Plugins/ActSVG/SurfaceSvgConverterTests.cpp
+++ b/Tests/UnitTests/Plugins/ActSVG/SurfaceSvgConverterTests.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2022 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include <boost/test/unit_test.hpp>
 
@@ -21,6 +21,7 @@
 #include "Acts/Surfaces/TrapezoidBounds.hpp"
 
 #include <fstream>
+#include <numbers>
 
 BOOST_AUTO_TEST_SUITE(ActSvg)
 
@@ -74,7 +75,7 @@ BOOST_AUTO_TEST_CASE(PlanarSurfaces) {
   planarStyle.highlightColor = {255, 153, 51};
   planarStyle.highlights = {"mouseover", "mouseout"};
   planarStyle.strokeWidth = 0.5;
-  planarStyle.nSegments = 0u;
+  planarStyle.quarterSegments = 0u;
 
   // Rectangle case
   auto rectangleBounds = std::make_shared<Acts::RectangleBounds>(36., 64.);
@@ -92,7 +93,7 @@ BOOST_AUTO_TEST_CASE(PlanarSurfaces) {
   runPlanarTests(*trapeozidPlane, planarStyle, "trapezoid");
 
   // Trapezoid case shifted and rotated
-  Acts::ActsScalar phi = 0.125 * M_PI;
+  Acts::ActsScalar phi = std::numbers::pi / 8.;
   Acts::ActsScalar radius = 150.;
   Acts::Vector3 center(radius * std::cos(phi), radius * std::sin(phi), 0.);
 
@@ -169,7 +170,7 @@ BOOST_AUTO_TEST_CASE(DiscSurfaces) {
   discStyle.highlightColor = {153, 204, 0};
   discStyle.highlights = {"mouseover", "mouseout"};
   discStyle.strokeWidth = 0.5;
-  discStyle.nSegments = 72u;
+  discStyle.quarterSegments = 72u;
 
   auto transform = Acts::Transform3::Identity();
   transform.pretranslate(Acts::Vector3{20., 20., 100.});
@@ -187,8 +188,8 @@ BOOST_AUTO_TEST_CASE(DiscSurfaces) {
   runPlanarTests(*fullRing, discStyle, "full_ring");
 
   // Sectorial disc case
-  auto sectoralDiscBounds =
-      std::make_shared<Acts::RadialBounds>(0., 64., 0.25 * M_PI, 0.5 * M_PI);
+  auto sectoralDiscBounds = std::make_shared<Acts::RadialBounds>(
+      0., 64., std::numbers::pi / 4., std::numbers::pi / 2.);
   auto sectoralDisc = Acts::Surface::makeShared<Acts::DiscSurface>(
       transform, sectoralDiscBounds);
   runPlanarTests(*sectoralDisc, discStyle, "full_disc");
diff --git a/Tests/UnitTests/Plugins/ActSVG/TrackingGeometrySvgConverterTests.cpp b/Tests/UnitTests/Plugins/ActSVG/TrackingGeometrySvgConverterTests.cpp
index f984984846e..3b7a8856875 100644
--- a/Tests/UnitTests/Plugins/ActSVG/TrackingGeometrySvgConverterTests.cpp
+++ b/Tests/UnitTests/Plugins/ActSVG/TrackingGeometrySvgConverterTests.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2022 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include <boost/test/unit_test.hpp>
 
@@ -32,7 +32,7 @@ BOOST_AUTO_TEST_CASE(CylindricalTrackingGeometrySvg) {
   cylinderLayerStyle.highlights = {"mouseover", "mouseout"};
   cylinderLayerStyle.strokeColor = {25, 25, 25};
   cylinderLayerStyle.strokeWidth = 0.5;
-  cylinderLayerStyle.nSegments = 72u;
+  cylinderLayerStyle.quarterSegments = 72u;
 
   Acts::GeometryIdentifier geoID{0};
 
diff --git a/Tests/UnitTests/Plugins/CMakeLists.txt b/Tests/UnitTests/Plugins/CMakeLists.txt
index a3ce9f373ef..c9f412032e4 100644
--- a/Tests/UnitTests/Plugins/CMakeLists.txt
+++ b/Tests/UnitTests/Plugins/CMakeLists.txt
@@ -1,5 +1,6 @@
 add_subdirectory_if(ActSVG ACTS_BUILD_PLUGIN_ACTSVG)
 add_subdirectory_if(Cuda ACTS_BUILD_PLUGIN_CUDA)
+add_subdirectory_if(Detray ACTS_BUILD_PLUGIN_TRACCC)
 add_subdirectory_if(DD4hep ACTS_BUILD_PLUGIN_DD4HEP)
 add_subdirectory_if(ExaTrkX ACTS_BUILD_PLUGIN_EXATRKX)
 add_subdirectory_if(Geant4 ACTS_BUILD_PLUGIN_GEANT4)
@@ -9,3 +10,5 @@ add_subdirectory_if(TGeo ACTS_BUILD_PLUGIN_TGEO)
 add_subdirectory_if(EDM4hep ACTS_BUILD_PLUGIN_EDM4HEP)
 add_subdirectory_if(FpeMonitoring ACTS_BUILD_PLUGIN_FPEMON)
 add_subdirectory_if(Podio ACTS_BUILD_PLUGIN_PODIO)
+add_subdirectory_if(Covfie ACTS_BUILD_PLUGIN_TRACCC)
+add_subdirectory_if(Hashing ACTS_BUILD_PLUGIN_HASHING)
diff --git a/Tests/UnitTests/Plugins/Covfie/CMakeLists.txt b/Tests/UnitTests/Plugins/Covfie/CMakeLists.txt
new file mode 100644
index 00000000000..a95e6b65e25
--- /dev/null
+++ b/Tests/UnitTests/Plugins/Covfie/CMakeLists.txt
@@ -0,0 +1,2 @@
+set(unittest_extra_libraries ActsPluginCovfie)
+add_unittest(CovfieFieldConversion CovfieFieldConversionTest.cpp)
diff --git a/Tests/UnitTests/Plugins/Covfie/CovfieFieldConversionTest.cpp b/Tests/UnitTests/Plugins/Covfie/CovfieFieldConversionTest.cpp
new file mode 100644
index 00000000000..2db6c78ae1b
--- /dev/null
+++ b/Tests/UnitTests/Plugins/Covfie/CovfieFieldConversionTest.cpp
@@ -0,0 +1,217 @@
+// This file is part of the ACTS project.
+//
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
+//
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
+
+// Acts include(s)
+#include "Acts/Definitions/Units.hpp"
+#include "Acts/MagneticField/ConstantBField.hpp"
+#include "Acts/MagneticField/MagneticFieldContext.hpp"
+#include "Acts/MagneticField/MagneticFieldProvider.hpp"
+#include "Acts/MagneticField/SolenoidBField.hpp"
+
+// Covfie Plugin include(s)
+#include "Acts/Plugins/Covfie/FieldConversion.hpp"
+
+// System include(s)
+#include <array>
+#include <cmath>
+#include <sstream>
+#include <vector>
+
+// Boost include(s)
+#include <boost/test/unit_test.hpp>
+
+using namespace Acts::UnitLiterals;
+
+template <typename view_t, typename iterator_t>
+void checkMagneticFieldEqual(const Acts::MagneticFieldProvider& fieldProvider,
+                             Acts::MagneticFieldProvider::Cache& cache,
+                             view_t view, iterator_t points,
+                             float error_margin_half_width) {
+  for (auto point : points) {
+    auto x = point[0], y = point[1], z = point[2];
+
+    auto lookupResult = fieldProvider.getField(Acts::Vector3{x, y, z}, cache);
+    if (!lookupResult.ok()) {
+      throw std::runtime_error{"Field lookup failure"};
+    }
+    auto actsValueX = (*lookupResult)[0], actsValueY = (*lookupResult)[1],
+         actsValueZ = (*lookupResult)[2];
+
+    auto covfieValues = view.at(x, y, z);
+    auto covfieValueX = covfieValues[0], covfieValueY = covfieValues[1],
+         covfieValueZ = covfieValues[2];
+
+    auto isEqual =
+        std::abs(covfieValueX - actsValueX) <= error_margin_half_width &&
+        std::abs(covfieValueY - actsValueY) <= error_margin_half_width &&
+        std::abs(covfieValueZ - actsValueZ) <= error_margin_half_width;
+
+    std::stringstream ss;
+    ss << "Fields are not equal at position (" << x << ", " << y << ", " << z
+       << "). Acts: (" << actsValueX << ", " << actsValueY << ", " << actsValueZ
+       << "), Covfie: (" << covfieValueX << ", " << covfieValueY << ", "
+       << covfieValueZ << ")" << std::endl;
+
+    BOOST_CHECK_MESSAGE(isEqual, ss.str());
+  }
+}
+
+BOOST_AUTO_TEST_SUITE(CovfiePlugin)
+
+BOOST_AUTO_TEST_CASE(InterpolatedMagneticField1) {
+  auto localToGlobalBin_xyz = [](std::array<std::size_t, 3> binsXYZ,
+                                 std::array<std::size_t, 3> nBinsXYZ) {
+    return (binsXYZ.at(0) * (nBinsXYZ.at(1) * nBinsXYZ.at(2)) +
+            binsXYZ.at(1) * nBinsXYZ.at(2) + binsXYZ.at(2));
+  };
+
+  std::vector<double> xPos = {0., 1., 2., 3.};
+  std::vector<double> yPos = {0., 1., 2., 3.};
+  std::vector<double> zPos = {0., 1., 2., 3.};
+
+  std::vector<Acts::Vector3> bField_xyz;
+  for (int i = 0; i < 64; i++) {
+    bField_xyz.push_back(Acts::Vector3(i, i, i));
+  }
+
+  Acts::MagneticFieldContext fieldContext;
+  auto actsField = Acts::fieldMapXYZ(localToGlobalBin_xyz, xPos, yPos, zPos,
+                                     bField_xyz, 1, 1, false);
+  Acts::MagneticFieldProvider::Cache cache = actsField.makeCache(fieldContext);
+
+  Acts::CovfiePlugin::InterpolatedField field =
+      Acts::CovfiePlugin::covfieField(actsField);
+  typename Acts::CovfiePlugin::InterpolatedField::view_t view(field);
+
+  std::array<std::array<float, 3>, 14> points = {{
+      {0.f, 0.f, 0.f},
+      {1.f, 1.f, 1.f},
+      {2.f, 2.f, 2.f},
+      {2.9f, 2.9f, 2.9f},
+      {1.2f, 2.5f, 0.8f},
+      {0.7f, 1.9f, 2.3f},
+      {2.1f, 0.3f, 1.5f},
+      {0.4f, 2.8f, 2.9f},
+      {1.6f, 1.2f, 0.5f},
+      {2.3f, 0.6f, 2.2f},
+      {1.1f, 2.7f, 1.3f},
+      {0.9f, 1.4f, 2.7f},
+      {2.4f, 1.8f, 0.9f},
+      {0.6f, 2.2f, 2.1f},
+  }};
+
+  checkMagneticFieldEqual(actsField, cache, view, points, 0.0001);
+}
+
+BOOST_AUTO_TEST_CASE(InterpolatedMagneticField2) {
+  auto localToGlobalBin_xyz = [](std::array<std::size_t, 3> binsXYZ,
+                                 std::array<std::size_t, 3> nBinsXYZ) {
+    return (binsXYZ.at(0) * (nBinsXYZ.at(1) * nBinsXYZ.at(2)) +
+            binsXYZ.at(1) * nBinsXYZ.at(2) + binsXYZ.at(2));
+  };
+
+  std::vector<double> xPos = {8., 12., 16., 20.};
+  std::vector<double> yPos = {8., 12., 16., 20.};
+  std::vector<double> zPos = {8., 12., 16., 20.};
+
+  std::vector<Acts::Vector3> bField_xyz;
+  for (int i = 0; i < 64; i++) {
+    bField_xyz.push_back(Acts::Vector3(i, i * i * 0.01, i));
+  }
+
+  Acts::MagneticFieldContext fieldContext;
+  auto actsField = Acts::fieldMapXYZ(localToGlobalBin_xyz, xPos, yPos, zPos,
+                                     bField_xyz, 1, 1, false);
+  Acts::MagneticFieldProvider::Cache cache = actsField.makeCache(fieldContext);
+
+  Acts::CovfiePlugin::InterpolatedField field =
+      Acts::CovfiePlugin::covfieField(actsField);
+  typename Acts::CovfiePlugin::InterpolatedField::view_t view(field);
+
+  std::array<std::array<float, 3>, 14> points = {{
+      {8.f, 8.f, 8.f},
+      {12.f, 12.f, 12.f},
+      {16.f, 16.f, 16.f},
+      {19.9, 19.9, 19.9},
+      {8.1f, 10.2f, 12.3f},
+      {9.4f, 11.5f, 13.6f},
+      {10.7f, 12.8f, 14.9f},
+      {11.0f, 13.1f, 15.2f},
+      {12.3f, 14.4f, 16.5f},
+      {13.6f, 15.7f, 17.8f},
+      {14.9f, 16.0f, 18.1f},
+      {16.2f, 17.3f, 19.4f},
+      {17.5f, 18.6f, 19.7f},
+      {18.8f, 19.9f, 14.0f},
+  }};
+
+  checkMagneticFieldEqual(actsField, cache, view, points, 0.0001f);
+}
+
+BOOST_AUTO_TEST_CASE(ConstantMagneticField1) {
+  Acts::ConstantBField actsField(Acts::Vector3{1.3f, 2.5f, 2.f});
+  Acts::MagneticFieldContext ctx;
+  Acts::MagneticFieldProvider::Cache cache = actsField.makeCache(ctx);
+
+  Acts::CovfiePlugin::ConstantField field =
+      Acts::CovfiePlugin::covfieField(actsField);
+  typename Acts::CovfiePlugin::ConstantField::view_t view(field);
+
+  std::array<std::array<float, 3>, 13> points = {{
+      {8.f, 8.f, 8.f},
+      {12.f, 12.f, 12.f},
+      {16.f, 16.f, 16.f},
+      {8.1f, 10.2f, 12.3f},
+      {9.4f, 11.5f, 13.6f},
+      {10.7f, 12.8f, 14.9f},
+      {11.0f, 13.1f, 15.2f},
+      {12.3f, 14.4f, 16.5f},
+      {13.6f, 15.7f, 17.8f},
+      {14.9f, 16.0f, 18.1f},
+      {16.2f, 17.3f, 19.4f},
+      {17.5f, 18.6f, 19.7f},
+      {18.8f, 19.9f, 14.0f},
+  }};
+
+  checkMagneticFieldEqual(actsField, cache, view, points, 0.0001f);
+}
+
+BOOST_AUTO_TEST_CASE(SolenoidBField1) {
+  Acts::SolenoidBField::Config cfg{};
+  cfg.length = 5.8_m;
+  cfg.radius = (2.56 + 2.46) * 0.5 * 0.5_m;
+  cfg.nCoils = 1154;
+  cfg.bMagCenter = 2_T;
+  Acts::SolenoidBField actsField(cfg);
+  Acts::MagneticFieldContext ctx;
+  Acts::MagneticFieldProvider::Cache cache = actsField.makeCache(ctx);
+
+  Acts::CovfiePlugin::InterpolatedField field = Acts::CovfiePlugin::covfieField(
+      actsField, cache, {21UL, 21UL, 21UL}, {0., 0., 0.}, {20., 20., 20.});
+  typename Acts::CovfiePlugin::InterpolatedField::view_t view(field);
+
+  std::array<std::array<float, 3>, 13> points = {{
+      {8.f, 8.f, 8.f},
+      {12.f, 12.f, 12.f},
+      {16.f, 16.f, 16.f},
+      {8.1f, 10.2f, 12.3f},
+      {9.4f, 11.5f, 13.6f},
+      {10.7f, 12.8f, 14.9f},
+      {11.0f, 13.1f, 15.2f},
+      {12.3f, 14.4f, 16.5f},
+      {13.6f, 15.7f, 17.8f},
+      {14.9f, 16.0f, 18.1f},
+      {16.2f, 17.3f, 19.4f},
+      {17.5f, 18.6f, 19.7f},
+      {18.8f, 19.9f, 14.0f},
+  }};
+
+  checkMagneticFieldEqual(actsField, cache, view, points, 0.0001);
+}
+
+BOOST_AUTO_TEST_SUITE_END()
diff --git a/Tests/UnitTests/Plugins/Cuda/Seeding/ATLASCuts.hpp b/Tests/UnitTests/Plugins/Cuda/Seeding/ATLASCuts.hpp
index b13421c14ca..27dec35c80f 100644
--- a/Tests/UnitTests/Plugins/Cuda/Seeding/ATLASCuts.hpp
+++ b/Tests/UnitTests/Plugins/Cuda/Seeding/ATLASCuts.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2023 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
diff --git a/Tests/UnitTests/Plugins/Cuda/Seeding/SeedFinderCudaTest.cpp b/Tests/UnitTests/Plugins/Cuda/Seeding/SeedFinderCudaTest.cpp
index d30ed0d398e..1b31f083fd8 100644
--- a/Tests/UnitTests/Plugins/Cuda/Seeding/SeedFinderCudaTest.cpp
+++ b/Tests/UnitTests/Plugins/Cuda/Seeding/SeedFinderCudaTest.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2024 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include "Acts/Plugins/Cuda/Seeding/SeedFinder.hpp"
 #include "Acts/Seeding/BinnedGroup.hpp"
diff --git a/Tests/UnitTests/Plugins/Cuda/Seeding/SpacePoint.hpp b/Tests/UnitTests/Plugins/Cuda/Seeding/SpacePoint.hpp
index baaeb3754b7..765de8e7973 100755
--- a/Tests/UnitTests/Plugins/Cuda/Seeding/SpacePoint.hpp
+++ b/Tests/UnitTests/Plugins/Cuda/Seeding/SpacePoint.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2018 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
diff --git a/Tests/UnitTests/Plugins/Cuda/Seeding2/CommandLineArguments.cpp b/Tests/UnitTests/Plugins/Cuda/Seeding2/CommandLineArguments.cpp
index 16ee26f60dc..14413db10db 100644
--- a/Tests/UnitTests/Plugins/Cuda/Seeding2/CommandLineArguments.cpp
+++ b/Tests/UnitTests/Plugins/Cuda/Seeding2/CommandLineArguments.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2020 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 // Local include(s).
 #include "CommandLineArguments.hpp"
diff --git a/Tests/UnitTests/Plugins/Cuda/Seeding2/CommandLineArguments.hpp b/Tests/UnitTests/Plugins/Cuda/Seeding2/CommandLineArguments.hpp
index 6050daf6486..a33ccf4330a 100644
--- a/Tests/UnitTests/Plugins/Cuda/Seeding2/CommandLineArguments.hpp
+++ b/Tests/UnitTests/Plugins/Cuda/Seeding2/CommandLineArguments.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2020 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
diff --git a/Tests/UnitTests/Plugins/Cuda/Seeding2/ReadSeedFile.cpp b/Tests/UnitTests/Plugins/Cuda/Seeding2/ReadSeedFile.cpp
index 0de5b7385fe..5bd1c8c8830 100644
--- a/Tests/UnitTests/Plugins/Cuda/Seeding2/ReadSeedFile.cpp
+++ b/Tests/UnitTests/Plugins/Cuda/Seeding2/ReadSeedFile.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2020 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 // Local include(s).
 #include "ReadSeedFile.hpp"
diff --git a/Tests/UnitTests/Plugins/Cuda/Seeding2/ReadSeedFile.hpp b/Tests/UnitTests/Plugins/Cuda/Seeding2/ReadSeedFile.hpp
index c76d6c682c1..50e335e6c0a 100644
--- a/Tests/UnitTests/Plugins/Cuda/Seeding2/ReadSeedFile.hpp
+++ b/Tests/UnitTests/Plugins/Cuda/Seeding2/ReadSeedFile.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2020 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
diff --git a/Tests/UnitTests/Plugins/Cuda/Seeding2/TestDeviceCuts.cu b/Tests/UnitTests/Plugins/Cuda/Seeding2/TestDeviceCuts.cu
index 97befe31688..30a3595a129 100644
--- a/Tests/UnitTests/Plugins/Cuda/Seeding2/TestDeviceCuts.cu
+++ b/Tests/UnitTests/Plugins/Cuda/Seeding2/TestDeviceCuts.cu
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2020 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 // Local include(s).
 #include "TestDeviceCuts.hpp"
diff --git a/Tests/UnitTests/Plugins/Cuda/Seeding2/TestDeviceCuts.hpp b/Tests/UnitTests/Plugins/Cuda/Seeding2/TestDeviceCuts.hpp
index d356ecf5358..5577be26275 100644
--- a/Tests/UnitTests/Plugins/Cuda/Seeding2/TestDeviceCuts.hpp
+++ b/Tests/UnitTests/Plugins/Cuda/Seeding2/TestDeviceCuts.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2020 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
diff --git a/Tests/UnitTests/Plugins/Cuda/Seeding2/TestHostCuts.cpp b/Tests/UnitTests/Plugins/Cuda/Seeding2/TestHostCuts.cpp
index 6f8a6dd2b4d..51411f59b42 100644
--- a/Tests/UnitTests/Plugins/Cuda/Seeding2/TestHostCuts.cpp
+++ b/Tests/UnitTests/Plugins/Cuda/Seeding2/TestHostCuts.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2020 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 // Local include(s).
 #include "TestHostCuts.hpp"
diff --git a/Tests/UnitTests/Plugins/Cuda/Seeding2/TestHostCuts.hpp b/Tests/UnitTests/Plugins/Cuda/Seeding2/TestHostCuts.hpp
index 7b26dd0dd5a..4dc96e10767 100644
--- a/Tests/UnitTests/Plugins/Cuda/Seeding2/TestHostCuts.hpp
+++ b/Tests/UnitTests/Plugins/Cuda/Seeding2/TestHostCuts.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2023 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
diff --git a/Tests/UnitTests/Plugins/Cuda/Seeding2/TestSpacePoint.cpp b/Tests/UnitTests/Plugins/Cuda/Seeding2/TestSpacePoint.cpp
index e94d00d6a82..212db6a0005 100644
--- a/Tests/UnitTests/Plugins/Cuda/Seeding2/TestSpacePoint.cpp
+++ b/Tests/UnitTests/Plugins/Cuda/Seeding2/TestSpacePoint.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2020 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 // Local include(s).
 #include "TestSpacePoint.hpp"
diff --git a/Tests/UnitTests/Plugins/Cuda/Seeding2/TestSpacePoint.hpp b/Tests/UnitTests/Plugins/Cuda/Seeding2/TestSpacePoint.hpp
index 329a3d65215..ee9e7b0e826 100644
--- a/Tests/UnitTests/Plugins/Cuda/Seeding2/TestSpacePoint.hpp
+++ b/Tests/UnitTests/Plugins/Cuda/Seeding2/TestSpacePoint.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2020 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
diff --git a/Tests/UnitTests/Plugins/Cuda/Seeding2/main.cpp b/Tests/UnitTests/Plugins/Cuda/Seeding2/main.cpp
index ba927acde5c..b63d549e37f 100644
--- a/Tests/UnitTests/Plugins/Cuda/Seeding2/main.cpp
+++ b/Tests/UnitTests/Plugins/Cuda/Seeding2/main.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2024 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 // Local include(s).
 #include "CommandLineArguments.hpp"
diff --git a/Tests/UnitTests/Plugins/Cuda/Utilities/CudaMostSimplifiedTests.cu b/Tests/UnitTests/Plugins/Cuda/Utilities/CudaMostSimplifiedTests.cu
index 238b4b48cc3..a457ec873ba 100644
--- a/Tests/UnitTests/Plugins/Cuda/Utilities/CudaMostSimplifiedTests.cu
+++ b/Tests/UnitTests/Plugins/Cuda/Utilities/CudaMostSimplifiedTests.cu
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2020 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include <boost/test/unit_test.hpp>
 
diff --git a/Tests/UnitTests/Plugins/Cuda/Utilities/CudaTests.cu b/Tests/UnitTests/Plugins/Cuda/Utilities/CudaTests.cu
index 54b199ac494..b736bc11de6 100644
--- a/Tests/UnitTests/Plugins/Cuda/Utilities/CudaTests.cu
+++ b/Tests/UnitTests/Plugins/Cuda/Utilities/CudaTests.cu
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2020 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include <boost/test/unit_test.hpp>
 
diff --git a/Tests/UnitTests/Plugins/DD4hep/DD4hepCylinderLayerStructureTests.cpp b/Tests/UnitTests/Plugins/DD4hep/DD4hepCylinderLayerStructureTests.cpp
index cf1550a5886..994ac8bb927 100644
--- a/Tests/UnitTests/Plugins/DD4hep/DD4hepCylinderLayerStructureTests.cpp
+++ b/Tests/UnitTests/Plugins/DD4hep/DD4hepCylinderLayerStructureTests.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2023 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include <boost/test/unit_test.hpp>
 
diff --git a/Tests/UnitTests/Plugins/DD4hep/DD4hepCylindricalDetectorTests.cpp b/Tests/UnitTests/Plugins/DD4hep/DD4hepCylindricalDetectorTests.cpp
index 5620ca8d585..4a6925a2633 100644
--- a/Tests/UnitTests/Plugins/DD4hep/DD4hepCylindricalDetectorTests.cpp
+++ b/Tests/UnitTests/Plugins/DD4hep/DD4hepCylindricalDetectorTests.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2023 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include <boost/test/unit_test.hpp>
 
diff --git a/Tests/UnitTests/Plugins/DD4hep/DD4hepDetectorElementTests.cpp b/Tests/UnitTests/Plugins/DD4hep/DD4hepDetectorElementTests.cpp
index 9f4b44e51f1..104c10b5ad4 100644
--- a/Tests/UnitTests/Plugins/DD4hep/DD4hepDetectorElementTests.cpp
+++ b/Tests/UnitTests/Plugins/DD4hep/DD4hepDetectorElementTests.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2023 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include <boost/test/unit_test.hpp>
 
diff --git a/Tests/UnitTests/Plugins/DD4hep/DD4hepDiscLayerStructureTests.cpp b/Tests/UnitTests/Plugins/DD4hep/DD4hepDiscLayerStructureTests.cpp
index 504691d496f..40ad97f1ebf 100644
--- a/Tests/UnitTests/Plugins/DD4hep/DD4hepDiscLayerStructureTests.cpp
+++ b/Tests/UnitTests/Plugins/DD4hep/DD4hepDiscLayerStructureTests.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2023 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include <boost/test/unit_test.hpp>
 
diff --git a/Tests/UnitTests/Plugins/DD4hep/DD4hepTestsHelper.cpp b/Tests/UnitTests/Plugins/DD4hep/DD4hepTestsHelper.cpp
index 8077382eff8..44286f0ace4 100644
--- a/Tests/UnitTests/Plugins/DD4hep/DD4hepTestsHelper.cpp
+++ b/Tests/UnitTests/Plugins/DD4hep/DD4hepTestsHelper.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2023 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include "DD4hepTestsHelper.hpp"
 
diff --git a/Tests/UnitTests/Plugins/DD4hep/DD4hepTestsHelper.hpp b/Tests/UnitTests/Plugins/DD4hep/DD4hepTestsHelper.hpp
index 52dd1cde058..12be9136046 100644
--- a/Tests/UnitTests/Plugins/DD4hep/DD4hepTestsHelper.hpp
+++ b/Tests/UnitTests/Plugins/DD4hep/DD4hepTestsHelper.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2023 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
diff --git a/Tests/UnitTests/Plugins/DD4hep/LayerFactory.cpp b/Tests/UnitTests/Plugins/DD4hep/LayerFactory.cpp
index 8c14a59bdb9..f079686d33b 100644
--- a/Tests/UnitTests/Plugins/DD4hep/LayerFactory.cpp
+++ b/Tests/UnitTests/Plugins/DD4hep/LayerFactory.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2022 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include "Acts/Geometry/VolumeBounds.hpp"
 #include "Acts/Plugins/DD4hep/DD4hepBinningHelpers.hpp"
diff --git a/Tests/UnitTests/Plugins/DD4hep/PrimitivesFactory.cpp b/Tests/UnitTests/Plugins/DD4hep/PrimitivesFactory.cpp
index 44eaee325dc..52539c058af 100644
--- a/Tests/UnitTests/Plugins/DD4hep/PrimitivesFactory.cpp
+++ b/Tests/UnitTests/Plugins/DD4hep/PrimitivesFactory.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2023 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include "Acts/Plugins/DD4hep/DD4hepConversionHelpers.hpp"
 
diff --git a/Tests/UnitTests/Plugins/DD4hep/XMLFragments.hpp b/Tests/UnitTests/Plugins/DD4hep/XMLFragments.hpp
index 32ebd8740b1..4eee687f3a5 100644
--- a/Tests/UnitTests/Plugins/DD4hep/XMLFragments.hpp
+++ b/Tests/UnitTests/Plugins/DD4hep/XMLFragments.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2023 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
diff --git a/Tests/UnitTests/Plugins/Detray/CMakeLists.txt b/Tests/UnitTests/Plugins/Detray/CMakeLists.txt
new file mode 100644
index 00000000000..f621fa1261d
--- /dev/null
+++ b/Tests/UnitTests/Plugins/Detray/CMakeLists.txt
@@ -0,0 +1,4 @@
+set(unittest_extra_libraries ActsPluginDetray)
+add_unittest(DetrayConverter DetrayConverterTests.cpp)
+add_unittest(DetrayGeometryConverter DetrayGeometryConverterTests.cpp)
+add_unittest(DetrayMaterialConverter DetrayMaterialConverterTests.cpp)
diff --git a/Tests/UnitTests/Plugins/Detray/DetrayConverterTests.cpp b/Tests/UnitTests/Plugins/Detray/DetrayConverterTests.cpp
new file mode 100644
index 00000000000..15e2dbc3b31
--- /dev/null
+++ b/Tests/UnitTests/Plugins/Detray/DetrayConverterTests.cpp
@@ -0,0 +1,51 @@
+// This file is part of the ACTS project.
+//
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
+//
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
+
+#include <boost/test/unit_test.hpp>
+
+#include "Acts/Plugins/Detray/DetrayConverter.hpp"
+#include "Acts/Tests/CommonHelpers/CylindricalDetector.hpp"
+
+#include <vecmem/memory/host_memory_resource.hpp>
+#include <vecmem/memory/memory_resource.hpp>
+
+using namespace Acts;
+using namespace Acts::Experimental;
+using namespace Acts::Test;
+
+GeometryContext tContext;
+
+auto logger =
+    Acts::getDefaultLogger("DetrayConverterTests", Acts::Logging::INFO);
+
+BOOST_AUTO_TEST_SUITE(DetrayConversion)
+
+BOOST_AUTO_TEST_CASE(DetrayConversion) {
+  // Load the detector from the Test utilities
+  auto detector = buildCylindricalDetector(tContext);
+
+  DetrayConverter::Options options;
+
+  vecmem::host_memory_resource memoryResource;
+
+  auto detrayDetector =
+      DetrayConverter(std::move(logger))
+          .convert<>(tContext, *detector, memoryResource, options);
+
+  BOOST_CHECK_EQUAL(detrayDetector.volumes().size(), 6u);
+  // Beampipe : original 3 -> split into 5
+  // Nec:       original 4 -> split into 6
+  // Layer0:    original 4 -> left  at   4
+  // Layer1:    original 4 -> left  at   4
+  // Layer2:    original 4 -> left  at   4
+  // Pec:       original 4 -> split into 6
+  // + portals to itself, one per volume 6
+  BOOST_CHECK_EQUAL(detrayDetector.portals().size(), 35u);
+}
+
+BOOST_AUTO_TEST_SUITE_END()
diff --git a/Tests/UnitTests/Plugins/Detray/DetrayGeometryConverterTests.cpp b/Tests/UnitTests/Plugins/Detray/DetrayGeometryConverterTests.cpp
new file mode 100644
index 00000000000..96f0f174ce0
--- /dev/null
+++ b/Tests/UnitTests/Plugins/Detray/DetrayGeometryConverterTests.cpp
@@ -0,0 +1,172 @@
+// This file is part of the ACTS project.
+//
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
+//
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
+
+#include <boost/test/unit_test.hpp>
+
+#include "Acts/Definitions/Algebra.hpp"
+#include "Acts/Detector/DetectorVolume.hpp"
+#include "Acts/Geometry/CylinderVolumeBounds.hpp"
+#include "Acts/Geometry/GeometryContext.hpp"
+#include "Acts/Plugins/Detray/DetrayGeometryConverter.hpp"
+#include "Acts/Surfaces/CylinderBounds.hpp"
+#include "Acts/Surfaces/CylinderSurface.hpp"
+#include "Acts/Surfaces/Surface.hpp"
+#include "Acts/Tests/CommonHelpers/CylindricalDetector.hpp"
+#include "Acts/Tests/CommonHelpers/FloatComparisons.hpp"
+#include "Acts/Utilities/BinningType.hpp"
+#include "Acts/Utilities/Enumerate.hpp"
+#include "Acts/Utilities/Logger.hpp"
+
+#include <memory>
+#include <numbers>
+#include <vector>
+
+#include <detray/io/frontend/payloads.hpp>
+
+using namespace Acts;
+using namespace Acts::Experimental;
+using namespace Acts::Test;
+
+GeometryContext tContext;
+
+auto logger =
+    Acts::getDefaultLogger("DetrayGeometryConverterTests", Acts::Logging::INFO);
+
+BOOST_AUTO_TEST_SUITE(DetrayConversion)
+
+BOOST_AUTO_TEST_CASE(DetrayTransformConversion) {
+  auto transform = Transform3::Identity();
+  transform.pretranslate(Vector3(1., 2., 3.));
+  transform.rotate(Eigen::AngleAxisd(std::numbers::pi / 2., Vector3::UnitZ()));
+
+  detray::io::transform_payload payload =
+      DetrayGeometryConverter::convertTransform(transform);
+  // Transform is correctly translated
+  CHECK_CLOSE_ABS(payload.tr[0u], 1.,
+                  std::numeric_limits<Acts::ActsScalar>::epsilon());
+  CHECK_CLOSE_ABS(payload.tr[1u], 2.,
+                  std::numeric_limits<Acts::ActsScalar>::epsilon());
+  CHECK_CLOSE_ABS(payload.tr[2u], 3.,
+                  std::numeric_limits<Acts::ActsScalar>::epsilon());
+  // Rotation is correctly translated
+  RotationMatrix3 rotation = transform.rotation().transpose();
+  CHECK_CLOSE_ABS(payload.rot[0u], rotation(0, 0),
+                  std::numeric_limits<Acts::ActsScalar>::epsilon());
+  CHECK_CLOSE_ABS(payload.rot[1u], rotation(0, 1),
+                  std::numeric_limits<Acts::ActsScalar>::epsilon());
+  CHECK_CLOSE_ABS(payload.rot[2u], rotation(0, 2),
+                  std::numeric_limits<Acts::ActsScalar>::epsilon());
+  CHECK_CLOSE_ABS(payload.rot[3u], rotation(1, 0),
+                  std::numeric_limits<Acts::ActsScalar>::epsilon());
+  CHECK_CLOSE_ABS(payload.rot[4u], rotation(1, 1),
+                  std::numeric_limits<Acts::ActsScalar>::epsilon());
+  CHECK_CLOSE_ABS(payload.rot[5u], rotation(1, 2),
+                  std::numeric_limits<Acts::ActsScalar>::epsilon());
+  CHECK_CLOSE_ABS(payload.rot[6u], rotation(2, 0),
+                  std::numeric_limits<Acts::ActsScalar>::epsilon());
+  CHECK_CLOSE_ABS(payload.rot[7u], rotation(2, 1),
+                  std::numeric_limits<Acts::ActsScalar>::epsilon());
+  CHECK_CLOSE_ABS(payload.rot[8u], rotation(2, 2),
+                  std::numeric_limits<Acts::ActsScalar>::epsilon());
+}
+
+BOOST_AUTO_TEST_CASE(DetrayMaskConversion) {
+  // Placeholder, masks are tested for the moment through the DetrayJsonHelper,
+  // this code will move over here when the "toJsonDetray" will become
+  // deprecated
+}
+
+BOOST_AUTO_TEST_CASE(DetraySurfaceConversion) {
+  // Translate a cylinder
+  auto cylinderSurface = Acts::Surface::makeShared<CylinderSurface>(
+      Transform3::Identity(), std::make_shared<CylinderBounds>(20., 100.));
+
+  auto sgID = Acts::GeometryIdentifier().setSensitive(1);
+  cylinderSurface->assignGeometryId(sgID);
+
+  detray::io::surface_payload payload = DetrayGeometryConverter::convertSurface(
+      tContext, *cylinderSurface, false);
+
+  // Check the payload
+  BOOST_CHECK(!payload.index_in_coll.has_value());
+  BOOST_CHECK(payload.mask.shape == detray::io::shape_id::cylinder2);
+  BOOST_CHECK_EQUAL(payload.source, sgID.value());
+  BOOST_CHECK(payload.type == detray::surface_id::e_sensitive);
+}
+
+BOOST_AUTO_TEST_CASE(DetrayVolumeConversion) {
+  auto beampipe = std::make_shared<
+      CylindricalVolumeBuilder<CylinderSurface, CylinderBounds>>(
+      Transform3::Identity(), CylinderVolumeBounds(0., 50., 400.),
+      CylinderBounds(25., 380.), "BeamPipe");
+
+  auto [volumes, portals, rootVolumes] = beampipe->construct(tContext);
+  auto volume = volumes.front();
+
+  std::vector<const Experimental::DetectorVolume*> dVolumes = {volume.get()};
+  DetrayConversionUtils::Cache cCache(dVolumes);
+
+  detray::io::volume_payload payload = DetrayGeometryConverter::convertVolume(
+      cCache, tContext, *volume, *logger);
+
+  // Check the volume payload
+  BOOST_CHECK(payload.name == "BeamPipe");
+  BOOST_CHECK(payload.type == detray::volume_id::e_cylinder);
+  // 3 portals and 1 surface contained
+  BOOST_CHECK_EQUAL(payload.surfaces.size(), 4u);
+  // Let's count
+  std::size_t nPortals = 0;
+  for (auto& s : payload.surfaces) {
+    if (s.type == detray::surface_id::e_portal) {
+      nPortals++;
+    }
+  }
+  BOOST_CHECK_EQUAL(nPortals, 3u);
+  // No acceleration structure for the moment
+  BOOST_CHECK(!payload.acc_links.has_value());
+}
+
+BOOST_AUTO_TEST_CASE(CylindricalDetector) {
+  // Load the detector from the Test utilities
+  auto detector = buildCylindricalDetector(tContext);
+
+  // Convert the detector
+  DetrayConversionUtils::Cache cCache(detector->volumes());
+
+  detray::io::detector_payload payload =
+      DetrayGeometryConverter::convertDetector(cCache, tContext, *detector,
+                                               *logger);
+
+  // Test the payload - we have six volumes
+  BOOST_CHECK_EQUAL(payload.volumes.size(), 6u);
+
+  // The first volume is the beam pipe volume
+  BOOST_CHECK_EQUAL(payload.volumes[0].name, "BeamPipe");
+  // The beam pipe should have 1 surface and 5 portals
+  // the original cylinder cover is split into 3 portals
+  BOOST_CHECK_EQUAL(payload.volumes[0].surfaces.size(), 6u);
+  // The second volume should be the negative endcap
+  BOOST_CHECK_EQUAL(payload.volumes[1].name, "NegativeEndcap");
+  // The negative endcap should have 1 surface and 6 portals
+  BOOST_CHECK_EQUAL(payload.volumes[1].surfaces.size(), 7u);
+  // Barrel 0,1,2 follow
+  BOOST_CHECK_EQUAL(payload.volumes[2].name, "Barrel0");
+  BOOST_CHECK_EQUAL(payload.volumes[3].name, "Barrel1");
+  BOOST_CHECK_EQUAL(payload.volumes[4].name, "Barrel2");
+  // No portal splitting for those, hence we remain at 5 surfaces
+  // i.e. 4 portals and one surface
+  BOOST_CHECK_EQUAL(payload.volumes[2].surfaces.size(), 5u);
+  BOOST_CHECK_EQUAL(payload.volumes[3].surfaces.size(), 5u);
+  BOOST_CHECK_EQUAL(payload.volumes[4].surfaces.size(), 5u);
+  // Finally the positive endcap
+  BOOST_CHECK_EQUAL(payload.volumes[5].name, "PositiveEndcap");
+  // The positive endcap should have again 1 surface and 6 portals
+  BOOST_CHECK_EQUAL(payload.volumes[5].surfaces.size(), 7u);
+}
+
+BOOST_AUTO_TEST_SUITE_END()
diff --git a/Tests/UnitTests/Plugins/Detray/DetrayMaterialConverterTests.cpp b/Tests/UnitTests/Plugins/Detray/DetrayMaterialConverterTests.cpp
new file mode 100644
index 00000000000..1e3f18ea512
--- /dev/null
+++ b/Tests/UnitTests/Plugins/Detray/DetrayMaterialConverterTests.cpp
@@ -0,0 +1,439 @@
+// This file is part of the ACTS project.
+//
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
+//
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
+
+#include <boost/test/unit_test.hpp>
+
+#include "Acts/Geometry/GeometryContext.hpp"
+#include "Acts/Material/BinnedSurfaceMaterial.hpp"
+#include "Acts/Material/HomogeneousSurfaceMaterial.hpp"
+#include "Acts/Material/Material.hpp"
+#include "Acts/Material/MaterialSlab.hpp"
+#include "Acts/Plugins/Detray/DetrayConversionUtils.hpp"
+#include "Acts/Plugins/Detray/DetrayMaterialConverter.hpp"
+#include "Acts/Tests/CommonHelpers/CylindricalDetector.hpp"
+#include "Acts/Tests/CommonHelpers/FloatComparisons.hpp"
+#include "Acts/Utilities/BinUtility.hpp"
+#include "Acts/Utilities/Logger.hpp"
+
+#include <numbers>
+
+#include <detray/definitions/grid_axis.hpp>
+#include <detray/io/frontend/payloads.hpp>
+
+auto tContext = Acts::GeometryContext();
+
+BOOST_AUTO_TEST_SUITE(DetrayConversion)
+
+// These tests check the conversion to the payload objects, the full test
+auto materialSlab12345 =
+    Acts::MaterialSlab(Acts::Material::fromMolarDensity(1, 2, 3, 4, 5), 1.);
+
+auto materialSlab678910 =
+    Acts::MaterialSlab(Acts::Material::fromMolarDensity(6, 7, 8, 9, 10), 2.);
+
+auto materialSlab54321 =
+    Acts::MaterialSlab(Acts::Material::fromMolarDensity(5, 4, 3, 2, 1), 3.);
+
+auto materialSlab109876 =
+    Acts::MaterialSlab(Acts::Material::fromMolarDensity(10, 9, 8, 7, 6), 4.);
+
+auto logger =
+    Acts::getDefaultLogger("DetrayMaterialConverterTests", Acts::Logging::INFO);
+
+BOOST_AUTO_TEST_CASE(DetrayMaterialSlabConversion) {
+  // Convert the material slab
+  detray::io::material_slab_payload payload =
+      Acts::DetrayMaterialConverter::convertMaterialSlab(materialSlab12345);
+
+  // Material type should be set to slab
+  BOOST_CHECK(payload.type ==
+              detray::io::material_slab_payload::mat_type::slab);
+  // Thickness should be set to one
+  CHECK_CLOSE_ABS(payload.thickness, 1.,
+                  std::numeric_limits<Acts::ActsScalar>::epsilon());
+  // Index in collection not set at this simple conversion
+  BOOST_CHECK(!payload.index_in_coll.has_value());
+  // Material parameters in detray are (x0, l0, ar, z, mass_density,
+  // molar_density, solid/liquid/etc. flag ... ignored currently)
+  CHECK_CLOSE_ABS(payload.mat.params[0u], 1.,
+                  std::numeric_limits<Acts::ActsScalar>::epsilon());
+  CHECK_CLOSE_ABS(payload.mat.params[1u], 2.,
+                  std::numeric_limits<Acts::ActsScalar>::epsilon());
+  CHECK_CLOSE_ABS(payload.mat.params[2u], 3.,
+                  std::numeric_limits<Acts::ActsScalar>::epsilon());
+  CHECK_CLOSE_ABS(payload.mat.params[3u], 4.,
+                  std::numeric_limits<Acts::ActsScalar>::epsilon());
+  BOOST_CHECK_NE(payload.mat.params[4u], payload.mat.params[5u]);
+  CHECK_CLOSE_ABS(payload.mat.params[5u], 5.,
+                  std::numeric_limits<Acts::ActsScalar>::epsilon());
+  CHECK_CLOSE_ABS(payload.mat.params[6u], 0.,
+                  std::numeric_limits<Acts::ActsScalar>::epsilon());
+}
+
+BOOST_AUTO_TEST_CASE(DetrayHomogeneousMaterialConversion) {
+  // Convert homogeneous material
+  Acts::HomogeneousSurfaceMaterial homMaterial(materialSlab12345);
+
+  detray::io::grid_payload<detray::io::material_slab_payload,
+                           detray::io::material_id>
+      payload = Acts::DetrayMaterialConverter::convertGridSurfaceMaterial(
+          homMaterial, *logger);
+
+  // Check the payload - empty, this should run through another converter
+  BOOST_CHECK(payload.axes.empty());
+  BOOST_CHECK(payload.bins.empty());
+}
+
+BOOST_AUTO_TEST_CASE(DetrayBinnedMaterialConversionX) {
+  // Create a binned material in 4 bins in x direction
+  Acts::BinUtility binUtility(4u, -2., 2., Acts::BinningOption::open,
+                              Acts::BinningValue::binX);
+
+  std::vector<Acts::MaterialSlab> materialSlabs = {
+      materialSlab12345, materialSlab678910, materialSlab54321,
+      materialSlab109876};
+
+  auto binnedMaterial = Acts::BinnedSurfaceMaterial(
+      binUtility, {materialSlabs}, 0., Acts::MappingType::Default);
+
+  detray::io::grid_payload<detray::io::material_slab_payload,
+                           detray::io::material_id>
+      payload = Acts::DetrayMaterialConverter::convertGridSurfaceMaterial(
+          binnedMaterial, *logger);
+  // Check the payload
+  // - we fake 2D always for detray to minimize the number of containers
+  // - four material payloads in the grid
+  BOOST_CHECK_EQUAL(payload.axes.size(), 2u);
+  BOOST_CHECK_EQUAL(payload.bins.size(), 4u);
+  BOOST_CHECK(!payload.transform.has_value());
+  BOOST_CHECK(payload.grid_link.type ==
+              detray::io::material_id::rectangle2_map);
+  // x-axis
+  BOOST_CHECK(payload.axes[0u].label == detray::axis::label::e_x);
+  BOOST_CHECK_EQUAL(payload.axes[0u].bins, 4u);
+  CHECK_CLOSE_ABS(payload.axes[0u].edges[0u], -2.,
+                  std::numeric_limits<Acts::ActsScalar>::epsilon());
+  CHECK_CLOSE_ABS(payload.axes[0u].edges[1u], 2.,
+                  std::numeric_limits<Acts::ActsScalar>::epsilon());
+  BOOST_CHECK(payload.axes[0u].binning == detray::axis::binning::e_regular);
+  BOOST_CHECK(payload.axes[0u].bounds == detray::axis::bounds::e_closed);
+  // axis is dummy
+  BOOST_CHECK(payload.axes[1u].label == detray::axis::label::e_y);
+  BOOST_CHECK_EQUAL(payload.axes[1u].bins, 1u);
+
+  // Check the local indices
+  BOOST_CHECK_EQUAL(payload.bins[0u].loc_index.size(), 2u);
+
+  // Bins should be : [0,0], [1,0], [2,0], [3,0]
+  //
+  // [0,0] - materialSlab12345
+  BOOST_CHECK_EQUAL(payload.bins[0u].loc_index[0], 0u);
+  BOOST_CHECK_EQUAL(payload.bins[0u].loc_index[1], 0u);
+  BOOST_CHECK_EQUAL(payload.bins[0u].content[0u].mat.params[0u], 1.);
+  // [1,0] - materialSlab678910
+  BOOST_CHECK_EQUAL(payload.bins[1u].loc_index[0], 1u);
+  BOOST_CHECK_EQUAL(payload.bins[1u].loc_index[1], 0u);
+  BOOST_CHECK_EQUAL(payload.bins[1u].content[0u].mat.params[0u], 6.);
+  // [2,0] - materialSlab54321
+  BOOST_CHECK_EQUAL(payload.bins[2u].loc_index[0], 2u);
+  BOOST_CHECK_EQUAL(payload.bins[2u].loc_index[1], 0u);
+  BOOST_CHECK_EQUAL(payload.bins[2u].content[0u].mat.params[0u], 5.);
+  // [3,0] - materialSlab109876
+  BOOST_CHECK_EQUAL(payload.bins[3u].loc_index[0], 3u);
+  BOOST_CHECK_EQUAL(payload.bins[3u].loc_index[1], 0u);
+  BOOST_CHECK_EQUAL(payload.bins[3u].content[0u].mat.params[0u], 10.);
+}
+
+BOOST_AUTO_TEST_CASE(DetrayBinnedMaterialConversionY) {
+  // Create a binned material in 4 bins in y direction
+  Acts::BinUtility binUtility(4u, -2., 2., Acts::BinningOption::open,
+                              Acts::BinningValue::binY);
+
+  std::vector<Acts::MaterialSlab> materialSlabs = {
+      materialSlab12345, materialSlab678910, materialSlab54321,
+      materialSlab109876};
+
+  auto binnedMaterial = Acts::BinnedSurfaceMaterial(
+      binUtility, {materialSlabs}, 0., Acts::MappingType::Default);
+
+  detray::io::grid_payload<detray::io::material_slab_payload,
+                           detray::io::material_id>
+      payload = Acts::DetrayMaterialConverter::convertGridSurfaceMaterial(
+          binnedMaterial, *logger);
+  // Check the payload
+  // - we fake 2D always for detray to minimize the number of containers
+  // - four material payloads in the grid
+  BOOST_CHECK_EQUAL(payload.axes.size(), 2u);
+  BOOST_CHECK_EQUAL(payload.bins.size(), 4u);
+  BOOST_CHECK(!payload.transform.has_value());
+  BOOST_CHECK(payload.grid_link.type ==
+              detray::io::material_id::rectangle2_map);
+  // x-axis is dummy
+  BOOST_CHECK(payload.axes[0u].label == detray::axis::label::e_x);
+  BOOST_CHECK_EQUAL(payload.axes[0u].bins, 1u);
+  // y-axis
+  BOOST_CHECK(payload.axes[1u].label == detray::axis::label::e_y);
+  BOOST_CHECK_EQUAL(payload.axes[1u].bins, 4u);
+  CHECK_CLOSE_ABS(payload.axes[1u].edges[0u], -2.,
+                  std::numeric_limits<Acts::ActsScalar>::epsilon());
+  CHECK_CLOSE_ABS(payload.axes[1u].edges[1u], 2.,
+                  std::numeric_limits<Acts::ActsScalar>::epsilon());
+  BOOST_CHECK(payload.axes[1u].binning == detray::axis::binning::e_regular);
+  BOOST_CHECK(payload.axes[1u].bounds == detray::axis::bounds::e_closed);
+
+  // Check the local indices
+  BOOST_CHECK_EQUAL(payload.bins[0u].loc_index.size(), 2u);
+
+  // Bins should be : [0,0], [0,1], [0,2], [0,3]
+  //
+  // [0, 0] - materialSlab12345
+  BOOST_CHECK_EQUAL(payload.bins[0u].loc_index[0], 0u);
+  BOOST_CHECK_EQUAL(payload.bins[0u].loc_index[1], 0u);
+  BOOST_CHECK_EQUAL(payload.bins[0u].content[0u].mat.params[0u], 1.);
+  // [0, 1]  - materialSlab678910
+  BOOST_CHECK_EQUAL(payload.bins[1u].loc_index[0], 0u);
+  BOOST_CHECK_EQUAL(payload.bins[1u].loc_index[1], 1u);
+  BOOST_CHECK_EQUAL(payload.bins[1u].content[0u].mat.params[0u], 6.);
+  // [0, 2] - materialSlab54321
+  BOOST_CHECK_EQUAL(payload.bins[2u].loc_index[0], 0u);
+  BOOST_CHECK_EQUAL(payload.bins[2u].loc_index[1], 2u);
+  BOOST_CHECK_EQUAL(payload.bins[2u].content[0u].mat.params[0u], 5.);
+  // [0, 3] - materialSlab109876
+  BOOST_CHECK_EQUAL(payload.bins[3u].loc_index[0], 0u);
+  BOOST_CHECK_EQUAL(payload.bins[3u].loc_index[1], 3u);
+  BOOST_CHECK_EQUAL(payload.bins[3u].content[0u].mat.params[0u], 10.);
+}
+
+BOOST_AUTO_TEST_CASE(DetrayBinnedMaterialConversionXY) {
+  // Create a binned material in 2 x2  bins in x-y direction
+  Acts::BinUtility binUtility(2u, -1., 1., Acts::BinningOption::open,
+                              Acts::BinningValue::binX);
+  binUtility += Acts::BinUtility(2u, -2., 2., Acts::BinningOption::open,
+                                 Acts::BinningValue::binY);
+
+  std::vector<Acts::MaterialSlab> materialSlabs0 = {materialSlab12345,
+                                                    materialSlab678910};
+  std::vector<Acts::MaterialSlab> materialSlabs1 = {materialSlab54321,
+                                                    materialSlab109876};
+
+  auto binnedMaterial =
+      Acts::BinnedSurfaceMaterial(binUtility, {materialSlabs0, materialSlabs1},
+                                  0., Acts::MappingType::Default);
+
+  detray::io::grid_payload<detray::io::material_slab_payload,
+                           detray::io::material_id>
+      payload = Acts::DetrayMaterialConverter::convertGridSurfaceMaterial(
+          binnedMaterial, *logger);
+  // Check the payload
+  BOOST_CHECK_EQUAL(payload.axes.size(), 2u);
+  BOOST_CHECK(payload.grid_link.type ==
+              detray::io::material_id::rectangle2_map);
+  //  The axis are real x-y
+  BOOST_CHECK(payload.axes[0u].label == detray::axis::label::e_x);
+  BOOST_CHECK(payload.axes[1u].label == detray::axis::label::e_y);
+  BOOST_CHECK_EQUAL(payload.bins.size(), 4u);
+  BOOST_CHECK(!payload.transform.has_value());
+  // 2 bins in x, 2 bins in y
+  BOOST_CHECK_EQUAL(payload.axes[0u].bins, 2u);
+  BOOST_CHECK_EQUAL(payload.axes[1u].bins, 2u);
+
+  // Check the local indices
+  BOOST_CHECK_EQUAL(payload.bins[0u].loc_index.size(), 2u);
+
+  // Bins should be : [0,0], [1,0], [0,1], [1,1]
+  //
+  // [0, 0] - materialSlab12345
+  BOOST_CHECK_EQUAL(payload.bins[0u].loc_index[0], 0u);
+  BOOST_CHECK_EQUAL(payload.bins[0u].loc_index[1], 0u);
+  BOOST_CHECK_EQUAL(payload.bins[0u].content[0u].mat.params[0u], 1.);
+  // [0, 1]  - materialSlab678910
+  BOOST_CHECK_EQUAL(payload.bins[1u].loc_index[0], 1u);
+  BOOST_CHECK_EQUAL(payload.bins[1u].loc_index[1], 0u);
+  BOOST_CHECK_EQUAL(payload.bins[1u].content[0u].mat.params[0u], 6.);
+  // [1, 0] - materialSlab54321
+  BOOST_CHECK_EQUAL(payload.bins[2u].loc_index[0], 0u);
+  BOOST_CHECK_EQUAL(payload.bins[2u].loc_index[1], 1u);
+  BOOST_CHECK_EQUAL(payload.bins[2u].content[0u].mat.params[0u], 5.);
+  // [1, 1] - materialSlab109876
+  BOOST_CHECK_EQUAL(payload.bins[3u].loc_index[0], 1u);
+  BOOST_CHECK_EQUAL(payload.bins[3u].loc_index[1], 1u);
+  BOOST_CHECK_EQUAL(payload.bins[3u].content[0u].mat.params[0u], 10.);
+}
+
+BOOST_AUTO_TEST_CASE(DetrayBinnedMaterialConversionR) {
+  // Create a binned material in 4 bins (irregularly) in r direction
+  std::vector<float> binEdges = {0., 5., 10., 15., 20.};
+  Acts::BinUtility binUtility(binEdges, Acts::BinningOption::open,
+                              Acts::BinningValue::binR);
+
+  std::vector<Acts::MaterialSlab> materialSlabs = {
+      materialSlab12345, materialSlab678910, materialSlab54321,
+      materialSlab109876};
+
+  auto binnedMaterial = Acts::BinnedSurfaceMaterial(
+      binUtility, {materialSlabs}, 0., Acts::MappingType::Default);
+
+  detray::io::grid_payload<detray::io::material_slab_payload,
+                           detray::io::material_id>
+      payload = Acts::DetrayMaterialConverter::convertGridSurfaceMaterial(
+          binnedMaterial, *logger);
+  // Check the payload
+  // - we fake 2D always for detray to minimize the number of containers
+  // - four material payloads in the grid
+  BOOST_CHECK_EQUAL(payload.axes.size(), 2u);
+  BOOST_CHECK_EQUAL(payload.bins.size(), 4u);
+  BOOST_CHECK(!payload.transform.has_value());
+  BOOST_CHECK(payload.grid_link.type == detray::io::material_id::ring2_map);
+  // first axis is r axis
+  BOOST_CHECK(payload.axes[0u].label == detray::axis::label::e_r);
+  BOOST_CHECK_EQUAL(payload.axes[0u].bins, 4u);
+  BOOST_CHECK_EQUAL(payload.axes[0u].edges.size(), 5);
+  CHECK_CLOSE_ABS(payload.axes[0u].edges.front(), 0.,
+                  std::numeric_limits<Acts::ActsScalar>::epsilon());
+  CHECK_CLOSE_ABS(payload.axes[0u].edges.back(), 20.,
+                  std::numeric_limits<Acts::ActsScalar>::epsilon());
+  BOOST_CHECK(payload.axes[0u].binning == detray::axis::binning::e_irregular);
+  BOOST_CHECK(payload.axes[0u].bounds == detray::axis::bounds::e_closed);
+  // 2nd-axis is dummy
+  BOOST_CHECK(payload.axes[1u].label == detray::axis::label::e_phi);
+  BOOST_CHECK(payload.axes[1u].bounds == detray::axis::bounds::e_circular);
+}
+
+BOOST_AUTO_TEST_CASE(DetrayBinnedMaterialConversionRPhi) {
+  // Create a binned material in 2 bins - irregularly in r, 2 bins in phi
+  std::vector<float> binEdges = {0., 5., 20.};
+  Acts::BinUtility binUtility(binEdges, Acts::BinningOption::open,
+                              Acts::BinningValue::binR);
+  binUtility +=
+      Acts::BinUtility(2u, -std::numbers::pi, std::numbers::pi,
+                       Acts::BinningOption::closed, Acts::BinningValue::binPhi);
+
+  std::vector<Acts::MaterialSlab> materialSlabs0 = {materialSlab12345,
+                                                    materialSlab678910};
+  std::vector<Acts::MaterialSlab> materialSlabs1 = {materialSlab54321,
+                                                    materialSlab109876};
+
+  auto binnedMaterial =
+      Acts::BinnedSurfaceMaterial(binUtility, {materialSlabs0, materialSlabs1},
+                                  0., Acts::MappingType::Default);
+
+  detray::io::grid_payload<detray::io::material_slab_payload,
+                           detray::io::material_id>
+      payload = Acts::DetrayMaterialConverter::convertGridSurfaceMaterial(
+          binnedMaterial, *logger);
+  // Check the payload
+  BOOST_CHECK_EQUAL(payload.axes.size(), 2u);
+  BOOST_CHECK_EQUAL(payload.bins.size(), 4u);
+  BOOST_CHECK(!payload.transform.has_value());
+  BOOST_CHECK(payload.grid_link.type == detray::io::material_id::ring2_map);
+  // 2 bins irregularly in r
+  BOOST_CHECK(payload.axes[0u].label == detray::axis::label::e_r);
+  BOOST_CHECK_EQUAL(payload.axes[0u].bins, 2u);
+  BOOST_CHECK(payload.axes[0u].bounds == detray::axis::bounds::e_closed);
+  BOOST_CHECK(payload.axes[0u].binning == detray::axis::binning::e_irregular);
+  // 2bins regularly in phi
+  BOOST_CHECK(payload.axes[1u].label == detray::axis::label::e_phi);
+  BOOST_CHECK_EQUAL(payload.axes[1u].bins, 2u);
+  BOOST_CHECK(payload.axes[1u].bounds == detray::axis::bounds::e_circular);
+  BOOST_CHECK(payload.axes[1u].binning == detray::axis::binning::e_regular);
+}
+
+BOOST_AUTO_TEST_CASE(DetrayBinnedMaterialConversionZ) {
+  // Create a binned material in 4 bins in x direction
+  std::vector<float> binEdges = {-20, 0, 25, 50, 100};
+  Acts::BinUtility binUtility(binEdges, Acts::BinningOption::open,
+                              Acts::BinningValue::binZ);
+
+  std::vector<Acts::MaterialSlab> materialSlabs = {
+      materialSlab12345, materialSlab678910, materialSlab54321,
+      materialSlab109876};
+
+  auto binnedMaterial = Acts::BinnedSurfaceMaterial(
+      binUtility, {materialSlabs}, 0., Acts::MappingType::Default);
+
+  detray::io::grid_payload<detray::io::material_slab_payload,
+                           detray::io::material_id>
+      payload = Acts::DetrayMaterialConverter::convertGridSurfaceMaterial(
+          binnedMaterial, *logger);
+
+  // Check the payload
+  BOOST_CHECK_EQUAL(payload.axes.size(), 2u);
+  BOOST_CHECK_EQUAL(payload.bins.size(), 4u);
+  BOOST_CHECK(!payload.transform.has_value());
+  BOOST_CHECK(payload.grid_link.type ==
+              detray::io::material_id::concentric_cylinder2_map);
+  // 1st-axis is dummy
+  BOOST_CHECK(payload.axes[0u].label == detray::axis::label::e_phi);
+  BOOST_CHECK(payload.axes[0u].bounds == detray::axis::bounds::e_circular);
+  BOOST_CHECK_EQUAL(payload.axes[0u].bins, 1u);
+  // second axis is z axis
+  BOOST_CHECK(payload.axes[1u].label == detray::axis::label::e_z);
+  BOOST_CHECK_EQUAL(payload.axes[1u].bins, 4u);
+  BOOST_CHECK_EQUAL(payload.axes[1u].edges.size(), 5);
+  CHECK_CLOSE_ABS(payload.axes[1u].edges.front(), -20.,
+                  std::numeric_limits<Acts::ActsScalar>::epsilon());
+  CHECK_CLOSE_ABS(payload.axes[1u].edges.back(), 100.,
+                  std::numeric_limits<Acts::ActsScalar>::epsilon());
+  BOOST_CHECK(payload.axes[1u].binning == detray::axis::binning::e_irregular);
+  BOOST_CHECK(payload.axes[1u].bounds == detray::axis::bounds::e_closed);
+}
+
+BOOST_AUTO_TEST_CASE(DetrayBinnedMaterialConversionZPhi) {
+  // Create a binned material in 2 x2  bins in x-y direction
+  Acts::BinUtility binUtility(2u, -1., 1., Acts::BinningOption::open,
+                              Acts::BinningValue::binZ);
+  binUtility +=
+      Acts::BinUtility(2u, -std::numbers::pi, std::numbers::pi,
+                       Acts::BinningOption::closed, Acts::BinningValue::binPhi);
+
+  std::vector<Acts::MaterialSlab> materialSlabs0 = {materialSlab12345,
+                                                    materialSlab678910};
+  std::vector<Acts::MaterialSlab> materialSlabs1 = {materialSlab54321,
+                                                    materialSlab109876};
+
+  auto binnedMaterial =
+      Acts::BinnedSurfaceMaterial(binUtility, {materialSlabs0, materialSlabs1},
+                                  0., Acts::MappingType::Default);
+
+  detray::io::grid_payload<detray::io::material_slab_payload,
+                           detray::io::material_id>
+      payload = Acts::DetrayMaterialConverter::convertGridSurfaceMaterial(
+          binnedMaterial, *logger);
+  // Check the payload
+  BOOST_CHECK_EQUAL(payload.axes.size(), 2u);
+  BOOST_CHECK(payload.grid_link.type ==
+              detray::io::material_id::concentric_cylinder2_map);
+  //  The axis are real aphi-z
+  BOOST_CHECK(payload.axes[0u].label == detray::axis::label::e_phi);
+  BOOST_CHECK(payload.axes[1u].label == detray::axis::label::e_z);
+  BOOST_CHECK_EQUAL(payload.bins.size(), 4u);
+  BOOST_CHECK(!payload.transform.has_value());
+}
+
+BOOST_AUTO_TEST_CASE(DetrayBinnedMaterialConversionInvalid) {
+  // Create a binned material in 4 bins in x direction
+  Acts::BinUtility binUtility(2u, -1., 1., Acts::BinningOption::open,
+                              Acts::BinningValue::binR);
+  binUtility += Acts::BinUtility(2u, -2., 2., Acts::BinningOption::open,
+                                 Acts::BinningValue::binEta);
+
+  std::vector<Acts::MaterialSlab> materialSlabs0 = {materialSlab12345,
+                                                    materialSlab678910};
+  std::vector<Acts::MaterialSlab> materialSlabs1 = {materialSlab54321,
+                                                    materialSlab109876};
+
+  auto binnedMaterial =
+      Acts::BinnedSurfaceMaterial(binUtility, {materialSlabs0, materialSlabs1},
+                                  0., Acts::MappingType::Default);
+
+  BOOST_CHECK_THROW(Acts::DetrayMaterialConverter::convertGridSurfaceMaterial(
+                        binnedMaterial, *logger),
+                    std::invalid_argument);
+}
+
+BOOST_AUTO_TEST_SUITE_END()
diff --git a/Tests/UnitTests/Plugins/EDM4hep/ConvertTrackEDM4hepTest.cpp b/Tests/UnitTests/Plugins/EDM4hep/ConvertTrackEDM4hepTest.cpp
index ffd2ef2e7d4..45ed254ddd0 100644
--- a/Tests/UnitTests/Plugins/EDM4hep/ConvertTrackEDM4hepTest.cpp
+++ b/Tests/UnitTests/Plugins/EDM4hep/ConvertTrackEDM4hepTest.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2023 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include <boost/test/unit_test.hpp>
 
@@ -19,6 +19,7 @@
 #include "Acts/Plugins/EDM4hep/EDM4hepUtil.hpp"
 #include "Acts/Propagator/detail/CovarianceEngine.hpp"
 #include "Acts/Propagator/detail/JacobianEngine.hpp"
+#include "Acts/Surfaces/CurvilinearSurface.hpp"
 #include "Acts/Surfaces/PerigeeSurface.hpp"
 #include "Acts/Surfaces/PlaneSurface.hpp"
 #include "Acts/Surfaces/Surface.hpp"
@@ -29,6 +30,7 @@
 
 #include <algorithm>
 #include <iostream>
+#include <numbers>
 #include <random>
 
 #include <edm4hep/TrackCollection.h>
@@ -39,14 +41,14 @@ BOOST_AUTO_TEST_SUITE(EDM4hepParameterConversion)
 
 BOOST_AUTO_TEST_CASE(JacobianRoundtrip) {
   BoundVector par;
-  par << 1_mm, 5_mm, 0.1, M_PI_2 * 0.9, -1 / 1_GeV, 5_ns;
+  par << 1_mm, 5_mm, 0.1, std::numbers::pi / 2. * 0.9, -1 / 1_GeV, 5_ns;
 
   BoundMatrix cov;
   cov.setIdentity();
 
   double Bz = 2_T;
 
-  double tanLambda = std::tan(M_PI_2 - par[Acts::eBoundTheta]);
+  double tanLambda = std::tan(std::numbers::pi / 2. - par[Acts::eBoundTheta]);
   double omega =
       par[Acts::eBoundQOverP] / std::sin(par[Acts::eBoundTheta]) * Bz;
 
@@ -66,7 +68,7 @@ BOOST_AUTO_TEST_CASE(ConvertTrackParametersToEdm4hepWithPerigee) {
   auto refSurface = Surface::makeShared<PerigeeSurface>(Vector3{50, 30, 20});
 
   BoundVector par;
-  par << 1_mm, 5_mm, 0, M_PI_2, -1 / 1_GeV,
+  par << 1_mm, 5_mm, 0, std::numbers::pi / 2., -1 / 1_GeV,
       5_ns;  // -> perpendicular to perigee and pointing right, should be PCA
 
   BoundMatrix cov;
@@ -106,11 +108,13 @@ BOOST_AUTO_TEST_CASE(ConvertTrackParametersToEdm4hepWithPerigee) {
 }
 
 BOOST_AUTO_TEST_CASE(ConvertTrackParametersToEdm4hepWithOutPerigee) {
-  auto planeSurface = Surface::makeShared<PlaneSurface>(
-      Vector3{50, 30, 20}, Vector3{1, 1, 0.3}.normalized());
+  auto planeSurface =
+      CurvilinearSurface(Vector3{50, 30, 20}, Vector3{1, 1, 0.3}.normalized())
+          .planeSurface();
 
   BoundVector par;
-  par << 1_mm, 5_mm, M_PI / 4., M_PI_2 * 0.9, -1 / 1_GeV, 5_ns;
+  par << 1_mm, 5_mm, std::numbers::pi / 4., std::numbers::pi / 2. * 0.9,
+      -1 / 1_GeV, 5_ns;
 
   BoundMatrix cov;
   cov.setIdentity();
@@ -174,7 +178,7 @@ BOOST_AUTO_TEST_CASE(ConvertTrackParametersToEdm4hepWithPerigeeNoCov) {
   auto refSurface = Surface::makeShared<PerigeeSurface>(Vector3{50, 30, 20});
 
   BoundVector par;
-  par << 1_mm, 5_mm, 0, M_PI_2, -1 / 1_GeV,
+  par << 1_mm, 5_mm, 0, std::numbers::pi / 2., -1 / 1_GeV,
       5_ns;  // -> perpendicular to perigee and pointing right, should be PCA
 
   BoundTrackParameters boundPar{refSurface, par, std::nullopt,
@@ -204,11 +208,13 @@ BOOST_AUTO_TEST_CASE(ConvertTrackParametersToEdm4hepWithPerigeeNoCov) {
 }
 
 BOOST_AUTO_TEST_CASE(ConvertTrackParametersToEdm4hepWithOutPerigeeNoCov) {
-  auto refSurface = Surface::makeShared<PlaneSurface>(
-      Vector3{50, 30, 20}, Vector3{1, 1, 0.3}.normalized());
+  auto refSurface =
+      CurvilinearSurface(Vector3{50, 30, 20}, Vector3{1, 1, 0.3}.normalized())
+          .planeSurface();
 
   BoundVector par;
-  par << 1_mm, 5_mm, M_PI / 4., M_PI_2, -1 / 1_GeV, 5_ns;
+  par << 1_mm, 5_mm, std::numbers::pi / 4., std::numbers::pi / 2., -1 / 1_GeV,
+      5_ns;
 
   BoundTrackParameters boundPar{refSurface, par, std::nullopt,
                                 ParticleHypothesis::pion()};
@@ -271,7 +277,8 @@ BOOST_AUTO_TEST_CASE(RoundTripTests) {
   std::uniform_real_distribution<double> r(0, 1);
   std::uniform_int_distribution<std::uint32_t> nTracks(2, 20);
   std::uniform_int_distribution<std::uint32_t> nTs(1, 20);
-  std::uniform_real_distribution<double> phiDist(-M_PI, M_PI);
+  std::uniform_real_distribution<double> phiDist(-std::numbers::pi,
+                                                 std::numbers::pi);
   std::uniform_real_distribution<double> etaDist(-4, 4);
   std::uniform_real_distribution<double> ptDist(1_MeV, 10_GeV);
   std::uniform_real_distribution<double> qDist(0., 1.);
diff --git a/Tests/UnitTests/Plugins/ExaTrkX/ExaTrkXBoostTrackBuildingTests.cpp b/Tests/UnitTests/Plugins/ExaTrkX/ExaTrkXBoostTrackBuildingTests.cpp
index 7fad2d0b071..e221aaf4847 100644
--- a/Tests/UnitTests/Plugins/ExaTrkX/ExaTrkXBoostTrackBuildingTests.cpp
+++ b/Tests/UnitTests/Plugins/ExaTrkX/ExaTrkXBoostTrackBuildingTests.cpp
@@ -1,15 +1,16 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2022 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include <boost/test/unit_test.hpp>
 
 #include "Acts/Plugins/ExaTrkX/BoostTrackBuilding.hpp"
 #include "Acts/Plugins/ExaTrkX/detail/TensorVectorConversion.hpp"
+#include "Acts/Utilities/Helpers.hpp"
 
 #include <algorithm>
 
@@ -50,13 +51,12 @@ BOOST_AUTO_TEST_CASE(test_track_building) {
 
   // Sort tracks, so we can find them
   std::for_each(testTracks.begin(), testTracks.end(),
-                [](auto &t) { std::sort(t.begin(), t.end()); });
+                [](auto &t) { std::ranges::sort(t); });
   std::for_each(refTracks.begin(), refTracks.end(),
-                [](auto &t) { std::sort(t.begin(), t.end()); });
+                [](auto &t) { std::ranges::sort(t); });
 
   // Check what we have here
   for (const auto &refTrack : refTracks) {
-    auto found = std::find(testTracks.begin(), testTracks.end(), refTrack);
-    BOOST_CHECK(found != testTracks.end());
+    BOOST_CHECK(Acts::rangeContainsValue(testTracks, refTrack));
   }
 }
diff --git a/Tests/UnitTests/Plugins/ExaTrkX/ExaTrkXEdgeBuildingTest.cpp b/Tests/UnitTests/Plugins/ExaTrkX/ExaTrkXEdgeBuildingTest.cpp
index 7e75b2a8b43..b4219c83ba9 100644
--- a/Tests/UnitTests/Plugins/ExaTrkX/ExaTrkXEdgeBuildingTest.cpp
+++ b/Tests/UnitTests/Plugins/ExaTrkX/ExaTrkXEdgeBuildingTest.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2022 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include <boost/test/unit_test.hpp>
 
@@ -12,6 +12,7 @@
 #include "Acts/Plugins/ExaTrkX/detail/TensorVectorConversion.hpp"
 #include "Acts/Plugins/ExaTrkX/detail/buildEdges.hpp"
 
+#include <algorithm>
 #include <cassert>
 #include <iostream>
 
@@ -83,8 +84,8 @@ void test_random_graph(int emb_dim, int n_nodes, float r, int knn,
     edges_test_cantor.push_back(a < b ? CantorPair(a, b) : CantorPair(b, a));
   }
 
-  std::sort(edges_ref_cantor.begin(), edges_ref_cantor.end());
-  std::sort(edges_test_cantor.begin(), edges_test_cantor.end());
+  std::ranges::sort(edges_ref_cantor, std::less<CantorPair>{});
+  std::ranges::sort(edges_test_cantor, std::less<CantorPair>{});
 
 #if PRINT
   std::cout << "test size " << edges_test_cantor.size() << std::endl;
diff --git a/Tests/UnitTests/Plugins/ExaTrkX/ExaTrkXMetricHookTests.cpp b/Tests/UnitTests/Plugins/ExaTrkX/ExaTrkXMetricHookTests.cpp
index 2974cd5ac32..16e715e1924 100644
--- a/Tests/UnitTests/Plugins/ExaTrkX/ExaTrkXMetricHookTests.cpp
+++ b/Tests/UnitTests/Plugins/ExaTrkX/ExaTrkXMetricHookTests.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2022 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include <boost/test/unit_test.hpp>
 
diff --git a/Tests/UnitTests/Plugins/ExaTrkX/ExaTrkXTensorConversionTests.cpp b/Tests/UnitTests/Plugins/ExaTrkX/ExaTrkXTensorConversionTests.cpp
index a75527a72e0..a1e74db14e7 100644
--- a/Tests/UnitTests/Plugins/ExaTrkX/ExaTrkXTensorConversionTests.cpp
+++ b/Tests/UnitTests/Plugins/ExaTrkX/ExaTrkXTensorConversionTests.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2022 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include <boost/test/unit_test.hpp>
 
diff --git a/Tests/UnitTests/Plugins/FpeMonitoring/FpeMonitorTests.cpp b/Tests/UnitTests/Plugins/FpeMonitoring/FpeMonitorTests.cpp
index 060b03b7535..74ca4012337 100644
--- a/Tests/UnitTests/Plugins/FpeMonitoring/FpeMonitorTests.cpp
+++ b/Tests/UnitTests/Plugins/FpeMonitoring/FpeMonitorTests.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2023 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include <boost/test/unit_test.hpp>
 
diff --git a/Tests/UnitTests/Plugins/Geant4/Geant4ConvertersTests.cpp b/Tests/UnitTests/Plugins/Geant4/Geant4ConvertersTests.cpp
index f7706e8c2ba..e0064b02a09 100644
--- a/Tests/UnitTests/Plugins/Geant4/Geant4ConvertersTests.cpp
+++ b/Tests/UnitTests/Plugins/Geant4/Geant4ConvertersTests.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2022 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include <boost/test/unit_test.hpp>
 
@@ -24,6 +24,7 @@
 #include <array>
 #include <cmath>
 #include <memory>
+#include <numbers>
 #include <stdexcept>
 #include <tuple>
 
@@ -61,8 +62,9 @@ BOOST_AUTO_TEST_CASE(Geant4AlgebraConversion) {
 }
 
 BOOST_AUTO_TEST_CASE(Geant4CylinderConversion) {
-  G4Tubs cylinder("Cylinder", 399., 401., 800., -M_PI * CLHEP::radian,
-                  2 * M_PI * CLHEP::radian);
+  G4Tubs cylinder("Cylinder", 399., 401., 800.,
+                  -std::numbers::pi * CLHEP::radian,
+                  2 * std::numbers::pi * CLHEP::radian);
   auto [bounds, thickness] =
       Acts::Geant4ShapeConverter{}.cylinderBounds(cylinder);
   CHECK_CLOSE_ABS(bounds->get(Acts::CylinderBounds::BoundValues::eR), 400.,
@@ -70,30 +72,30 @@ BOOST_AUTO_TEST_CASE(Geant4CylinderConversion) {
   CHECK_CLOSE_ABS(bounds->get(Acts::CylinderBounds::BoundValues::eHalfLengthZ),
                   800., 10e-10);
   CHECK_CLOSE_ABS(
-      bounds->get(Acts::CylinderBounds::BoundValues::eHalfPhiSector), M_PI,
-      10e-10);
+      bounds->get(Acts::CylinderBounds::BoundValues::eHalfPhiSector),
+      std::numbers::pi, 10e-10);
   CHECK_CLOSE_ABS(bounds->get(Acts::CylinderBounds::BoundValues::eAveragePhi),
                   0., 10e-10);
   CHECK_CLOSE_ABS(thickness, 2., 10e-10);
 }
 
 BOOST_AUTO_TEST_CASE(Geant4RadialConversion) {
-  G4Tubs disc("disc", 40., 400., 2., -M_PI * CLHEP::radian,
-              2 * M_PI * CLHEP::radian);
+  G4Tubs disc("disc", 40., 400., 2., -std::numbers::pi * CLHEP::radian,
+              2 * std::numbers::pi * CLHEP::radian);
   auto [bounds, thickness] = Acts::Geant4ShapeConverter{}.radialBounds(disc);
   CHECK_CLOSE_ABS(bounds->get(Acts::RadialBounds::BoundValues::eMinR), 40.,
                   10e-10);
   CHECK_CLOSE_ABS(bounds->get(Acts::RadialBounds::BoundValues::eMaxR), 400.,
                   10e-10);
   CHECK_CLOSE_ABS(bounds->get(Acts::RadialBounds::BoundValues::eHalfPhiSector),
-                  M_PI, 10e-10);
+                  std::numbers::pi, 10e-10);
   CHECK_CLOSE_ABS(bounds->get(Acts::RadialBounds::BoundValues::eAveragePhi), 0.,
                   10e-10);
   CHECK_CLOSE_ABS(thickness, 4., 10e-10);
 }
 
 BOOST_AUTO_TEST_CASE(Geant4LineConversion) {
-  G4Tubs line("line", 0., 20., 400., 0., 2 * M_PI);
+  G4Tubs line("line", 0., 20., 400., 0., 2 * std::numbers::pi);
   auto bounds = Acts::Geant4ShapeConverter{}.lineBounds(line);
   CHECK_CLOSE_ABS(bounds->get(Acts::LineBounds::BoundValues::eR), 20., 10e-10);
   CHECK_CLOSE_ABS(bounds->get(Acts::LineBounds::BoundValues::eHalfLengthZ),
@@ -281,7 +283,8 @@ BOOST_AUTO_TEST_CASE(Geant4CylVPhysConversion) {
   Acts::ActsScalar halfLengthZ = 200;
 
   G4Tubs* g4Tube = new G4Tubs("Tube", radius, radius + thickness, halfLengthZ,
-                              -M_PI * CLHEP::radian, 2 * M_PI * CLHEP::radian);
+                              -std::numbers::pi * CLHEP::radian,
+                              2 * std::numbers::pi * CLHEP::radian);
 
   G4RotationMatrix* g4Rot = new G4RotationMatrix({0., 0., 1.}, 0.);
   G4LogicalVolume* g4TubeLog =
@@ -324,7 +327,8 @@ BOOST_AUTO_TEST_CASE(Geant4VDiscVPhysConversion) {
   Acts::ActsScalar thickness = 2.;
 
   G4Tubs* g4Tube = new G4Tubs("Disc", innerRadius, outerRadius, 0.5 * thickness,
-                              -M_PI * CLHEP::radian, 2 * M_PI * CLHEP::radian);
+                              -std::numbers::pi * CLHEP::radian,
+                              2 * std::numbers::pi * CLHEP::radian);
 
   G4RotationMatrix* g4Rot = new G4RotationMatrix({0., 0., 1.}, 0.);
   G4LogicalVolume* g4TubeLog =
@@ -356,7 +360,8 @@ BOOST_AUTO_TEST_CASE(Geant4LineVPhysConversion) {
   Acts::ActsScalar thickness = 400.;
 
   G4Tubs* g4Tube = new G4Tubs("Line", innerRadius, outerRadius, 0.5 * thickness,
-                              -M_PI * CLHEP::radian, 2 * M_PI * CLHEP::radian);
+                              -std::numbers::pi * CLHEP::radian,
+                              2 * std::numbers::pi * CLHEP::radian);
 
   G4RotationMatrix* g4Rot = new G4RotationMatrix({0., 0., 1.}, 0.);
   G4LogicalVolume* g4TubeLog =
diff --git a/Tests/UnitTests/Plugins/Geant4/Geant4DetectorElementTests.cpp b/Tests/UnitTests/Plugins/Geant4/Geant4DetectorElementTests.cpp
index 2beea2f61d6..d0ee306a18c 100644
--- a/Tests/UnitTests/Plugins/Geant4/Geant4DetectorElementTests.cpp
+++ b/Tests/UnitTests/Plugins/Geant4/Geant4DetectorElementTests.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2022 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include <boost/test/unit_test.hpp>
 
diff --git a/Tests/UnitTests/Plugins/Geant4/Geant4DetectorSurfaceFactoryTests.cpp b/Tests/UnitTests/Plugins/Geant4/Geant4DetectorSurfaceFactoryTests.cpp
index dc102eefaf2..e4e2b9043c1 100644
--- a/Tests/UnitTests/Plugins/Geant4/Geant4DetectorSurfaceFactoryTests.cpp
+++ b/Tests/UnitTests/Plugins/Geant4/Geant4DetectorSurfaceFactoryTests.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2022 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include <boost/test/unit_test.hpp>
 
@@ -15,6 +15,7 @@
 #include "Acts/Visualization/ObjVisualization3D.hpp"
 
 #include <memory>
+#include <numbers>
 #include <string>
 
 #include "G4Box.hh"
@@ -67,8 +68,8 @@ BOOST_AUTO_TEST_CASE(Geant4DetecturSurfaceFactory_Cylinder) {
   G4LogicalVolume* worldLV = new G4LogicalVolume(worldS, nullptr, "World");
 
   G4Tubs* cylinderS =
-      new G4Tubs("cylinder", 99, 100, 100, -M_PI * CLHEP::radian,
-                 2 * M_PI * CLHEP::radian);
+      new G4Tubs("cylinder", 99, 100, 100, -std::numbers::pi * CLHEP::radian,
+                 2 * std::numbers::pi * CLHEP::radian);
 
   G4LogicalVolume* cylinderLV =
       new G4LogicalVolume(cylinderS, nullptr, "World");
@@ -108,7 +109,7 @@ BOOST_AUTO_TEST_CASE(Geant4DetecturSurfaceFactory_Transforms) {
   auto vol1S = new G4Box("volume1", 25, 10, 50);
   auto vol1L = new G4LogicalVolume(vol1S, nullptr, "Volume1");
 
-  G4Transform3D transformVol1(CLHEP::HepRotationX(M_PI / 4),
+  G4Transform3D transformVol1(CLHEP::HepRotationX(std::numbers::pi / 4.),
                               G4ThreeVector(20, 0, 0));
 
   [[maybe_unused]] auto vol1PV = new G4PVPlacement(
@@ -117,7 +118,7 @@ BOOST_AUTO_TEST_CASE(Geant4DetecturSurfaceFactory_Transforms) {
   auto vol2S = new G4Box("volume2", 25, 10, 50);
   auto vol2L = new G4LogicalVolume(vol2S, nullptr, "Volume2");
 
-  G4Transform3D transformVol2(CLHEP::HepRotationY(M_PI / 6),
+  G4Transform3D transformVol2(CLHEP::HepRotationY(std::numbers::pi / 6.),
                               G4ThreeVector(0, 100, 20));
 
   [[maybe_unused]] auto vol2PV = new G4PVPlacement(
@@ -126,7 +127,7 @@ BOOST_AUTO_TEST_CASE(Geant4DetecturSurfaceFactory_Transforms) {
   auto vol3S = new G4Box("volume3", 25, 10, 50);
   auto vol3L = new G4LogicalVolume(vol3S, nullptr, "Volume3");
 
-  G4Transform3D transformVol3(CLHEP::HepRotationZ(M_PI / 12),
+  G4Transform3D transformVol3(CLHEP::HepRotationZ(std::numbers::pi / 12.),
                               G4ThreeVector(30, 100, 0));
 
   [[maybe_unused]] auto vol3PV = new G4PVPlacement(
@@ -161,27 +162,24 @@ BOOST_AUTO_TEST_CASE(Geant4DetecturSurfaceFactory_Transforms) {
   Acts::ObjVisualization3D obj;
   Acts::Vector3 origin(0, 0, 0);
   Acts::GeometryView3D::drawArrowForward(obj, origin, Acts::Vector3(100, 0, 0),
-                                         1000, 10,
-                                         Acts::ViewConfig({255, 0, 0}));
+                                         1000, 10, {.color = {255, 0, 0}});
   Acts::GeometryView3D::drawArrowForward(obj, origin, Acts::Vector3(0, 100, 0),
-                                         1000, 10,
-                                         Acts::ViewConfig({0, 255, 0}));
+                                         1000, 10, {.color = {0, 255, 0}});
   Acts::GeometryView3D::drawArrowForward(obj, origin, Acts::Vector3(0, 0, 100),
-                                         1000, 10,
-                                         Acts::ViewConfig({0, 0, 255}));
-  Acts::GeometryView3D::drawArrowForward(
-      obj, surface->center(gctx), surface->center(gctx) + 100 * normal, 1000,
-      10, Acts::ViewConfig({0, 255, 0}));
+                                         1000, 10, {.color = {0, 0, 255}});
+  Acts::GeometryView3D::drawArrowForward(obj, surface->center(gctx),
+                                         surface->center(gctx) + 100 * normal,
+                                         1000, 10, {.color = {0, 255, 0}});
   auto surfaces = cache.sensitiveSurfaces;
   for (const auto& [k, val] : Acts::enumerate(cache.sensitiveSurfaces)) {
     const auto& [el, surf] = val;
     Acts::ViewConfig vCfg;
     if (k == 0) {
-      vCfg.color = Acts::ColorRGB({0, 255, 0});
+      vCfg.color = {0, 255, 0};
     } else if (k == 1) {
-      vCfg.color = Acts::ColorRGB({255, 0, 0});
+      vCfg.color = {255, 0, 0};
     } else if (k == 2) {
-      vCfg.color = Acts::ColorRGB({0, 255, 255});
+      vCfg.color = {0, 255, 255};
     }
     Acts::GeometryView3D::drawSurface(obj, *surf, gctx,
                                       Acts::Transform3::Identity(), vCfg);
diff --git a/Tests/UnitTests/Plugins/Geant4/Geant4PhysicalVolumeSelectorsTests.cpp b/Tests/UnitTests/Plugins/Geant4/Geant4PhysicalVolumeSelectorsTests.cpp
index a1595d8e8ef..19f0431290f 100644
--- a/Tests/UnitTests/Plugins/Geant4/Geant4PhysicalVolumeSelectorsTests.cpp
+++ b/Tests/UnitTests/Plugins/Geant4/Geant4PhysicalVolumeSelectorsTests.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2022 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include <boost/test/unit_test.hpp>
 
diff --git a/Tests/UnitTests/Plugins/Geant4/Geant4SurfaceProviderTests.cpp b/Tests/UnitTests/Plugins/Geant4/Geant4SurfaceProviderTests.cpp
index 6f7f8d77726..9aeb29a8fa6 100644
--- a/Tests/UnitTests/Plugins/Geant4/Geant4SurfaceProviderTests.cpp
+++ b/Tests/UnitTests/Plugins/Geant4/Geant4SurfaceProviderTests.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2023 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include <boost/test/unit_test.hpp>
 
diff --git a/Tests/UnitTests/Plugins/GeoModel/CMakeLists.txt b/Tests/UnitTests/Plugins/GeoModel/CMakeLists.txt
index b20d8effc8e..a09476dae5b 100644
--- a/Tests/UnitTests/Plugins/GeoModel/CMakeLists.txt
+++ b/Tests/UnitTests/Plugins/GeoModel/CMakeLists.txt
@@ -3,3 +3,10 @@ set(unittest_extra_libraries ActsPluginGeoModel)
 add_unittest(GeoModelDetectorElement GeoModelDetectorElementTests.cpp)
 add_unittest(GeoBoxConverter GeoBoxConverterTests.cpp)
 add_unittest(GeoTrdConverter GeoTrdConverterTests.cpp)
+add_unittest(GeoDetectorObjectTest GeoDetectorObjectTest.cpp)
+add_unittest(GeoModelDetectorElementITk GeoModelDetectorElementITkTests.cpp)
+add_unittest(GeoPolyConverterTests GeoPolyConverterTests.cpp)
+add_unittest(GeoTrdToVolumeTest GeoTrdToVolumeTests.cpp)
+add_unittest(GeoBoxToVolumeTest GeoBoxToVolumeTest.cpp)
+add_unittest(GeoTubeToVolumeTest GeoTubeToVolumeTest.cpp)
+add_unittest(GeoSubConverterTests GeoSubConverterTest.cpp)
diff --git a/Tests/UnitTests/Plugins/GeoModel/GeoBoxConverterTests.cpp b/Tests/UnitTests/Plugins/GeoModel/GeoBoxConverterTests.cpp
index f93437a4580..c0f38881995 100644
--- a/Tests/UnitTests/Plugins/GeoModel/GeoBoxConverterTests.cpp
+++ b/Tests/UnitTests/Plugins/GeoModel/GeoBoxConverterTests.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2024 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include <boost/test/unit_test.hpp>
 
@@ -32,7 +32,7 @@ BOOST_AUTO_TEST_SUITE(GeoModelPlugin)
 
 // GeoBox conversion test case
 BOOST_AUTO_TEST_CASE(GeoBoxToSensitiveConversion) {
-  auto material = new GeoMaterial("Material", 1.0);
+  auto material = make_intrusive<GeoMaterial>("Material", 1.0);
   // Let's create a GeoFullPhysVol object
 
   // (BOX object) - XY
@@ -40,7 +40,10 @@ BOOST_AUTO_TEST_CASE(GeoBoxToSensitiveConversion) {
   auto logXY = new GeoLogVol("LogVolumeXY", boxXY, material);
   auto fphysXY = make_intrusive<GeoFullPhysVol>(logXY);
 
-  auto converted = Acts::GeoBoxConverter{}.toSensitiveSurface(*fphysXY);
+  PVConstLink physXY{make_intrusive<GeoFullPhysVol>(logXY)};
+
+  auto converted = Acts::GeoBoxConverter{}.toSensitiveSurface(
+      physXY, Acts::Transform3::Identity());
 
   BOOST_CHECK(converted.ok());
 
@@ -64,7 +67,8 @@ BOOST_AUTO_TEST_CASE(GeoBoxToSensitiveConversion) {
   auto logYZ = new GeoLogVol("LogVolumeYZ", boxYZ, material);
   auto fphysYZ = make_intrusive<GeoFullPhysVol>(logYZ);
 
-  converted = Acts::GeoBoxConverter{}.toSensitiveSurface(*fphysYZ);
+  converted = Acts::GeoBoxConverter{}.toSensitiveSurface(
+      fphysYZ, Acts::Transform3::Identity());
 
   BOOST_CHECK(converted.ok());
 
@@ -90,7 +94,8 @@ BOOST_AUTO_TEST_CASE(GeoBoxToSensitiveConversion) {
   auto logXZ = new GeoLogVol("LogVolumeXZ", boxXZ, material);
   auto fphysXZ = make_intrusive<GeoFullPhysVol>(logXZ);
 
-  converted = Acts::GeoBoxConverter{}.toSensitiveSurface(*fphysXZ);
+  converted = Acts::GeoBoxConverter{}.toSensitiveSurface(
+      fphysXZ, Acts::Transform3::Identity());
 
   BOOST_CHECK(converted.ok());
 
diff --git a/Tests/UnitTests/Plugins/GeoModel/GeoBoxToVolumeTest.cpp b/Tests/UnitTests/Plugins/GeoModel/GeoBoxToVolumeTest.cpp
new file mode 100644
index 00000000000..37a923bac13
--- /dev/null
+++ b/Tests/UnitTests/Plugins/GeoModel/GeoBoxToVolumeTest.cpp
@@ -0,0 +1,66 @@
+// This file is part of the ACTS project.
+//
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
+//
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
+
+#include <boost/test/unit_test.hpp>
+
+// switching format off to avoid conflicting declaration in GeoModel
+// needed until Acts GeoModel bumps to 6.5
+//clang-format off
+#include "Acts/Plugins/GeoModel/GeoModelDetectorObjectFactory.hpp"
+//clang-format on
+#include "Acts/Geometry/CuboidVolumeBounds.hpp"
+#include "Acts/Geometry/GeometryContext.hpp"
+#include "Acts/Plugins/GeoModel/GeoModelConverters.hpp"
+#include "Acts/Surfaces/RectangleBounds.hpp"
+#include "Acts/Surfaces/Surface.hpp"
+#include "Acts/Surfaces/SurfaceBounds.hpp"
+#include "Acts/Surfaces/TrapezoidBounds.hpp"
+#include "Acts/Tests/CommonHelpers/FloatComparisons.hpp"
+
+#include <GeoModelKernel/GeoBox.h>
+#include <GeoModelKernel/GeoFullPhysVol.h>
+#include <GeoModelKernel/GeoLogVol.h>
+#include <GeoModelKernel/GeoMaterial.h>
+#include <GeoModelKernel/GeoTrap.h>
+#include <GeoModelKernel/GeoTrd.h>
+#include <GeoModelKernel/GeoVPhysVol.h>
+
+BOOST_AUTO_TEST_SUITE(GeoModelPlugin)
+
+// GeoBox conversion test case
+BOOST_AUTO_TEST_CASE(GeoBoxToSensitiveConversion) {
+  auto material = make_intrusive<GeoMaterial>("Material", 1.0);
+  // Let's create a GeoFullPhysVol object
+
+  // (BOX object) - XY
+  std::vector<double> hls = {100, 200, 2};
+  auto box = new GeoBox(hls[0], hls[1], hls[2]);
+  auto logBox = new GeoLogVol("Box", box, material);
+  auto physBox = make_intrusive<GeoFullPhysVol>(logBox);
+
+  // create pars for conversion
+  Acts::GeoModelDetectorObjectFactory::Config gmConfig;
+  gmConfig.convertBox = {"Box"};
+  Acts::GeometryContext gContext;
+  Acts::GeoModelDetectorObjectFactory::Cache gmCache;
+
+  // create factory instance
+  Acts::GeoModelDetectorObjectFactory factory(gmConfig);
+
+  factory.convertFpv("Box", physBox, gmCache, gContext);
+  std::shared_ptr<Acts::Experimental::DetectorVolume> volumeBox =
+      gmCache.boundingBoxes[0];
+  const auto* bounds =
+      dynamic_cast<const Acts::CuboidVolumeBounds*>(&volumeBox->volumeBounds());
+  std::vector<Acts::ActsScalar> convHls = bounds->values();
+  for (long unsigned int i = 0; i < hls.size(); i++) {
+    BOOST_CHECK(hls[i] == convHls[i]);
+  }
+}
+
+BOOST_AUTO_TEST_SUITE_END()
diff --git a/Tests/UnitTests/Plugins/GeoModel/GeoDetectorObjectTest.cpp b/Tests/UnitTests/Plugins/GeoModel/GeoDetectorObjectTest.cpp
new file mode 100644
index 00000000000..033f2c9cb4a
--- /dev/null
+++ b/Tests/UnitTests/Plugins/GeoModel/GeoDetectorObjectTest.cpp
@@ -0,0 +1,166 @@
+// This file is part of the ACTS project.
+//
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
+//
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
+
+#include <boost/test/unit_test.hpp>
+
+#include "Acts/Plugins/GeoModel/GeoModelDetectorObjectFactory.hpp"
+#include "Acts/Plugins/GeoModel/GeoModelReader.hpp"
+#include "Acts/Surfaces/CylinderBounds.hpp"
+#include "Acts/Surfaces/DiamondBounds.hpp"
+#include "Acts/Surfaces/LineBounds.hpp"
+#include "Acts/Surfaces/PlaneSurface.hpp"
+#include "Acts/Surfaces/RectangleBounds.hpp"
+#include "Acts/Surfaces/StrawSurface.hpp"
+#include "Acts/Surfaces/Surface.hpp"
+#include "Acts/Surfaces/TrapezoidBounds.hpp"
+#include "Acts/Utilities/Logger.hpp"
+
+#include <typeinfo>
+
+#include <GeoModelKernel/GeoBox.h>
+#include <GeoModelKernel/GeoFullPhysVol.h>
+#include <GeoModelKernel/GeoLogVol.h>
+#include <GeoModelKernel/GeoMaterial.h>
+#include <GeoModelKernel/GeoTrd.h>
+#include <GeoModelKernel/GeoTube.h>
+
+BOOST_AUTO_TEST_SUITE(GeoModelDetObj)
+
+struct GeoDims {
+  std::vector<double> boxO;
+  std::vector<double> boxI;
+  std::vector<double> tube;
+  std::vector<std::vector<double>> trapVerts;
+  std::vector<double> trapHls;
+  std::vector<std::vector<double>> polyVerts;
+};
+void test(const Acts::GeoModelDetectorObjectFactory::Cache& cache,
+          GeoModelDetObj::GeoDims geoDims) {
+  for (const auto& box : cache.boundingBoxes) {
+    const Acts::VolumeBounds& bounds = box->volumeBounds();
+    for (long unsigned int i = 0; i < geoDims.boxO.size(); i++) {
+      BOOST_CHECK(geoDims.boxO[i] == bounds.values()[i]);
+    }
+    std::vector<const Acts::Surface*> surfaces = box->surfaces();
+
+    for (auto surface : surfaces) {
+      const Acts::SurfaceBounds& sbounds = surface->bounds();
+      // check straws
+      if (surface->type() == Acts::Surface::SurfaceType::Straw) {
+        const auto* lineBounds =
+            dynamic_cast<const Acts::LineBounds*>(&sbounds);
+        BOOST_CHECK(geoDims.tube[1] == lineBounds->get(Acts::LineBounds::eR));
+        BOOST_CHECK(geoDims.tube[2] ==
+                    lineBounds->get(Acts::LineBounds::eHalfLengthZ));
+      }
+      // rectangle Surface check corner position without trf
+      if (sbounds.type() == Acts::SurfaceBounds::eRectangle) {
+        double csxmin = sbounds.values()[0];
+        double csymin = sbounds.values()[1];
+        double csxmax = sbounds.values()[2];
+        double csymax = sbounds.values()[3];
+        BOOST_CHECK(geoDims.boxI[0] == -csxmin);
+        BOOST_CHECK(geoDims.boxI[1] == -csymin);
+        BOOST_CHECK(geoDims.boxI[0] == csxmax);
+        BOOST_CHECK(geoDims.boxI[1] == csymax);
+      }
+      // trap Surface without trf
+      if (sbounds.type() == Acts::SurfaceBounds::eTrapezoid) {
+        const auto* trapBounds =
+            dynamic_cast<const Acts::TrapezoidBounds*>(&sbounds);
+        std::vector<Acts::Vector2> trapVerts = trapBounds->vertices();
+
+        for (long unsigned int i = 0; i < trapVerts.size(); i++) {
+          BOOST_CHECK(trapVerts[i][0] == geoDims.trapVerts[i][0]);
+          BOOST_CHECK(trapVerts[i][1] == geoDims.trapVerts[i][1]);
+        }
+      }
+    }
+  }
+}
+struct GeoGeometry {
+  std::vector<GeoIntrusivePtr<GeoFullPhysVol>> fpvs;
+  GeoDims dim;
+};
+GeoGeometry constructGeoModel() {
+  // define materials
+  GeoIntrusivePtr<GeoMaterial> material(new GeoMaterial("Material", 1.0));
+  GeoIntrusivePtr<GeoMaterial> al(new GeoMaterial("Aluminium", 1.0));
+
+  // define dimensions
+  GeoDims geoDims;
+  geoDims.boxO = {100, 200, 2};
+  geoDims.boxI = {100, 150, 1};
+  geoDims.trapVerts = {{-103, -50}, {103, -50}, {183, 50}, {-183, 50}};
+  geoDims.polyVerts = {{-60, -50}, {60, -50},  {153, 0},
+                       {123, 50},  {-123, 50}, {-153, 0}};
+  geoDims.tube = {5, 6, 100};
+  geoDims.trapHls = {
+      std::abs(geoDims.trapVerts[0][0] - geoDims.trapVerts[1][0]) / 2,
+      std::abs(geoDims.trapVerts[2][0] - geoDims.trapVerts[3][0]) / 2,
+      std::abs(geoDims.trapVerts[0][1] - geoDims.trapVerts[2][1]) / 2};
+
+  // create shapes
+  GeoIntrusivePtr<GeoBox> boxXY(
+      new GeoBox(geoDims.boxO[0], geoDims.boxO[1], geoDims.boxO[2]));
+  GeoIntrusivePtr<GeoTube> tube(
+      new GeoTube(geoDims.tube[0], geoDims.tube[1], geoDims.tube[2]));
+  GeoIntrusivePtr<GeoBox> ssurface(
+      new GeoBox(geoDims.boxI[0], geoDims.boxI[1], geoDims.boxI[2]));
+  GeoIntrusivePtr<GeoTrd> trd(new GeoTrd(
+      1, 1, geoDims.trapHls[0], geoDims.trapHls[1], geoDims.trapHls[2]));
+
+  // create logvols
+  GeoIntrusivePtr<GeoLogVol> logXY(
+      new GeoLogVol("LogVolumeXY", boxXY, material));
+  GeoIntrusivePtr<GeoLogVol> logTube(new GeoLogVol("LogTube", tube, al));
+  GeoIntrusivePtr<GeoLogVol> logSurface(
+      new GeoLogVol("LogSurface", ssurface, al));
+  GeoIntrusivePtr<GeoLogVol> logTrd(new GeoLogVol("LogTrd", trd, al));
+
+  // create physvols
+  std::vector<GeoIntrusivePtr<GeoFullPhysVol>> fpvs;
+  fpvs.push_back(new GeoFullPhysVol(logXY));
+  fpvs.push_back(new GeoFullPhysVol(logTube));
+  fpvs.push_back(new GeoFullPhysVol(logSurface));
+  fpvs.push_back(new GeoFullPhysVol(logTrd));
+  GeoGeometry ret;
+  ret.fpvs = fpvs;
+  ret.dim = geoDims;
+  return ret;
+}
+
+BOOST_AUTO_TEST_CASE(GeoModelDetectorObjectFactory) {
+  GeoGeometry geom = constructGeoModel();
+  GeoDims geoDims = geom.dim;
+  std::vector<GeoIntrusivePtr<GeoFullPhysVol>> fpvs = geom.fpvs;
+
+  int index = 0;
+  GeoFullPhysVol* parentVol = fpvs[index];
+  fpvs.erase(fpvs.begin() + index);
+  // build hierarchy
+  for (const auto& fpv : fpvs) {
+    parentVol->add(fpv);
+  }
+
+  // create pars for conversion
+  Acts::GeoModelDetectorObjectFactory::Config gmConfig;
+  gmConfig.convertBox = {"LogVolumeXY"};
+  Acts::GeometryContext gContext;
+  Acts::GeoModelDetectorObjectFactory::Cache gmCache;
+
+  // create factory instance
+  Acts::GeoModelDetectorObjectFactory factory(gmConfig);
+  // convert GeoFullPhysVol
+  factory.convertFpv("LogVolumeXY", parentVol, gmCache, gContext);
+
+  // checking the dimension of the converted bounding boxes
+  test(gmCache, geoDims);
+}
+
+BOOST_AUTO_TEST_SUITE_END()
diff --git a/Tests/UnitTests/Plugins/GeoModel/GeoModelDetectorElementITkTests.cpp b/Tests/UnitTests/Plugins/GeoModel/GeoModelDetectorElementITkTests.cpp
new file mode 100644
index 00000000000..0c945ebb6dd
--- /dev/null
+++ b/Tests/UnitTests/Plugins/GeoModel/GeoModelDetectorElementITkTests.cpp
@@ -0,0 +1,90 @@
+// This file is part of the ACTS project.
+//
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
+//
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
+
+// This file is part of the Acts project.
+//
+// Copyright (C) 2024 CERN for the benefit of the Acts project
+//
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this
+// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+#include <boost/test/unit_test.hpp>
+
+#include "Acts/Plugins/GeoModel/GeoModelDetectorElementITk.hpp"
+#include "Acts/Surfaces/PlaneSurface.hpp"
+#include "Acts/Surfaces/RectangleBounds.hpp"
+#include "Acts/Surfaces/Surface.hpp"
+
+#include <GeoModelKernel/GeoBox.h>
+#include <GeoModelKernel/GeoFullPhysVol.h>
+#include <GeoModelKernel/GeoLogVol.h>
+#include <GeoModelKernel/GeoMaterial.h>
+
+BOOST_AUTO_TEST_SUITE(GeoModelPlugin)
+
+BOOST_AUTO_TEST_CASE(ITkIdentifierTests) {
+  auto test = [](int hw, int bec, int lw, int em, int pm, int side) {
+    Acts::ITkIdentifier id(hw, bec, lw, em, pm, side);
+    BOOST_CHECK_EQUAL(id.hardware(), hw);
+    BOOST_CHECK_EQUAL(id.barrelEndcap(), bec);
+    BOOST_CHECK_EQUAL(id.layerWheel(), lw);
+    BOOST_CHECK_EQUAL(id.etaModule(), em);
+    BOOST_CHECK_EQUAL(id.phiModule(), pm);
+    BOOST_CHECK_EQUAL(id.side(), side);
+  };
+
+  for (int hw : {0, 1}) {
+    for (int bec : {-2, 0, 2}) {
+      for (int lw : {0, 10}) {
+        for (int em : {-10, 0, 10}) {
+          for (int pm : {10, 0}) {
+            for (int side : {0, 1}) {
+              test(hw, bec, lw, em, pm, side);
+            }
+          }
+        }
+      }
+    }
+  }
+}
+
+BOOST_AUTO_TEST_CASE(GeoModelDetectorElementConstruction) {
+  Acts::GeometryContext gctx{};
+
+  auto material = GeoIntrusivePtr(new GeoMaterial("Material", 1.0));
+  auto box = GeoIntrusivePtr(new GeoBox(100, 200, 2));
+  auto log = GeoIntrusivePtr(new GeoLogVol("LogVolumeXY", box, material));
+  auto fphys = GeoIntrusivePtr(new GeoFullPhysVol(log));
+  auto rBounds = std::make_shared<Acts::RectangleBounds>(100, 200);
+
+  auto element =
+      Acts::GeoModelDetectorElement::createDetectorElement<Acts::PlaneSurface>(
+          fphys, rBounds, Acts::Transform3::Identity(), 2.0);
+
+  const int hardware = 0, barrelEndcap = -2, layerWheel = 100, phiModule = 200,
+            etaModule = 300, side = 1;
+
+  auto [itkElement, _] = Acts::GeoModelDetectorElementITk::convertFromGeomodel(
+      element, element->surface().getSharedPtr(), gctx, hardware, barrelEndcap,
+      layerWheel, etaModule, phiModule, side);
+
+  BOOST_CHECK_EQUAL(element->surface().type(), itkElement->surface().type());
+  BOOST_CHECK_EQUAL(element->surface().bounds().type(),
+                    itkElement->surface().bounds().type());
+  BOOST_CHECK_NE(element->surface().associatedDetectorElement(),
+                 itkElement->surface().associatedDetectorElement());
+  BOOST_CHECK_EQUAL(itkElement->identifier().barrelEndcap(), barrelEndcap);
+  BOOST_CHECK_EQUAL(itkElement->identifier().hardware(), hardware);
+  BOOST_CHECK_EQUAL(itkElement->identifier().layerWheel(), layerWheel);
+  BOOST_CHECK_EQUAL(itkElement->identifier().phiModule(), phiModule);
+  BOOST_CHECK_EQUAL(itkElement->identifier().etaModule(), etaModule);
+  BOOST_CHECK_EQUAL(itkElement->identifier().side(), side);
+}
+
+BOOST_AUTO_TEST_SUITE_END()
diff --git a/Tests/UnitTests/Plugins/GeoModel/GeoModelDetectorElementTests.cpp b/Tests/UnitTests/Plugins/GeoModel/GeoModelDetectorElementTests.cpp
index 1a5ae649990..274ef93ca59 100644
--- a/Tests/UnitTests/Plugins/GeoModel/GeoModelDetectorElementTests.cpp
+++ b/Tests/UnitTests/Plugins/GeoModel/GeoModelDetectorElementTests.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2024 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include <boost/test/unit_test.hpp>
 
@@ -29,9 +29,11 @@ BOOST_AUTO_TEST_CASE(GeoModelDetectorElementConstruction) {
   auto logXY = new GeoLogVol("LogVolumeXY", boxXY, material);
   auto fphysXY = new GeoFullPhysVol(logXY);
   auto rBounds = std::make_shared<Acts::RectangleBounds>(100, 200);
+
+  PVConstLink physXY{fphysXY};
   auto elementXY =
       Acts::GeoModelDetectorElement::createDetectorElement<Acts::PlaneSurface>(
-          *fphysXY, rBounds, Acts::Transform3::Identity(), 2.0);
+          physXY, rBounds, Acts::Transform3::Identity(), 2.0);
 
   const Acts::Surface& surface = elementXY->surface();
   BOOST_CHECK(surface.type() == Acts::Surface::SurfaceType::Plane);
diff --git a/Tests/UnitTests/Plugins/GeoModel/GeoPolyConverterTests.cpp b/Tests/UnitTests/Plugins/GeoModel/GeoPolyConverterTests.cpp
new file mode 100644
index 00000000000..b273b0a2364
--- /dev/null
+++ b/Tests/UnitTests/Plugins/GeoModel/GeoPolyConverterTests.cpp
@@ -0,0 +1,104 @@
+// This file is part of the ACTS project.
+//
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
+//
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
+
+#include <boost/test/unit_test.hpp>
+
+#include "Acts/Plugins/GeoModel/GeoModelDetectorObjectFactory.hpp"
+#include "Acts/Plugins/GeoModel/GeoModelReader.hpp"
+#include "Acts/Surfaces/CylinderBounds.hpp"
+#include "Acts/Surfaces/DiamondBounds.hpp"
+#include "Acts/Surfaces/LineBounds.hpp"
+#include "Acts/Surfaces/PlaneSurface.hpp"
+#include "Acts/Surfaces/RectangleBounds.hpp"
+#include "Acts/Surfaces/StrawSurface.hpp"
+#include "Acts/Surfaces/Surface.hpp"
+#include "Acts/Surfaces/TrapezoidBounds.hpp"
+#include "Acts/Utilities/Logger.hpp"
+
+#include <typeinfo>
+
+#include <GeoModelKernel/GeoBox.h>
+#include <GeoModelKernel/GeoFullPhysVol.h>
+#include <GeoModelKernel/GeoLogVol.h>
+#include <GeoModelKernel/GeoMaterial.h>
+#include <GeoModelKernel/GeoSimplePolygonBrep.h>
+#include <GeoModelKernel/GeoTrd.h>
+#include <GeoModelKernel/GeoTube.h>
+
+BOOST_AUTO_TEST_SUITE(GeoModelPoyVol)
+
+BOOST_AUTO_TEST_CASE(GeoModelDetectorObjectFactory) {
+  auto al = new GeoMaterial("Aluminium", 1.0);
+
+  std::vector<std::vector<double>> trapVerts = {
+      {-103, -50}, {103, -50}, {183, 50}, {-183, 50}};
+  std::vector<std::vector<double>> polyVerts = {
+      {-60, -50}, {60, -50}, {153, 0}, {123, 50}, {-123, 50}, {-153, 0}};
+  std::vector<std::vector<double>> errVerts = {
+      {60, -50}, {153, 0}, {123, 50}, {-123, 50}, {-153, 0}};
+  double poly_z = 2;
+
+  auto trap = new GeoSimplePolygonBrep(poly_z);
+  for (const auto& tVert : trapVerts) {
+    trap->addVertex(tVert[0], tVert[1]);
+  }
+  auto poly = new GeoSimplePolygonBrep(poly_z);
+  for (const auto& pVert : polyVerts) {
+    poly->addVertex(pVert[0], pVert[1]);
+  }
+  auto err = new GeoSimplePolygonBrep(poly_z);
+  for (const auto& eVert : errVerts) {
+    err->addVertex(eVert[0], eVert[1]);
+  }
+  auto logTrap = new GeoLogVol("LogTrap", trap, al);
+  auto logPoly = new GeoLogVol("LogPoly", poly, al);
+  auto logErr = new GeoLogVol("LogErr", err, al);
+
+  auto physTrap = new GeoFullPhysVol(logTrap);
+  auto physPoly = new GeoFullPhysVol(logPoly);
+  auto physErr = new GeoFullPhysVol(logErr);
+  // create pars for conversion
+  Acts::GeoModelDetectorObjectFactory::Config gmConfig;
+  Acts::GeometryContext gContext;
+  Acts::GeoModelDetectorObjectFactory::Cache trapCache;
+  Acts::GeoModelDetectorObjectFactory::Cache polyCache;
+  Acts::GeoModelDetectorObjectFactory::Cache errCache;
+
+  // create factory instance
+  Acts::GeoModelDetectorObjectFactory factory(gmConfig);
+
+  // convert GeoFullPhysVol (to surfaces)
+  factory.convertFpv("Trap", physTrap, trapCache, gContext);
+  factory.convertFpv("Poly", physPoly, polyCache, gContext);
+  BOOST_CHECK_THROW(factory.convertFpv("Error", physErr, errCache, gContext),
+                    std::runtime_error);
+
+  Acts::GeoModelSensitiveSurface trapSensSurface =
+      trapCache.sensitiveSurfaces[0];
+  Acts::GeoModelSensitiveSurface polySensSurface =
+      polyCache.sensitiveSurfaces[0];
+  std::shared_ptr<Acts::Surface> polySurface = std::get<1>(polySensSurface);
+  std::shared_ptr<Acts::Surface> trapSurface = std::get<1>(trapSensSurface);
+
+  const auto* polyBounds =
+      dynamic_cast<const Acts::DiamondBounds*>(&polySurface->bounds());
+  std::vector<Acts::Vector2> convPolyVerts = polyBounds->vertices();
+  for (long unsigned int i = 0; i < polyVerts.size(); i++) {
+    BOOST_CHECK(polyVerts[i][0] == convPolyVerts[i][0]);
+    BOOST_CHECK(polyVerts[i][1] == convPolyVerts[i][1]);
+  }
+
+  const auto* trapBounds =
+      dynamic_cast<const Acts::TrapezoidBounds*>(&trapSurface->bounds());
+  std::vector<Acts::Vector2> convTrapVerts = trapBounds->vertices();
+  for (long unsigned int i = 0; i < trapVerts.size(); i++) {
+    BOOST_CHECK(trapVerts[i][0] == convTrapVerts[i][0]);
+    BOOST_CHECK(trapVerts[i][1] == convTrapVerts[i][1]);
+  }
+}
+BOOST_AUTO_TEST_SUITE_END()
diff --git a/Tests/UnitTests/Plugins/GeoModel/GeoSubConverterTest.cpp b/Tests/UnitTests/Plugins/GeoModel/GeoSubConverterTest.cpp
new file mode 100644
index 00000000000..3a5461aad84
--- /dev/null
+++ b/Tests/UnitTests/Plugins/GeoModel/GeoSubConverterTest.cpp
@@ -0,0 +1,71 @@
+// This file is part of the ACTS project.
+//
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
+//
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
+
+#include <boost/test/unit_test.hpp>
+
+//clang-format off
+#include "Acts/Plugins/GeoModel/GeoModelDetectorObjectFactory.hpp"
+//clang-format on
+#include "Acts/Geometry/GeometryContext.hpp"
+#include "Acts/Plugins/GeoModel/GeoModelConverters.hpp"
+#include "Acts/Surfaces/RectangleBounds.hpp"
+#include "Acts/Surfaces/Surface.hpp"
+#include "Acts/Surfaces/SurfaceBounds.hpp"
+#include "Acts/Surfaces/TrapezoidBounds.hpp"
+#include "Acts/Tests/CommonHelpers/FloatComparisons.hpp"
+
+#include <GeoModelKernel/GeoFullPhysVol.h>
+#include <GeoModelKernel/GeoLogVol.h>
+#include <GeoModelKernel/GeoMaterial.h>
+#include <GeoModelKernel/GeoShapeSubtraction.h>
+#include <GeoModelKernel/GeoTrap.h>
+#include <GeoModelKernel/GeoTrd.h>
+#include <GeoModelKernel/GeoVPhysVol.h>
+
+Acts::GeometryContext tContext;
+Acts::RotationMatrix3 idRotation = Acts::RotationMatrix3::Identity();
+Acts::Transform3 idTransform = Acts::Transform3::Identity();
+
+BOOST_AUTO_TEST_SUITE(GeoModelPlugin)
+
+// GeoBox conversion test case
+BOOST_AUTO_TEST_CASE(GeoSubToSensitiveConversion) {
+  GeoIntrusivePtr<GeoMaterial> material(new GeoMaterial("Material", 1.0));
+
+  // BOX object
+  double hlX = 200, hlY = 100, hlZ = 2;
+  GeoIntrusivePtr<GeoBox> shapeA(new GeoBox(hlX, hlY, hlZ));
+  // Trapezoid object
+  GeoIntrusivePtr<GeoTrd> shapeB(new GeoTrd(2, 2, 50, 80, 60));
+
+  // create subtraction
+  GeoIntrusivePtr<GeoShapeSubtraction> geoSub(
+      new GeoShapeSubtraction(shapeA, shapeB));
+  GeoIntrusivePtr<GeoLogVol> logSub(
+      new GeoLogVol("LogVolume", geoSub, material));
+  auto fphysSub = make_intrusive<GeoFullPhysVol>(logSub);
+
+  // create pars for conversion
+  Acts::GeoModelDetectorObjectFactory::Config gmConfig;
+  Acts::GeometryContext gContext;
+  Acts::GeoModelDetectorObjectFactory::Cache subCache;
+
+  // create factory instance
+  Acts::GeoModelDetectorObjectFactory factory(gmConfig);
+
+  // convert GeoFullPhysVol (to surfaces)
+  factory.convertFpv("Sub", fphysSub, subCache, gContext);
+
+  Acts::GeoModelSensitiveSurface subSensSurface = subCache.sensitiveSurfaces[0];
+  std::shared_ptr<Acts::Surface> subSurface = std::get<1>(subSensSurface);
+  const auto* subBounds =
+      dynamic_cast<const Acts::RectangleBounds*>(&subSurface->bounds());
+  BOOST_CHECK(subBounds->halfLengthX() == hlX);
+  BOOST_CHECK(subBounds->halfLengthY() == hlY);
+}
+BOOST_AUTO_TEST_SUITE_END()
diff --git a/Tests/UnitTests/Plugins/GeoModel/GeoTrdConverterTests.cpp b/Tests/UnitTests/Plugins/GeoModel/GeoTrdConverterTests.cpp
index 3fc413a2881..b8d9e51946d 100644
--- a/Tests/UnitTests/Plugins/GeoModel/GeoTrdConverterTests.cpp
+++ b/Tests/UnitTests/Plugins/GeoModel/GeoTrdConverterTests.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2024 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include <boost/test/unit_test.hpp>
 
@@ -38,7 +38,10 @@ BOOST_AUTO_TEST_CASE(GeoTrfToSensitiveConversion) {
   auto logYZ = new GeoLogVol("LogVolumeYZ", trapYZ, material);
   auto fphysYZ = make_intrusive<GeoFullPhysVol>(logYZ);
 
-  auto converted = Acts::GeoTrdConverter{}.toSensitiveSurface(*fphysYZ);
+  PVConstLink physYZ{make_intrusive<GeoFullPhysVol>(logYZ)};
+
+  auto converted =
+      Acts::GeoTrdConverter{}.toSensitiveSurface(physYZ, idTransform);
 
   BOOST_CHECK(converted.ok());
 
@@ -74,7 +77,7 @@ BOOST_AUTO_TEST_CASE(GeoTrfToSensitiveConversion) {
   auto logYZs = new GeoLogVol("LogVolumeYZs", trapYZs, material);
   auto fphysYZs = make_intrusive<GeoFullPhysVol>(logYZs);
 
-  converted = Acts::GeoTrdConverter{}.toSensitiveSurface(*fphysYZs);
+  converted = Acts::GeoTrdConverter{}.toSensitiveSurface(fphysYZs, idTransform);
 
   BOOST_CHECK(converted.ok());
 
@@ -108,7 +111,7 @@ BOOST_AUTO_TEST_CASE(GeoTrfToSensitiveConversion) {
   auto logXZ = new GeoLogVol("LogVolumeXZ", trapXZ, material);
   auto fphysXZ = make_intrusive<GeoFullPhysVol>(logXZ);
 
-  converted = Acts::GeoTrdConverter{}.toSensitiveSurface(*fphysXZ);
+  converted = Acts::GeoTrdConverter{}.toSensitiveSurface(fphysXZ, idTransform);
 
   BOOST_CHECK(converted.ok());
 
@@ -142,7 +145,9 @@ BOOST_AUTO_TEST_CASE(GeoTrfToSensitiveConversion) {
   auto logXZs = new GeoLogVol("LogVolumeXZs", trapXZs, material);
   auto fphysXZs = make_intrusive<GeoFullPhysVol>(logXZs);
 
-  converted = Acts::GeoTrdConverter{}.toSensitiveSurface(*fphysXZs);
+  PVConstLink physXZs{make_intrusive<GeoFullPhysVol>(logXZs)};
+
+  converted = Acts::GeoTrdConverter{}.toSensitiveSurface(physXZs, idTransform);
 
   BOOST_CHECK(converted.ok());
 
@@ -176,8 +181,9 @@ BOOST_AUTO_TEST_CASE(GeoTrfToSensitiveConversion) {
   auto logDouble = new GeoLogVol("LogVolumeDouble", trapDouble, material);
   auto fphysDouble = make_intrusive<GeoFullPhysVol>(logDouble);
 
-  BOOST_CHECK_THROW(Acts::GeoTrdConverter{}.toSensitiveSurface(*fphysDouble),
-                    std::invalid_argument);
+  BOOST_CHECK_THROW(
+      Acts::GeoTrdConverter{}.toSensitiveSurface(fphysDouble, idTransform),
+      std::invalid_argument);
 }
 
 BOOST_AUTO_TEST_SUITE_END()
diff --git a/Tests/UnitTests/Plugins/GeoModel/GeoTrdToVolumeTests.cpp b/Tests/UnitTests/Plugins/GeoModel/GeoTrdToVolumeTests.cpp
new file mode 100644
index 00000000000..9c156e16423
--- /dev/null
+++ b/Tests/UnitTests/Plugins/GeoModel/GeoTrdToVolumeTests.cpp
@@ -0,0 +1,72 @@
+// This file is part of the ACTS project.
+//
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
+//
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
+
+#include <boost/test/unit_test.hpp>
+
+// switching format off to avoid conflicting declaration in GeoModel
+// needed until Acts GeoModel bumps to 6.5
+//clang-format off
+#include "Acts/Plugins/GeoModel/GeoModelDetectorObjectFactory.hpp"
+//clang-format on
+#include "Acts/Geometry/GeometryContext.hpp"
+#include "Acts/Geometry/TrapezoidVolumeBounds.hpp"
+#include "Acts/Plugins/GeoModel/GeoModelConverters.hpp"
+#include "Acts/Surfaces/Surface.hpp"
+#include "Acts/Surfaces/SurfaceBounds.hpp"
+#include "Acts/Surfaces/TrapezoidBounds.hpp"
+#include "Acts/Tests/CommonHelpers/FloatComparisons.hpp"
+
+#include <GeoModelKernel/GeoFullPhysVol.h>
+#include <GeoModelKernel/GeoLogVol.h>
+#include <GeoModelKernel/GeoMaterial.h>
+#include <GeoModelKernel/GeoTrd.h>
+
+BOOST_AUTO_TEST_SUITE(GeoModelPlugin)
+
+// GeoBox conversion test case
+BOOST_AUTO_TEST_CASE(GeoTrdToVolumeConversion) {
+  auto material = new GeoMaterial("Material", 1.0);
+  // Let's create a GeoFullPhysVol object
+  double geoHlX1 = 2, geoHlX2 = 2, geoHlY1 = 50, geoHlY2 = 80, geoHlZ = 60;
+  auto trd = new GeoTrd(geoHlX1, geoHlX1, geoHlY1, geoHlY2, geoHlZ);
+  auto logTrd = new GeoLogVol("Trd", trd, material);
+  auto physTrd = make_intrusive<GeoFullPhysVol>(logTrd);
+
+  // this should produce an error while converting
+  auto errTrd = new GeoTrd(2, 3, 25, 40, 30);
+  auto errLogTrd = new GeoLogVol("Trd", errTrd, material);
+  auto errPhysTrd = make_intrusive<GeoFullPhysVol>(errLogTrd);
+
+  // create pars for conversion
+  Acts::GeoModelDetectorObjectFactory::Config gmConfig;
+  gmConfig.convertBox = {"Trd"};
+  Acts::GeometryContext gContext;
+  Acts::GeoModelDetectorObjectFactory::Cache gmCache;
+  Acts::GeoModelDetectorObjectFactory::Cache errCache;
+
+  // create factory instance
+  Acts::GeoModelDetectorObjectFactory factory(gmConfig);
+
+  // test error case
+  BOOST_CHECK_THROW(factory.convertFpv("Trd", errPhysTrd, errCache, gContext),
+                    std::runtime_error);
+  factory.convertFpv("Trd", physTrd, gmCache, gContext);
+  std::shared_ptr<Acts::Experimental::DetectorVolume> volumeTrd =
+      gmCache.boundingBoxes[0];
+  const auto* bounds = dynamic_cast<const Acts::TrapezoidVolumeBounds*>(
+      &volumeTrd->volumeBounds());
+  std::vector<Acts::ActsScalar> convHls = bounds->values();
+  // note: GeoTrd and Acts use different coordinates
+  BOOST_CHECK(geoHlX1 == convHls[3]);
+  BOOST_CHECK(geoHlX2 == convHls[3]);
+  BOOST_CHECK(geoHlY1 == convHls[0]);
+  BOOST_CHECK(geoHlY2 == convHls[1]);
+  BOOST_CHECK(geoHlZ == convHls[2]);
+}
+
+BOOST_AUTO_TEST_SUITE_END()
diff --git a/Tests/UnitTests/Plugins/GeoModel/GeoTubeToVolumeTest.cpp b/Tests/UnitTests/Plugins/GeoModel/GeoTubeToVolumeTest.cpp
new file mode 100644
index 00000000000..fc3263a8593
--- /dev/null
+++ b/Tests/UnitTests/Plugins/GeoModel/GeoTubeToVolumeTest.cpp
@@ -0,0 +1,64 @@
+// This file is part of the ACTS project.
+//
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
+//
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
+
+#include <boost/test/unit_test.hpp>
+
+// In order to avoid conflicts with declarations in Geomodel that is fixed in
+// v3.5
+//  clang-formal off
+#include "Acts/Plugins/GeoModel/GeoModelDetectorObjectFactory.hpp"
+// clang-formal on
+#include "Acts/Geometry/CylinderVolumeBounds.hpp"
+#include "Acts/Geometry/GeometryContext.hpp"
+#include "Acts/Plugins/GeoModel/GeoModelConverters.hpp"
+#include "Acts/Surfaces/Surface.hpp"
+#include "Acts/Surfaces/SurfaceBounds.hpp"
+#include "Acts/Surfaces/TrapezoidBounds.hpp"
+#include "Acts/Tests/CommonHelpers/FloatComparisons.hpp"
+
+#include <GeoModelKernel/GeoFullPhysVol.h>
+#include <GeoModelKernel/GeoLogVol.h>
+#include <GeoModelKernel/GeoMaterial.h>
+#include <GeoModelKernel/GeoTrap.h>
+#include <GeoModelKernel/GeoTube.h>
+#include <GeoModelKernel/GeoVPhysVol.h>
+
+BOOST_AUTO_TEST_SUITE(GeoModelPlugin)
+
+// GeoBox conversion test case
+BOOST_AUTO_TEST_CASE(GeoBoxToSensitiveConversion) {
+  auto material = make_intrusive<GeoMaterial>("Material", 1.0);
+  // Let's create a GeoFullPhysVol object
+
+  // (BOX object) - XY
+  std::vector<double> dims = {5, 6, 50};
+  auto tube = new GeoTube(dims[0], dims[1], dims[2]);
+  auto logTube = new GeoLogVol("Tube", tube, material);
+  auto physTube = make_intrusive<GeoFullPhysVol>(logTube);
+
+  // create pars for conversion
+  Acts::GeoModelDetectorObjectFactory::Config gmConfig;
+  gmConfig.convertBox = {"Tube"};
+  Acts::GeometryContext gContext;
+  Acts::GeoModelDetectorObjectFactory::Cache gmCache;
+
+  // create factory instance
+  Acts::GeoModelDetectorObjectFactory factory(gmConfig);
+
+  factory.convertFpv("Tube", physTube, gmCache, gContext);
+  std::shared_ptr<Acts::Experimental::DetectorVolume> volumeTube =
+      gmCache.boundingBoxes[0];
+  const auto* bounds = dynamic_cast<const Acts::CylinderVolumeBounds*>(
+      &volumeTube->volumeBounds());
+  std::vector<Acts::ActsScalar> convDims = bounds->values();
+  for (long unsigned int i = 0; i < dims.size(); i++) {
+    BOOST_CHECK(dims[i] == convDims[i]);
+  }
+}
+
+BOOST_AUTO_TEST_SUITE_END()
diff --git a/Tests/UnitTests/Plugins/Hashing/AnnoyTest.cpp b/Tests/UnitTests/Plugins/Hashing/AnnoyTest.cpp
new file mode 100644
index 00000000000..cb506e23514
--- /dev/null
+++ b/Tests/UnitTests/Plugins/Hashing/AnnoyTest.cpp
@@ -0,0 +1,199 @@
+// This file is part of the ACTS project.
+//
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
+//
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
+
+#include <boost/test/unit_test.hpp>
+
+#include <array>
+#include <cstdint>
+#include <vector>
+
+#include <annoy/annoylib.h>
+#include <annoy/kissrandom.h>
+
+namespace {
+// Test vector of 2D points generated from the make_blobs function of
+// scikit-learn to correspond to 4 clusters with a standard deviation of 0.3
+std::vector<std::array<double, 2>> testVector{
+    {-2.83739915, 2.62792556},  {-2.02847331, -1.90722196},
+    {4.42609249, -2.42439165},  {-2.54167208, -1.31586441},
+    {-2.74072011, 1.88175176},  {-2.44805173, -1.72270269},
+    {4.32373114, -3.04946856},  {-3.02908065, 3.05502207},
+    {4.21551681, -2.72367792},  {6.94454243, -8.26702198},
+    {4.57729285, -2.98832874},  {-2.05999536, -1.60664607},
+    {7.29942963, -7.49254664},  {-1.76560555, -1.94316957},
+    {-3.08697607, 2.38012823},  {-2.68133439, -1.96863594},
+    {-3.04707961, 2.42381653},  {-1.6693666 - 1.98996212},
+    {4.87565038, -2.42067792},  {6.57829525 - 8.14269767},
+    {-1.89777458, -1.71029565}, {-2.82010574, 2.27963425},
+    {-1.8938416, -1.76676642},  {-2.8088788, 2.14373147},
+    {-2.7111892, 2.7343114},    {5.00997563, -3.03311654},
+    {-3.00272791, 1.59086316},  {-2.69800242, 2.19671366},
+    {5.35757875, -2.98359632},  {6.41134781, -7.79582109},
+    {5.06123223, -2.84952632},  {6.33969189, -7.83811637},
+    {5.11101701, -2.80965778},  {7.01442234, -7.47047664},
+    {6.82239627, -7.97467806},  {6.82647513, -7.64299033},
+    {-2.02651791, -1.81791892}, {-2.53859699, -2.20157508},
+    {5.07240334, -2.48183097},  {-1.58869273, -2.30974576},
+    {5.24011121, -2.78045434},  {4.89256735, -2.98154234},
+    {-2.61589554, -1.38994103}, {-2.37898031, 2.02633106},
+    {6.71148996, -7.87697906},  {-2.24310299, -2.01958434},
+    {4.80875851, -3.00716459},  {-2.20240163, -1.45942015},
+    {5.0317719, -3.33571147},   {4.68497184, -2.2794554},
+    {6.57950453, -7.84613618},  {-2.39557904, -0.97990746},
+    {4.89489222, -3.31597619},  {5.22670358, -2.79577779},
+    {4.87625814, -2.70562793},  {5.37121464, -2.78439938},
+    {6.48510206, -7.89652351},  {-2.78153003, 1.79940689},
+    {6.80163025, -7.7267214},   {-2.42494396, -1.95543603},
+    {7.01502605, -7.93922357},  {-2.00219795, -1.95198446},
+    {-2.82690524, 1.83749478},  {-2.81153684, 2.30020325},
+    {-1.46316156, -1.70854783}, {-2.36754202, -1.62836379},
+    {-3.12179904, 1.86079695},  {-2.80228975, 2.16674687},
+    {7.25447808, -7.87780152},  {6.34182023, -7.72244414},
+    {6.85296593, -7.6565112},   {6.40782187, -7.95817435},
+    {4.60981662, -2.6214774},   {6.82470403, -7.8453859},
+    {-2.94909893, 2.4408267},   {6.48588252, -8.42529572},
+    {6.55194867, -7.54354929},  {-2.64178285, 2.28031333},
+    {-1.95664147, -2.44817923}, {-2.00957937, -2.01412199},
+    {-2.24603999, 2.48964234},  {4.73274418, -2.89077558},
+    {-2.47534453, 1.85935482},  {-2.35722712, -1.99652695},
+    {5.15661108, -2.88549784},  {6.68114631, -7.73743642},
+    {4.93268708, -2.97510717},  {6.54260932, -8.82618456},
+    {-3.57448792, 2.06852256},  {6.63296723, -8.32752766},
+    {-3.58610661, 2.2761471},   {-2.73077783, 1.8138345},
+    {-2.14150912, 1.94984708},  {-2.27235876, -1.67574786},
+    {6.92208545, -8.46326386},  {4.58953972, -3.22764749},
+    {-3.36912131, 2.58470911},  {5.28526348, -2.55723196},
+    {6.55276593, -7.81387909},  {-1.79854507, -2.10170986}};
+}  // namespace
+
+namespace Acts::Test {
+
+BOOST_AUTO_TEST_CASE(AnnoySetSeedTest) {
+  using AnnoyMetric = Annoy::Euclidean;
+  using AnnoyModel =
+      Annoy::AnnoyIndex<unsigned int, double, AnnoyMetric, Annoy::Kiss32Random,
+                        Annoy::AnnoyIndexSingleThreadedBuildPolicy>;
+
+  const unsigned int annoySeed = 123456789;
+  const std::int32_t f = 2;
+
+  AnnoyModel annoyModel = AnnoyModel(f);
+
+  annoyModel.set_seed(annoySeed);
+
+  BOOST_CHECK_EQUAL(annoyModel.get_seed(), annoySeed);
+}
+
+BOOST_AUTO_TEST_CASE(AnnoyAddAndBuildTest) {
+  using AnnoyMetric = Annoy::Euclidean;
+  using AnnoyModel =
+      Annoy::AnnoyIndex<unsigned int, double, AnnoyMetric, Annoy::Kiss32Random,
+                        Annoy::AnnoyIndexSingleThreadedBuildPolicy>;
+
+  const unsigned int annoySeed = 123456789;
+  const std::int32_t f = 2;
+
+  AnnoyModel annoyModel = AnnoyModel(f);
+
+  annoyModel.set_seed(annoySeed);
+
+  unsigned int pointIndex = 0;
+  // Add spacePoints parameters to Annoy
+  for (const auto& arrayvec : testVector) {
+    annoyModel.add_item(pointIndex, arrayvec.data());
+    pointIndex++;
+  }
+
+  unsigned int nTrees = 2 * f;
+
+  annoyModel.build(nTrees);
+
+  /// Get the bucketSize closest spacePoints
+  unsigned int bucketSize = 5;
+  std::vector<unsigned int> bucketIds;
+  annoyModel.get_nns_by_item(0, bucketSize, -1, &bucketIds, nullptr);
+
+  BOOST_CHECK_EQUAL(bucketIds.size(), bucketSize);
+}
+
+BOOST_AUTO_TEST_CASE(AnnoyNeighborTest) {
+  using AnnoyMetric = Annoy::Euclidean;
+  using AnnoyModel =
+      Annoy::AnnoyIndex<unsigned int, double, AnnoyMetric, Annoy::Kiss32Random,
+                        Annoy::AnnoyIndexSingleThreadedBuildPolicy>;
+
+  const unsigned int annoySeed = 123456789;
+  const std::int32_t f = 2;
+
+  AnnoyModel annoyModel = AnnoyModel(f);
+
+  annoyModel.set_seed(annoySeed);
+
+  unsigned int pointIndex = 0;
+  // Add spacePoints parameters to Annoy
+  for (const auto& arrayvec : testVector) {
+    annoyModel.add_item(pointIndex, arrayvec.data());
+    pointIndex++;
+  }
+
+  unsigned int nTrees = 2 * f;
+
+  annoyModel.build(nTrees);
+
+  /// Validate neighbors for the first point
+  unsigned int bucketSize = 5;
+  std::vector<unsigned int> bucketIds;
+  std::vector<double> distances;
+  annoyModel.get_nns_by_item(0, bucketSize, -1, &bucketIds, &distances);
+
+  BOOST_CHECK_EQUAL(bucketIds.size(), bucketSize);
+  BOOST_CHECK_EQUAL(distances.size(), bucketSize);
+
+  // Check that the first item is the closest to itself
+  BOOST_CHECK_EQUAL(bucketIds[0], 0);
+
+  // Check the distances are sorted in ascending order
+  for (std::size_t i = 1; i < distances.size(); ++i) {
+    BOOST_CHECK(distances[i] >= distances[i - 1]);
+  }
+}
+
+BOOST_AUTO_TEST_CASE(AnnoyDistanceTest) {
+  using AnnoyMetric = Annoy::Euclidean;
+  using AnnoyModel =
+      Annoy::AnnoyIndex<unsigned int, double, AnnoyMetric, Annoy::Kiss32Random,
+                        Annoy::AnnoyIndexSingleThreadedBuildPolicy>;
+
+  const unsigned int annoySeed = 123456789;
+  const std::int32_t f = 2;
+
+  AnnoyModel annoyModel = AnnoyModel(f);
+
+  annoyModel.set_seed(annoySeed);
+
+  unsigned int pointIndex = 0;
+  // Add spacePoints parameters to Annoy
+  for (const auto& arrayvec : testVector) {
+    annoyModel.add_item(pointIndex, arrayvec.data());
+    pointIndex++;
+  }
+
+  unsigned int nTrees = 2 * f;
+
+  annoyModel.build(nTrees);
+
+  /// Validate the distance computation
+  double distance = annoyModel.get_distance(0, 1);
+  double expected_distance =
+      std::sqrt(std::pow(testVector[0][0] - testVector[1][0], 2) +
+                std::pow(testVector[0][1] - testVector[1][1], 2));
+
+  BOOST_CHECK_CLOSE(distance, expected_distance, 1e-5);
+}
+
+}  // namespace Acts::Test
diff --git a/Tests/UnitTests/Plugins/Hashing/CMakeLists.txt b/Tests/UnitTests/Plugins/Hashing/CMakeLists.txt
new file mode 100644
index 00000000000..d10b13e3b4f
--- /dev/null
+++ b/Tests/UnitTests/Plugins/Hashing/CMakeLists.txt
@@ -0,0 +1,4 @@
+set(unittest_extra_libraries ActsPluginHashing)
+
+add_unittest(AnnoyTest AnnoyTest.cpp)
+add_unittest(HashingSeedingTest HashingSeedingTest.cpp)
diff --git a/Tests/UnitTests/Plugins/Hashing/HashingSeedingTest.cpp b/Tests/UnitTests/Plugins/Hashing/HashingSeedingTest.cpp
new file mode 100644
index 00000000000..1efd25e8319
--- /dev/null
+++ b/Tests/UnitTests/Plugins/Hashing/HashingSeedingTest.cpp
@@ -0,0 +1,186 @@
+// This file is part of the ACTS project.
+//
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
+//
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
+
+#include <boost/test/unit_test.hpp>
+
+#include "Acts/Definitions/Algebra.hpp"
+#include "Acts/Definitions/Units.hpp"
+#include "Acts/Plugins/Hashing/HashingAlgorithm.hpp"
+#include "Acts/Plugins/Hashing/HashingAlgorithmConfig.hpp"
+#include "Acts/Plugins/Hashing/HashingAnnoy.hpp"
+#include "Acts/Plugins/Hashing/HashingTraining.hpp"
+#include "Acts/Plugins/Hashing/HashingTrainingConfig.hpp"
+#include "Acts/Seeding/BinnedGroup.hpp"
+#include "Acts/Seeding/detail/UtilityFunctions.hpp"
+
+#include <cmath>
+#include <cstdlib>
+#include <memory>
+#include <vector>
+
+#include <annoy/annoylib.h>
+#include <annoy/kissrandom.h>
+
+#include "SpacePoint.hpp"
+
+using namespace Acts::UnitLiterals;
+
+// Function to create and initialize the test vector
+std::vector<std::unique_ptr<const SpacePoint>> createTestVector() {
+  std::optional<float> t, varianceT;
+  std::vector<std::unique_ptr<const SpacePoint>> testVector;
+  testVector.reserve(6);  // Reserve space for efficiency
+
+  testVector.push_back(std::make_unique<SpacePoint>(
+      27.2535, -18.0088, -146.526, 29.0, 1, 0.00520833, 0.5, t, varianceT));
+  testVector.push_back(std::make_unique<SpacePoint>(
+      42.9126, -27.3057, -171.477, 50.0, 1, 0.0133333, 0.8, t, varianceT));
+  testVector.push_back(std::make_unique<SpacePoint>(
+      42.7087, -27.4589, -171.557, 50.0, 1, 0.0133333, 0.4, t, varianceT));
+  testVector.push_back(std::make_unique<SpacePoint>(
+      74.3652, -45.8552, -221.277, 80.0, 1, 0.0133333, 0.4, t, varianceT));
+  testVector.push_back(std::make_unique<SpacePoint>(
+      104.12, -63.4203, -268.468, 110.0, 1, 0.0133333, 0.4, t, varianceT));
+  testVector.push_back(std::make_unique<SpacePoint>(
+      104.412, -63.1851, -268.468, 110.0, 1, 0.0133333, 0.4, t, varianceT));
+  return testVector;
+}
+namespace Acts::Test {
+BOOST_AUTO_TEST_CASE(HashingBucketCreationTest) {
+  using SpacePointPtrVector = std::vector<const SpacePoint*>;
+
+  // Initialize testVector using the createTestVector function
+  auto testVector = createTestVector();
+
+  // Extract raw pointers from unique_ptrs for the test
+  SpacePointPtrVector spVec;
+  spVec.reserve(testVector.size());
+  for (const auto& sp : testVector) {
+    spVec.push_back(sp.get());
+  }
+
+  /// Random seed for Annoy
+  unsigned int annoySeed = 123456789;
+
+  /// Number of features to use
+  std::int32_t nf = 1;
+
+  /// Size of the buckets = number of spacepoints in the bucket
+  unsigned int bucketSize = 100;
+  /// Number of zBins
+  unsigned int zBins = 10000;
+  /// Number of phiBins
+  unsigned int phiBins = 0;
+
+  /// Layer selection
+  double layerRMin = 25;
+  double layerRMax = 40;
+  double layerZMin = -550;
+  double layerZMax = 550;
+
+  Acts::HashingAlgorithmConfig hashingConfig;
+  hashingConfig.bucketSize = bucketSize;
+  hashingConfig.zBins = zBins;
+  hashingConfig.phiBins = phiBins;
+  hashingConfig.layerRMin = layerRMin;
+  hashingConfig.layerRMax = layerRMax;
+  hashingConfig.layerZMin = layerZMin;
+  hashingConfig.layerZMax = layerZMax;
+
+  Acts::HashingTrainingConfig hashingTrainingConfig;
+  hashingTrainingConfig.annoySeed = annoySeed;
+  hashingTrainingConfig.f = nf;
+
+  Acts::HashingAlgorithm<const SpacePoint*, SpacePointPtrVector> hashing =
+      Acts::HashingAlgorithm<const SpacePoint*, SpacePointPtrVector>(
+          hashingConfig);
+  Acts::HashingTrainingAlgorithm<SpacePointPtrVector> hashingTraining =
+      Acts::HashingTrainingAlgorithm<SpacePointPtrVector>(
+          hashingTrainingConfig);
+
+  // Hashing Training
+  Acts::AnnoyModel annoyModel = hashingTraining.execute(spVec);
+
+  // Hashing
+  std::vector<SpacePointPtrVector> bucketsPtrs;
+  bucketsPtrs.clear();
+  hashing.execute(spVec, &annoyModel, bucketsPtrs);
+
+  // Check the number of buckets created
+  BOOST_CHECK_GT(bucketsPtrs.size(), 0);
+}
+
+BOOST_AUTO_TEST_CASE(HashingBucketContentTest) {
+  using SpacePointPtrVector = std::vector<const SpacePoint*>;
+
+  // Initialize testVector using the createTestVector function
+  auto testVector = createTestVector();
+
+  // Extract raw pointers from unique_ptrs for the test
+  SpacePointPtrVector spVec;
+  spVec.reserve(testVector.size());
+  for (const auto& sp : testVector) {
+    spVec.push_back(sp.get());
+  }
+
+  /// Random seed for Annoy
+  unsigned int annoySeed = 123456789;
+
+  /// Number of features to use
+  std::int32_t nf = 1;
+
+  /// Size of the buckets = number of spacepoints in the bucket
+  unsigned int bucketSize = 100;
+  /// Number of zBins
+  unsigned int zBins = 10000;
+  /// Number of phiBins
+  unsigned int phiBins = 0;
+
+  /// Layer selection
+  double layerRMin = 25;
+  double layerRMax = 40;
+  double layerZMin = -550;
+  double layerZMax = 550;
+
+  Acts::HashingAlgorithmConfig hashingConfig;
+  hashingConfig.bucketSize = bucketSize;
+  hashingConfig.zBins = zBins;
+  hashingConfig.phiBins = phiBins;
+  hashingConfig.layerRMin = layerRMin;
+  hashingConfig.layerRMax = layerRMax;
+  hashingConfig.layerZMin = layerZMin;
+  hashingConfig.layerZMax = layerZMax;
+
+  Acts::HashingTrainingConfig hashingTrainingConfig;
+  hashingTrainingConfig.annoySeed = annoySeed;
+  hashingTrainingConfig.f = nf;
+
+  Acts::HashingAlgorithm<const SpacePoint*, SpacePointPtrVector> hashing =
+      Acts::HashingAlgorithm<const SpacePoint*, SpacePointPtrVector>(
+          hashingConfig);
+  Acts::HashingTrainingAlgorithm<SpacePointPtrVector> hashingTraining =
+      Acts::HashingTrainingAlgorithm<SpacePointPtrVector>(
+          hashingTrainingConfig);
+
+  // Hashing Training
+  Acts::AnnoyModel annoyModel = hashingTraining.execute(spVec);
+
+  // Hashing
+  std::vector<SpacePointPtrVector> bucketsPtrs;
+  bucketsPtrs.clear();
+  hashing.execute(spVec, &annoyModel, bucketsPtrs);
+
+  // Validate bucket content
+  for (const auto& bucket : bucketsPtrs) {
+    BOOST_CHECK_LE(bucket.size(), bucketSize);
+    for (const auto* sp : bucket) {
+      BOOST_CHECK(sp != nullptr);
+    }
+  }
+}
+}  // namespace Acts::Test
diff --git a/Tests/UnitTests/Plugins/Hashing/SpacePoint.hpp b/Tests/UnitTests/Plugins/Hashing/SpacePoint.hpp
new file mode 100644
index 00000000000..4b6b6ddd31f
--- /dev/null
+++ b/Tests/UnitTests/Plugins/Hashing/SpacePoint.hpp
@@ -0,0 +1,54 @@
+// This file is part of the ACTS project.
+//
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
+//
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
+
+#pragma once
+
+#include <cmath>
+#include <optional>
+
+struct SpacePoint {
+  // Member variables
+  float m_x{};
+  float m_y{};
+  float m_z{};
+  float m_r{};
+  int layer{};
+  float varianceR{};
+  float varianceZ{};
+  std::optional<float> m_t;
+  std::optional<float> varianceT;
+
+  // Default constructor
+  SpacePoint() = default;
+
+  // Constructor with parameters
+  SpacePoint(float x, float y, float z, float r, int l, float varR, float varZ,
+             std::optional<float> t, std::optional<float> varT)
+      : m_x(x),
+        m_y(y),
+        m_z(z),
+        m_r(r),
+        layer(l),
+        varianceR(varR),
+        varianceZ(varZ),
+        m_t(t),
+        varianceT(varT) {}
+
+  // Member functions
+  float x() const { return m_x; }
+  float y() const { return m_y; }
+  float z() const { return m_z; }
+  float r() const { return m_r; }
+  std::optional<float> t() const { return m_t; }
+
+  // Equality operator
+  friend bool operator==(const SpacePoint &a, const SpacePoint &b) {
+    return std::abs(a.m_x - b.m_x) < 1e-6 && std::abs(a.m_y - b.m_y) < 1e-6 &&
+           std::abs(a.m_z - b.m_z) < 1e-6;
+  }
+};
diff --git a/Tests/UnitTests/Plugins/Json/AlgebraJsonConverterTests.cpp b/Tests/UnitTests/Plugins/Json/AlgebraJsonConverterTests.cpp
index cb0c89c004a..3aca472080b 100644
--- a/Tests/UnitTests/Plugins/Json/AlgebraJsonConverterTests.cpp
+++ b/Tests/UnitTests/Plugins/Json/AlgebraJsonConverterTests.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2021 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include <boost/test/unit_test.hpp>
 
diff --git a/Tests/UnitTests/Plugins/Json/CMakeLists.txt b/Tests/UnitTests/Plugins/Json/CMakeLists.txt
index 1f8573fdf50..141f86fb3fe 100644
--- a/Tests/UnitTests/Plugins/Json/CMakeLists.txt
+++ b/Tests/UnitTests/Plugins/Json/CMakeLists.txt
@@ -15,3 +15,4 @@ add_unittest(UtilitiesJsonConverter UtilitiesJsonConverterTests.cpp)
 add_unittest(SurfaceBoundsJsonConverter SurfaceBoundsJsonConverterTests.cpp)
 add_unittest(SurfaceJsonConverter SurfaceJsonConverterTests.cpp)
 add_unittest(VolumeBoundsJsonConverter VolumeBoundsJsonConverterTests.cpp)
+add_unittest(TrackParametersJsonConverter TrackParametersJsonConverterTests.cpp)
diff --git a/Tests/UnitTests/Plugins/Json/DetectorJsonConverterTests.cpp b/Tests/UnitTests/Plugins/Json/DetectorJsonConverterTests.cpp
index 224549bb340..2d18bd98a45 100644
--- a/Tests/UnitTests/Plugins/Json/DetectorJsonConverterTests.cpp
+++ b/Tests/UnitTests/Plugins/Json/DetectorJsonConverterTests.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2023 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include <boost/test/unit_test.hpp>
 
@@ -32,6 +32,7 @@
 
 #include <fstream>
 #include <memory>
+#include <numbers>
 #include <vector>
 
 #include <nlohmann/json.hpp>
@@ -169,8 +170,8 @@ BOOST_AUTO_TEST_CASE(BeamPipeEndcapBarrelDetector) {
     lsConfig.auxiliary = "*** Endcap with 22 surfaces ***";
     lsConfig.surfacesProvider = endcapSurfaces;
     lsConfig.binnings = {Acts::Experimental::ProtoBinning(
-        Acts::BinningValue::binPhi, Acts::AxisBoundaryType::Closed, -M_PI, M_PI,
-        22u, 1u)};
+        Acts::BinningValue::binPhi, Acts::AxisBoundaryType::Closed,
+        -std::numbers::pi, std::numbers::pi, 22u, 1u)};
 
     auto layerBuilder =
         std::make_shared<Acts::Experimental::LayerStructureBuilder>(
@@ -178,7 +179,7 @@ BOOST_AUTO_TEST_CASE(BeamPipeEndcapBarrelDetector) {
                                              Acts::Logging::VERBOSE));
 
     Acts::Experimental::VolumeStructureBuilder::Config shapeConfig;
-    shapeConfig.boundValues = {18, 100, 10., M_PI, 0.};
+    shapeConfig.boundValues = {18, 100, 10., std::numbers::pi, 0.};
     shapeConfig.transform =
         Acts::Transform3{Acts::Transform3::Identity()}.pretranslate(
             Acts::Vector3(0., 0., ep));
@@ -203,7 +204,7 @@ BOOST_AUTO_TEST_CASE(BeamPipeEndcapBarrelDetector) {
 
   // Central barrel
   Acts::Experimental::VolumeStructureBuilder::Config innerShapeConfig;
-  innerShapeConfig.boundValues = {18., 60., 700., M_PI, 0.};
+  innerShapeConfig.boundValues = {18., 60., 700., std::numbers::pi, 0.};
   innerShapeConfig.boundsType = Acts::VolumeBounds::BoundsType::eCylinder;
 
   auto innerShapeBuilder =
@@ -234,9 +235,9 @@ BOOST_AUTO_TEST_CASE(BeamPipeEndcapBarrelDetector) {
       Acts::Experimental::ProtoBinning{Acts::BinningValue::binZ,
                                        Acts::AxisBoundaryType::Bound, -480.,
                                        480., 14u, 1u},
-      Acts::Experimental::ProtoBinning(Acts::BinningValue::binPhi,
-                                       Acts::AxisBoundaryType::Closed, -M_PI,
-                                       M_PI, 32u, 1u)};
+      Acts::Experimental::ProtoBinning(
+          Acts::BinningValue::binPhi, Acts::AxisBoundaryType::Closed,
+          -std::numbers::pi, std::numbers::pi, 32u, 1u)};
 
   auto barrelBuilder =
       std::make_shared<Acts::Experimental::LayerStructureBuilder>(
@@ -244,7 +245,7 @@ BOOST_AUTO_TEST_CASE(BeamPipeEndcapBarrelDetector) {
                                            Acts::Logging::VERBOSE));
 
   Acts::Experimental::VolumeStructureBuilder::Config shapeConfig;
-  shapeConfig.boundValues = {60., 80., 700., M_PI, 0.};
+  shapeConfig.boundValues = {60., 80., 700., std::numbers::pi, 0.};
   shapeConfig.boundsType = Acts::VolumeBounds::BoundsType::eCylinder;
 
   auto shapeBuilder =
@@ -262,7 +263,7 @@ BOOST_AUTO_TEST_CASE(BeamPipeEndcapBarrelDetector) {
 
   // Outer shape
   Acts::Experimental::VolumeStructureBuilder::Config outerShapeConfig;
-  outerShapeConfig.boundValues = {80., 100., 700., M_PI, 0.};
+  outerShapeConfig.boundValues = {80., 100., 700., std::numbers::pi, 0.};
   outerShapeConfig.boundsType = Acts::VolumeBounds::BoundsType::eCylinder;
 
   auto outerShapeBuilder =
@@ -300,7 +301,7 @@ BOOST_AUTO_TEST_CASE(BeamPipeEndcapBarrelDetector) {
 
   // Beam Pipe
   Acts::Experimental::VolumeStructureBuilder::Config bpShapeConfig;
-  bpShapeConfig.boundValues = {0., 18., 720., M_PI, 0.};
+  bpShapeConfig.boundValues = {0., 18., 720., std::numbers::pi, 0.};
   bpShapeConfig.boundsType = Acts::VolumeBounds::BoundsType::eCylinder;
 
   auto bpShapeBuilder =
diff --git a/Tests/UnitTests/Plugins/Json/DetectorVolumeFinderJsonConverterTests.cpp b/Tests/UnitTests/Plugins/Json/DetectorVolumeFinderJsonConverterTests.cpp
index f9842a182d5..c5f30c1ce7d 100644
--- a/Tests/UnitTests/Plugins/Json/DetectorVolumeFinderJsonConverterTests.cpp
+++ b/Tests/UnitTests/Plugins/Json/DetectorVolumeFinderJsonConverterTests.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2023 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include <boost/test/unit_test.hpp>
 
diff --git a/Tests/UnitTests/Plugins/Json/DetectorVolumeJsonConverterTests.cpp b/Tests/UnitTests/Plugins/Json/DetectorVolumeJsonConverterTests.cpp
index 126322514e2..b1701f06128 100644
--- a/Tests/UnitTests/Plugins/Json/DetectorVolumeJsonConverterTests.cpp
+++ b/Tests/UnitTests/Plugins/Json/DetectorVolumeJsonConverterTests.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2023 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include <boost/test/unit_test.hpp>
 
@@ -27,6 +27,7 @@
 
 #include <fstream>
 #include <memory>
+#include <numbers>
 #include <vector>
 
 #include <nlohmann/json.hpp>
@@ -148,8 +149,8 @@ BOOST_AUTO_TEST_CASE(EndcapVolumeWithSurfaces) {
   lsConfig.auxiliary = "*** Endcap with 22 surfaces ***";
   lsConfig.surfacesProvider = endcapSurfaces;
   lsConfig.binnings = {Acts::Experimental::ProtoBinning(
-      Acts::BinningValue::binPhi, Acts::AxisBoundaryType::Closed, -M_PI, M_PI,
-      22u, 1u)};
+      Acts::BinningValue::binPhi, Acts::AxisBoundaryType::Closed,
+      -std::numbers::pi, std::numbers::pi, 22u, 1u)};
 
   auto layerBuilder =
       std::make_shared<Acts::Experimental::LayerStructureBuilder>(
@@ -157,7 +158,7 @@ BOOST_AUTO_TEST_CASE(EndcapVolumeWithSurfaces) {
                                            Acts::Logging::VERBOSE));
 
   Acts::Experimental::VolumeStructureBuilder::Config shapeConfig;
-  shapeConfig.boundValues = {10, 100, 10., M_PI, 0.};
+  shapeConfig.boundValues = {10, 100, 10., std::numbers::pi, 0.};
   shapeConfig.transform =
       Acts::Transform3{Acts::Transform3::Identity()}.pretranslate(
           Acts::Vector3(0., 0., -800.));
@@ -230,9 +231,9 @@ BOOST_AUTO_TEST_CASE(BarrelVolumeWithSurfaces) {
       Acts::Experimental::ProtoBinning{Acts::BinningValue::binZ,
                                        Acts::AxisBoundaryType::Bound, -480.,
                                        480., 14u, 1u},
-      Acts::Experimental::ProtoBinning(Acts::BinningValue::binPhi,
-                                       Acts::AxisBoundaryType::Closed, -M_PI,
-                                       M_PI, 32u, 1u)};
+      Acts::Experimental::ProtoBinning(
+          Acts::BinningValue::binPhi, Acts::AxisBoundaryType::Closed,
+          -std::numbers::pi, std::numbers::pi, 32u, 1u)};
 
   auto barrelBuilder =
       std::make_shared<Acts::Experimental::LayerStructureBuilder>(
@@ -240,7 +241,7 @@ BOOST_AUTO_TEST_CASE(BarrelVolumeWithSurfaces) {
                                            Acts::Logging::VERBOSE));
 
   Acts::Experimental::VolumeStructureBuilder::Config shapeConfig;
-  shapeConfig.boundValues = {60., 80., 800., M_PI, 0.};
+  shapeConfig.boundValues = {60., 80., 800., std::numbers::pi, 0.};
   shapeConfig.boundsType = Acts::VolumeBounds::BoundsType::eCylinder;
 
   auto shapeBuilder =
diff --git a/Tests/UnitTests/Plugins/Json/EqualityHelpers.hpp b/Tests/UnitTests/Plugins/Json/EqualityHelpers.hpp
index 546ba6d8be7..b84d5f58a22 100644
--- a/Tests/UnitTests/Plugins/Json/EqualityHelpers.hpp
+++ b/Tests/UnitTests/Plugins/Json/EqualityHelpers.hpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2022 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #pragma once
 
diff --git a/Tests/UnitTests/Plugins/Json/ExtentJsonConverterTests.cpp b/Tests/UnitTests/Plugins/Json/ExtentJsonConverterTests.cpp
index f8e943c66c3..3fc16ad0ccf 100644
--- a/Tests/UnitTests/Plugins/Json/ExtentJsonConverterTests.cpp
+++ b/Tests/UnitTests/Plugins/Json/ExtentJsonConverterTests.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2022 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include <boost/test/unit_test.hpp>
 
diff --git a/Tests/UnitTests/Plugins/Json/GeometryHierarchyMapJsonConverterTests.cpp b/Tests/UnitTests/Plugins/Json/GeometryHierarchyMapJsonConverterTests.cpp
index 394e24a39ec..238cd3b96cc 100644
--- a/Tests/UnitTests/Plugins/Json/GeometryHierarchyMapJsonConverterTests.cpp
+++ b/Tests/UnitTests/Plugins/Json/GeometryHierarchyMapJsonConverterTests.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2020 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include <boost/test/unit_test.hpp>
 
diff --git a/Tests/UnitTests/Plugins/Json/GridJsonConverterTests.cpp b/Tests/UnitTests/Plugins/Json/GridJsonConverterTests.cpp
index 07a92711ebf..cac514a18ac 100644
--- a/Tests/UnitTests/Plugins/Json/GridJsonConverterTests.cpp
+++ b/Tests/UnitTests/Plugins/Json/GridJsonConverterTests.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2023 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include <boost/test/unit_test.hpp>
 
@@ -16,6 +16,7 @@
 #include <array>
 #include <fstream>
 #include <memory>
+#include <numbers>
 #include <vector>
 
 #include <nlohmann/json.hpp>
@@ -198,7 +199,8 @@ BOOST_AUTO_TEST_CASE(Grid2DSingleEntryBound) {
 BOOST_AUTO_TEST_CASE(Grid2DSingleEntryBoundClosed) {
   using EqBoundEqClosed = Acts::GridAxisGenerators::EqBoundEqClosed;
 
-  EqBoundEqClosed eqBoundEqClosed{{-6., 6.}, 3, {-M_PI, M_PI}, 3};
+  EqBoundEqClosed eqBoundEqClosed{
+      {-6., 6.}, 3, {-std::numbers::pi, std::numbers::pi}, 3};
   // Create the grid with the provided axis generator
   using GridTypeEQBEQC =
       typename EqBoundEqClosed::template grid_type<std::size_t>;
diff --git a/Tests/UnitTests/Plugins/Json/MaterialJsonConverterTests.cpp b/Tests/UnitTests/Plugins/Json/MaterialJsonConverterTests.cpp
index 2a755ef8dad..6647ee69fe4 100644
--- a/Tests/UnitTests/Plugins/Json/MaterialJsonConverterTests.cpp
+++ b/Tests/UnitTests/Plugins/Json/MaterialJsonConverterTests.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2023 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include <boost/test/unit_test.hpp>
 
@@ -19,6 +19,7 @@
 #include <array>
 #include <fstream>
 #include <memory>
+#include <numbers>
 #include <vector>
 
 #include <nlohmann/json.hpp>
@@ -108,18 +109,20 @@ BOOST_AUTO_TEST_CASE(IndexedSurfaceMaterial2DTests) {
   using EqEqGrid = EqBoundEqClosed::grid_type<std::size_t>;
   using Point = EqEqGrid::point_t;
 
-  EqBoundEqClosed eqeqBound{{-1., 1.}, 2, {-M_PI, M_PI}, 4};
+  EqBoundEqClosed eqeqBound{
+      {-1., 1.}, 2, {-std::numbers::pi, std::numbers::pi}, 4};
   EqEqGrid eqeqGrid{eqeqBound()};
 
-  eqeqGrid.atPosition(Point{-0.5, -M_PI * 0.75}) = 1u;  // material 1
-  eqeqGrid.atPosition(Point{-0.5, -M_PI * 0.25}) = 1u;  // material 1
-  eqeqGrid.atPosition(Point{-0.5, M_PI * 0.25}) = 0u;   // vacuum
-  eqeqGrid.atPosition(Point{-0.5, M_PI * 0.75}) = 2u;   // material 2
+  eqeqGrid.atPosition(Point{-0.5, -std::numbers::pi * 0.75}) =
+      1u;                                                          // material 1
+  eqeqGrid.atPosition(Point{-0.5, -std::numbers::pi / 4.}) = 1u;   // material 1
+  eqeqGrid.atPosition(Point{-0.5, std::numbers::pi / 4.}) = 0u;    // vacuum
+  eqeqGrid.atPosition(Point{-0.5, std::numbers::pi * 0.75}) = 2u;  // material 2
 
-  eqeqGrid.atPosition(Point{0.5, -M_PI * 0.75}) = 0u;  // vacuum
-  eqeqGrid.atPosition(Point{0.5, -M_PI * 0.25}) = 3u;  // material 3
-  eqeqGrid.atPosition(Point{0.5, M_PI * 0.25}) = 3u;   // material 3
-  eqeqGrid.atPosition(Point{0.5, M_PI * 0.75}) = 0u;   // vacuum
+  eqeqGrid.atPosition(Point{0.5, -std::numbers::pi * 0.75}) = 0u;  // vacuum
+  eqeqGrid.atPosition(Point{0.5, -std::numbers::pi / 4.}) = 3u;    // material 3
+  eqeqGrid.atPosition(Point{0.5, std::numbers::pi / 4.}) = 3u;     // material 3
+  eqeqGrid.atPosition(Point{0.5, std::numbers::pi * 0.75}) = 0u;   // vacuum
 
   auto boundToGrid =
       std::make_unique<const Acts::GridAccess::LocalSubspace<0u, 1u>>();
diff --git a/Tests/UnitTests/Plugins/Json/MaterialMapJsonConverterTests.cpp b/Tests/UnitTests/Plugins/Json/MaterialMapJsonConverterTests.cpp
index 7d0ffd19ac0..518ff1eab4e 100644
--- a/Tests/UnitTests/Plugins/Json/MaterialMapJsonConverterTests.cpp
+++ b/Tests/UnitTests/Plugins/Json/MaterialMapJsonConverterTests.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2019-2023 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include <boost/test/unit_test.hpp>
 
diff --git a/Tests/UnitTests/Plugins/Json/PortalJsonConverterTests.cpp b/Tests/UnitTests/Plugins/Json/PortalJsonConverterTests.cpp
index 7bc829a1c88..770076c1a0e 100644
--- a/Tests/UnitTests/Plugins/Json/PortalJsonConverterTests.cpp
+++ b/Tests/UnitTests/Plugins/Json/PortalJsonConverterTests.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2023 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include <boost/test/unit_test.hpp>
 
@@ -14,6 +14,7 @@
 #include "Acts/Detector/detail/PortalHelper.hpp"
 #include "Acts/Geometry/GeometryContext.hpp"
 #include "Acts/Plugins/Json/PortalJsonConverter.hpp"
+#include "Acts/Surfaces/CurvilinearSurface.hpp"
 #include "Acts/Surfaces/PlaneSurface.hpp"
 #include "Acts/Surfaces/Surface.hpp"
 #include "Acts/Tests/CommonHelpers/FloatComparisons.hpp"
@@ -33,8 +34,9 @@ BOOST_AUTO_TEST_SUITE(PortalJsonConverter)
 BOOST_AUTO_TEST_CASE(PortalUnconnected) {
   std::ofstream out;
 
-  auto surface = Acts::Surface::makeShared<Acts::PlaneSurface>(
-      Acts::Vector3(0., 0., 0.), Acts::Vector3(0., 1., 0.));
+  auto surface = Acts::CurvilinearSurface(Acts::Vector3(0., 0., 0.),
+                                          Acts::Vector3(0., 1., 0.))
+                     .planeSurface();
 
   auto portal =
       std::make_shared<Acts::Experimental::Portal>(std::move(surface));
@@ -66,8 +68,9 @@ BOOST_AUTO_TEST_CASE(PortalSingleConnected) {
   auto forwardVolume = std::make_shared<Acts::Experimental::DetectorVolume>();
   auto backwardVolume = std::make_shared<Acts::Experimental::DetectorVolume>();
 
-  auto surface = Acts::Surface::makeShared<Acts::PlaneSurface>(
-      Acts::Vector3(0., 0., 0.), Acts::Vector3(0., 1., 0.));
+  auto surface = Acts::CurvilinearSurface(Acts::Vector3(0., 0., 0.),
+                                          Acts::Vector3(0., 1., 0.))
+                     .planeSurface();
 
   auto portal =
       std::make_shared<Acts::Experimental::Portal>(std::move(surface));
@@ -112,8 +115,9 @@ BOOST_AUTO_TEST_CASE(PortalMultiConnected) {
 
   auto backwardVolume = std::make_shared<Acts::Experimental::DetectorVolume>();
 
-  auto surface = Acts::Surface::makeShared<Acts::PlaneSurface>(
-      Acts::Vector3(0., 0., 0.), Acts::Vector3(0., 1., 0.));
+  auto surface = Acts::CurvilinearSurface(Acts::Vector3(0., 0., 0.),
+                                          Acts::Vector3(0., 1., 0.))
+                     .planeSurface();
 
   auto portal =
       std::make_shared<Acts::Experimental::Portal>(std::move(surface));
diff --git a/Tests/UnitTests/Plugins/Json/ProtoDetectorJsonConverterTests.cpp b/Tests/UnitTests/Plugins/Json/ProtoDetectorJsonConverterTests.cpp
index f728f900542..e5fbc8cf797 100644
--- a/Tests/UnitTests/Plugins/Json/ProtoDetectorJsonConverterTests.cpp
+++ b/Tests/UnitTests/Plugins/Json/ProtoDetectorJsonConverterTests.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2022 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include <boost/test/unit_test.hpp>
 
@@ -22,6 +22,7 @@
 #include <cmath>
 #include <fstream>
 #include <iterator>
+#include <numbers>
 #include <optional>
 #include <string>
 #include <vector>
@@ -174,8 +175,9 @@ BOOST_AUTO_TEST_CASE(ProtoDetectorRoundTrip) {
 
   Acts::BinningData pixEcBinningR =
       Acts::BinningData(Acts::open, Acts::BinningValue::binR, 2., 0., 1.);
-  Acts::BinningData pixEcBinningPhi = Acts::BinningData(
-      Acts::closed, Acts::BinningValue::binPhi, 30., -M_PI, M_PI);
+  Acts::BinningData pixEcBinningPhi =
+      Acts::BinningData(Acts::closed, Acts::BinningValue::binPhi, 30.,
+                        -std::numbers::pi, std::numbers::pi);
 
   for (auto& cv : pixelNec.container.value().constituentVolumes) {
     cv.extent.setEnvelope(discLayerEnvelope);
@@ -278,8 +280,9 @@ BOOST_AUTO_TEST_CASE(ProtoDetectorRoundTrip) {
 
   Acts::BinningData sstripEcBinningR =
       Acts::BinningData(Acts::open, Acts::BinningValue::binR, 3., 0., 1.);
-  Acts::BinningData sstripEcBinningPhi = Acts::BinningData(
-      Acts::closed, Acts::BinningValue::binPhi, 42., -M_PI, M_PI);
+  Acts::BinningData sstripEcBinningPhi =
+      Acts::BinningData(Acts::closed, Acts::BinningValue::binPhi, 42.,
+                        -std::numbers::pi, std::numbers::pi);
 
   Acts::ProtoVolume sstripNec;
   sstripNec.name = "odd-sstrip-nec";
diff --git a/Tests/UnitTests/Plugins/Json/SurfaceBoundsJsonConverterTests.cpp b/Tests/UnitTests/Plugins/Json/SurfaceBoundsJsonConverterTests.cpp
index d79673e7571..82ed67867bd 100644
--- a/Tests/UnitTests/Plugins/Json/SurfaceBoundsJsonConverterTests.cpp
+++ b/Tests/UnitTests/Plugins/Json/SurfaceBoundsJsonConverterTests.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2021 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include <boost/test/unit_test.hpp>
 
diff --git a/Tests/UnitTests/Plugins/Json/SurfaceJsonConverterTests.cpp b/Tests/UnitTests/Plugins/Json/SurfaceJsonConverterTests.cpp
index 44c8b3470f9..75dedda0751 100644
--- a/Tests/UnitTests/Plugins/Json/SurfaceJsonConverterTests.cpp
+++ b/Tests/UnitTests/Plugins/Json/SurfaceJsonConverterTests.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2021 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include <boost/test/unit_test.hpp>
 
diff --git a/Tests/UnitTests/Plugins/Json/TrackParametersJsonConverterTests.cpp b/Tests/UnitTests/Plugins/Json/TrackParametersJsonConverterTests.cpp
new file mode 100644
index 00000000000..5c0882cb12c
--- /dev/null
+++ b/Tests/UnitTests/Plugins/Json/TrackParametersJsonConverterTests.cpp
@@ -0,0 +1,97 @@
+// This file is part of the ACTS project.
+//
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
+//
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
+
+#include <boost/test/unit_test.hpp>
+
+#include "Acts/EventData/ParticleHypothesis.hpp"
+#include "Acts/EventData/TrackParameters.hpp"
+#include "Acts/Plugins/Json/TrackParametersJsonConverter.hpp"
+#include "Acts/Surfaces/PlaneSurface.hpp"
+#include "Acts/Surfaces/RectangleBounds.hpp"
+
+#include <memory>
+
+#include <nlohmann/json.hpp>
+
+BOOST_AUTO_TEST_SUITE(TrackParametersJsonIO)
+
+BOOST_AUTO_TEST_CASE(TrackParametersJsonIO) {
+  Acts::GeometryContext gctx;
+
+  // Track parameters
+  Acts::Vector4 position(1., 2., 3., 4.);
+  Acts::ActsScalar phi = 0.1;
+  Acts::ActsScalar theta = 0.2;
+  Acts::ActsScalar qOverP = 3.0;
+  Acts::ParticleHypothesis particle = Acts::ParticleHypothesis::electron();
+  Acts::FreeMatrix freeCov = Acts::FreeMatrix::Identity();
+  Acts::BoundMatrix boundCov = Acts::BoundMatrix::Identity();
+
+  auto surface = Acts::Surface::makeShared<Acts::PlaneSurface>(
+      Acts::Transform3::Identity(),
+      std::make_shared<Acts::RectangleBounds>(10., 10.));
+  surface->assignGeometryId(Acts::GeometryIdentifier(1u));
+
+  // Free track parameters conversion
+  Acts::FreeTrackParameters ftp(position, phi, theta, qOverP, freeCov,
+                                particle);
+
+  nlohmann::json ftpJson = ftp;
+
+  Acts::FreeTrackParameters ftpRead = ftpJson;
+
+  BOOST_CHECK_EQUAL(ftp.position(), ftpRead.position());
+  BOOST_CHECK_EQUAL(ftp.direction(), ftpRead.direction());
+  BOOST_CHECK_EQUAL(ftp.qOverP(), ftpRead.qOverP());
+  BOOST_CHECK_EQUAL(ftp.covariance().value(), ftpRead.covariance().value());
+  BOOST_CHECK_EQUAL(ftp.particleHypothesis(), ftpRead.particleHypothesis());
+
+  // Curvilinear track parameters conversion
+  Acts::CurvilinearTrackParameters ctp(position, phi, theta, qOverP, boundCov,
+                                       particle);
+
+  nlohmann::json ctpJson = ctp;
+
+  Acts::CurvilinearTrackParameters ctpRead = ctpJson;
+
+  BOOST_CHECK_EQUAL(ctp.position(), ctpRead.position());
+  BOOST_CHECK_EQUAL(ctp.direction(), ctpRead.direction());
+  BOOST_CHECK_EQUAL(ctp.qOverP(), ctpRead.qOverP());
+  BOOST_CHECK_EQUAL(ctp.covariance().value(), ctpRead.covariance().value());
+  BOOST_CHECK_EQUAL(ctp.particleHypothesis(), ctpRead.particleHypothesis());
+
+  BOOST_CHECK(ctp.referenceSurface().transform(gctx).isApprox(
+      ctpRead.referenceSurface().transform(gctx)));
+  BOOST_CHECK_EQUAL(ctp.referenceSurface().geometryId(),
+                    ctpRead.referenceSurface().geometryId());
+  BOOST_CHECK_EQUAL(ctp.referenceSurface().bounds(),
+                    ctpRead.referenceSurface().bounds());
+
+  // Bound track parameters conversion
+  Acts::BoundVector boundPosition{1., 2., 3., 4., 5., 6.};
+  Acts::BoundTrackParameters btp(surface, boundPosition, boundCov, particle);
+
+  nlohmann::json btpJson = btp;
+
+  Acts::BoundTrackParameters btpRead = btpJson;
+
+  BOOST_CHECK_EQUAL(btp.position(gctx), btpRead.position(gctx));
+  BOOST_CHECK_EQUAL(btp.direction(), btpRead.direction());
+  BOOST_CHECK_EQUAL(btp.qOverP(), btpRead.qOverP());
+  BOOST_CHECK_EQUAL(btp.covariance().value(), btpRead.covariance().value());
+  BOOST_CHECK_EQUAL(btp.particleHypothesis(), btpRead.particleHypothesis());
+
+  BOOST_CHECK(btp.referenceSurface().transform(gctx).isApprox(
+      btpRead.referenceSurface().transform(gctx)));
+  BOOST_CHECK_EQUAL(btp.referenceSurface().geometryId(),
+                    btpRead.referenceSurface().geometryId());
+  BOOST_CHECK_EQUAL(btp.referenceSurface().bounds(),
+                    btpRead.referenceSurface().bounds());
+}
+
+BOOST_AUTO_TEST_SUITE_END()
diff --git a/Tests/UnitTests/Plugins/Json/UtilitiesJsonConverterTests.cpp b/Tests/UnitTests/Plugins/Json/UtilitiesJsonConverterTests.cpp
index 8a5b1c9c533..24831d53de0 100644
--- a/Tests/UnitTests/Plugins/Json/UtilitiesJsonConverterTests.cpp
+++ b/Tests/UnitTests/Plugins/Json/UtilitiesJsonConverterTests.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2021 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include <boost/test/unit_test.hpp>
 
@@ -17,6 +17,7 @@
 #include <cmath>
 #include <fstream>
 #include <initializer_list>
+#include <numbers>
 #include <string>
 #include <utility>
 #include <vector>
@@ -54,7 +55,8 @@ BOOST_AUTO_TEST_CASE(BinUtilityRoundTripTests) {
   BOOST_CHECK(isEqual(reference, test, 0.0001));
 
   // Increase to two dimensions
-  reference += BinUtility(10., -M_PI, M_PI, closed, BinningValue::binPhi);
+  reference += BinUtility(10., -std::numbers::pi, std::numbers::pi, closed,
+                          BinningValue::binPhi);
   nlohmann::json jtwoDimOut;
   to_json(jtwoDimOut, reference);
   out.open("BinUtility_2D.json");
diff --git a/Tests/UnitTests/Plugins/Json/VolumeBoundsJsonConverterTests.cpp b/Tests/UnitTests/Plugins/Json/VolumeBoundsJsonConverterTests.cpp
index c077ffbe1e4..ff850dcd48b 100644
--- a/Tests/UnitTests/Plugins/Json/VolumeBoundsJsonConverterTests.cpp
+++ b/Tests/UnitTests/Plugins/Json/VolumeBoundsJsonConverterTests.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2022 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include <boost/test/unit_test.hpp>
 
@@ -23,6 +23,7 @@
 #include <cmath>
 #include <fstream>
 #include <memory>
+#include <numbers>
 #include <string>
 #include <vector>
 
@@ -56,8 +57,8 @@ BOOST_AUTO_TEST_CASE(Cuboid) {
 BOOST_AUTO_TEST_CASE(Cylinder) {
   std::ofstream out("CylinderVolumeBounds.json");
 
-  auto cylinderRef =
-      std::make_shared<const CylinderVolumeBounds>(10., 20., 30., M_PI / 4, 0);
+  auto cylinderRef = std::make_shared<const CylinderVolumeBounds>(
+      10., 20., 30., std::numbers::pi / 4., 0);
   nlohmann::json cylinderOut = VolumeBoundsJsonConverter::toJson(*cylinderRef);
   out << cylinderOut.dump(2);
   out.close();
@@ -78,8 +79,8 @@ BOOST_AUTO_TEST_CASE(Cylinder) {
 BOOST_AUTO_TEST_CASE(Cone) {
   std::ofstream out("ConeVolumeBounds.json");
 
-  auto coneRef = std::make_shared<const ConeVolumeBounds>(0., 0., 0.45, 0.050,
-                                                          0.050, 0., M_PI);
+  auto coneRef = std::make_shared<const ConeVolumeBounds>(
+      0., 0., 0.45, 0.050, 0.050, 0., std::numbers::pi);
   nlohmann::json coneOut = VolumeBoundsJsonConverter::toJson(*coneRef);
   out << coneOut.dump(2);
   out.close();
diff --git a/Tests/UnitTests/Plugins/Podio/PodioTrackContainerTest.cpp b/Tests/UnitTests/Plugins/Podio/PodioTrackContainerTest.cpp
index adfb2946d13..3f9b11b4ab1 100644
--- a/Tests/UnitTests/Plugins/Podio/PodioTrackContainerTest.cpp
+++ b/Tests/UnitTests/Plugins/Podio/PodioTrackContainerTest.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2023 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include <boost/test/unit_test.hpp>
 #include <boost/test/unit_test_suite.hpp>
diff --git a/Tests/UnitTests/Plugins/Podio/PodioTrackStateContainerTest.cpp b/Tests/UnitTests/Plugins/Podio/PodioTrackStateContainerTest.cpp
index 449cd180b4d..2be4cc1411a 100644
--- a/Tests/UnitTests/Plugins/Podio/PodioTrackStateContainerTest.cpp
+++ b/Tests/UnitTests/Plugins/Podio/PodioTrackStateContainerTest.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2023 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include <boost/test/data/test_case.hpp>
 #include <boost/test/unit_test.hpp>
diff --git a/Tests/UnitTests/Plugins/TGeo/TGeoArb8ConversionTests.cpp b/Tests/UnitTests/Plugins/TGeo/TGeoArb8ConversionTests.cpp
index c632e37347f..97375d27925 100644
--- a/Tests/UnitTests/Plugins/TGeo/TGeoArb8ConversionTests.cpp
+++ b/Tests/UnitTests/Plugins/TGeo/TGeoArb8ConversionTests.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2020-2023 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include <boost/test/unit_test.hpp>
 
@@ -36,9 +36,9 @@ namespace Acts::Test {
 
 GeometryContext tgContext = GeometryContext();
 
-ViewConfig red({200, 0, 0});
-ViewConfig green({0, 200, 0});
-ViewConfig blue({0, 0, 200});
+ViewConfig red{.color = {200, 0, 0}};
+ViewConfig green{.color = {0, 200, 0}};
+ViewConfig blue{.color = {0, 0, 200}};
 
 /// @brief Unit test to convert a TGeoTrd2 into a Plane
 ///
diff --git a/Tests/UnitTests/Plugins/TGeo/TGeoBBoxConversionTests.cpp b/Tests/UnitTests/Plugins/TGeo/TGeoBBoxConversionTests.cpp
index f94428ad773..ec76fde6e5d 100644
--- a/Tests/UnitTests/Plugins/TGeo/TGeoBBoxConversionTests.cpp
+++ b/Tests/UnitTests/Plugins/TGeo/TGeoBBoxConversionTests.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2020-2023 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include <boost/test/unit_test.hpp>
 
@@ -35,9 +35,9 @@ namespace Acts::Test {
 
 GeometryContext tgContext = GeometryContext();
 
-ViewConfig red({200, 0, 0});
-ViewConfig green({0, 200, 0});
-ViewConfig blue({0, 0, 200});
+ViewConfig red{.color = {200, 0, 0}};
+ViewConfig green{.color = {0, 200, 0}};
+ViewConfig blue{.color = {0, 0, 200}};
 
 /// @brief Unit test to convert a Bbox into a Plane
 ///
diff --git a/Tests/UnitTests/Plugins/TGeo/TGeoLayerBuilderTests.cpp b/Tests/UnitTests/Plugins/TGeo/TGeoLayerBuilderTests.cpp
index 3c00279d813..b45e188f9ec 100644
--- a/Tests/UnitTests/Plugins/TGeo/TGeoLayerBuilderTests.cpp
+++ b/Tests/UnitTests/Plugins/TGeo/TGeoLayerBuilderTests.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2020 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include <boost/test/unit_test.hpp>
 
diff --git a/Tests/UnitTests/Plugins/TGeo/TGeoMaterialConverterTests.cpp b/Tests/UnitTests/Plugins/TGeo/TGeoMaterialConverterTests.cpp
index 43fa842f863..a35772ee14c 100644
--- a/Tests/UnitTests/Plugins/TGeo/TGeoMaterialConverterTests.cpp
+++ b/Tests/UnitTests/Plugins/TGeo/TGeoMaterialConverterTests.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2023 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include <boost/test/unit_test.hpp>
 
diff --git a/Tests/UnitTests/Plugins/TGeo/TGeoParserTests.cpp b/Tests/UnitTests/Plugins/TGeo/TGeoParserTests.cpp
index e91fe6413de..1292d311b84 100644
--- a/Tests/UnitTests/Plugins/TGeo/TGeoParserTests.cpp
+++ b/Tests/UnitTests/Plugins/TGeo/TGeoParserTests.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2020 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include <boost/test/unit_test.hpp>
 
diff --git a/Tests/UnitTests/Plugins/TGeo/TGeoPrimitivesHelperTests.cpp b/Tests/UnitTests/Plugins/TGeo/TGeoPrimitivesHelperTests.cpp
index 4bc89e36861..9d81193790b 100644
--- a/Tests/UnitTests/Plugins/TGeo/TGeoPrimitivesHelperTests.cpp
+++ b/Tests/UnitTests/Plugins/TGeo/TGeoPrimitivesHelperTests.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2020 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include <boost/test/unit_test.hpp>
 
diff --git a/Tests/UnitTests/Plugins/TGeo/TGeoTrd1ConversionTests.cpp b/Tests/UnitTests/Plugins/TGeo/TGeoTrd1ConversionTests.cpp
index ebdcaf8ddf1..89293a1d48b 100644
--- a/Tests/UnitTests/Plugins/TGeo/TGeoTrd1ConversionTests.cpp
+++ b/Tests/UnitTests/Plugins/TGeo/TGeoTrd1ConversionTests.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2020-2023 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include <boost/test/unit_test.hpp>
 
@@ -40,9 +40,9 @@ namespace Acts::Test {
 
 GeometryContext tgContext = GeometryContext();
 
-ViewConfig red({200, 0, 0});
-ViewConfig green({0, 200, 0});
-ViewConfig blue({0, 0, 200});
+ViewConfig red{.color = {200, 0, 0}};
+ViewConfig green{.color = {0, 200, 0}};
+ViewConfig blue{.color = {0, 0, 200}};
 
 /// @brief Unit test to convert a TGeoTrd1 into a Plane
 ///
diff --git a/Tests/UnitTests/Plugins/TGeo/TGeoTrd2ConversionTests.cpp b/Tests/UnitTests/Plugins/TGeo/TGeoTrd2ConversionTests.cpp
index cf9bea4acd7..386418d67b2 100644
--- a/Tests/UnitTests/Plugins/TGeo/TGeoTrd2ConversionTests.cpp
+++ b/Tests/UnitTests/Plugins/TGeo/TGeoTrd2ConversionTests.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2020 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include <boost/test/unit_test.hpp>
 
@@ -40,9 +40,9 @@ namespace Acts::Test {
 
 GeometryContext tgContext = GeometryContext();
 
-ViewConfig red({200, 0, 0});
-ViewConfig green({0, 200, 0});
-ViewConfig blue({0, 0, 200});
+ViewConfig red{.color = {200, 0, 0}};
+ViewConfig green{.color = {0, 200, 0}};
+ViewConfig blue{.color = {0, 0, 200}};
 
 /// @brief Unit test to convert a TGeoTrd2 into a Plane
 ///
diff --git a/Tests/UnitTests/Plugins/TGeo/TGeoTubeConversionTests.cpp b/Tests/UnitTests/Plugins/TGeo/TGeoTubeConversionTests.cpp
index dd9340de81c..180e9eaaa6d 100644
--- a/Tests/UnitTests/Plugins/TGeo/TGeoTubeConversionTests.cpp
+++ b/Tests/UnitTests/Plugins/TGeo/TGeoTubeConversionTests.cpp
@@ -1,10 +1,10 @@
-// This file is part of the Acts project.
+// This file is part of the ACTS project.
 //
-// Copyright (C) 2020 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 #include <boost/test/unit_test.hpp>
 
@@ -24,6 +24,7 @@
 #include <cmath>
 #include <cstddef>
 #include <memory>
+#include <numbers>
 #include <stdexcept>
 #include <string>
 #include <vector>
@@ -40,9 +41,9 @@ namespace Acts::Test {
 
 GeometryContext tgContext = GeometryContext();
 
-ViewConfig red({200, 0, 0});
-ViewConfig green({0, 200, 0});
-ViewConfig blue({0, 0, 200});
+ViewConfig red{.color = {200, 0, 0}};
+ViewConfig green{.color = {0, 200, 0}};
+ViewConfig blue{.color = {0, 0, 200}};
 
 std::vector<std::string> allowedAxes = {"XY*", "Xy*", "xy*", "xY*",
                                         "YX*", "yx*", "yX*", "Yx*"};
@@ -99,7 +100,6 @@ BOOST_AUTO_TEST_CASE(TGeoTube_to_CylinderSurface) {
         objVis, center, center + 1.2 * bR * rotation.col(1), 4., 2.5, green);
     GeometryView3D::drawArrowForward(
         objVis, center, center + 1.2 * bhZ * rotation.col(2), 4., 2.5, blue);
-
     objVis.write("TGeoConversion_TGeoTube_CylinderSurface_" +
                  std::to_string(icyl));
     objVis.clear();
@@ -120,7 +120,7 @@ BOOST_AUTO_TEST_CASE(TGeoTube_to_CylinderSurface) {
       double mphi = boundsSegment->get(CylinderBounds::eAveragePhi);
       CHECK_CLOSE_ABS(bR, 10.5, s_epsilon);
       CHECK_CLOSE_ABS(bhZ, hz, s_epsilon);
-      CHECK_CLOSE_ABS(hphi, 0.25 * M_PI, s_epsilon);
+      CHECK_CLOSE_ABS(hphi, std::numbers::pi / 4., s_epsilon);
       CHECK_CLOSE_ABS(mphi, 0., s_epsilon);
       GeometryView3D::drawSurface(objVis, *cylinderSegment, tgContext);
       GeometryView3D::drawArrowForward(
@@ -216,7 +216,7 @@ BOOST_AUTO_TEST_CASE(TGeoTube_to_DiscSurface) {
       double mphi = boundsSegment->get(RadialBounds::eAveragePhi);
       CHECK_CLOSE_ABS(bminr, rmin, s_epsilon);
       CHECK_CLOSE_ABS(bmaxr, rmax, s_epsilon);
-      CHECK_CLOSE_ABS(hphi, 0.25 * M_PI, s_epsilon);
+      CHECK_CLOSE_ABS(hphi, std::numbers::pi / 4., s_epsilon);
       CHECK_CLOSE_ABS(mphi, 0., s_epsilon);
       GeometryView3D::drawSurface(objVis, *discSegment, tgContext);
       GeometryView3D::drawArrowForward(objVis, center,
diff --git a/cmake/ActsConfig.cmake.in b/cmake/ActsConfig.cmake.in
index 127d8b14786..97d510f1319 100644
--- a/cmake/ActsConfig.cmake.in
+++ b/cmake/ActsConfig.cmake.in
@@ -52,9 +52,7 @@ list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_LIST_DIR}/Modules)
 # `find_dependency` is a wrapper around `find_package` that automatically
 # handles QUIET and REQUIRED parameters.
 include(CMakeFindDependencyMacro)
-if(@ACTS_USE_SYSTEM_BOOST@)
-  find_dependency(Boost @Boost_VERSION_STRING@ CONFIG EXACT)
-endif()
+find_dependency(Boost @Boost_VERSION_STRING@ CONFIG EXACT)
 if(@ACTS_USE_SYSTEM_EIGEN3@)
   find_dependency(Eigen3 @Eigen3_VERSION@ CONFIG EXACT)
 endif()
@@ -77,16 +75,15 @@ if(PluginPodio IN_LIST Acts_COMPONENTS)
   find_dependency(podio @podio_VERSION@ CONFIG EXACT)
 endif()
 if(PluginGeoModel IN_LIST Acts_COMPONENTS)
-  find_dependency(GeoModelCore @GeoModel_VERSION@ CONFIG EXACT)
-  find_dependency(GeoModelIO @GeoModel_VERSION@ CONFIG EXACT)
+  find_dependency(GeoModelCore @GeoModelCore_VERSION@ CONFIG EXACT)
+  find_dependency(GeoModelIO @GeoModelIO_VERSION@ CONFIG EXACT)
+endif()
+if (PluginHashing IN_LIST Acts_COMPONENTS)
+  find_dependency(Annoy @ANNOY_VERSION@ CONFIG EXACT)
 endif()
 
 # dependencies that we have built ourselves but cannot be
 # straightforwardly handed to cmake
-if(NOT @ACTS_USE_SYSTEM_BOOST@)
-  add_library(Boost::boost INTERFACE IMPORTED GLOBAL)
-  target_include_directories(Boost::boost INTERFACE "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_INCLUDEDIR}")
-endif()
 if(NOT @ACTS_USE_SYSTEM_EIGEN3@)
   add_library(Eigen3::Eigen INTERFACE IMPORTED GLOBAL)
   target_include_directories(Eigen3::Eigen INTERFACE "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_INCLUDEDIR}")
@@ -100,9 +97,14 @@ if(PluginDetray IN_LIST Acts_COMPONENTS)
   find_dependency(vecmem @vecmem_VERSION@ CONFIG EXACT)
   find_dependency(covfie @cofvie_VERSION@ CONFIG EXACT)
   find_dependency(algebra-plugins @algebra-plugins_VERSION@ CONFIG EXACT)
+  find_dependency(actsvg @actsvg_VERSION@ CONFIG EXACT)
   find_dependency(detray @detray_VERSION@ CONFIG EXACT)
 endif()
 
+if (PluginCovfie IN_LIST Acts_COMPONENTS)
+  find_dependency(covfie @covfie_VERSION@ CONFIG EXACT)
+endif()
+
 # load **all** available components. we can not just include the requested
 # components since there can be interdependencies between them.
 if(NOT Acts_FIND_QUIETLY)
diff --git a/cmake/ActsExternSources.cmake b/cmake/ActsExternSources.cmake
index f2e2ea146b5..8d994815a9d 100644
--- a/cmake/ActsExternSources.cmake
+++ b/cmake/ActsExternSources.cmake
@@ -1,40 +1,40 @@
 set(ACTS_ACTSVG_SOURCE
-    "URL;https://github.com/acts-project/actsvg/archive/refs/tags/v0.4.47.tar.gz;URL_HASH;SHA256=aeb3927f8db1c7c9b8afa76adaa720013aa03a01032c8d5f457f623e2b04a172"
+    "URL;https://github.com/acts-project/actsvg/archive/refs/tags/v${_acts_actsvg_version}.tar.gz;URL_HASH;SHA256=8073a371465ce2edef3bfdba5eae900e17ee61ae21766111ad1834e29250f304"
     CACHE STRING
     "Source to take ACTSVG from"
 )
 mark_as_advanced(ACTS_ACTSVG_SOURCE)
 
 set(ACTS_VECMEM_SOURCE
-    "URL;https://github.com/acts-project/vecmem/archive/refs/tags/v1.4.0.tar.gz;URL_HASH;SHA256=545dfb4de4f9f3d773eef6a0e3297ebf981bb81950930d0991ad739e31ab16af"
+    "URL;https://github.com/acts-project/vecmem/archive/refs/tags/v${_acts_vecmem_version}.tar.gz;URL_HASH;SHA256=545dfb4de4f9f3d773eef6a0e3297ebf981bb81950930d0991ad739e31ab16af"
     CACHE STRING
     "Source to take VECMEM from"
 )
 mark_as_advanced(ACTS_VECMEM_SOURCE)
 
 set(ACTS_ALGEBRAPLUGINS_SOURCE
-    "URL;https://github.com/acts-project/algebra-plugins/archive/refs/tags/v0.22.0.tar.gz;URL_HASH;SHA256=6fde02181c1b856c0a17a1925f0969798eecd5e3d6f2a87ea2eb365b6c948cc1"
+    "URL;https://github.com/acts-project/algebra-plugins/archive/refs/tags/v${_acts_algebraplugins_version}.tar.gz;URL_HASH;SHA256=6fde02181c1b856c0a17a1925f0969798eecd5e3d6f2a87ea2eb365b6c948cc1"
     CACHE STRING
     "Source to take ALGEBRAPLUGINS from"
 )
 mark_as_advanced(ACTS_ALGEBRAPLUGINS_SOURCE)
 
 set(ACTS_COVFIE_SOURCE
-    "URL;https://github.com/acts-project/covfie/archive/refs/tags/v0.10.0.tar.gz;URL_HASH;SHA256=d44142b302ffc193ad2229f1d2cc6d8d720dd9da8c37989ada4f23018f86c964"
+    "URL;https://github.com/acts-project/covfie/archive/refs/tags/v${_acts_covfie_version}.tar.gz;URL_HASH;SHA256=d44142b302ffc193ad2229f1d2cc6d8d720dd9da8c37989ada4f23018f86c964"
     CACHE STRING
     "Source to take COVFIE from"
 )
 mark_as_advanced(ACTS_COVFIE_SOURCE)
 
 set(ACTS_DETRAY_SOURCE
-    "URL;https://github.com/acts-project/detray/archive/refs/tags/v0.72.1.tar.gz;URL_HASH;SHA256=6cc8d34bc0d801338e9ab142c4a9884d19d9c02555dbb56972fab86b98d0f75b"
+    "URL;https://github.com/acts-project/detray/archive/refs/tags/v${_acts_detray_version}.tar.gz;URL_HASH;SHA256=1249d7398d1e534bd36b6f5a7d06a5e67adf6adeb8bca188d7e35490a675de7a"
     CACHE STRING
     "Source to take DETRAY from"
 )
 mark_as_advanced(ACTS_DETRAY_SOURCE)
 
 set(ACTS_TRACCC_SOURCE
-    "URL;https://github.com/acts-project/traccc/archive/refs/tags/v0.15.0.tar.gz;URL_HASH;SHA256=1a9a1d0d2f6c4a7773eae3119b1e044fb52031ca49dfc88e6dc4ab8a11df167e"
+    "URL;https://github.com/acts-project/traccc/archive/refs/tags/v${_acts_traccc_version}.tar.gz;URL_HASH;SHA256=86e0ebe7364d3a2106301d50a89feef583470da53c9dae6d1430dcc6eda7dba9"
     CACHE STRING
     "Source to take TRACCC from"
 )
@@ -48,7 +48,7 @@ set(ACTS_FRNN_SOURCE
 mark_as_advanced(ACTS_FRNN_SOURCE)
 
 set(ACTS_NLOHMANNJSON_SOURCE
-    "URL;https://github.com/nlohmann/json/archive/refs/tags/v3.10.5.tar.gz;URL_HASH;SHA256=5daca6ca216495edf89d167f808d1d03c4a4d929cef7da5e10f135ae1540c7e4"
+    "URL;https://github.com/nlohmann/json/archive/refs/tags/v${_acts_nlohmanjson_version}.tar.gz;URL_HASH;SHA256=5daca6ca216495edf89d167f808d1d03c4a4d929cef7da5e10f135ae1540c7e4"
     CACHE STRING
     "Source to take nlohmann_json from"
 )
@@ -62,8 +62,15 @@ set(ACTS_EIGEN3_SOURCE
 mark_as_advanced(ACTS_EIGEN3_SOURCE)
 
 set(ACTS_PYBIND11_SOURCE
-    "GIT_REPOSITORY;https://github.com/pybind/pybind11.git;GIT_TAG;v2.13.1"
+    "GIT_REPOSITORY;https://github.com/pybind/pybind11.git;GIT_TAG;v${_acts_pybind11_version}"
     CACHE STRING
     "Source to take pybind11 from"
 )
 mark_as_advanced(ACTS_PYBIND11_SOURCE)
+
+set(ACTS_ANNOY_SOURCE
+    "URL;https://github.com/spotify/annoy/archive/refs/tags/v${_acts_annoy_version}.tar.gz;URL_HASH;SHA256=c121d38cacd98f5103b24ca4e94ca097f18179eed3037e9eb93ad70ec1e6356e"
+    CACHE STRING
+    "Source to take Annoy from"
+)
+mark_as_advanced(ACTS_ANNOY_SOURCE)
diff --git a/cmake/assert_include/assert.h b/cmake/assert_include/assert.h
index 59268f6bd93..5c1b87a5d78 100644
--- a/cmake/assert_include/assert.h
+++ b/cmake/assert_include/assert.h
@@ -1,3 +1,11 @@
+// This file is part of the ACTS project.
+//
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
+//
+// This Source Code Form is subject to the terms of the Mozilla Public
+// License, v. 2.0. If a copy of the MPL was not distributed with this
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
+
 #if defined(NDEBUG)
 #define _HAD_NDEBUG
 #undef NDEBUG
diff --git a/cmake/setup_withdeps.sh.in b/cmake/setup_withdeps.sh.in
index 9e0bdc29031..ce1dc3506e7 100644
--- a/cmake/setup_withdeps.sh.in
+++ b/cmake/setup_withdeps.sh.in
@@ -1,10 +1,10 @@
-# This file is part of the Acts project.
+# This file is part of the ACTS project.
 #
-# Copyright (C) 2024 CERN for the benefit of the Acts project
+# Copyright (C) 2016 CERN for the benefit of the ACTS project
 #
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+# file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 # This script sets up the ACTS Examples environment in a somewhat robust way.
 
@@ -51,6 +51,9 @@ if [[ -d "@Geant4_DIR@" ]]; then
 fi
 if [[ -d "@DD4hep_DIR@" ]]; then
   . @DD4hep_INCLUDE_DIRS@/../bin/thisdd4hep.sh
+  # Without this, DD4hep's Xerces-C XML parsing fails with:
+  # > Could not load a transcoding service
+  export LC_ALL=C
 fi
 if [[ -d "@podio_DIR@" ]]; then
   export LD_LIBRARY_PATH="@podio_LIBRARY_DIR@:${LD_LIBRARY_PATH}"
diff --git a/codegen/generate_sympy_cov.py b/codegen/generate_sympy_cov.py
index 1680381504a..017b81937f8 100644
--- a/codegen/generate_sympy_cov.py
+++ b/codegen/generate_sympy_cov.py
@@ -46,13 +46,13 @@ def my_covariance_transport_generic_function_print(name_exprs, run_cse=True):
 
 
 print(
-    """// This file is part of the Acts project.
+    """// This file is part of the ACTS project.
 //
-// Copyright (C) 2024 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 // Note: This file is generated by generate_sympy_cov.py
 //       Do not modify it manually.
diff --git a/codegen/generate_sympy_jac.py b/codegen/generate_sympy_jac.py
index 667382e4cf6..3c6043589e0 100644
--- a/codegen/generate_sympy_jac.py
+++ b/codegen/generate_sympy_jac.py
@@ -115,13 +115,13 @@ def my_full_transport_jacobian_curvilinear_function_print(name_exprs, run_cse=Tr
 
 
 print(
-    """// This file is part of the Acts project.
+    """// This file is part of the ACTS project.
 //
-// Copyright (C) 2024 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 // Note: This file is generated by generate_sympy_jac.py
 //       Do not modify it manually.
diff --git a/codegen/generate_sympy_stepper.py b/codegen/generate_sympy_stepper.py
index 7602a30c4a8..a1b2e77afc4 100644
--- a/codegen/generate_sympy_stepper.py
+++ b/codegen/generate_sympy_stepper.py
@@ -272,13 +272,13 @@ def post_expr_hook(var):
 )
 
 print(
-    """// This file is part of the Acts project.
+    """// This file is part of the ACTS project.
 //
-// Copyright (C) 2024 CERN for the benefit of the Acts project
+// Copyright (C) 2016 CERN for the benefit of the ACTS project
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
-// file, You can obtain one at http://mozilla.org/MPL/2.0/.
+// file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 // Note: This file is generated by generate_sympy_stepper.py
 //       Do not modify it manually.
diff --git a/docs/codeguide.md b/docs/codeguide.md
index 402ba00be6f..0030cef319d 100644
--- a/docs/codeguide.md
+++ b/docs/codeguide.md
@@ -30,7 +30,7 @@ pos4[eTime] = 12.3;
 BoundVector pars;
 pars[eBoundLoc0] = 1.2;
 ...
-pars[eBoundPhi] = M_PI;
+pars[eBoundPhi] = std::numbers::pi;
 ...
 ```
 
diff --git a/docs/conf.py b/docs/conf.py
index 7788dad8dce..0f333f385a5 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -121,7 +121,6 @@
 nitpick_ignore = [
     ("cpp:identifier", "Acts"),
     ("cpp:identifier", "detail"),
-    ("cpp:identifier", "M_PI"),
     ("cpp:identifier", "eSize"),
     ("cpp:identifier", "eBoundSize"),
     ("cpp:identifier", "eFreeSize"),
diff --git a/docs/core/eventdata/tracks.md b/docs/core/eventdata/tracks.md
index 4249af5a983..33662b6e397 100644
--- a/docs/core/eventdata/tracks.md
+++ b/docs/core/eventdata/tracks.md
@@ -442,7 +442,7 @@ std::cout << extraConst(track) << std::endl; // prints 42.2
 For both const and mutable proxy accessors you do not actually need a mutable reference, as the internal accessor state is not mutated after construction. You can safely use a static instance of these accessors to avoid constructing them over and over again:
 
 ```cpp
-template<typename track_proxy_t>
+template<TrackProxyConcept track_proxy_t>
 void doSomething(track_proxy_t track, float value) {
     // only created once, never changed
     static const Acts::ProxyAccessor<float> extra("extra");
diff --git a/docs/core/propagation.md b/docs/core/propagation.md
index 175278a0157..aba6312bdd0 100644
--- a/docs/core/propagation.md
+++ b/docs/core/propagation.md
@@ -18,9 +18,9 @@ The interaction of these two components is handled by the {class}`Acts::Propagat
 Propagator<Navigator, Stepper>
 ```
 
-Additional to these mandatory components, the propagator can be equipped with **Actors** and **Aborters** to allow for custom behaviour. These are function objects that are hooked in the propagation loop. Actors just perform some action on the propagator state (e.g. the {class}`Acts::KalmanFitter` is an actor), aborts can abort propagation (e.g., the {struct}`Acts::PathLimitReached`).
+Additional to these mandatory components, the propagator can be equipped with **Actors** to allow for custom behaviour. These are function objects that are hooked in the propagation loop. Actors just perform some action on the propagator state (e.g. the {class}`Acts::KalmanFitter` is an actor), aborts can abort propagation (e.g., the {struct}`Acts::PathLimitReached`).
 
-The propagator exposes its state to the actors and aborters as arguments to `operator()`. Actors must define a default-constructable `result_type`, which can be modified in each call:
+The propagator exposes its state to the actors as arguments to `act()` and `checkAbort()`. Actors must define a default-constructable `result_type`, which can be modified in each call:
 
 ```cpp
 template<typename propagator_state_t, typename stepper_t>
@@ -36,23 +36,21 @@ The result of a propagation consists of the track parameters at the endpoint of
 ## Initialization and running
 
 The {class}`Acts::Propagator` is initialized with the helper class
-{struct}`Acts::PropagatorOptions`, which is templated on the list of actors and
-aborters. This is done with the classes {struct}`Acts::ActionList` and
-{struct}`Acts::AbortList` (which are in fact small wrappers around
-`std::tuple`):
+{struct}`Acts::PropagatorOptions`, which is templated on the list of actors.
+This is done with the class {struct}`Acts::ActorList`
+(which are in fact small wrappers around `std::tuple`):
 
 ```cpp
 using MyOptions = Acts::PropagatorOptions<
-                    Acts::ActionList<MyActor1, MyActor2>,
-                    Acts::AbortList<MyAborter1, MyAborter2>
+                    Acts::ActorList<MyActor1, MyActor2>
                   >;
 ```
 
-The actors and aborters are instantiated with the options and can be accessed with the `get`-method that expects the corresponding actor type as template parameter. Besides this, the {struct}`Acts::PropagatorOptions` also contains a lot of general options like the `maxStepSize`:
+The actors are instantiated with the options and can be accessed with the `get`-method that expects the corresponding actor type as template parameter. Besides this, the {struct}`Acts::PropagatorOptions` also contains a lot of general options like the `maxStepSize`:
 
 ```cpp
 auto options = MyOptions();
-options.actionList.get<MyActor1>().foo = bar;
+options.actorList.get<MyActor1>().foo = bar;
 options.maxStepSize = 100;
 ```
 
@@ -63,7 +61,7 @@ The propagator also contains a loop-protection mechanism. It estimates a circle
 :::
 
 To run the propagation, we must call the member function `propagate(...)` with the initial track parameters and the propagator options. There are several overloads to the `propagate(...)` function, which allow further customization:
-* With/without a target surface: The overload with a target surface automatically adds an aborter for the passed `Surface` to the `AbortList`.
+* With/without a target surface: The overload with a target surface automatically adds an aborter for the passed `Surface` to the `ActorList`.
 * With/without a prepared result object: Without a result object, a suitable result object is default-constructed internally.
 
 The result is an instance of {class}`Acts::Result`. It contains the actual result, or an error code in case something went wrong. In the actual result, the results of the different actors can again be accessed via a `get` method:
@@ -108,22 +106,17 @@ The {class}`Acts::StraightLineStepper` is a very stripped down stepper that just
 
 ### EigenStepper
 
-The {class}`Acts::EigenStepper` implements the same functionality as the ATLAS stepper, however, the stepping code is rewritten by using `Eigen` primitives. Thus, it also uses a 4th-order Runge-Kutta algorithm for the integration of the EOM. Additionally, the {class}`Acts::EigenStepper` allows to customize the concrete integration step via **extensions**.
+The {class}`Acts::EigenStepper` implements the same functionality as the ATLAS stepper, however, the stepping code is rewritten by using `Eigen` primitives. Thus, it also uses a 4th-order Runge-Kutta algorithm for the integration of the EOM. Additionally, the {class}`Acts::EigenStepper` allows to customize the concrete integration step via **extension**.
 
-The extensions encapsulate the relevant equations for different environments. There exists a {struct}`Acts::DefaultExtension` that is suited for propagation in a vacuum, and the {struct}`Acts::DenseEnvironmentExtension`, that contains additional code to handle the propagation inside materials. Which extension is used is selected by a bidding-system.
+The extension encapsulate the relevant equations for different environments. There exists a {struct}`Acts::EigenStepperDefaultExtension` that is suited for propagation in a vacuum, and the {struct}`Acts::EigenStepperDenseExtension`, that contains additional code to handle the propagation inside materials. Which extension is used is decided by the user.
 
-The extension can be configured via the {struct}`Acts::StepperExtensionList`:
+The extension can be configured via the {class}`Acts::EigenStepper`:
 
-```cpp
-using Stepper = Acts::EigenStepper<
-                  Acts::StepperExtensionList<
-                    Acts::DefaultExtension,
-                    Acts::DenseEnvironmentExtension
-                  >
-                >;
+```c++
+using Stepper = Acts::EigenStepper<Acts::EigenStepperDenseExtension>;
 ```
 
-By default, the {class}`Acts::EigenStepper` only uses the {struct}`Acts::DefaultExtension`.
+By default, the {class}`Acts::EigenStepper` only uses the {struct}`Acts::EigenStepperDenseExtension`.
 
 ### MultiEigenStepperLoop
 
diff --git a/docs/core/reconstruction/pattern_recognition/seeding.md b/docs/core/reconstruction/pattern_recognition/seeding.md
index ebb72cd94bc..1c557d6d900 100644
--- a/docs/core/reconstruction/pattern_recognition/seeding.md
+++ b/docs/core/reconstruction/pattern_recognition/seeding.md
@@ -223,7 +223,8 @@ The seed confirmation also sets a limit on the number of seeds produced for each
 which retains only the higher quality seeds. If this limit is exceeded, the algorithm
 checks if there is any low-quality seed in the seed container of this middle SP that can be removed.
 
-:::{doxygenfunction} Acts::SeedFilter::filterSeeds_1SpFixed (Acts::SpacePointData &spacePointData, CandidatesForMiddleSp<const InternalSpacePoint<external_spacepoint_t>>&, collection_t&) const
+
+:::{doxygenfunction} Acts::SeedFilter::filterSeeds_1SpFixed (Acts::SpacePointMutableData& , CandidatesForMiddleSp<const external_spacepoint_t>&, collection_t&) const
 :outline:
 :::
 
diff --git a/docs/core/reconstruction/track_fitting.md b/docs/core/reconstruction/track_fitting.md
index d1de9d8f72d..18a60823cfc 100644
--- a/docs/core/reconstruction/track_fitting.md
+++ b/docs/core/reconstruction/track_fitting.md
@@ -65,7 +65,7 @@ Simplified overview of the GSF algorithm.
 :::
 
 ### The Multi-Stepper
-To implement the GSF, a special stepper is needed, that can handle a multi-component state internally: The {class}`Acts::MultiEigenStepperLoop`, which is based on the {class}`Acts::EigenStepper` and thus shares a lot of code with it. It interfaces to the navigation as one aggregate state to limit the navigation overhead, but internally processes a multi-component state. How this aggregation is performed can be configured via a template parameter, by default weighted average is used ({struct}`Acts::WeightedComponentReducerLoop`).
+To implement the GSF, a special stepper is needed, that can handle a multi-component state internally: The {class}`Acts::MultiEigenStepperLoop`, which is based on the {class}`Acts::EigenStepper` and thus shares a lot of code with it. It interfaces to the navigation as one aggregate state to limit the navigation overhead, but internally processes a multi-component state. How this aggregation is performed can be configured via a template parameter, by default maximum weight is used ({type}`Acts::MaxWeightReducerLoop`).
 
 Even though the multi-stepper interface exposes only one aggregate state and thus is compatible with most standard tools, there is a special aborter is required to stop the navigation when the surface is reached, the {struct}`Acts::MultiStepperSurfaceReached`. It checks if all components have reached the target surface already and updates their state accordingly. Optionally, it also can stop the propagation when the aggregate state reaches the surface.
 
diff --git a/docs/getting_started.md b/docs/getting_started.md
index ea8c669f5ac..aff8e38a3b0 100644
--- a/docs/getting_started.md
+++ b/docs/getting_started.md
@@ -9,9 +9,9 @@ following commands will clone the repository, configure, and build the core
 library:
 
 ```console
-$ git clone https://github.com/acts-project/acts <source>
-$ cmake -B <build> -S <source>
-$ cmake --build <build>
+git clone https://github.com/acts-project/acts <source>
+cmake -B <build> -S <source>
+cmake --build <build>
 ```
 
 For a full list of dependencies, including specific versions, see the
@@ -23,27 +23,27 @@ section.
 
 The following dependencies are required to build the ACTS core library:
 
--   A C++17 compatible compiler (recent versions of either gcc and clang should work)
--   [CMake](https://cmake.org) >= 3.14
--   [Boost](https://www.boost.org) >= 1.71 with `filesystem`, `program_options`, and `unit_test_framework`
--   [Eigen](https://eigen.tuxfamily.org) >= 3.3.7
+- A C++17 compatible compiler (recent versions of either gcc and clang should work)
+- [CMake](https://cmake.org) >= 3.14
+- [Boost](https://www.boost.org) >= 1.71 with `filesystem`, `program_options`, and `unit_test_framework`
+- [Eigen](https://eigen.tuxfamily.org) >= 3.3.7
 
 The following dependencies are optional and are needed to build additional
 components:
 
--   [CUDA](https://developer.nvidia.com/cuda-zone) for the CUDA plugin and the Exa.TrkX plugin and its examples
--   [DD4hep](http://dd4hep.cern.ch) >= 1.11 for the DD4hep plugin and some examples
--   [Doxygen](http://doxygen.org) >= 1.8.15 for the documentation
--   [Geant4](https://geant4.org/) for some examples
--   [HepMC](https://gitlab.cern.ch/hepmc/HepMC3) >= 3.2.1 for some examples
--   [Intel Threading Building Blocks](https://github.com/oneapi-src/oneTBB) >= 2020.1 for the examples
--   [ONNX Runtime](https://onnxruntime.ai/) >= 1.12.0 for the ONNX plugin, the Exa.TrkX plugin and some examples
--   [Pythia8](https://pythia.org) for some examples
--   [ROOT](https://root.cern.ch) >= 6.20 for the TGeo plugin and the examples
--   [Sphinx](https://www.sphinx-doc.org) >= 2.0 with [Breathe](https://breathe.readthedocs.io/en/latest/), [Exhale](https://exhale.readthedocs.io/en/latest/), and [recommonmark](https://recommonmark.readthedocs.io/en/latest/index.html) extensions for the documentation
--   [cugraph](https://github.com/rapidsai/cugraph) for the Exa.TrkX plugin
--   [libtorch](https://pytorch.org/cppdocs/installing.html) for the Exa.TrkX plugin
--   [Pybind11](https://github.com/pybind/pybind11) for the Python bindings of the examples
+- [CUDA](https://developer.nvidia.com/cuda-zone) for the CUDA plugin and the Exa.TrkX plugin and its examples
+- [DD4hep](http://dd4hep.cern.ch) >= 1.11 for the DD4hep plugin and some examples
+- [Doxygen](http://doxygen.org) >= 1.8.15 for the documentation
+- [Geant4](https://geant4.org/) for some examples
+- [HepMC](https://gitlab.cern.ch/hepmc/HepMC3) >= 3.2.1 for some examples
+- [Intel Threading Building Blocks](https://github.com/oneapi-src/oneTBB) >= 2020.1 for the examples
+- [ONNX Runtime](https://onnxruntime.ai/) >= 1.12.0 for the ONNX plugin, the Exa.TrkX plugin and some examples
+- [Pythia8](https://pythia.org) for some examples
+- [ROOT](https://root.cern.ch) >= 6.20 for the TGeo plugin and the examples
+- [Sphinx](https://www.sphinx-doc.org) >= 2.0 with [Breathe](https://breathe.readthedocs.io/en/latest/), [Exhale](https://exhale.readthedocs.io/en/latest/), and [recommonmark](https://recommonmark.readthedocs.io/en/latest/index.html) extensions for the documentation
+- [cugraph](https://github.com/rapidsai/cugraph) for the Exa.TrkX plugin
+- [libtorch](https://pytorch.org/cppdocs/installing.html) for the Exa.TrkX plugin
+- [Pybind11](https://github.com/pybind/pybind11) for the Python bindings of the examples
 
 There are some additional dependencies that are automatically provided as part of
 the build system.
@@ -69,7 +69,7 @@ runs the configuration and searches for the dependencies. The `<build>`
 directory is automatically created.
 
 ```console
-$ cmake -B <build> -S <source>
+cmake -B <build> -S <source>
 ```
 
 The build can be configured via various options that are listed in detail in the
@@ -77,19 +77,19 @@ The build can be configured via various options that are listed in detail in the
 The previous command could be e.g. modified to
 
 ```console
-$ cmake -B <build> -S <source> -DACTS_BUILD_UNITTESTS=on -DACTS_BUILD_FATRAS=on
+cmake -B <build> -S <source> -DACTS_BUILD_UNITTESTS=on -DACTS_BUILD_FATRAS=on
 ```
 
 After the configuration succeeded, the software is build. This is also done with cmake via the following command
 
 ```console
-$ cmake --build <build>
+cmake --build <build>
 ```
 
 This automatically calls the configure build tool, e.g. Make or Ninja. To build only a specific target, the target names has to be separated from the CMake options by `--`, i.e.
 
 ```console
-$ cmake --build <build> -- ActsFatras # to build the Fatras library
+cmake --build <build> -- ActsFatras # to build the Fatras library
 ```
 
 The build commands are the same regardless of where you are building the
@@ -103,8 +103,8 @@ e.g. CERNs lxplus login machines, the dependencies can be easily satisfied
 via a LCG releases available through CVMFS. A setup script is provided to activate a compatible releases that can be used as follows:
 
 ```console
-$ cd <source>
-$ source CI/setup_cvmfs_lcg.sh
+cd <source>
+source CI/setup_cvmfs_lcg.sh
 ```
 
 After sourcing the setup script, you can build ACTS as described above. The
@@ -112,10 +112,10 @@ following commands will build ACTS in the `<source>/build` directory with the
 Fatras component.
 
 ```console
-$ cd <source>
-$ source CI/setup_cvmfs_lcg.sh
-$ cmake -B build -S . -DACTS_BUILD_FATRAS=on
-$ cmake --build build
+cd <source>
+source CI/setup_cvmfs_lcg.sh
+cmake -B build -S . -DACTS_BUILD_FATRAS=on
+cmake --build build
 ```
 
 ### In a container
@@ -144,13 +144,13 @@ available tags, e.g. for the `ubuntu2004` image, you can use the following
 command:
 
 ```console
-$ docker search --list-tags ghcr.io/acts-project/ubuntu2404
+docker search --list-tags ghcr.io/acts-project/ubuntu2404
 ```
 
 The following command then downloads a stable tag of the `ubuntu2404` image:
 
 ```console
-$ docker pull ghcr.io/acts-project/ubuntu2404:51
+docker pull ghcr.io/acts-project/ubuntu2404:51
 ```
 
 This should print the image id as part of the output. You can also find out the
@@ -163,7 +163,7 @@ following command will make the source directory available as `/acts` in the
 container and start an interactive `bash` shell
 
 ```console
-$ docker run --volume=<source>:/acts:ro --interactive --tty <image> /bin/bash
+docker run --volume=<source>:/acts:ro --interactive --tty <image> /bin/bash
 ```
 
 where `<image>` is the image id that was previously mentioned. If you are using the Ubuntu-based image you are already good to go. For the images based on LCG releases, you can now activate the LCG release in the container shell by sourcing a setup script:
@@ -184,11 +184,14 @@ container $ cmake --build build
 ### On your local machine
 
 Building and running ACTS on your local machine is not officially supported.
-However, if you have the necessary prerequisites installed it is possible to use
-it locally. ACTS developers regularly use different Linux distributions
-and macOS to build and develop ACTS.
+However, if you have the necessary prerequisites installed it is possible to
+use it locally. ACTS developers regularly use different Linux distributions and
+macOS to build and develop ACTS. It is possible to use Spack to more easily
+install ACTS' dependencies; see the [building with Spack](misc/spack) page for
+more information.
 
 (build_docs)=
+
 ## Building the documentation
 
 The documentation uses [Doxygen][doxygen] to extract the source code
@@ -199,8 +202,8 @@ need to have [Doxygen][doxygen] version `1.9.5` or newer installed.
 package manager `pip`:
 
 ```console
-$ cd <source>
-$ pip install -r docs/requirements.txt
+cd <source>
+pip install -r docs/requirements.txt
 ```
 
 :::{tip}
@@ -209,8 +212,8 @@ environment](https://realpython.com/python-virtual-environments-a-primer/) for
 this purpose! For example, run
 
 ```console
-$ python -m venv docvenv
-$ source docvenv/bin/activate
+python -m venv docvenv
+source docvenv/bin/activate
 ```
 
 to create a local virtual environment, and then run the `pip` command above.
@@ -219,13 +222,13 @@ to create a local virtual environment, and then run the `pip` command above.
 To activate the documentation build targets, the `ACTS_BUILD_DOCS` option has to be set
 
 ```console
-$ cmake -B <build> -S <source> -DACTS_BUILD_DOCS=on
+cmake -B <build> -S <source> -DACTS_BUILD_DOCS=on
 ```
 
 Then the documentation can be build with this target
 
 ```console
-$ cmake --build <build> --target docs
+cmake --build <build> --target docs
 ```
 
 The default option includes the Doxygen, Sphinx, and the Breathe extension,
@@ -237,8 +240,6 @@ of errors you will need to manually pull in symbols to be documented.
 [doxygen]: https://doxygen.nl/
 [sphinx]: https://www.sphinx-doc.org
 [breathe]: https://breathe.readthedocs.io
-[exhale]: https://exhale.readthedocs.io
-[rtd_acts]: https://acts.readthedocs.io
 
 ## Build options
 
@@ -246,7 +247,7 @@ CMake options can be set by adding `-D<OPTION>=<VALUE>` to the configuration
 command. The following command would e.g. enable the unit tests
 
 ```console
-$ cmake -B <build> -S <source> -DACTS_BUILD_UNITTESTS=ON
+cmake -B <build> -S <source> -DACTS_BUILD_UNITTESTS=ON
 ```
 
 Multiple options can be given. `cmake` caches the options so that only changed
@@ -262,7 +263,6 @@ components.
 | ACTS_FORCE_ASSERTIONS               | Force assertions regardless of build<br>type<br> type: `bool`, default: `OFF`                                                                                                                                                      |
 | ACTS_USE_SYSTEM_LIBS                | Use system libraries by default<br> type: `bool`, default: `OFF`                                                                                                                                                                   |
 | ACTS_USE_SYSTEM_ACTSVG              | Use the ActSVG system library<br> type: `bool`, default: `ACTS_USE_SYSTEM_LIBS -> OFF`                                                                                                                                             |
-| ACTS_USE_SYSTEM_GEOMODEL            | Use a system-provided GeoModel<br>installation<br> type: `bool`, default: `ACTS_USE_SYSTEM_LIBS -> OFF`                                                                                                                            |
 | ACTS_USE_SYSTEM_COVFIE              | Use a system-provided covfie<br>installation<br> type: `bool`, default: `ACTS_USE_SYSTEM_LIBS -> OFF`                                                                                                                              |
 | ACTS_USE_SYSTEM_DETRAY              | Use a system-provided detray<br>installation<br> type: `bool`, default: `ACTS_USE_SYSTEM_LIBS -> OFF`                                                                                                                              |
 | ACTS_USE_SYSTEM_TRACCC              | Use a system-provided traccc<br>installation<br> type: `bool`, default: `ACTS_USE_SYSTEM_LIBS -> OFF`                                                                                                                              |
@@ -288,6 +288,8 @@ components.
 | ACTS_BUILD_PLUGIN_LEGACY            | Build legacy plugin<br> type: `bool`, default: `OFF`                                                                                                                                                                               |
 | ACTS_BUILD_PLUGIN_ONNX              | Build ONNX plugin<br> type: `bool`, default: `OFF`                                                                                                                                                                                 |
 | ACTS_BUILD_PLUGIN_TGEO              | Build TGeo plugin<br> type: `bool`, default: `OFF`                                                                                                                                                                                 |
+| ACTS_SETUP_ANNOY                    | Explicitly set up Annoy for the project<br> type: `bool`, default: `OFF`                                                                                                                                                           |
+| ACTS_BUILD_PLUGIN_HASHING           | Build Hashing plugin<br> type: `bool`, default: `OFF`                                                                                                                                                                              |
 | ACTS_BUILD_FATRAS                   | Build FAst TRAcking Simulation package<br> type: `bool`, default: `OFF`                                                                                                                                                            |
 | ACTS_BUILD_FATRAS_GEANT4            | Build Geant4 Fatras package<br> type: `bool`, default: `OFF`                                                                                                                                                                       |
 | ACTS_BUILD_ALIGNMENT                | Build Alignment package<br> type: `bool`, default: `OFF`                                                                                                                                                                           |
@@ -296,9 +298,9 @@ components.
 | ACTS_BUILD_EXAMPLES_EXATRKX         | Build the Exa.TrkX example code<br> type: `bool`, default: `OFF`                                                                                                                                                                   |
 | ACTS_BUILD_EXAMPLES_GEANT4          | Build Geant4-based code in the examples<br> type: `bool`, default: `OFF`                                                                                                                                                           |
 | ACTS_BUILD_EXAMPLES_HEPMC3          | Build HepMC3-based code in the examples<br> type: `bool`, default: `OFF`                                                                                                                                                           |
+| ACTS_BUILD_EXAMPLES_HASHING         | Build Hashing-based code in the examples<br> type: `bool`, default: `OFF`                                                                                                                                                          |
 | ACTS_BUILD_EXAMPLES_PYTHIA8         | Build Pythia8-based code in the examples<br> type: `bool`, default: `OFF`                                                                                                                                                          |
 | ACTS_BUILD_EXAMPLES_PYTHON_BINDINGS | Build python bindings for the examples<br> type: `bool`, default: `OFF`                                                                                                                                                            |
-| ACTS_USE_EXAMPLES_TBB               | Use Threading Building Blocks library in<br>the examples<br> type: `bool`, default: `ON`                                                                                                                                           |
 | ACTS_BUILD_ANALYSIS_APPS            | Build Analysis applications in the<br>examples<br> type: `bool`, default: `OFF`                                                                                                                                                    |
 | ACTS_BUILD_BENCHMARKS               | Build benchmarks<br> type: `bool`, default: `OFF`                                                                                                                                                                                  |
 | ACTS_BUILD_INTEGRATIONTESTS         | Build integration tests<br> type: `bool`, default: `OFF`                                                                                                                                                                           |
@@ -345,7 +347,7 @@ documentation](https://cmake.org/documentation/).
 The build is also affected by some environment variables. They can be set by prepending them to the configuration call:
 
 ```console
-$ DD4hep_DIR=<path/to/dd4hep> cmake -B <build> -S <source>
+DD4hep_DIR=<path/to/dd4hep> cmake -B <build> -S <source>
 ```
 
 The following environment variables might be useful.
@@ -362,8 +364,8 @@ ACTS comes packaged with a detector modeled using DD4hep that can be used to tes
 It is available via the git submodule feature by performing the following steps ([`git lfs`](https://git-lfs.com/) need to be installed on your machine):
 
 ```console
-$ git submodule init
-$ git submodule update
+git submodule init
+git submodule update
 ```
 
 To use it, you will then need to build ACTS with the `ACTS_BUILD_ODD` option and then point either `LD_LIBRARY_PATH` on Linux or
@@ -376,7 +378,6 @@ oddMaterialDeco = acts.IMaterialDecorator.fromFile("PATH_TO_Acts/thirdparty/Open
 detector, trackingGeometry, decorators = getOpenDataDetector(oddMaterialDeco)
 ```
 
-
 ## Using ACTS
 
 When using ACTS in your own CMake-based project, you need to include the
diff --git a/docs/index.rst b/docs/index.rst
index 31764809a8b..d4fa186d302 100644
--- a/docs/index.rst
+++ b/docs/index.rst
@@ -38,6 +38,7 @@ Key features:
    versioning
    formats/formats
    codeguide
+   misc/misc
    authors
    license
 
diff --git a/docs/misc/misc.rst b/docs/misc/misc.rst
new file mode 100644
index 00000000000..252db71967e
--- /dev/null
+++ b/docs/misc/misc.rst
@@ -0,0 +1,10 @@
+Miscellaneous topics
+====================
+
+This section of the documentation covers miscellaneous topics which do not fit
+elsewhere, but which may still prove useful to the reader.
+
+.. toctree::
+   :maxdepth: 1
+
+   spack
diff --git a/docs/misc/spack.md b/docs/misc/spack.md
new file mode 100644
index 00000000000..f71c4be762a
--- /dev/null
+++ b/docs/misc/spack.md
@@ -0,0 +1,76 @@
+# Building with Spack
+
+[Spack](https://spack.io/) is a package manager designed to handle software
+used in scientific computing, including computing in high-energy physics. The
+Spack package manager can be used to more easily install ACTS' dependencies.
+Builds using Spack are not officially supported. In order to start using Spack,
+follow the instructions on the [official Spack
+documentation](https://spack.readthedocs.io/en/latest/getting_started.html).
+
+## Installing dependencies
+
+Once Spack has been installed, we are ready to create a development
+environment; for example:
+
+```console
+$ spack env create acts
+```
+
+This new environment can then be activated and deactivated as follows:
+
+```console
+$ spack env activate acts
+$ despacktivate
+```
+
+:::{tip}
+The creation of a Spack environment is persistent, i.e. you should only need to
+create your environment once. The activation of the environment, on the other
+hand, affects only your current shell. As a result, you will need to activate
+the environment every time you open a new shell.
+:::
+
+With the Spack environment activated, you are ready to install ACTS'
+dependencies. You can either do this manually, or you can rely on Spack's
+definition of how to do this. To use the Spack definition, execute the
+following command (tuned for ACTS version 36.1.0; make sure you update the
+version number to match the version of ACTS you want to build):
+
+```console
+$ spack install --add --only dependencies "acts@36.1.0"
+```
+
+This specification will suffice to build the core ACTS library. If you want to
+build ACTS plugins, you will need to add additional _variants_; the following
+is a spec which can be used to build ACTS and all its plugins:
+
+```console
+$ spack install --add --only dependencies "acts@36.1.0+tgeo+geomodel+podio+edm4hep+examples+odd+fatras+json+dd4hep+geant4+fatras_geant4+hepmc3+pythia8+python+svg+traccc"
+```
+
+The string starting with `acts` in the commands above is the so-called _spec_,
+and it consists of three parts. The first part is the name of the package,
+which is `acts`. The second part is the version of the package, in this case
+`36.1.0`; Spack will pull in a set of dependencies suitable for that given
+version, so it is recommended to tune the version number to match the version
+of ACTS you want to build. The final part is a series of variants, marked with
+the `+` symbol. The command above allows you to build virtually all components
+of ACTS, but it also pulls in a large number of dependencies. You can remove
+variants you do not need in order to speed up the Spack build.
+
+Once Spack has concretized and installed the ACTS dependencies, you can build
+ACTS as normal using CMake.
+
+
+## Build caches
+
+Work on build caches for ACTS is in progress.
+
+## Support
+
+Spack support is experimental and not officially supported. Because ACTS'
+dependencies are constantly changing, it is possible that Spack's database may
+at times be out of date. If you encounter any problems using Spack to build
+ACTS, unofficial support is available in the
+[#Spack](https://mattermost.web.cern.ch/acts/channels/spack) channel on the
+ACTS Mattermost.
diff --git a/thirdparty/Annoy/0001-Modify-annoy.patch b/thirdparty/Annoy/0001-Modify-annoy.patch
new file mode 100644
index 00000000000..939f036f524
--- /dev/null
+++ b/thirdparty/Annoy/0001-Modify-annoy.patch
@@ -0,0 +1,306 @@
+From 16f4711d53903e2541dd518122d52e11e8569908 Mon Sep 17 00:00:00 2001
+From: Jeremy Couthures <jeremy.couthures@lapp.in2p3.fr>
+Date: Wed, 10 Jul 2024 10:31:31 +0200
+Subject: [PATCH] Add AngularEuclidean metric, get_seed function and
+ optimizations
+
+---
+ src/annoylib.h | 118 ++++++++++++++++++++++++++++++++++++++-----------
+ 1 file changed, 93 insertions(+), 25 deletions(-)
+
+diff --git a/src/annoylib.h b/src/annoylib.h
+index 492d9ca..5c83601 100644
+--- a/src/annoylib.h
++++ b/src/annoylib.h
+@@ -12,6 +12,10 @@
+ // License for the specific language governing permissions and limitations under
+ // the License.
+ 
++/*
++ * Note: This file has been modified to meet the needs of the ACTS projects and
++ * differs from the original provided by Spotify AB.
++ */
+ 
+ #ifndef ANNOY_ANNOYLIB_H
+ #define ANNOY_ANNOYLIB_H
+@@ -128,7 +132,11 @@ inline void set_error_from_errno(char **error, const char* msg) {
+   annoylib_showUpdate("%s: %s (%d)\n", msg, strerror(errno), errno);
+   if (error) {
+     *error = (char *)malloc(256);  // TODO: win doesn't support snprintf
+-    snprintf(*error, 255, "%s: %s (%d)", msg, strerror(errno), errno);
++#if defined(_MSC_VER) || defined(__MINGW32__)
++    sprintf(*error, "%s: %s (%d)", msg, strerror(errno), errno);
++#else
++    snprintf(*error, 256, "%s: %s (%d)", msg, strerror(errno), errno);
++#endif
+   }
+ }
+ 
+@@ -201,6 +209,35 @@ inline T euclidean_distance(const T* x, const T* y, int f) {
+   return d;
+ }
+ 
++template <typename T>
++inline T angular_euclidean_distance(const T *x, const T *y, int f) {
++  /// First dimension is an angle, so we need to be careful about periodicity.
++  /// Here we assume that the angle is in radians, and that the difference is
++  /// less than 2pi. Other dimensions are regular Euclidean.
++
++  /// Angular part
++  T tmp = std::fabs(*x - *y);
++
++  /// If the difference is larger than pi, then we can get a smaller distance by
++  /// going the other way around the circle.
++  if (tmp > M_PI) {
++    tmp = 2 * M_PI - tmp;
++  }
++
++  T d = tmp * tmp;
++  ++x;
++  ++y;
++
++  /// Euclidean part
++  for (int i = 1; i < f; ++i) {
++    tmp = *x - *y;
++    d += tmp * tmp;
++    ++x;
++    ++y;
++  }
++  return d;
++}
++
+ #ifdef ANNOYLIB_USE_AVX
+ // Horizontal single sum of 256bit vector.
+ inline float hsum256_ps_avx(__m256 v) {
+@@ -412,13 +449,13 @@ inline void two_means(const vector<Node*>& nodes, int f, Random& random, bool co
+ 
+ struct Base {
+   template<typename T, typename S, typename Node>
+-  static inline void preprocess(void* nodes, size_t _s, const S node_count, const int f) {
++  static inline void preprocess(void* /*unused*/, size_t /*unused*/, const S /*unused*/, const int /*unused*/) {
+     // Override this in specific metric structs below if you need to do any pre-processing
+     // on the entire set of nodes passed into this index.
+   }
+ 
+   template<typename Node>
+-  static inline void zero_value(Node* dest) {
++  static inline void zero_value(Node* /*unused*/) {
+     // Initialize any fields that require sane defaults within this node.
+   }
+ 
+@@ -547,7 +584,7 @@ struct DotProduct : Angular {
+   }
+ 
+   template<typename S, typename T>
+-  static inline void init_node(Node<S, T>* n, int f) {
++  static inline void init_node(Node<S, T>* /*unused*/, int /*unused*/) {
+   }
+ 
+   template<typename T, typename Node>
+@@ -671,17 +708,17 @@ struct Hamming : Base {
+     return dist;
+   }
+   template<typename S, typename T>
+-  static inline bool margin(const Node<S, T>* n, const T* y, int f) {
++  static inline bool margin(const Node<S, T>* n, const T* y, int /*unused*/) {
+     static const size_t n_bits = sizeof(T) * 8;
+     T chunk = n->v[0] / n_bits;
+     return (y[chunk] & (static_cast<T>(1) << (n_bits - 1 - (n->v[0] % n_bits)))) != 0;
+   }
+   template<typename S, typename T, typename Random>
+-  static inline bool side(const Node<S, T>* n, const T* y, int f, Random& random) {
++  static inline bool side(const Node<S, T>* n, const T* y, int f, Random& /*unused*/) {
+     return margin(n, y, f);
+   }
+   template<typename S, typename T, typename Random>
+-  static inline void create_split(const vector<Node<S, T>*>& nodes, int f, size_t s, Random& random, Node<S, T>* n) {
++  static inline void create_split(const vector<Node<S, T>*>& nodes, int f, size_t /*unused*/, Random& random, Node<S, T>* n) {
+     size_t cur_size = 0;
+     size_t i = 0;
+     int dim = f * 8 * sizeof(T);
+@@ -720,7 +757,7 @@ struct Hamming : Base {
+     return distance;
+   }
+   template<typename S, typename T>
+-  static inline void init_node(Node<S, T>* n, int f) {
++  static inline void init_node(Node<S, T>* /*unused*/, int /*unused*/) {
+   }
+   static const char* name() {
+     return "hamming";
+@@ -784,7 +821,7 @@ struct Euclidean : Minkowski {
+     return sqrt(std::max(distance, T(0)));
+   }
+   template<typename S, typename T>
+-  static inline void init_node(Node<S, T>* n, int f) {
++  static inline void init_node(Node<S, T>* /*unused*/, int /*unused*/) {
+   }
+   static const char* name() {
+     return "euclidean";
+@@ -792,6 +829,35 @@ struct Euclidean : Minkowski {
+ 
+ };
+ 
++struct AngularEuclidean : Minkowski {
++  template <typename S, typename T>
++  static inline T distance(const Node<S, T> *x, const Node<S, T> *y, int f) {
++    return angular_euclidean_distance(x->v, y->v, f);
++  }
++  template <typename S, typename T, typename Random>
++  static inline void create_split(const vector<Node<S, T> *> &nodes, int f,
++                                  size_t s, Random &random,
++                                  Node<S, T> *n) {
++    Node<S, T> *p = (Node<S, T> *)alloca(s);
++    Node<S, T> *q = (Node<S, T> *)alloca(s);
++    two_means<T, Random, AngularEuclidean, Node<S, T>>(nodes, f, random, false,
++                                                       p, q);
++
++    for (int z = 0; z < f; z++)
++      n->v[z] = p->v[z] - q->v[z];
++    Base::normalize<T, Node<S, T>>(n, f);
++    n->a = 0.0;
++    for (int z = 0; z < f; z++)
++      n->a += -n->v[z] * (p->v[z] + q->v[z]) / 2;
++  }
++  template <typename T> static inline T normalized_distance(T distance) {
++    return sqrt(std::max(distance, T(0)));
++  }
++  template <typename S, typename T>
++  static inline void init_node(Node<S, T> * /*unused*/, int /*unused*/) {}
++  static const char *name() { return "angular_euclidean"; }
++};
++
+ struct Manhattan : Minkowski {
+   template<typename S, typename T>
+   static inline T distance(const Node<S, T>* x, const Node<S, T>* y, int f) {
+@@ -815,7 +881,7 @@ struct Manhattan : Minkowski {
+     return std::max(distance, T(0));
+   }
+   template<typename S, typename T>
+-  static inline void init_node(Node<S, T>* n, int f) {
++  static inline void init_node(Node<S, T>* /*unused*/, int /*unused*/) {
+   }
+   static const char* name() {
+     return "manhattan";
+@@ -841,6 +907,7 @@ class AnnoyIndexInterface {
+   virtual void verbose(bool v) = 0;
+   virtual void get_item(S item, T* v) const = 0;
+   virtual void set_seed(R q) = 0;
++  virtual R get_seed() const = 0;
+   virtual bool on_disk_build(const char* filename, char** error=NULL) = 0;
+ };
+ 
+@@ -869,14 +936,14 @@ public:
+ #endif
+ 
+ protected:
+-  const int _f;
+-  size_t _s;
++  const unsigned int _f;
++  size_t _s; // Size of each node
+   S _n_items;
+   void* _nodes; // Could either be mmapped, or point to a memory buffer that we reallocate
+   S _n_nodes;
+   S _nodes_size;
+   vector<S> _roots;
+-  S _K;
++  S _K; // Max number of descendants to fit into node
+   R _seed;
+   bool _loaded;
+   bool _verbose;
+@@ -885,7 +952,7 @@ protected:
+   bool _built;
+ public:
+ 
+-   AnnoyIndex(int f) : _f(f), _seed(Random::default_seed) {
++   AnnoyIndex(unsigned int f) : _f(f), _seed(Random::default_seed) {
+     _s = offsetof(Node, v) + _f * sizeof(T); // Size of each node
+     _verbose = false;
+     _built = false;
+@@ -896,7 +963,7 @@ public:
+     unload();
+   }
+ 
+-  int get_f() const {
++  unsigned int get_f() const {
+     return _f;
+   }
+ 
+@@ -911,6 +978,9 @@ public:
+       return false;
+     }
+     _allocate_size(item + 1);
++    if (item >= _n_items)
++      _n_items = item + 1;
++
+     Node* n = _get(item);
+ 
+     D::zero_value(n);
+@@ -919,14 +989,11 @@ public:
+     n->children[1] = 0;
+     n->n_descendants = 1;
+ 
+-    for (int z = 0; z < _f; z++)
++    for (unsigned int z = 0; z < _f; z++)
+       n->v[z] = w[z];
+ 
+     D::init_node(n, _f);
+ 
+-    if (item >= _n_items)
+-      _n_items = item + 1;
+-
+     return true;
+   }
+     
+@@ -976,8 +1043,7 @@ public:
+     // This way we can load them faster without reading the whole file
+     _allocate_size(_n_nodes + (S)_roots.size());
+     for (size_t i = 0; i < _roots.size(); i++)
+-      memcpy(_get(_n_nodes + (S)i), _get(_roots[i]), _s);
+-    _n_nodes += _roots.size();
++      memcpy(_get(_n_nodes++), _get(_roots[i]), _s);
+ 
+     if (_verbose) annoylib_showUpdate("has %d nodes\n", _n_nodes);
+     
+@@ -1119,10 +1185,10 @@ public:
+ 
+     // Find the roots by scanning the end of the file and taking the nodes with most descendants
+     _roots.clear();
+-    S m = -1;
++    S m = (S)-1;
+     for (S i = _n_nodes - 1; i >= 0; i--) {
+       S k = _get(i)->n_descendants;
+-      if (m == -1 || k == m) {
++      if (m == (S)-1 || k == m) {
+         _roots.push_back(i);
+         m = k;
+       } else {
+@@ -1175,6 +1241,8 @@ public:
+     _seed = seed;
+   }
+ 
++  R get_seed() const { return _seed; }
++
+   void thread_build(int q, int thread_idx, ThreadedBuildPolicy& threaded_build_policy) {
+     // Each thread needs its own seed, otherwise each thread would be building the same tree(s)
+     Random _random(_seed + thread_idx);
+@@ -1332,7 +1400,7 @@ protected:
+       children_indices[1].clear();
+ 
+       // Set the vector to 0.0
+-      for (int z = 0; z < _f; z++)
++      for (unsigned int z = 0; z < _f; z++)
+         m->v[z] = 0;
+ 
+       for (size_t i = 0; i < indices.size(); i++) {
+@@ -1425,7 +1493,7 @@ protected:
+ class AnnoyIndexSingleThreadedBuildPolicy {
+ public:
+   template<typename S, typename T, typename D, typename Random>
+-  static void build(AnnoyIndex<S, T, D, Random, AnnoyIndexSingleThreadedBuildPolicy>* annoy, int q, int n_threads) {
++  static void build(AnnoyIndex<S, T, D, Random, AnnoyIndexSingleThreadedBuildPolicy>* annoy, int q, int /*unused*/) {
+     AnnoyIndexSingleThreadedBuildPolicy threaded_build_policy;
+     annoy->thread_build(q, 0, threaded_build_policy);
+   }
+-- 
+2.34.1
+
diff --git a/thirdparty/Annoy/CMakeLists.txt b/thirdparty/Annoy/CMakeLists.txt
new file mode 100644
index 00000000000..adc28862843
--- /dev/null
+++ b/thirdparty/Annoy/CMakeLists.txt
@@ -0,0 +1,33 @@
+# This file is part of the ACTS project.
+#
+# Copyright (C) 2016 CERN for the benefit of the ACTS project
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at https://mozilla.org/MPL/2.0/.
+
+# CMake include(s).
+include(FetchContent)
+
+# Information message.
+message(STATUS "Building Annoy as part of the ACTS project")
+
+# Version of the Annoy library to fetch.
+set(ANNOY_VERSION "v${_acts_annoy_version}")
+
+# Declare the fetching of the Annoy library.
+FetchContent_Declare(
+    Annoy
+    ${ACTS_ANNOY_SOURCE}
+    PATCH_COMMAND
+        patch -p1 < ${CMAKE_CURRENT_SOURCE_DIR}/0001-Modify-annoy.patch
+)
+
+# Make the fetched content available.
+# Annoy contains a CMakeLists.txt file, so it will be added as a subdirectory.
+FetchContent_MakeAvailable(Annoy)
+
+target_compile_options(
+    Annoy
+    INTERFACE "-Wno-old-style-cast" "-Wno-zero-as-null-pointer-constant"
+)
diff --git a/thirdparty/FRNN/CMakeLists.txt b/thirdparty/FRNN/CMakeLists.txt
index cd36fc9a330..25bcfb10f2b 100644
--- a/thirdparty/FRNN/CMakeLists.txt
+++ b/thirdparty/FRNN/CMakeLists.txt
@@ -1,10 +1,10 @@
-# This file is part of the Acts project.
+# This file is part of the ACTS project.
 #
-# Copyright (C) 2022 CERN for the benefit of the Acts project
+# Copyright (C) 2016 CERN for the benefit of the ACTS project
 #
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+# file, You can obtain one at https://mozilla.org/MPL/2.0/.
 include(FetchContent)
 
 message(STATUS "Building FRNN as part of the ACTS project")
diff --git a/thirdparty/README.md b/thirdparty/README.md
index d90f1a04710..243479db0aa 100644
--- a/thirdparty/README.md
+++ b/thirdparty/README.md
@@ -17,9 +17,7 @@ CMake instructions to build [nlohmann::json](https://github.com/nlohmann/json).
 ## boost
 
 For convenience, it's possible to use the ACTS build system to build the minimum
-required version of [boost](https://www.boost.org/) (currently 1.71.0).  No source is
-bundled here, and if requested via "-DACTS_USE_SYSTEM_BOOST=OFF", only the filesystem,
-program_options, and test libraries will be built.
+required version of [boost](https://www.boost.org/) (currently 1.71.0).
 
 Warning: during installation, the built boost libraries will be installed alongside the
 ACTS libraries, with a version suffix. This location may be known to the system linker.
@@ -57,3 +55,7 @@ CMake instruction to build [detray](https://github.com/acts-project/detray), whi
 ## Traccc
 
 CMake instruction to build [traccc](https://github.com/acts-project/traccc), which is used by the traccc plugin.
+
+## Annoy
+
+CMake instructions to build [Annoy](https://github.com/spotify/annoy) which is used by the Hashing plugin.
diff --git a/thirdparty/actsvg/CMakeLists.txt b/thirdparty/actsvg/CMakeLists.txt
index 1fea9d85b2b..8d57b9ba764 100644
--- a/thirdparty/actsvg/CMakeLists.txt
+++ b/thirdparty/actsvg/CMakeLists.txt
@@ -1,10 +1,10 @@
-# This file is part of the Acts project.
+# This file is part of the ACTS project.
 #
-# Copyright (C) 2022 CERN for the benefit of the Acts project
+# Copyright (C) 2016 CERN for the benefit of the ACTS project
 #
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+# file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 # CMake include(s).
 include(FetchContent)
@@ -14,5 +14,11 @@ message(STATUS "Building actsvg as part of the ACTS project")
 
 FetchContent_Declare(actsvg ${ACTS_ACTSVG_SOURCE})
 
+set(ACTSVG_BUILD_PYTHON_BINDINGS
+    OFF
+    CACHE BOOL
+    "Do not build the Python bindings for actsvg"
+)
+
 # Now set up its build.
 FetchContent_MakeAvailable(actsvg)
diff --git a/thirdparty/algebra-plugins/CMakeLists.txt b/thirdparty/algebra-plugins/CMakeLists.txt
index d09880b2615..ef0fc005afb 100644
--- a/thirdparty/algebra-plugins/CMakeLists.txt
+++ b/thirdparty/algebra-plugins/CMakeLists.txt
@@ -1,10 +1,10 @@
-# This file is part of the Acts project.
+# This file is part of the ACTS project.
 #
-# Copyright (C) 2021 CERN for the benefit of the Acts project
+# Copyright (C) 2016 CERN for the benefit of the ACTS project
 #
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+# file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 # CMake include(s).
 include(FetchContent)
diff --git a/thirdparty/covfie/CMakeLists.txt b/thirdparty/covfie/CMakeLists.txt
index 0d6d71cf47e..fe86e7e0e47 100644
--- a/thirdparty/covfie/CMakeLists.txt
+++ b/thirdparty/covfie/CMakeLists.txt
@@ -1,10 +1,10 @@
-# This file is part of the Acts project.
+# This file is part of the ACTS project.
 #
-# Copyright (C) 2021 CERN for the benefit of the Acts project
+# Copyright (C) 2016 CERN for the benefit of the ACTS project
 #
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+# file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 # CMake include(s).
 include(FetchContent)
diff --git a/thirdparty/detray/CMakeLists.txt b/thirdparty/detray/CMakeLists.txt
index c24b260b0ff..aeae6304a54 100644
--- a/thirdparty/detray/CMakeLists.txt
+++ b/thirdparty/detray/CMakeLists.txt
@@ -1,10 +1,10 @@
-# This file is part of the Acts project.
+# This file is part of the ACTS project.
 #
-# Copyright (C) 2021 CERN for the benefit of the Acts project
+# Copyright (C) 2016 CERN for the benefit of the ACTS project
 #
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+# file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 # CMake include(s).
 include(FetchContent)
@@ -30,16 +30,32 @@ set(DETRAY_CUSTOM_SCALARTYPE
     "Scalar type to use in the Detray code"
 )
 
-set(DETRAY_BUILD_TESTING
+set(DETRAY_BUILD_TEST_UTILS
+    ON
+    CACHE BOOL
+    "Turn on the build of the Detray test utilities"
+)
+
+set(DETRAY_BUILD_UNITTESTS
     OFF
     CACHE BOOL
     "Turn off the build of the Detray unit tests"
 )
+set(DETRAY_BUILD_INTEGRATIONTESTS
+    OFF
+    CACHE BOOL
+    "Turn off the build of the Detray integration tests"
+)
 set(DETRAY_BUILD_TUTORIALS
     OFF
     CACHE BOOL
     "Turn off the build of the Detray tutorials"
 )
+set(DETRAY_BUILD_BENCHMARKS
+    OFF
+    CACHE BOOL
+    "Turn off the build of the Detray benchmarks"
+)
 set(DETRAY_EIGEN_PLUGIN
     ON
     CACHE BOOL
diff --git a/thirdparty/traccc/CMakeLists.txt b/thirdparty/traccc/CMakeLists.txt
index 6271b5ef0c3..94674839a7e 100644
--- a/thirdparty/traccc/CMakeLists.txt
+++ b/thirdparty/traccc/CMakeLists.txt
@@ -1,10 +1,10 @@
-# This file is part of the Acts project.
+# This file is part of the ACTS project.
 #
-# Copyright (C) 2021 CERN for the benefit of the Acts project
+# Copyright (C) 2016 CERN for the benefit of the ACTS project
 #
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+# file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 # CMake include(s).
 include(FetchContent)
@@ -15,12 +15,7 @@ message(STATUS "Building traccc as part of the Acts project")
 set(TRACCC_VERSION "${_acts_traccc_version}")
 
 # Declare where to get traccc from.
-FetchContent_Declare(
-    traccc
-    ${ACTS_TRACCC_SOURCE}
-    # Needed until https://github.com/acts-project/traccc/pull/682 and https://github.com/acts-project/traccc/pull/683 are deployed
-    PATCH_COMMAND patch -p1 -i ${CMAKE_CURRENT_SOURCE_DIR}/warnings.diff
-)
+FetchContent_Declare(traccc ${ACTS_TRACCC_SOURCE})
 
 if(ACTS_CUSTOM_SCALARTYPE)
     set(ACTS_TRACCC_SCALARTYPE ${ACTS_CUSTOM_SCALARTYPE})
diff --git a/thirdparty/traccc/warnings.diff b/thirdparty/traccc/warnings.diff
deleted file mode 100644
index 78fa1f37118..00000000000
--- a/thirdparty/traccc/warnings.diff
+++ /dev/null
@@ -1,40 +0,0 @@
-diff --git a/core/include/traccc/seeding/spacepoint_binning_helper.hpp b/core/include/traccc/seeding/spacepoint_binning_helper.hpp
-index 56a068d4..5a4f2ff2 100644
---- a/core/include/traccc/seeding/spacepoint_binning_helper.hpp
-+++ b/core/include/traccc/seeding/spacepoint_binning_helper.hpp
-@@ -99,7 +99,8 @@ inline std::pair<detray::axis2::circular<>, detray::axis2::regular<>> get_axes(
- 
-     scalar zBinSize = grid_config.cotThetaMax * grid_config.deltaRMax;
-     detray::dindex zBins = std::max(
--        1, (int)std::floor((grid_config.zMax - grid_config.zMin) / zBinSize));
-+        1, static_cast<int>(
-+               std::floor((grid_config.zMax - grid_config.zMin) / zBinSize)));
- 
-     detray::axis2::regular m_z_axis{zBins, grid_config.zMin, grid_config.zMax,
-                                     mr};
-diff --git a/io/src/csv/read_cells.cpp b/io/src/csv/read_cells.cpp
-index a80d8f92..1451202f 100644
---- a/io/src/csv/read_cells.cpp
-+++ b/io/src/csv/read_cells.cpp
-@@ -58,7 +58,7 @@ traccc::cell_module get_module(const std::uint64_t geometry_id,
-         }
- 
-         // Set the value on the module description.
--        result.placement = (*geom)[result.surface_link.value()];
-+        result.placement = geom->at(result.surface_link.value());
-     }
- 
-     // Find/set the digitization configuration of the detector module.
-diff --git a/io/src/csv/read_spacepoints.cpp b/io/src/csv/read_spacepoints.cpp
-index b2a38aba..41922683 100644
---- a/io/src/csv/read_spacepoints.cpp
-+++ b/io/src/csv/read_spacepoints.cpp
-@@ -59,7 +59,7 @@ void read_spacepoints(spacepoint_reader_output& out, std::string_view filename,
-             m[iohit.geometry_id] = link;
-             cell_module mod;
-             mod.surface_link = detray::geometry::barcode{iohit.geometry_id};
--            mod.placement = geom[iohit.geometry_id];
-+            mod.placement = geom.at(iohit.geometry_id);
-             result_modules.push_back(mod);
-         }
- 
diff --git a/thirdparty/vecmem/CMakeLists.txt b/thirdparty/vecmem/CMakeLists.txt
index 637ea1800b7..e0fbf07b143 100644
--- a/thirdparty/vecmem/CMakeLists.txt
+++ b/thirdparty/vecmem/CMakeLists.txt
@@ -1,10 +1,10 @@
-# This file is part of the Acts project.
+# This file is part of the ACTS project.
 #
-# Copyright (C) 2021 CERN for the benefit of the Acts project
+# Copyright (C) 2016 CERN for the benefit of the ACTS project
 #
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+# file, You can obtain one at https://mozilla.org/MPL/2.0/.
 
 # CMake include(s).
 include(FetchContent)